Skip to content

M
mancheng
Commit 9a133484 by dong
Options

fix202302017

parent 9dbff66b
Showing with 16 additions and 8 deletions
apps/view_atlas/view.py
...@@ -1322,7 +1322,8 @@ def attract_map(): ...@@ -1322,7 +1322,8 @@ def attract_map():
df.append({"name": pro, df.append({"name": pro,
"value": num, "value": num,
"color": jishu(num), "color": jishu(num),
"jwd": {"lng": province_data.p_lng, "lat": province_data.p_lat}}) # "jwd": {"lng": province_data.p_lng, "lat": province_data.p_lat}
})
return jsonify(code=RET.OK, msg="获取成功", data=df) return jsonify(code=RET.OK, msg="获取成功", data=df)
if province and not city: # 省-》市数据 if province and not city: # 省-》市数据
...@@ -1334,7 +1335,8 @@ def attract_map(): ...@@ -1334,7 +1335,8 @@ def attract_map():
df.append({"name": cit, df.append({"name": cit,
"value": num, "value": num,
"color": jishu(num), "color": jishu(num),
"jwd": {"lng": city_data.c_lng, "lat": city_data.c_lat}}) # "jwd": {"lng": city_data.c_lng, "lat": city_data.c_lat}
})
return jsonify(code=RET.OK, msg="获取成功", data=df) return jsonify(code=RET.OK, msg="获取成功", data=df)
if province and city and not district: # 市-》区数据 if province and city and not district: # 市-》区数据
...@@ -1347,7 +1349,8 @@ def attract_map(): ...@@ -1347,7 +1349,8 @@ def attract_map():
df.append({"name": dis, df.append({"name": dis,
"value": num, "value": num,
"color": jishu(num), "color": jishu(num),
"jwd": {"lng": district_data.d_lng, "lat": district_data.d_lat}}) # "jwd": {"lng": district_data.d_lng, "lat": district_data.d_lat}
})
return jsonify(code=RET.OK, msg="获取成功", data=df) return jsonify(code=RET.OK, msg="获取成功", data=df)
if province and city and district: # 区数据 if province and city and district: # 区数据
...@@ -1358,7 +1361,8 @@ def attract_map(): ...@@ -1358,7 +1361,8 @@ def attract_map():
df.append({"name": district, df.append({"name": district,
"value": num, "value": num,
"color": "", "color": "",
"jwd": {"lng": district_data.d_lng, "lat": district_data.d_lat}}) # "jwd": {"lng": district_data.d_lng, "lat": district_data.d_lat}
})
return jsonify(code=RET.OK, msg="获取成功", data=df) return jsonify(code=RET.OK, msg="获取成功", data=df)
else: else:
return jsonify(code=RET.OK, msg="无满足条件数据", data=df) return jsonify(code=RET.OK, msg="无满足条件数据", data=df)
......
apps/view_map/view.py
...@@ -65,7 +65,8 @@ def attract_map(): ...@@ -65,7 +65,8 @@ def attract_map():
df.append({"name": pro, df.append({"name": pro,
"value": num, "value": num,
"color": jishu(num), "color": jishu(num),
"jwd": {"lng": province_data.p_lng, "lat": province_data.p_lat}}) # "jwd": {"lng": province_data.p_lng, "lat": province_data.p_lat}})
})
return jsonify(code=RET.OK, msg="获取成功", data=df) return jsonify(code=RET.OK, msg="获取成功", data=df)
if province and not city: # 省-》市数据 if province and not city: # 省-》市数据
...@@ -77,7 +78,8 @@ def attract_map(): ...@@ -77,7 +78,8 @@ def attract_map():
df.append({"name": cit, df.append({"name": cit,
"value": num, "value": num,
"color": jishu(num), "color": jishu(num),
"jwd": {"lng": city_data.c_lng, "lat": city_data.c_lat}}) # "jwd": {"lng": city_data.c_lng, "lat": city_data.c_lat}})
})
return jsonify(code=RET.OK, msg="获取成功", data=df) return jsonify(code=RET.OK, msg="获取成功", data=df)
if province and city and not district: # 市-》区数据 if province and city and not district: # 市-》区数据
...@@ -90,7 +92,8 @@ def attract_map(): ...@@ -90,7 +92,8 @@ def attract_map():
df.append({"name": dis, df.append({"name": dis,
"value": num, "value": num,
"color": jishu(num), "color": jishu(num),
"jwd": {"lng": district_data.d_lng, "lat": district_data.d_lat}}) # "jwd": {"lng": district_data.d_lng, "lat": district_data.d_lat}})
})
return jsonify(code=RET.OK, msg="获取成功", data=df) return jsonify(code=RET.OK, msg="获取成功", data=df)
if province and city and district: # 区数据 if province and city and district: # 区数据
...@@ -101,7 +104,8 @@ def attract_map(): ...@@ -101,7 +104,8 @@ def attract_map():
df.append({"name": district, df.append({"name": district,
"value": num, "value": num,
"color": "", "color": "",
"jwd": {"lng": district_data.d_lng, "lat": district_data.d_lat}}) # "jwd": {"lng": district_data.d_lng, "lat": district_data.d_lat}})
})
return jsonify(code=RET.OK, msg="获取成功", data=df) return jsonify(code=RET.OK, msg="获取成功", data=df)
else: else:
return jsonify(code=RET.OK, msg="无满足条件数据", data=df) return jsonify(code=RET.OK, msg="无满足条件数据", data=df)
......
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