fix

apps/view_index/view.py

@@ -527,21 +527,23 @@ def company_detail():
                                      "scope": company.business_scope if company.business_scope else "-",  # 企业经营范围
                                      # "collect": "1",
                                      # "choice": "3"
-                                     "tax_code": company.tax_code if company.tax_code else "-",
-                                     "register_code": company.register_code if company.register_code else "-",
-
-                                     "high_new": '高新技术企业' if company.high_new == '1' else "-",
-                                     "tbe": '科技型中小企业' if company.tbe == '1' else "-",
-                                     # "fianacing": '融资企业' if company.fianacing == '1'' else "-",
-                                     "quoted_company": '上市企业' if company.quoted_company == '1' else "-",
-                                     # "patent": '专利企业' if company.patent == '1'' else "-",
-                                     "unicorn": '独角兽企业' if company.unicorn == '1' else "-",
-                                     "dengl": '瞪羚' if company.dengl == '1' else "-",
-                                     "isfive": '中国500强' if company.isfive == '1' else "-",
-                                     "zjtg": '山西专精特新企业' if company.zjtg == '1' else "-",
-                                     "zjtg_gjjxjr": '国家级专精特新小巨人企业' if company.zjtg_gjjxjr == '1' else "-",
-                                     "zjtg_sjxjr": '省级专精特新小巨人企业' if company.zjtg_sjxjr == '1' else "-",
-                                     "tbe_sjmy": '省级民营科技企业' if company.tbe_sjmy == '1' else "-",
+                                     "tax_code": company.tax_code if company.tax_code else "",
+                                     "register_code": company.register_code if company.register_code else "",
+
+                                     "high_new": '高新技术企业' if company.high_new == '1' else "",
+                                     "tbe": '科技型中小企业' if company.tbe == '1' else "",
+                                     # "fianacing": '融资企业' if company.fianacing == '1'' else "",
+                                     "quoted_company": '上市企业' if company.quoted_company == '1' else "",
+                                     # "patent": '专利企业' if company.patent == '1'' else "",
+                                     "unicorn": '独角兽企业' if company.unicorn == '1' else "",
+                                     "dengl": '瞪羚' if company.dengl == '1' else "",
+                                     "isfive": '中国500强' if company.isfive == '1' else "",
+                                     "zjtg": '山西专精特新企业' if company.zjtg == '1' else "",
+                                     "zjtg_gjjxjr": '国家级专精特新小巨人企业' if company.zjtg_gjjxjr == '1' else "",
+                                     "zjtg_sjxjr": '省级专精特新小巨人企业' if company.zjtg_sjxjr == '1' else "",
+                                     "tbe_sjmy": '省级民营科技企业' if company.tbe_sjmy == '1' else "",
+                                     "scale": '规模以上企业' if company.tbe_sjmy == '1' else "",
+
                                      },
                     #  经营状况数据封装
                     "select2_info": {

apps/view_map/view.py

@@ -54,7 +54,7 @@ def attract_map():
                 province_data = Enterprise.query.filter_by(province=pro).first()
                 df.append({"name": pro,
                            "value": num,
-                           "color": jishu(num),
+                           # "color": jishu(num),
                            "jwd": {"lng": province_data.p_lng, "lat": province_data.p_lat}})
 
             return jsonify(code=RET.OK, msg="获取成功", data=df)
@@ -66,7 +66,7 @@ def attract_map():
                 city_data = Enterprise.query.filter_by(province=province, city=cit).first()
                 df.append({"name": cit,
                            "value": num,
-                           "color": jishu(num),
+                           # "color": jishu(num),
                            "jwd": {"lng": city_data.c_lng, "lat": city_data.c_lat}})
 
             return jsonify(code=RET.OK, msg="获取成功", data=df)