fix20220308

apps/models.py

@@ -1026,43 +1026,10 @@ class GovDepartment(db.Model):
     function = db.Column(db.Text, doc='负责人电话', comment='负责人电话')  # 部门职能
     function = db.Column(db.Text, doc='负责人电话', comment='负责人电话')  # 部门职能
     name = db.Column(db.String(255), nullable=False, doc='政府机构部门名称', comment='政府机构部门名称')  # 政府机构部门名称
     name = db.Column(db.String(255), nullable=False, doc='政府机构部门名称', comment='政府机构部门名称')  # 政府机构部门名称
     # gid = db.Column(db.Integer) # 政府id
     # gid = db.Column(db.Integer) # 政府id
-    goverment_org_id = db.Column(db.Integer, db.ForeignKey("government_organization.id"), doc='外键id，机构id', comment='外键id，机构id')
+    goverment_org_id = db.Column(db.Integer, db.ForeignKey("government_organization.id"), doc='外键id，机构id',
+                                 comment='外键id，机构id')
     goverment = db.relationship('GovOrganization', backref=db.backref('government_departments'))  # 政府1-N部门
     goverment = db.relationship('GovOrganization', backref=db.backref('government_departments'))  # 政府1-N部门
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 # 项目列表
 # 项目列表
 # class Item(db.Model):
 # class Item(db.Model):
 #     __tablename_ = "item"
 #     __tablename_ = "item"
@@ -1143,7 +1110,6 @@ class GovDepartment(db.Model):
 #                      )
 #                      )
 
 
 
 
-
 #
 #
 # # 政府组（政府1-N部门1-N组）
 # # 政府组（政府1-N部门1-N组）
 # class Group(db.Model):
 # class Group(db.Model):
@@ -1184,7 +1150,6 @@ class GovDepartment(db.Model):
 #     enterprise_id = db.Column(db.Integer, db.ForeignKey("enterprise.id"), primary_key=True)
 #     enterprise_id = db.Column(db.Integer, db.ForeignKey("enterprise.id"), primary_key=True)
 
 
 
 
-
 # # 创新资源-双创平台
 # # 创新资源-双创平台
 # class Platform(db.Model):
 # class Platform(db.Model):
 #     __tablename_ = "platform"
 #     __tablename_ = "platform"
@@ -1566,3 +1531,21 @@ class GovDepartment(db.Model):
 #     company_info = db.Column(db.Text)  # 公司简介
 #     company_info = db.Column(db.Text)  # 公司简介
 #     product = db.Column(db.String(255))  # 产品
 #     product = db.Column(db.String(255))  # 产品
 #     takingn = db.Column(db.Float)  # 营收
 #     takingn = db.Column(db.Float)  # 营收
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

apps/view_atlas/view.py

@@ -156,7 +156,7 @@ def industry_enterprise():
             company = Company.query.filter_by(c_type=inid, city="晋城市")
             company = Company.query.filter_by(c_type=inid, city="晋城市")
 
 
             if product:
             if product:
-                company = Company.query.filter(Company.product_all.like("%{}%".format(product)))
+                company = Company.query.filter(Company.product.like("%{}%".format(product)))
 
 
         size = company.count()
         size = company.count()
         companys = company.order_by(Company.hots.desc()).paginate(page, perpage).items  # 企业热度倒序
         companys = company.order_by(Company.hots.desc()).paginate(page, perpage).items  # 企业热度倒序
@@ -180,11 +180,11 @@ def industry_enterprise():
                "scale": '规模以上企业' if i.scale == '1' else ''
                "scale": '规模以上企业' if i.scale == '1' else ''
                } for i in companys]
                } for i in companys]
         data = {"size": size, "df": df}
         data = {"size": size, "df": df}
+        return jsonify(code=RET.OK, msg="获取成功", data=data)
     except Exception as e:
     except Exception as e:
         current_app.logger.error(e)
         current_app.logger.error(e)
         return jsonify(code=RET.DBERR, msg="数据库查询错误")
         return jsonify(code=RET.DBERR, msg="数据库查询错误")
 
 
-    return jsonify(code=RET.OK, msg="获取成功", data=data)
 
 
 
 
 # 点击产业创新资源联动显示 innovation resource
 # 点击产业创新资源联动显示 innovation resource

apps/view_radar/view.py

@@ -317,6 +317,68 @@ def prolink():
         current_app.logger.error(e)
         current_app.logger.error(e)
         return jsonify(code=RET.DBERR, msg="数据库查询错误")
         return jsonify(code=RET.DBERR, msg="数据库查询错误")
 
 
+# 产业评估-优势薄弱缺失三环节
+# @api_radar.route('/ThreeLink', methods=['POST'])
+# # @login_required
+# def prolink():
+#     '''雷达监测页企业属性分布统计'''
+#     req_dict = request.get_json()
+#     inid = req_dict.get("inid")  # 行业id
+#     # area = req_dict.get("area")  # [省，市，区]
+#     # province = area[0]
+#     # city = area[1]
+#     # district = area[2]
+#
+#     link_type = req_dict.get("link_type")  # 缺失环节1，薄弱环节2，优势环节3
+#     page = req_dict.get("page")  # page
+#     perpage = req_dict.get("perpage")  # perpage
+#
+#     # 校验参数完整性
+#     if not all([inid, page, perpage]):
+#         return jsonify(code=RET.PARAMERR, msg="参数不完整")
+#
+#     try:
+#         edata = EvaluationNodeData.query.filter_by(c_type=inid)
+#         edata = edata.filter_by(province="山西省", city="晋城市")
+#         edata = edata.all()
+#
+#         if edata:
+#             # num = [math.ceil(i.score) if i.score else 0 for i in edata]
+#             # num.sort()
+#             # num = [i for i in num if i > 0]
+#             # cent = num[int(len(num) * 0.5)]
+#
+#             # deletion = len([item for item in edata if item.score == 0])  # 缺失环节
+#             # bedness = len([item for item in edata if item.score > 0 and item.score <= cent])  # 薄弱环节
+#             # goodness = len([item for item in edata if item.score > cent])  # 优势环节
+#             deletion = len([item for item in edata if item.score == 0])  # 缺失环节
+#             bedness = len([item for item in edata if item.score < 50])  # 薄弱环节
+#             goodness = len([item for item in edata if item.score > 80])  # 优势环节
+#
+#             res = {
+#                 "deletion": deletion,
+#                 "goodness": goodness,
+#                 "bedness": bedness
+#             }
+#             if link_type == 1:  # "缺失环节":
+#                 result_bylink = [item.product for item in edata if item.score == 0]
+#             elif link_type == 2:  # "薄弱环节":
+#                 result_bylink = [item.product for item in edata if item.score < 50]
+#             elif link_type == 3:  # "优势环节":
+#                 result_bylink = [item.product for item in edata if item.score > 80]
+#             else:
+#                 return jsonify(code=RET.DATAERR, msg="参数错误")
+#             df = result_bylink[(page - 1) * perpage:page * perpage]
+#
+#             data = {"df": df, "size": res}
+#             return jsonify(code=RET.OK, msg="获取成功", data=data)
+#         else:
+#             data = []
+#             return jsonify(code=RET.NODATA, msg="产业评估三环节暂无数据", data=data)
+#     except Exception as e:
+#         current_app.logger.error(e)
+#         return jsonify(code=RET.DBERR, msg="数据库查询错误")
+
 
 
 # 产业评估-根据具体环节的细分产业获取相关企业
 # 产业评估-根据具体环节的细分产业获取相关企业
 @api_radar.route('/GetLinkEnterprise', methods=['POST'])
 @api_radar.route('/GetLinkEnterprise', methods=['POST'])