Skip to content

M
mancheng
Commit 1d5c255e by dong
Options

fix20230207

parent e7cdde6d
Showing with 5 additions and 6 deletions
apps/inves_manage/statistic_analysis_view.py
...@@ -1391,7 +1391,7 @@ def get_data(): ...@@ -1391,7 +1391,7 @@ def get_data():
if flag == 1: # 签约项目完成情况 if flag == 1: # 签约项目完成情况
try: try:
target_data_li = get_data1([], district_li1, current_year) target_data_li = get_data1([], district_li1, current_year)
return jsonify(code=RET.OK, data_time=data_time, data=target_data_li, msg='数据查询成功。') return jsonify(code=RET.OK, data={"target_data_li": target_data_li, "data_time": data_time}, msg='数据查询成功。')
except Exception as e: except Exception as e:
current_app.logger.error(e) current_app.logger.error(e)
return jsonify(code=RET.DBERR, msg="数据查询错误！") return jsonify(code=RET.DBERR, msg="数据查询错误！")
...@@ -1399,8 +1399,7 @@ def get_data(): ...@@ -1399,8 +1399,7 @@ def get_data():
if flag == 2: # 项目开工完成情况 if flag == 2: # 项目开工完成情况
try: try:
target_data_li = get_data2([], district_li1, current_year) target_data_li = get_data2([], district_li1, current_year)
return jsonify(code=RET.OK, data={"target_data_li": target_data_li, "data_time": data_time}, msg='数据查询成功。')
return jsonify(code=RET.OK, data_time=data_time, data=target_data_li, msg='数据查询成功。')
except Exception as e: except Exception as e:
current_app.logger.error(e) current_app.logger.error(e)
return jsonify(code=RET.DBERR, msg="数据查询错误！") return jsonify(code=RET.DBERR, msg="数据查询错误！")
...@@ -1408,7 +1407,7 @@ def get_data(): ...@@ -1408,7 +1407,7 @@ def get_data():
if flag == 3: # 新开工项目计划投资额完情况 if flag == 3: # 新开工项目计划投资额完情况
try: try:
target_data_li = get_data3([], district_li1, current_year) target_data_li = get_data3([], district_li1, current_year)
return jsonify(code=RET.OK, data_time=data_time, data=target_data_li, msg='数据查询成功。') return jsonify(code=RET.OK, data={"target_data_li": target_data_li, "data_time": data_time}, msg='数据查询成功。')
except Exception as e: except Exception as e:
current_app.logger.error(e) current_app.logger.error(e)
return jsonify(code=RET.DBERR, msg="数据查询错误！") return jsonify(code=RET.DBERR, msg="数据查询错误！")
...@@ -1416,7 +1415,7 @@ def get_data(): ...@@ -1416,7 +1415,7 @@ def get_data():
if flag == 4: # 固投资金完成情况 if flag == 4: # 固投资金完成情况
try: try:
target_data_li = get_data4([], district_li1, current_year) target_data_li = get_data4([], district_li1, current_year)
return jsonify(code=RET.OK, data_time=data_time, data=target_data_li, msg='数据查询成功。') return jsonify(code=RET.OK, data={"target_data_li": target_data_li, "data_time": data_time}, msg='数据查询成功。')
except Exception as e: except Exception as e:
current_app.logger.error(e) current_app.logger.error(e)
return jsonify(code=RET.DBERR, msg="数据查询错误！") return jsonify(code=RET.DBERR, msg="数据查询错误！")
...@@ -1424,7 +1423,7 @@ def get_data(): ...@@ -1424,7 +1423,7 @@ def get_data():
if flag == 5: # 非固投资金完成情况 if flag == 5: # 非固投资金完成情况
try: try:
target_data_li = get_data5([], district_li1, current_year) target_data_li = get_data5([], district_li1, current_year)
return jsonify(code=RET.OK, data_time=data_time, data=target_data_li, msg='数据查询成功。') return jsonify(code=RET.OK, data={"target_data_li": target_data_li, "data_time": data_time}, msg='数据查询成功。')
except Exception as e: except Exception as e:
current_app.logger.error(e) current_app.logger.error(e)
return jsonify(code=RET.DBERR, msg="数据查询错误！") return jsonify(code=RET.DBERR, msg="数据查询错误！")
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