Skip to content

M
mancheng
Commit 8f452eff by dong
Options

fix20230721

parent ec812502
Showing with 19 additions and 19 deletions
apps/constants.py
...@@ -25,7 +25,7 @@ LOGIN_ERROR_FORBID_TIME = 900 ...@@ -25,7 +25,7 @@ LOGIN_ERROR_FORBID_TIME = 900
UPLOAD_IMAGE_URL = '' UPLOAD_IMAGE_URL = ''
# 用户下载文件的保存，本地 # 用户下载文件的保存，本地
UPLOAD_FILE_URL = 'http://127.0.0.1:5000/static/files/' UPLOAD_FILE_URL = 'http://127.0.0.1:5000/statics/files/'
# 城区信息的缓存时间，单位：秒 # 城区信息的缓存时间，单位：秒
AREA_INFO_REDIS_EXPIRE = 7200 AREA_INFO_REDIS_EXPIRE = 7200
......
apps/inves_manage/project_manager.py
...@@ -488,10 +488,10 @@ def batch_export_project5(): ...@@ -488,10 +488,10 @@ def batch_export_project5():
select_id_list = req_dic["select_id_list"] select_id_list = req_dic["select_id_list"]
# path = './apps/statics/project_file/' # path = './apps/statics/project_file/'
# pro_path = 'http://39.100.39.50:5050/statics/project_file/' # 项目路径 # pro_path = 'http://39.100.39.50:5050/statics/project_file/' # 项目路径
path = './apps/static/project_file/' path = './apps/statics/project_file/'
# pro_path = 'http://39.100.39.50:5050/static/project_file/' # 项目路径 pro_path = 'http://39.100.39.50:5050/statics/project_file/' # 项目路径
pro_path = SERVER_NAME + '/static/project_file/' # 项目路径 # pro_path = SERVER_NAME + '/statics/project_file/' # 项目路径
if not select_id_list: if not select_id_list:
return jsonify(code=RET.PARAMERR, msg="参数不能为空！") return jsonify(code=RET.PARAMERR, msg="参数不能为空！")
target_data_list = [] target_data_list = []
...@@ -1119,8 +1119,8 @@ def download_shanxi_data(): ...@@ -1119,8 +1119,8 @@ def download_shanxi_data():
req_dic = request.get_json() req_dic = request.get_json()
data_time = req_dic["data_time"] data_time = req_dic["data_time"]
path = './apps/statics/project_file/' path = './apps/statics/project_file/'
# pro_path = 'http://39.100.39.50:8008/aaa_statics/project_file/' # 项目路径 pro_path = 'http://39.100.39.50:5050/statics/project_file/' # 项目路径
pro_path = SERVER_NAME + '/aaa_statics/project_file/' # 项目路径 # pro_path = SERVER_NAME + '/aaa_statics/project_file/' # 项目路径
if not data_time: if not data_time:
return jsonify(code=RET.PARAMERR, msg="参数不能为空！") return jsonify(code=RET.PARAMERR, msg="参数不能为空！")
target_data_list = [] target_data_list = []
...@@ -1516,8 +1516,8 @@ def download_jc_data(): ...@@ -1516,8 +1516,8 @@ def download_jc_data():
req_dic = request.get_json() req_dic = request.get_json()
year = req_dic["year"] year = req_dic["year"]
path = './apps/statics/project_file/' path = './apps/statics/project_file/'
# pro_path = 'http://39.100.39.50:8008/aaa_statics/project_file/' # 项目路径 pro_path = 'http://39.100.39.50:5050/statics/project_file/' # 项目路径
pro_path = SERVER_NAME + '/aaa_statics/project_file/' # 项目路径 # pro_path = SERVER_NAME + '/aaa_statics/project_file/' # 项目路径
if not year: if not year:
return jsonify(code=RET.PARAMERR, msg="参数不能为空！") return jsonify(code=RET.PARAMERR, msg="参数不能为空！")
target_data_list = [] target_data_list = []
...@@ -1818,8 +1818,8 @@ def download_money_arrive(): ...@@ -1818,8 +1818,8 @@ def download_money_arrive():
req_dic = request.get_json() req_dic = request.get_json()
data_time = req_dic["data_time"] data_time = req_dic["data_time"]
path = './apps/statics/project_file/' path = './apps/statics/project_file/'
# pro_path = 'http://39.100.39.50:8008/aaa_statics/project_file/' # 项目路径 pro_path = 'http://39.100.39.50:5050/statics/project_file/' # 项目路径
pro_path = SERVER_NAME + '/aaa_statics/project_file/' # 项目路径 # pro_path = SERVER_NAME + '/aaa_statics/project_file/' # 项目路径
if not data_time: if not data_time:
return jsonify(code=RET.PARAMERR, msg="参数不能为空！") return jsonify(code=RET.PARAMERR, msg="参数不能为空！")
target_data_list = [] target_data_list = []
......
apps/inves_manage/statistic_analysis_view.py
...@@ -541,7 +541,7 @@ def get_data2(data_time, district_li, max_year): ...@@ -541,7 +541,7 @@ def get_data2(data_time, district_li, max_year):
now_time3 = '' now_time3 = ''
now_time4 = '' now_time4 = ''
now_time = '{}-01-01 00:00:00'.format(max_year) now_time = '{}-01-01 00:00:00'.format(max_year)
now_time1 = '{}-01-01 00:00:00'.format(max_year + 1) now_time1 = '{}-01-01 00:00:00'.format(str(int(max_year) + 1))
if data_time: if data_time:
if data_time[0] and data_time[1]: if data_time[0] and data_time[1]:
now_time3 = ('{}-{}-01 00:00:00').format(data_time[0], data_time[1]) now_time3 = ('{}-{}-01 00:00:00').format(data_time[0], data_time[1])
...@@ -1022,9 +1022,9 @@ def export_jc_data(): ...@@ -1022,9 +1022,9 @@ def export_jc_data():
req_dic = request.get_json() req_dic = request.get_json()
flag = req_dic['flag'] # 1县(市、区)、开发区指标,2开发区(示范区)指标 flag = req_dic['flag'] # 1县(市、区)、开发区指标,2开发区(示范区)指标
data_time = req_dic['data_time'] data_time = req_dic['data_time']
path = './apps/static/project_file/' path = './apps/statics/project_file/'
# pro_path = 'http://39.100.39.50:8008/aaa_statics/project_file/' # 项目路径 # pro_path = 'http://39.100.39.50:8008/aaa_statics/project_file/' # 项目路径
pro_path = 'http://39.100.39.50:5050/static/project_file/' # 项目路径 pro_path = 'http://39.100.39.50:5050/statics/project_file/' # 项目路径
if flag == 1: if flag == 1:
res = export_jc_data1(data_time, path, pro_path) res = export_jc_data1(data_time, path, pro_path)
......
apps/view_choose/fill_data.py
...@@ -763,8 +763,8 @@ def batch_export_build(): ...@@ -763,8 +763,8 @@ def batch_export_build():
return jsonify(code=RET.SESSIONERR, msg="进行{}操作时用户信息校验失败，请重新登陆后尝试！".format(action_name)) return jsonify(code=RET.SESSIONERR, msg="进行{}操作时用户信息校验失败，请重新登陆后尝试！".format(action_name))
select_id_list = req_dic["select_id_list"] select_id_list = req_dic["select_id_list"]
path = './apps/static/carrier_file/' path = './apps/statics/carrier_file/'
pro_path = 'http://39.100.39.50:5050/static/carrier_file/' # 项目路径 pro_path = 'http://39.100.39.50:5050/statics/carrier_file/' # 项目路径
try: try:
if not select_id_list: if not select_id_list:
return jsonify(code=RET.PARAMERR, msg="参数不能为空！") return jsonify(code=RET.PARAMERR, msg="参数不能为空！")
...@@ -918,8 +918,8 @@ def batch_export_land(): ...@@ -918,8 +918,8 @@ def batch_export_land():
return jsonify(code=RET.SESSIONERR, msg="进行{}操作时用户信息校验失败，请重新登陆后尝试！".format(action_name)) return jsonify(code=RET.SESSIONERR, msg="进行{}操作时用户信息校验失败，请重新登陆后尝试！".format(action_name))
select_id_list = req_dic["select_id_list"] select_id_list = req_dic["select_id_list"]
path = './apps/static/carrier_file/' path = './apps/statics/carrier_file/'
pro_path = 'http://39.100.39.50:5050/static/carrier_file/' # 项目路径 pro_path = 'http://39.100.39.50:5050/statics/carrier_file/' # 项目路径
try: try:
if not select_id_list: if not select_id_list:
...@@ -1062,9 +1062,9 @@ def batch_export_factory(): ...@@ -1062,9 +1062,9 @@ def batch_export_factory():
return jsonify(code=RET.SESSIONERR, msg="进行{}操作时用户信息校验失败，请重新登陆后尝试！".format(action_name)) return jsonify(code=RET.SESSIONERR, msg="进行{}操作时用户信息校验失败，请重新登陆后尝试！".format(action_name))
select_id_list = req_dic["select_id_list"] select_id_list = req_dic["select_id_list"]
path = './apps/static/carrier_file/' path = './apps/statics/carrier_file/'
# pro_path = 'http://192.168.31.154:5000/static/' # 项目路径 # pro_path = 'http://192.168.31.154:5000/static/' # 项目路径
pro_path = 'http://39.100.39.50:5050/static/carrier_file/' # 项目路径 pro_path = 'http://39.100.39.50:5050/statics/carrier_file/' # 项目路径
try: try:
if not select_id_list: if not select_id_list:
return jsonify(code=RET.PARAMERR, msg="参数不能为空！") return jsonify(code=RET.PARAMERR, 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