From ad4a321de7f3bb00534767a9fd81f7379a666ef5 Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期三, 31 五月 2023 09:30:49 +0800
Subject: [PATCH] 数据管理-项目管理目录结构上下调整失效,勘察信息表无信息弹出窗口颜色修改;二维地图不能切换

---
 src/components/MapDiv.vue        |    2 +-
 src/components/mapol.vue         |   36 +++++++++++++++++++++---------------
 src/components/mapsdk.vue        |    2 +-
 src/views/Tools/AddOnlineMap.vue |    3 ++-
 4 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/components/MapDiv.vue b/src/components/MapDiv.vue
index b926a6d..9c1be5b 100644
--- a/src/components/MapDiv.vue
+++ b/src/components/MapDiv.vue
@@ -228,7 +228,7 @@
       return this.levelArray[this.levelArray.length - 1]
     },
     showBaseMapLayer() {
-      this.$refs && this.$refs.addOnlineMap && this.$refs.addOnlineMap.open("鍦颁笅妯″紡", null);
+      this.$refs && this.$refs.addOnlineMap && this.$refs.addOnlineMap.open("鍦ㄧ嚎鍦板浘", null);
     }
   },
   mounted() {
diff --git a/src/components/mapol.vue b/src/components/mapol.vue
index 0cb5ad9..3dc2939 100644
--- a/src/components/mapol.vue
+++ b/src/components/mapol.vue
@@ -97,22 +97,22 @@
 
     init2DMap() {
       var layerBase = [];
-      if (!is_production) {
-        var vectorLayer = new TileLayer({
-          source: new XYZ({
-            url: "http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}",
-          }),
-        })
-        var imageLayer = new TileLayer({
-          source: new XYZ({
-            url: "http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=6&x={x}&y={y}&z={z}",
-          }),
-        })
-        layerBase = [vectorLayer, imageLayer]
-      }
+      // if (!is_production) {
+      //   var vectorLayer = new TileLayer({
+      //     source: new XYZ({
+      //       url: "http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}",
+      //     }),
+      //   })
+      //   var imageLayer = new TileLayer({
+      //     source: new XYZ({
+      //       url: "http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=6&x={x}&y={y}&z={z}",
+      //     }),
+      //   })
+      //   layerBase = [vectorLayer, imageLayer]
+      // } 
       window.map = new Map({
         target: "mapol",
-        layers: layerBase,
+        // layers: layerBase,
         view: new View({
           center: [105.02, 34.9],
           zoom: 4,
@@ -140,7 +140,13 @@
           })
         });
         window.map.addLayer(window.olBaseMapLayer);
-
+      } else {
+        window.olBaseMapLayer = new TileLayer({
+          source: new XYZ({
+            url: "http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=6&x={x}&y={y}&z={z}",
+          }),
+        })
+        window.map.addLayer(window.olBaseMapLayer);
       }
 
 
diff --git a/src/components/mapsdk.vue b/src/components/mapsdk.vue
index 2017b1e..41278f1 100644
--- a/src/components/mapsdk.vue
+++ b/src/components/mapsdk.vue
@@ -1843,7 +1843,7 @@
       }
 
       if (!data.result.length) {
-        this.$message.error("鏈煡璇㈠埌鍕樻帰淇℃伅鏁版嵁");
+        this.$message("鏈煡璇㈠埌鍕樻帰淇℃伅鏁版嵁");
         return
       }
       this.showAttribute = !this.showAttribute;
diff --git a/src/views/Tools/AddOnlineMap.vue b/src/views/Tools/AddOnlineMap.vue
index d6bbf49..3829134 100644
--- a/src/views/Tools/AddOnlineMap.vue
+++ b/src/views/Tools/AddOnlineMap.vue
@@ -237,6 +237,7 @@
     open() {
       this.close(true);
       this.$refs.pop.open();
+
     },
     changeToken(token) {
       this.mapCollection.tokne = token;
@@ -289,7 +290,7 @@
           format: "image/jpeg",
           tileMatrixSetID: "GoogleMapsCompatible",
         }))
-
+        debugger
         window.olBaseMapLayer = new TileLayer({
           title: "楂樺痉鍦板浘",
           source: new XYZ({

--
Gitblit v1.9.3