From 0350f3c02209ee8b62f818810eaa663289158843 Mon Sep 17 00:00:00 2001
From: 少年 <1392120328@qq.com>
Date: 星期二, 06 二月 2024 10:38:57 +0800
Subject: [PATCH] Merge branch 'master' of http://106.120.22.35:48888/r/PM20221203225_MobileWeb

---
 src/utils/map.js |   31 +++++++++++++++++--------------
 1 files changed, 17 insertions(+), 14 deletions(-)

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,

--
Gitblit v1.9.3