Commit 471bb567 by 赵宇

fix

parent d87713b0
...@@ -71,6 +71,7 @@ def advice(): ...@@ -71,6 +71,7 @@ def advice():
# 根据产业名称查询园区 # 根据产业名称查询园区
zone = Induzone.query.filter(or_(Induzone.navigat.like("%{}%".format(industry_name)), zone = Induzone.query.filter(or_(Induzone.navigat.like("%{}%".format(industry_name)),
Induzone.navigator.like("%{}%".format(industry_name)))) Induzone.navigator.like("%{}%".format(industry_name))))
print(type(zone))
# 根据投资预算过滤 # 根据投资预算过滤
if budget: if budget:
zone = zone.filter(Induzone.invest_power < budget) zone = zone.filter(Induzone.invest_power < budget)
...@@ -91,8 +92,12 @@ def advice(): ...@@ -91,8 +92,12 @@ def advice():
if preference[4] == "true": # 交通 -----交通打分 if preference[4] == "true": # 交通 -----交通打分
zone = zone.order_by(Induzone.traffic_point.desc()) zone = zone.order_by(Induzone.traffic_point.desc())
size = zone.count() size = zone.count()
print(type(zone))
result = zone.paginate(page, perpage).items result = zone.paginate(page, perpage).items
# print(result) print(type(zone))
zone = zone.all()
all_jwd = [{"id": i.id, "name": i.name, "lng": i.lng, "lat": i.lat} for i in zone]
data = {"data": [{"id": i.id, data = {"data": [{"id": i.id,
"name": i.name, # 园区名称 "name": i.name, # 园区名称
"level": i.level, # 园区级别 "level": i.level, # 园区级别
...@@ -100,7 +105,7 @@ def advice(): ...@@ -100,7 +105,7 @@ def advice():
"charge": i.charge if i.charge else "-", # 园区负责人 "charge": i.charge if i.charge else "-", # 园区负责人
"phone": i.phone if i.phone else "-", # 园区电话 "phone": i.phone if i.phone else "-", # 园区电话
"address": i.address, # 园区地址 "address": i.address, # 园区地址
"jwd": {"lng": i.lng, "lat": i.lat}} for i in result], "size": size} "jwd": {"lng": i.lng, "lat": i.lat}} for i in result], "all_jwd": all_jwd, "size": size}
if not result: if not result:
# 在第一条建议显示 # 在第一条建议显示
data = [{"name": "没有找到合适的园区!"}] data = [{"name": "没有找到合适的园区!"}]
......
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