fix

apps/utils/neo4j_conn.py

@@ -2,8 +2,8 @@ from py2neo import Graph
 
 
 
 
 def conn_neo4j():
 def conn_neo4j():
-    graph = Graph("http://localhost:7474", username="neo4j", password="123456")  # 本地neo4j
-    # graph = Graph("http://localhost:7476", username="neo4j", password="123456")  # 上传到50服务器前需更改
+    # graph = Graph("http://localhost:7474", username="neo4j", password="123456")  # 本地neo4j
+    graph = Graph("http://localhost:7476", username="neo4j", password="123456")  # 上传到50服务器前需更改
     # graph = Graph("http://39.100.39.50:7476/", username="neo4j", password="123456")  # 测试50服务器上的neo4j时使用
     # graph = Graph("http://39.100.39.50:7476/", username="neo4j", password="123456")  # 测试50服务器上的neo4j时使用
     return graph
     return graph
 
 

apps/view_index/view.py

@@ -27,10 +27,14 @@ def get_jjzb(district):
                   "addscale": '%.2f' % datas.addscale + "%" if datas.addscale else "-%",  # 规上工业增加值增速
                   "addscale": '%.2f' % datas.addscale + "%" if datas.addscale else "-%",  # 规上工业增加值增速
                   "investment": '%.2f亿元' % (datas.investment / 10000) if datas.investment else "-亿元",  # 固定资产投资
                   "investment": '%.2f亿元' % (datas.investment / 10000) if datas.investment else "-亿元",  # 固定资产投资
                   "retail": '%.2f亿元' % (datas.retail / 10000) if datas.retail else "-亿元",  # 社会消费品零售额
                   "retail": '%.2f亿元' % (datas.retail / 10000) if datas.retail else "-亿元",  # 社会消费品零售额
-                  "in_out": '%.2f亿元' % (datas.in_out / 10000) if datas.in_out else "-亿元",  # 进出口总额
+                  # "in_out": '%.2f亿元' % (datas.in_out / 10000) if datas.in_out else "-亿元",  # 进出口总额
+                  "public_in": '%.2f亿元' % (datas.public_in / 10000) if datas.public_in else "-亿元",  # 一般公共预算收入
                   "public": '%.2f亿元' % (datas.public / 10000) if datas.public else "-亿元",  # 一般公共预算支出
                   "public": '%.2f亿元' % (datas.public / 10000) if datas.public else "-亿元",  # 一般公共预算支出
                   "people_out": '%.2f元' % datas.people_out if datas.people_out else "-元",  # 居民人均可支配收入
                   "people_out": '%.2f元' % datas.people_out if datas.people_out else "-元",  # 居民人均可支配收入
-                  "people_per": '%.2f' % datas.people_per if datas.people_per else "-"}  # 居民消费价格指数
+                  "people_per": '%.2f' % datas.people_per if datas.people_per else "-",
+                  "question": datas.question
+                  }  # 居民消费价格指数
+
         # print(df_dic)
         # print(df_dic)
         # return jsonify(code=RET.OK, msg="查找成功", data=df)
         # return jsonify(code=RET.OK, msg="查找成功", data=df)
         return df_dic
         return df_dic
@@ -126,9 +130,9 @@ def menu():
         qt = 100 - mcq - gjd - mtmhg - gtzz - qyly
         qt = 100 - mcq - gjd - mtmhg - gtzz - qyly
         # 产业结构分布
         # 产业结构分布
         industry = [
         industry = [
-            {"per": mtmhg, "name": "煤炭煤化工", "count": count_mtmhg},
             {"per": mcq, "name": "煤层气", "count": count_mcq},  # {百分比，value}
             {"per": mcq, "name": "煤层气", "count": count_mcq},  # {百分比，value}
             {"per": gjd, "name": "光机电", "count": count_gjd},
             {"per": gjd, "name": "光机电", "count": count_gjd},
+            {"per": mtmhg, "name": "煤炭煤化工", "count": count_mtmhg},
             {"per": gtzz, "name": "钢铁铸造", "count": count_gtzz},
             {"per": gtzz, "name": "钢铁铸造", "count": count_gtzz},
             {"per": qyly, "name": "全域旅游和康养", "count": count_qyly},
             {"per": qyly, "name": "全域旅游和康养", "count": count_qyly},
             {"per": qt, "name": "其他", "count": count_qt},
             {"per": qt, "name": "其他", "count": count_qt},
@@ -372,8 +376,8 @@ def policy_details():
                     "pubdate": str(policy.pubdate)[0:10] if policy.pubdate else "-",  # 发布时间
                     "pubdate": str(policy.pubdate)[0:10] if policy.pubdate else "-",  # 发布时间
                     "url": policy.url if policy.pubdate else "-",  # 外链接
                     "url": policy.url if policy.pubdate else "-",  # 外链接
                     "post_num": policy.post_num if policy.post_num else "",  # 发文字号
                     "post_num": policy.post_num if policy.post_num else "",  # 发文字号
-                    "last": [policy2.name, _id1] if policy2 else "",
-                    "next": [policy1.name, _id2] if policy1 else ""}
+                    "next": [policy1.name, _id1] if policy1 else "",
+                    "last": [policy2.name, _id2] if policy2 else ""}
             return jsonify(code=RET.OK, msg="查找成功", data=data)
             return jsonify(code=RET.OK, msg="查找成功", data=data)
         else:
         else:
             return jsonify(code=RET.OK, msg="查找成功,无数据", data='')
             return jsonify(code=RET.OK, msg="查找成功,无数据", data='')