Skip to content

M
mancheng
Commit 1ab3a37e by dong
Options

fix20230417

parent c5ef8fb4
Showing with 66 additions and 185 deletions
apps/view_atlas/view.py
......@@ -498,9 +498,8 @@ def get_data(name, industry_level, select_flag, page, perpage):
admin_data = {"admin_data": [{
"id": i.id,
"image": i.image,
# "region": i.region,
"region": i.district,
"cate": i.cate, # 园区类型
"cate": i.cate,
"area": i.area,
"address": i.address,
"navigat": i.navigat,
......@@ -527,72 +526,9 @@ def get_data(name, industry_level, select_flag, page, perpage):
"address": i.address,
"lng": i.lng,
"lat": i.lat,
} for i in induzone], "size": size}
} for i in induzone],
"size": size}
return garden_data
# if select_flag == 3: # 当选择载体土地时
# if industry_level == 1: # 当选择的是父产业时
# land = ZaitiLand.query.filter(ZaitiLand.navigator.like("%{}%".format(name)))
# else:
# land = ZaitiLand.query.filter(ZaitiLand.navigat.like("%{}%".format(name)))
# size = land.count() # 分页总数
# land = land.paginate(page, perpage).items
#
# # 封装土地数据
# land_data = {"land_data": [{
# "id": i.id,
# "name": i.name,
# "num": i.num,
# "nature": i.nature,
# "acreage": i.acreage,
# "industry_type": i.industry_type,
# "telephone": i.telephone
# } for i in land], "size": size}
# return land_data
#
# if select_flag == 4: # 当选择载体楼宇时
# if industry_level == 1: # 当选择的是父产业时
# build = ZaitiBuild.query.filter(ZaitiBuild.navigator.like("%{}%".format(name)))
# else:
# build = ZaitiBuild.query.filter(ZaitiBuild.navigat.like("%{}%".format(name)))
# size = build.count() # 分页总数
# build = build.paginate(page, perpage).items
#
# # 封装楼宇数据
# build_data = {
# "build_data": [{
# "id": i.id,
# "name": i.name,
# "acreage": i.acreage,
# "buide_type": i.buide_type,
# "industry_type": i.industry_type,
# "telephone": i.telephone,
# "addr": i.addr,
# } for i in build], "size": size
# }
# return build_data
#
# if select_flag == 5: # 当选择载体厂房时
# if industry_level == 1: # 当选择的是父产业时
# factory = ZaitiFactory.query.filter(ZaitiFactory.navigator.like("%{}%".format(name)))
# else:
# factory = ZaitiFactory.query.filter(ZaitiFactory.navigat.like("%{}%".format(name)))
# size = factory.count() # 分页总数
# factory = factory.paginate(page, perpage).items
#
# # 封装楼宇数据
# factory_data = {
# "factory_data": [{
# "id": i.id,
# "name": i.name,
# "acreage": i.acreage,
# "factory_type": i.factory_type,
# "industry_type": i.industry_type,
# "telephone": i.telephone,
# "addr": i.addr,
# } for i in factory], "size": size
# }
# return factory_data
except Exception as e:
# print(e)
current_app.logger.error(e)
......@@ -947,70 +883,68 @@ def get_zaiti_detail_data():
pass
data = {
"id": induzone.id,
"district": induzone.district,
"cate": induzone.cate,
"area": induzone.area,
"address": induzone.address,
# "address": induzone.region,
"cluster": induzone.cluster,
"name": induzone.name, # 名称
# "district": induzone.district, # 所属地区
"phone": induzone.phone, # 电话
"email": induzone.email,
# "address": induzone.address, # 园区地址
"industry_position": induzone.industry_position, # 产业定位
# "cate": induzone.cate, # 园区类型
"gdp": induzone.gdp, # GDP
"represent": induzone.represent, # 代表企业
"introduct": induzone.introduct, # 简介
"level": induzone.level, # 等级
"charge": induzone.charge, # 园区负责人
"site": induzone.site, # 园区所在地
"industry_type": induzone.industry_type, # 产业类型
# "area": induzone.area, # 面积
"out_power": induzone.out_power, # 产出强度（万元/亩）
"invest_power": induzone.invest_power, # 亩均投资强度（万元/亩）
"value_product": induzone.value_product, # 亩均年产值（万元/亩）
"tax": induzone.tax, # 亩均年税收（万元/亩）
"indu_land": induzone.indu_land, # 工业土地均价（万元/亩）
"comm_land": induzone.comm_land, # 商办土地均价（万元/亩）
"highmag": induzone.highmag, # 高层管理人员（元/月）
"middlemag": induzone.middlemag, # 中级管理人员（元/月）
"worker": induzone.worker, # 普通员工（元/月）
"trans_facility": induzone.trans_facility, # 交通配套
"goods_trans": induzone.goods_trans, # 货物运输
"live_facility": induzone.live_facility, # 园区生活配套
"market": induzone.market, # 百货商场
"hotel_bus": induzone.hotel_bus, # 酒店商务
"medical": induzone.medical, # 医疗机构
"education": induzone.education, # 教育教育
"img_url": url,
"xiaqu_area": induzone.xiaqu_area,
"people_num": induzone.people_num,
"carrier_form": induzone.carrier_form,
"area_structure": induzone.area_structure,
"lng": induzone.lng,
"lat": induzone.lat,
"admin_live_water1": induzone.admin_live_water1,
"admin_live_water2": induzone.admin_live_water2,
"admin_live_water3": induzone.admin_live_water3,
"admin_electric1": induzone.admin_electric1,
"admin_electric2": induzone.admin_electric2,
"admin_electric3": induzone.admin_electric3,
"admin_gas1": induzone.admin_gas1,
"admin_gas2": induzone.admin_gas2,
"admin_residence1": induzone.admin_residence1,
"admin_residence2": induzone.admin_residence2,
"admin_tax_rate": induzone.admin_tax_rate,
"admin_wage_level": induzone.admin_wage_level,
"zone_status": induzone.zone_status,
"zone_land_area": induzone.zone_land_area,
"zone_structure_area": induzone.zone_structure_area,
"zone_linkman": induzone.zone_linkman,
"zone_mobile": induzone.zone_mobile,
"district": induzone.district if induzone.district else '',
"cate": induzone.cate if induzone.cate else '',
"area": induzone.area if induzone.area else '',
"address": induzone.address if induzone.address else '',
# "address": induzone.region if induzone.region else ',
"cluster": induzone.cluster if induzone.cluster else '',
"name": induzone.name if induzone.name else '', # 名称
# "district": induzone.district if induzone.district else ', # 所属地区
"phone": induzone.phone if induzone.phone else '', # 电话
"email": induzone.email if induzone.email else '',
# "address": induzone.address if induzone.address else ', # 园区地址
"industry_position": induzone.industry_position if induzone.industry_position else '', # 产业定位
# "cate": induzone.cate if induzone.cate else ', # 园区类型
"gdp": induzone.gdp if induzone.gdp else '', # GDP
"represent": induzone.represent if induzone.represent else '', # 代表企业
"introduct": induzone.introduct if induzone.introduct else '', # 简介
"level": induzone.level if induzone.level else '', # 等级
"charge": induzone.charge if induzone.charge else '', # 园区负责人
"site": induzone.site if induzone.site else '', # 园区所在地
"industry_type": induzone.industry_type if induzone.industry_type else '', # 产业类型
# "area": induzone.area if induzone.area else ', # 面积
"out_power": induzone.out_power if induzone.out_power else '', # 产出强度（万元/亩）
"invest_power": induzone.invest_power if induzone.invest_power else '', # 亩均投资强度（万元/亩）
"value_product": induzone.value_product if induzone.value_product else '', # 亩均年产值（万元/亩）
"tax": induzone.tax if induzone.tax else '', # 亩均年税收（万元/亩）
"indu_land": induzone.indu_land if induzone.indu_land else '', # 工业土地均价（万元/亩）
"comm_land": induzone.comm_land if induzone.comm_land else '', # 商办土地均价（万元/亩）
"highmag": induzone.highmag if induzone.highmag else '', # 高层管理人员（元/月）
"middlemag": induzone.middlemag if induzone.middlemag else '', # 中级管理人员（元/月）
"worker": induzone.worker if induzone.worker else '', # 普通员工（元/月）
"trans_facility": induzone.trans_facility if induzone.trans_facility else '', # 交通配套
"goods_trans": induzone.goods_trans if induzone.goods_trans else '', # 货物运输
"live_facility": induzone.live_facility if induzone.live_facility else '', # 园区生活配套
"market": induzone.market if induzone.market else '', # 百货商场
"hotel_bus": induzone.hotel_bus if induzone.hotel_bus else '', # 酒店商务
"medical": induzone.medical if induzone.medical else '', # 医疗机构
"education": induzone.education if induzone.education else '', # 教育教育
"img_url": url if url else '',
"xiaqu_area": induzone.xiaqu_area if induzone.xiaqu_area else '',
"people_num": induzone.people_num if induzone.people_num else '',
"carrier_form": induzone.carrier_form if induzone.carrier_form else '',
"area_structure": induzone.area_structure if induzone.area_structure else '',
"lng": induzone.lng if induzone.lng else '',
"lat": induzone.lat if induzone.lat else '',
"admin_live_water1": induzone.admin_live_water1 if induzone.admin_live_water1 else '',
"admin_live_water2": induzone.admin_live_water2 if induzone.admin_live_water2 else '',
"admin_live_water3": induzone.admin_live_water3 if induzone.admin_live_water3 else '',
"admin_electric1": induzone.admin_electric1 if induzone.admin_electric1 else '',
"admin_electric2": induzone.admin_electric2 if induzone.admin_electric2 else '',
"admin_electric3": induzone.admin_electric3 if induzone.admin_electric3 else '',
"admin_gas1": induzone.admin_gas1 if induzone.admin_gas1 else '',
"admin_gas2": induzone.admin_gas2 if induzone.admin_gas2 else '',
"admin_residence1": induzone.admin_residence1 if induzone.admin_residence1 else '',
"admin_residence2": induzone.admin_residence2 if induzone.admin_residence2 else '',
"admin_tax_rate": induzone.admin_tax_rate if induzone.admin_tax_rate else '',
"admin_wage_level": induzone.admin_wage_level if induzone.admin_wage_level else '',
"zone_status": induzone.zone_status if induzone.zone_status else '',
"zone_land_area": induzone.zone_land_area if induzone.zone_land_area else '',
"zone_structure_area": induzone.zone_structure_area if induzone.zone_structure_area else '',
"zone_linkman": induzone.zone_linkman if induzone.zone_linkman else '',
"zone_mobile": induzone.zone_mobile if induzone.zone_mobile else '',
# "resource_data": resource_data,
# "labor_data": labor_data
}
......@@ -1018,60 +952,6 @@ def get_zaiti_detail_data():
except Exception as e:
current_app.logger.error(e)
# if cate_id == 3:
# try:
# land = ZaitiLand.query.filter_by(id=id).first()
# data = {
# "num": land.num, # 编号
# "name": land.name, # 地块名称
# "addr": land.addr, # 地址
# "nature": land.nature, # 土地性质
# "acreage": land.acreage, # 面积
# "target": land.target, # 规划指标
# "age_limit": land.age_limit, # 出让年限
# "industry_type": land.industry_type, # 产业类型
# "telephone": land.telephone # 电话
# }
# return jsonify(code=RET.OK, msg='土地详情查询成功！', data=data)
# except Exception as e:
# current_app.logger.error(e)
# if cate_id == 4:
# try:
# build = ZaitiBuild.query.filter_by(id=id).first()
# data = {
# "name": build.name, # 楼宇名称
# "addr": build.addr, # 地址
# "acreage": build.acreage, # 面积
# "buide_type": build.buide_type, # 楼宇类型
# "industry_type": build.industry_type, # 产业类型
# "rate": build.rate, # 出租率
# "telephone": build.telephone # 电话
# }
# return jsonify(code=RET.OK, msg='楼宇详情查询成功！', data=data)
# except Exception as e:
# current_app.logger.error(e)
# if cate_id == 5:
# try:
# factory = ZaitiFactory.query.filter_by(id=id).first()
# data = {
# "name": factory.name, # 厂房名称
# "addr": factory.addr, # 地址
# "acreage": factory.acreage, # 面积
# "structure": factory.structure, # 简介
# "height": factory.height, # 高度
# "bearing": factory.bearing, # 承重
# "new_level": factory.new_level, # 新旧程度
# "other": factory.other, # 其他
# "industry_type": factory.industry_type, # 产业类型
# "factory_type": factory.factory_type, # 厂房类型
# "telephone": factory.telephone, # 电话
# }
# return jsonify(code=RET.OK, msg='厂房详情查询成功！', data=data)
# except Exception as e:
# current_app.logger.error(e)
"""以下202212月改版后需求"""
......
apps/view_xiaocx/view.py
......@@ -214,6 +214,7 @@ def index_search():
# Induzone.name.like('%{}%'.format(carrier_name)) if carrier_name else text(''),
Induzone.navigat.like('%{}%'.format(industry)) if industry else text(''),
Induzone.district == district if district else text(''),
Induzone.cate == '产业园区',
Induzone.level == zone_level if zone_level else text('')
).filter(
or_(
......
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