fix20230104

apps/manage/view_dict.py

@@ -26,15 +26,9 @@ def list_fields():
 @api_power.route('/modifyFields', methods=['POST'])
 @api_power.route('/modifyFields', methods=['POST'])
 @login_required
 @login_required
 def modify_fields():
 def modify_fields():
-    # token = request.headers["token"]
-    # user = verify_btoken(token)
-    # user_role = user.role  # 用户角色
-    # if user_role != 1:
-    #     return jsonify(code=RET.ROLEERR, msg="暂无权限")
-
-    req_dict = request.get_json()
-    _id = req_dict.get('id')  # 行业id
-    name = req_dict.get("newname")  # 行业新名字
+    # req_dict = request.get_json()
+    _id = request.get('id')  # 行业id
+    name = request.get("newname")  # 行业新名字
 
 
     try:
     try:
         field = IndustryChain.query.get(_id)
         field = IndustryChain.query.get(_id)

apps/view_atlas/view.py

@@ -76,9 +76,9 @@ def find_up_thr(name_query, relation):
 @api_atlas.route('/industry/cluster', methods=['GET'])
 @api_atlas.route('/industry/cluster', methods=['GET'])
 def get_cluster():
 def get_cluster():
     try:
     try:
-        cluster_obj = IndustryChain.query.filter_by(industry_type=0,
-                                                    status=1).all()
-        # cluster_obj = Industry.query.all()
+        # cluster_obj = IndustryChain.query.filter_by(industry_type=0,
+        #                                             status=1).all()
+        cluster_obj = Industry.query.all()
 
 
         data = {
         data = {
             "cluster": [
             "cluster": [
@@ -91,7 +91,9 @@ def get_cluster():
                       } for j in Industry.query.filter_by(fid=i.nid)
                       } for j in Industry.query.filter_by(fid=i.nid)
                  ]} for i in cluster_obj]
                  ]} for i in cluster_obj]
         }
         }
-        return jsonify(code=RET.OK, msg='产业集群名称获取成功！', data=data)
+        data = [{"id": i.id, 'name': i.industry_name} for i in cluster_obj]
+        print('发起请求')
+        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)