Skip to content

M
mancheng
Commit 31476be6 by dong
Options

fix

parent a2168dab
Showing with 32 additions and 21 deletions
apps/big_data/view.py
...@@ -46,15 +46,19 @@ def get_jjzb(): ...@@ -46,15 +46,19 @@ def get_jjzb():
"year": str(datas.year) + '年' "year": str(datas.year) + '年'
} # 居民消费价格指数 } # 居民消费价格指数
else: else:
df_dic = {"GDP": '', # 地区生产总值 df_dic = {
"addscale": '', # 规上工业增加值增速 "GDP": "",
"investment": '', # 固定资产投资 "addscale": "",
"retail": '', # 社会消费品零售额 "investment": "",
"in_out": '', # 进出口总额 "retail": "",
"public": '', # 一般公共预算支出 "limit_retail": "",
"people_out": '', # 居民人均可支配收入 "public_in": "",
"people_per": '', "in_out": "",
"question": '', "public": "",
"people_out": "",
"country_people_out": "",
"people_per": "",
"question": "",
"year": str(datas.year) + '年' "year": str(datas.year) + '年'
} # 居民消费价格指数 } # 居民消费价格指数
return jsonify(code=RET.OK, msg="查找成功", data=df_dic) return jsonify(code=RET.OK, msg="查找成功", data=df_dic)
......
apps/view_index/view.py
...@@ -69,25 +69,32 @@ def get_jjzb(district, flag): ...@@ -69,25 +69,32 @@ def get_jjzb(district, flag):
"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 "-亿元", # 社会消费品零售额
"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 "-亿元", # 进出口总额 "in_out": '%.2f亿元' % (datas.in_out / 10000) if datas.in_out 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 "-元", # 城镇居民人均可支配收入
"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 "-", "people_per": '%.2f' % datas.people_per if datas.people_per else "-",
"question": datas.question, "question": datas.question,
# "year": str(datas.year) + '年' if flag == 1 else datas.question # "year": str(datas.year) + '年',
"year": datas.question "year": datas.question
} # 居民消费价格指数 } # 居民消费价格指数
else: else:
df_dic = {"GDP": '', # 地区生产总值 df_dic = {
"addscale": '', # 规上工业增加值增速 "GDP": "",
"investment": '', # 固定资产投资 "addscale": "",
"retail": '', # 社会消费品零售额 "investment": "",
"in_out": '', # 进出口总额 "retail": "",
"public": '', # 一般公共预算支出 "limit_retail": "",
"people_out": '', # 居民人均可支配收入 "public_in": "",
"people_per": '', "in_out": "",
"question": '', "public": "",
# "year": str(datas.year) + '年' if flag == 1 else datas.question "people_out": "",
"country_people_out": "",
"people_per": "",
"question": "",
# "year": str(datas.year) + '年'
"year": datas.question "year": datas.question
} # 居民消费价格指数 } # 居民消费价格指数
return df_dic return df_dic
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment