fix20221210

apps/view_choose/map_view.py

@@ -272,11 +272,9 @@ def month_rate():
         # 当年产业用地面积
         # 当年产业用地面积
         # upload_time = '2022-01-01 00:00:00'
         # upload_time = '2022-01-01 00:00:00'
         upload_time = ''
         upload_time = ''
-        if district_name == '太原市':
-            district_name_list = ["小店区", "迎泽区", "杏花岭区", "尖草坪区",
-                                  "万柏林区", "晋源区", "古交市", "清徐县", "阳曲县",
-                                  "娄烦县", "中北高新区", "清徐开发区",
-                                  "阳曲示范区", "西山示范区"]
+        if district_name == '晋城市':
+            district_name_list = ["沁水县", "高平市", "陵川县", "阳城县",
+                                  "泽州县", "城区", "晋城经济技术开发区"]
             for district_name in district_name_list:
             for district_name in district_name_list:
                 land_area_obj_list = com.get_total_land_area('', '', district_name, '', upload_time)
                 land_area_obj_list = com.get_total_land_area('', '', district_name, '', upload_time)
                 land_total_area = sum([float(land_area_obj.total_area if land_area_obj.total_area else 0) for land_area_obj in land_area_obj_list])
                 land_total_area = sum([float(land_area_obj.total_area if land_area_obj.total_area else 0) for land_area_obj in land_area_obj_list])

apps/view_choose/view.py

@@ -5,10 +5,10 @@ from apps.utils.response_code import RET
 from apps.view_choose import api_address
 from apps.view_choose import api_address
 
 
 
 
-#  获取某个行政区的全部园区信息
 from apps.util import verify_token
 from apps.util import verify_token
 
 
 
 
+#  获取某个行政区的全部园区信息
 @api_address.route("/DefaultAddress", methods=["POST"])
 @api_address.route("/DefaultAddress", methods=["POST"])
 def default_address():
 def default_address():
     req_dict = request.get_json()
     req_dict = request.get_json()
@@ -17,11 +17,11 @@ def default_address():
     perpage = req_dict.get("perpage")
     perpage = req_dict.get("perpage")
     # 查询出该区县的所有园区列表
     # 查询出该区县的所有园区列表
     try:
     try:
-        if district=="晋城市":
-            result = Induzone.query.filter_by(upper_district=district, cate='产业园区').all()
+        if district == "晋城市":
+            result = Induzone.query.filter_by(cate='产业园区').all()
             all_jwd = [{"id": i.id, "name": i.name, "lng": i.lng, "lat": i.lat} for i in result]
             all_jwd = [{"id": i.id, "name": i.name, "lng": i.lng, "lat": i.lat} for i in result]
             size = len(result)
             size = len(result)
-            result = Induzone.query.filter_by(upper_district=district, cate='产业园区')
+            result = Induzone.query.filter_by(cate='产业园区')
             result = result.paginate(page, perpage).items
             result = result.paginate(page, perpage).items
         else:
         else:
             result = Induzone.query.filter_by(district=district, cate='产业园区').all()
             result = Induzone.query.filter_by(district=district, cate='产业园区').all()
@@ -68,8 +68,8 @@ def advice():
     page = req_dict.get("page")
     page = req_dict.get("page")
     perpage = req_dict.get("perpage")
     perpage = req_dict.get("perpage")
     # print(address)
     # print(address)
-    if not all([industry_id, product, budget, preference]):
-        return jsonify(code=RET.DATAERR, msg="数据不全")
+    # if not all([industry_id, product, budget, preference]):
+    #     return jsonify(code=RET.DATAERR, msg="数据不全")
     try:
     try:
         indu = Industry.query.filter_by(nid=industry_id).first()
         indu = Industry.query.filter_by(nid=industry_id).first()
         if not indu:
         if not indu: