fix

apps/models.py

@@ -33,6 +33,7 @@ class IndustryChain(db.Model):
     __table_args__ = ({'comment': '新版产业链数据数据表'})  # 添加表注释
     __table_args__ = ({'comment': '新版产业链数据数据表'})  # 添加表注释
     id = db.Column(db.Integer, primary_key=True, autoincrement=True, comment='主键id')
     id = db.Column(db.Integer, primary_key=True, autoincrement=True, comment='主键id')
     industry_name = db.Column(db.String(20), comment='行业名称')
     industry_name = db.Column(db.String(20), comment='行业名称')
+    oname = db.Column(db.String(20), comment='行业名称,关联产业链图')
     icon_url = db.Column(db.String(255), comment='未选中时行业图标')
     icon_url = db.Column(db.String(255), comment='未选中时行业图标')
     icon_url1 = db.Column(db.String(255), comment='选中时行业图标')
     icon_url1 = db.Column(db.String(255), comment='选中时行业图标')
     status = db.Column(db.Integer, doc='启用状态1启用，2禁用', comment='启用状态1启用，2禁用')  # 启用状态1启用，2禁用
     status = db.Column(db.Integer, doc='启用状态1启用，2禁用', comment='启用状态1启用，2禁用')  # 启用状态1启用，2禁用

apps/view_atlas/view.py

@@ -77,14 +77,14 @@ def find_up_thr(name_query, relation):
 # @login_required
 # @login_required
 def get_cluster():
 def get_cluster():
     try:
     try:
-        # cluster_obj = IndustryChain.query.filter_by(industry_type=0, status=1).all()
-        # data = [{"id": i.id, 'name': i.industry_name, 'industry_level': 1,
-        #          "icon": i.icon_url, "icon1": i.icon_url1}
-        #         for i in cluster_obj]
-        cluster_obj = Industry.query.all()
-        data = [{"id": i.id, 'name': i.oname, 'oname': i.name, 'industry_level': 1,
-                 "icon": '', "icon1": ''}
+        cluster_obj = IndustryChain.query.all()
+        data = [{"id": i.id, 'name': i.oname, 'oname': i.industry_name, 'industry_level': 1,
+                 "icon": i.icon_url, "icon1": i.icon_url1}
                 for i in cluster_obj]
                 for i in cluster_obj]
+        # cluster_obj = Industry.query.all()
+        # data = [{"id": i.id, 'name': i.oname, 'oname': i.name, 'industry_level': 1,
+        #          "icon": '', "icon1": ''}
+        #         for i in cluster_obj]
 
 
         return jsonify(code=RET.OK, msg='产业集群名称获取成功！', data=data)
         return jsonify(code=RET.OK, msg='产业集群名称获取成功！', data=data)
     except Exception as e:
     except Exception as e: