fix20221211

apps/inves_manage/statistic_analysis_view.py

@@ -872,13 +872,6 @@ def project_graph():
                 {"name": "第三产业", "value": round(project_count3 / total_num * 100, 2)},
                 {"name": "第三产业", "value": round(project_count3 / total_num * 100, 2)},
             ]
             ]
         elif flag == 4:
         elif flag == 4:
-            # industry_list = []
-            # for project_obj_obj in project_obj.all():
-            #     if project_obj_obj.industry not in industry_list:
-            #         industry_list.append(project_obj_obj.industry)
-            #         continue
-            #     else:
-            #         continue
             industry_list = ["传统产业升级改造", "现代农业", "战略性新兴产业", "现代服务业", "文化旅游产业", "其他"]
             industry_list = ["传统产业升级改造", "现代农业", "战略性新兴产业", "现代服务业", "文化旅游产业", "其他"]
             data = []
             data = []
             num_li = []
             num_li = []

apps/inves_manage/view.py

@@ -88,7 +88,9 @@ def project_map():
         project_obj_count1 = 0
         project_obj_count1 = 0
         project_obj_count2 = 0
         project_obj_count2 = 0
         project_obj_count3 = 0
         project_obj_count3 = 0
-        project_obj_list = ProjectManagement.query.filter_by(district=district_name).all()
+        project_obj_list = ProjectManagement.query.filter(
+            ProjectManagement.district == district_name if district_name else text('')
+            ).all()
         for project_obj in project_obj_list:
         for project_obj in project_obj_list:
             if project_obj.sign_time:
             if project_obj.sign_time:
                 project_obj_count1 += 1
                 project_obj_count1 += 1