From b1b43cebc10b16fdb750da16c741401f545019f4 Mon Sep 17 00:00:00 2001 From: pengtao Date: Fri, 22 Nov 2019 12:00:58 +0800 Subject: [PATCH] fixbug --- daily_report/dreport.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/daily_report/dreport.py b/daily_report/dreport.py index 4ef4a31..0083365 100644 --- a/daily_report/dreport.py +++ b/daily_report/dreport.py @@ -529,7 +529,8 @@ class TapWeeklyReport: temp["name"] = self.all_type.get(key).get("name") rows = self.base_head + self.all_type.get(key).get("row") + self.base_end temp["row_name"] = [] - + for k in rows: + temp["row_name"].append(self.row_cn.get(k)) temp["row_data"] = [] for line in data_key[0]: #print(f"line={line}") @@ -541,9 +542,10 @@ class TapWeeklyReport: for item in tt.keys(): if item not in rows: new_tt.pop(item) + ttt = list() for k in rows: - temp["row_name"].append(self.row_cn.get(k)) - temp["row_data"].append(new_tt.get(k)) + ttt.append(new_tt.get(k)) + temp["row_data"].append(ttt) pdb.set_trace() r_data.append(temp) except Exception: