From fc5dcfa17caab9b6aa48d84aaaf1443a32720ef8 Mon Sep 17 00:00:00 2001
From: 少年 <1392120328@qq.com>
Date: 星期一, 04 三月 2024 15:33:59 +0800
Subject: [PATCH] Merge branch 'master' of http://103.135.160.14:9034/r/PM20221203225_MobileWeb
---
src/utils/map.js | 4 ++--
src/components/leftMenu/sousuo2.vue | 2 +-
src/components/login.vue | 20 ++++----------------
src/utils/map2.js | 8 ++++----
4 files changed, 11 insertions(+), 23 deletions(-)
diff --git a/src/components/leftMenu/sousuo2.vue b/src/components/leftMenu/sousuo2.vue
index 9386c2d..0186aeb 100644
--- a/src/components/leftMenu/sousuo2.vue
+++ b/src/components/leftMenu/sousuo2.vue
@@ -556,7 +556,7 @@
// axios
// .get(
// 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=" +
+ // "BEApi/cs/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=" +
// degrees[0] +
// "&lat=" +
// degrees[1] +
diff --git a/src/components/login.vue b/src/components/login.vue
index e4d5ae6..89a01fc 100644
--- a/src/components/login.vue
+++ b/src/components/login.vue
@@ -9,19 +9,11 @@
return {};
},
mounted() {
- // this.$router.push("/index");
- this.getQueryString("focus-open-code");
- // if (
- // window.location.href.match(/=(\S*)#/) &&
- // window.location.href.match(/=(\S*)#/)[1] != ""
- // ) {
- // this.passFree();
- // }
+ // 娴嬭瘯鐗堟湰鍏嶇櫥褰�
+ this.$router.push("/home");
- // // 浜姙鍏嶅瘑鐧诲綍锛坲rl甯﹀弬"focus-open-code"锛�
- // if (this.$route.query["focus-open-code"]) {
- // this.passJBFree();
- // }
+ // // 姝ｅ紡鐗堢涓夋柟鐧诲綍
+ // this.getQueryString("focus-open-code");
},
methods: {
@@ -33,10 +25,6 @@
}
return null;
},
- // 浜姙鍏嶅瘑鐧诲綍
- // passJBFree() {
- // // this.$router.push("/index");
- // },
},
};
</script>
diff --git a/src/utils/map.js b/src/utils/map.js
index e49d709..4224b84 100644
--- a/src/utils/map.js
+++ b/src/utils/map.js
@@ -453,7 +453,7 @@
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 + "BEApi/cs/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=" +
@@ -501,7 +501,7 @@
axios
.get(
// "http://10.10.4.115:8022//poisearch/guihuacon/getInfo?ydbm=" +
- window.gisBaseUrl + "yzxncsApi/poisearch/guihuacon/getInfo?ydbm=" +
+ window.gisBaseUrl + "BEApi/cs/poisearch/guihuacon/getInfo?ydbm=" +
// window.gisBaseUrl + "cs/poisearch/guihuacon/getInfo?ydbm=" +
response.data.NO
)
diff --git a/src/utils/map2.js b/src/utils/map2.js
index c3571bc..2cb9b64 100644
--- a/src/utils/map2.js
+++ b/src/utils/map2.js
@@ -458,7 +458,7 @@
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 + "BEApi/cs/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.clickPOI.lon +
"&lat=" +
window.clickPOI.lat +
@@ -505,7 +505,7 @@
axios
.get(
// "http://10.10.4.115:8022//poisearch/guihuacon/getInfo?ydbm=" +
- window.gisBaseUrl + "yzxncsApi/poisearch/guihuacon/getInfo?ydbm=" +
+ window.gisBaseUrl + "BEApi/cs/poisearch/guihuacon/getInfo?ydbm=" +
response.data.NO
)
.then(
@@ -2251,7 +2251,7 @@
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 + "BEApi/cs/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=" +
e.coordinate[0] +
"&lat=" +
@@ -2283,7 +2283,7 @@
axios.get(
// "http://10.10.4.115:8022//poisearch/guihuacon/getInfo?ydbm=" +
- window.gisBaseUrl + "yzxncsApi/poisearch/guihuacon/getInfo?ydbm=" + response.data.NO
+ window.gisBaseUrl + "BEApi/cs/poisearch/guihuacon/getInfo?ydbm=" + response.data.NO
).then((info) => {
let data = info.data.data;
if (data.yongdishuju === null) {
--
Gitblit v1.9.3