From 148c311857daa99f5bf0c8ef235f06cd19b34dec Mon Sep 17 00:00:00 2001
From: ZhAkps <46207005+ZhAkps@users.noreply.github.com>
Date: 星期二, 06 二月 2024 10:37:43 +0800
Subject: [PATCH] Merge branch 'master' of http://106.120.22.35:48888/r/PM20221203225_MobileWeb
---
src/utils/map.js | 31 +++++++++++++++++--------------
src/utils/poiKeys.js | 2 +-
src/components/login.vue | 4 ++--
3 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/src/components/login.vue b/src/components/login.vue
index 9651c5c..fb71d32 100644
--- a/src/components/login.vue
+++ b/src/components/login.vue
@@ -9,8 +9,8 @@
return {};
},
mounted() {
- this.$router.push("/index");
- // this.getQueryString("focus-open-code");
+ // this.$router.push("/index");
+ this.getQueryString("focus-open-code");
// if (
// window.location.href.match(/=(\S*)#/) &&
// window.location.href.match(/=(\S*)#/)[1] != ""
diff --git a/src/utils/map.js b/src/utils/map.js
index fd9327b..097ebc7 100644
--- a/src/utils/map.js
+++ b/src/utils/map.js
@@ -4,7 +4,7 @@
import poiLayer from '@/components/poplayer/main';
import store from "@/utils/store";
import { Message } from 'element-ui';
-let tdglLine, qiyexinxi, qysl, ydbm, ydlx, cyfx, crzt, ydmj, crnx, crnf, rjl, jzxg, jzmd;
+let tdglLine, qiyexinxi, qysl, ydbm, ydlx, cyfx, jszt, ydmj, crnx, crnf, rjl, jzxg, jzmd;
let objdata;
window.tdglLine = tdglLine
@@ -450,7 +450,8 @@
axios
.get(
// "http://10.10.4.115:8022/geowinmap_xncs/ds?r=0.9158559377752831&serviceproviderid=map.vectorserviceprovider&serviceid=queryfeature&featcls=225%25E8%258C%2583%25E5%259B%25B4%25E5%2588%2586%25E5%258C%25BA%25E8%25A7%2584%25E5%2588%2592.geojson&lng=" +
- window.gisBaseUrl + "yzxncsApi/geowinmap_xncs/ds?r=0.9158559377752831&serviceproviderid=map.vectorserviceprovider&serviceid=queryfeature&featcls=225%25E8%258C%2583%25E5%259B%25B4%25E5%2588%2586%25E5%258C%25BA%25E8%25A7%2584%25E5%2588%2592.geojson&lng=" +
+ // window.gisBaseUrl + "yzxncsApi/geowinmap_xncs/ds?r=0.9158559377752831&serviceproviderid=map.vectorserviceprovider&serviceid=queryfeature&featcls=225%25E8%258C%2583%25E5%259B%25B4%25E5%2588%2586%25E5%258C%25BA%25E8%25A7%2584%25E5%2588%2592.geojson&lng=" +
+ window.gisBaseUrl + "cs/geowinmap_xncs/ds?&lng=" +
window.clickPOI.lon +
"&lat=" +
window.clickPOI.lat +
@@ -497,7 +498,8 @@
axios
.get(
// "http://10.10.4.115:8022//poisearch/guihuacon/getInfo?ydbm=" +
- window.gisBaseUrl + "yzxncsApi/poisearch/guihuacon/getInfo?ydbm=" +
+ // window.gisBaseUrl + "yzxncsApi/poisearch/guihuacon/getInfo?ydbm=" +
+ window.gisBaseUrl + "cs/poisearch/guihuacon/getInfo?ydbm=" +
response.data.NO
)
.then(
@@ -514,7 +516,8 @@
qiyexinxi = info.data.data.qiyexinxi;
qysl = data.qiyexinxi.length;
if (qysl > 0) {
- ydbm = data.qiyexinxi[0]["鍦板潡缂栧彿"];
+ // ydbm = data.qiyexinxi[0]["鍦板潡缂栧彿"];
+ ydbm = data.qiyexinxi[0]["ydbh"];
} else {
ydbm = data.churangxinxi["ydbh"];
}
@@ -525,15 +528,15 @@
cyfx = data.yongdishuju["cyfx"];
} catch (e) { }
try {
- // this.crzt = response.data["ZT"];
- switch (response.data["ZT"]) {
- case 3:
- crzt = "宸插嚭璁�";
- break;
- case 4:
- crzt = "鏈嚭璁�";
- break;
- }
+ jszt = response.data["ZT"];
+ // switch (response.data["ZT"]) {
+ // case "宸插缓":
+ // jszt = "宸插嚭璁�";
+ // break;
+ // case "鍦ㄥ缓":
+ // jszt = "鏈嚭璁�";
+ // break;
+ // }
} catch (e) { }
try {
ydmj = parseFloat(
@@ -560,7 +563,7 @@
ydbm,
ydlx,
cyfx,
- crzt,
+ jszt,
ydmj,
ydbm,
crnx,
diff --git a/src/utils/poiKeys.js b/src/utils/poiKeys.js
index 6311f74..4555419 100644
--- a/src/utils/poiKeys.js
+++ b/src/utils/poiKeys.js
@@ -17,7 +17,7 @@
鐢ㄥ湴缂栫爜: 'ydbm',
鐢ㄥ湴绫诲瀷: 'ydlx',
浜т笟鏂瑰悜: 'cyfx',
- 鍑鸿鐘舵��: 'crzt',
+ 寤鸿鐘舵��: 'jszt',
鐢ㄥ湴闈㈢Н: 'ydmj',
鍑鸿骞撮檺: 'crnx',
鍑鸿骞翠唤: 'crnf',
--
Gitblit v1.9.3