fix

apps/models.py

@@ -40,8 +40,8 @@ class IndustryChain(db.Model):
     industry_type = db.Column(db.Integer, comment='行业类型(0是产业集群，1是上游行业，2是中游行业，3是下游行业)')
     industry_type = db.Column(db.Integer, comment='行业类型(0是产业集群，1是上游行业，2是中游行业，3是下游行业)')
     relate_id = db.Column(db.Integer, comment='关系id(关联哪个产业环节')
     relate_id = db.Column(db.Integer, comment='关系id(关联哪个产业环节')
     chain_id = db.Column(db.Integer, comment='关系id(关联哪个产业链')
     chain_id = db.Column(db.Integer, comment='关系id(关联哪个产业链')
-    # enterprise = db.relationship('Enterprise', backref=db.backref('enterprise'))
     enterprise_num = db.Column(db.Integer, comment='相关全企业表数量')
     enterprise_num = db.Column(db.Integer, comment='相关全企业表数量')
+    sort = db.Column(db.Integer, comment='顺序')
 
 
 
 
 class IndustryChain1(db.Model):
 class IndustryChain1(db.Model):

apps/view_atlas/view.py

@@ -77,15 +77,13 @@ def find_up_thr(name_query, relation):
 # @login_required
 # @login_required
 def get_cluster():
 def get_cluster():
     try:
     try:
-        cluster_obj = IndustryChain.query.filter(IndustryChain.id<10, IndustryChain.status == 1).all()
+        cluster_obj = IndustryChain.query.filter(
+            IndustryChain.id < 10,
+            IndustryChain.status == 1
+        ).order_by(IndustryChain.sort.asc()).all()
         data = [{"id": i.id, 'name': i.oname, 'oname': i.industry_name, 'industry_level': 1,
         data = [{"id": i.id, 'name': i.oname, 'oname': i.industry_name, 'industry_level': 1,
                  "icon": i.icon_url, "icon1": i.icon_url1}
                  "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:
         current_app.logger.error(e)
         current_app.logger.error(e)