From c2908cda4397025198e2c4a231afac7c6a85b64c Mon Sep 17 00:00:00 2001 From: pengtao Date: Fri, 22 Nov 2019 11:52:51 +0800 Subject: [PATCH] fixbug --- daily_report/dreport.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/daily_report/dreport.py b/daily_report/dreport.py index f2cc665..f8bc4fa 100644 --- a/daily_report/dreport.py +++ b/daily_report/dreport.py @@ -529,8 +529,7 @@ 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}") @@ -542,8 +541,9 @@ class TapWeeklyReport: for item in tt.keys(): if item not in rows: new_tt.pop(item) - temp["row_data"].append(new_tt) - pdb.set_trace() + for k in rows: + temp["row_name"].append(self.row_cn.get(k)) + temp["row_data"].append(new_tt.get(k)) r_data.append(temp) except Exception: log.error(f"struct data with {line} Failed", exc_info=True)