Commit 4ae8d13d by dong

fix20221220

parent ae49f4f7
...@@ -60,7 +60,7 @@ def get_data1(district_li, current_year): ...@@ -60,7 +60,7 @@ def get_data1(district_li, current_year):
current_app.logger.error(e) current_app.logger.error(e)
print('项目签约完成率计算出错', e) print('项目签约完成率计算出错', e)
return 'error' return 'error'
data_li1 = sorted(data_li1, key=lambda x: x['value'], reverse=True) data_li1 = sorted(data_li1, key=lambda x: x['value'], reverse=False)
return data_li1 return data_li1
...@@ -92,7 +92,7 @@ def get_data2(district_li, current_year): ...@@ -92,7 +92,7 @@ def get_data2(district_li, current_year):
current_app.logger.error(e) current_app.logger.error(e)
print('项目开工率计算出错', e) print('项目开工率计算出错', e)
return 'error' return 'error'
data_li2 = sorted(data_li2, key=lambda x: x['value'], reverse=True) data_li2 = sorted(data_li2, key=lambda x: x['value'], reverse=False)
return data_li2 return data_li2
...@@ -130,7 +130,7 @@ def get_data3(district_li, current_year): ...@@ -130,7 +130,7 @@ def get_data3(district_li, current_year):
current_app.logger.error(e) current_app.logger.error(e)
print('新开工项目计划投资额完成率计算出错', e) print('新开工项目计划投资额完成率计算出错', e)
return 'error' return 'error'
data_li3 = sorted(data_li3, key=lambda x: x['value'], reverse=True) data_li3 = sorted(data_li3, key=lambda x: x['value'], reverse=False)
return data_li3 return data_li3
...@@ -167,7 +167,7 @@ def get_data4(district_li, current_year): ...@@ -167,7 +167,7 @@ def get_data4(district_li, current_year):
current_app.logger.error(e) current_app.logger.error(e)
print('固定资产投资项目到位资金完成率计算出错', e) print('固定资产投资项目到位资金完成率计算出错', e)
return 'error' return 'error'
data_li4 = sorted(data_li4, key=lambda x: x['value'], reverse=True) data_li4 = sorted(data_li4, key=lambda x: x['value'], reverse=False)
return data_li4 return data_li4
...@@ -205,7 +205,7 @@ def get_data5(district_li, current_year): ...@@ -205,7 +205,7 @@ def get_data5(district_li, current_year):
current_app.logger.error(e) current_app.logger.error(e)
print('非固定资产投资项目到位资金完成率计算出错', e) print('非固定资产投资项目到位资金完成率计算出错', e)
return 'error' return 'error'
data_li5 = sorted(data_li5, key=lambda x: x['value'], reverse=True) data_li5 = sorted(data_li5, key=lambda x: x['value'], reverse=False)
return data_li5 return data_li5
...@@ -285,7 +285,7 @@ def get_data6(district_li, current_year): ...@@ -285,7 +285,7 @@ def get_data6(district_li, current_year):
grade5 = grade_dic["grade"] grade5 = grade_dic["grade"]
total_grade = grade1 + grade2 + grade3 + grade4 + grade5 total_grade = grade1 + grade2 + grade3 + grade4 + grade5
data_li6.append({"name": district, "value": total_grade}) data_li6.append({"name": district, "value": total_grade})
data_li6 = sorted(data_li6, key=lambda x: x['value'], reverse=True) data_li6 = sorted(data_li6, key=lambda x: x['value'], reverse=False)
return data_li6 return data_li6
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment