fix

apps/big_data/view.py

@@ -46,17 +46,21 @@ def get_jjzb():
                       "year": str(datas.year) + '年'
                       }  # 居民消费价格指数
         else:
-            df_dic = {"GDP": '',  # 地区生产总值
-                      "addscale": '',  # 规上工业增加值增速
-                      "investment": '',  # 固定资产投资
-                      "retail": '',  # 社会消费品零售额
-                      "in_out": '',  # 进出口总额
-                      "public": '',  # 一般公共预算支出
-                      "people_out": '',  # 居民人均可支配收入
-                      "people_per": '',
-                      "question": '',
-                      "year": str(datas.year) + '年'
-                      }  # 居民消费价格指数
+            df_dic = {
+                "GDP": "",
+                "addscale": "",
+                "investment": "",
+                "retail": "",
+                "limit_retail": "",
+                "public_in": "",
+                "in_out": "",
+                "public": "",
+                "people_out": "",
+                "country_people_out": "",
+                "people_per": "",
+                "question": "",
+                "year": str(datas.year) + '年'
+              }  # 居民消费价格指数
         return jsonify(code=RET.OK, msg="查找成功", data=df_dic)
     except Exception as e:
         current_app.logger.error(e)

apps/view_index/view.py

@@ -69,26 +69,33 @@ def get_jjzb(district, flag):
                       "addscale": '%.2f' % datas.addscale + "%" if datas.addscale else "-%",  # 规上工业增加值增速
                       "investment": '%.2f亿元' % (datas.investment / 10000) if datas.investment else "-亿元",  # 固定资产投资
                       "retail": '%.2f亿元' % (datas.retail / 10000) if datas.retail else "-亿元",  # 社会消费品零售额
+                      "limit_retail": '%.2f亿元' % (datas.limit_retail / 10000) if datas.limit_retail else "-亿元",  # 限额以上消费品零售额
+                      "public_in": '%.2f亿元' % (datas.public_in / 10000) if datas.public_in else "-亿元",  # 一般公共预算收入
                       "in_out": '%.2f亿元' % (datas.in_out / 10000) if datas.in_out 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 "-元",  # 城镇居民人均可支配收入
+                      "country_people_out": '%.2f元' % datas.country_people_out if datas.country_people_out else "-元",  # 农村居民人均可支配收入
                       "people_per": '%.2f' % datas.people_per if datas.people_per else "-",
                       "question": datas.question,
-                      # "year": str(datas.year) + '年' if flag == 1 else datas.question
+                      # "year": str(datas.year) + '年',
                       "year": datas.question
                       }  # 居民消费价格指数
         else:
-            df_dic = {"GDP": '',  # 地区生产总值
-                      "addscale": '',  # 规上工业增加值增速
-                      "investment": '',  # 固定资产投资
-                      "retail": '',  # 社会消费品零售额
-                      "in_out": '',  # 进出口总额
-                      "public": '',  # 一般公共预算支出
-                      "people_out": '',  # 居民人均可支配收入
-                      "people_per": '',
-                      "question": '',
-                      # "year": str(datas.year) + '年' if flag == 1 else datas.question
-                      "year": datas.question
+            df_dic = {
+                "GDP": "",
+                "addscale": "",
+                "investment": "",
+                "retail": "",
+                "limit_retail": "",
+                "public_in": "",
+                "in_out": "",
+                "public": "",
+                "people_out": "",
+                "country_people_out": "",
+                "people_per": "",
+                "question": "",
+                # "year": str(datas.year) + '年'
+                "year": datas.question
                       }  # 居民消费价格指数
         return df_dic
     except Exception as e: