Skip to content

M
mancheng
Commit 9dc99a65 by dong
Options

fix20230721

parent 13d9f98a
Showing with 4 additions and 4 deletions
apps/view_choose/choose_view.py
...@@ -375,7 +375,7 @@ def search_all(): ...@@ -375,7 +375,7 @@ def search_all():
page, per_page) page, per_page)
data_list.append(region_data) data_list.append(region_data)
# 土地 # 土地
land_data = global_land(key_words, district_name, '', '', industry_name, page, per_page) land_data = global_land(key_words, district_name, '', '', '', page, per_page)
data_list.append(land_data) data_list.append(land_data)
# 厂房 # 厂房
factory_data = global_factory(key_words, district_name, '', industry_name, page, per_page) factory_data = global_factory(key_words, district_name, '', industry_name, page, per_page)
...@@ -385,7 +385,7 @@ def search_all(): ...@@ -385,7 +385,7 @@ def search_all():
data_list.append(build_data) data_list.append(build_data)
return jsonify(code=RET.OK, data=data_list, msg='全部数据查询成功！') return jsonify(code=RET.OK, data=data_list, msg='全部数据查询成功！')
if carrier_type_id == 1: # 土地 if carrier_type_id == 1: # 土地
data = global_land(key_words, district_name, '', '', industry_name, page, per_page) data = global_land(key_words, district_name, '', '', '', page, per_page)
return jsonify(data) return jsonify(data)
if carrier_type_id == 2: # 厂房 if carrier_type_id == 2: # 厂房
data = global_factory(key_words, district_name, '', industry_name, page, per_page) data = global_factory(key_words, district_name, '', industry_name, page, per_page)
......
apps/view_xiaocx/view.py
...@@ -43,7 +43,7 @@ def search_all(): ...@@ -43,7 +43,7 @@ def search_all():
page, per_page) page, per_page)
data_list.append(region_data) data_list.append(region_data)
# 土地 # 土地
land_data = global_land(key_words, district_name, '', '', industry_name, page, per_page) land_data = global_land(key_words, district_name, '', '', '', page, per_page)
data_list.append(land_data) data_list.append(land_data)
# 厂房 # 厂房
factory_data = global_factory(key_words, district_name, '', industry_name, page, per_page) factory_data = global_factory(key_words, district_name, '', industry_name, page, per_page)
...@@ -53,7 +53,7 @@ def search_all(): ...@@ -53,7 +53,7 @@ def search_all():
data_list.append(build_data) data_list.append(build_data)
return jsonify(code=RET.OK, data=data_list, msg='全部数据查询成功！') return jsonify(code=RET.OK, data=data_list, msg='全部数据查询成功！')
if carrier_type_id == 1: # 土地 if carrier_type_id == 1: # 土地
data = global_land(key_words, district_name, '', '', industry_name, page, per_page) data = global_land(key_words, district_name, '', '', '', page, per_page)
return jsonify(data) return jsonify(data)
if carrier_type_id == 2: # 厂房 if carrier_type_id == 2: # 厂房
data = global_factory(key_words, district_name, '', industry_name, page, per_page) data = global_factory(key_words, district_name, '', industry_name, page, per_page)
......
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