This commit is contained in:
pengtao 2019-11-22 12:00:58 +08:00
parent 145d7ad161
commit b1b43cebc1

View File

@ -529,7 +529,8 @@ class TapWeeklyReport:
temp["name"] = self.all_type.get(key).get("name") temp["name"] = self.all_type.get(key).get("name")
rows = self.base_head + self.all_type.get(key).get("row") + self.base_end rows = self.base_head + self.all_type.get(key).get("row") + self.base_end
temp["row_name"] = [] temp["row_name"] = []
for k in rows:
temp["row_name"].append(self.row_cn.get(k))
temp["row_data"] = [] temp["row_data"] = []
for line in data_key[0]: for line in data_key[0]:
#print(f"line={line}") #print(f"line={line}")
@ -541,9 +542,10 @@ class TapWeeklyReport:
for item in tt.keys(): for item in tt.keys():
if item not in rows: if item not in rows:
new_tt.pop(item) new_tt.pop(item)
ttt = list()
for k in rows: for k in rows:
temp["row_name"].append(self.row_cn.get(k)) ttt.append(new_tt.get(k))
temp["row_data"].append(new_tt.get(k)) temp["row_data"].append(ttt)
pdb.set_trace() pdb.set_trace()
r_data.append(temp) r_data.append(temp)
except Exception: except Exception: