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

---
 src/components/sideMenu/layerMenu/layerPanel2.vue |   78 ++++++++-------------------------------
 1 files changed, 16 insertions(+), 62 deletions(-)

diff --git a/src/components/sideMenu/layerMenu/layerPanel2.vue b/src/components/sideMenu/layerMenu/layerPanel2.vue
index 163e60f..2c56ef1 100644
--- a/src/components/sideMenu/layerMenu/layerPanel2.vue
+++ b/src/components/sideMenu/layerMenu/layerPanel2.vue
@@ -427,70 +427,30 @@
         this.curFuncIndex = index;
         switch (index) {
           case 0:
+            if (window.tdgllayer) {
+              window.map.removeLayer(window.tdgllayer);
+              store.setSliderShow(false);
+              window.tdgllayer = null;
+              window.map.removeLayer(window.tdgllayer);
+              return;
+            }
             store.setSliderShow(true);
-            // window.tdglLayer = sgworld.Creator.createImageryProvider(
-            //   layers[8].name,
-            //   "tms",
-            //   {
-            //     id: layers[8].children[0].id,
-            //     url: layers[8].children[0].urls,
-            //     fileExtension: layers[8].children[0].img || "png",
-            //     enablePickFeatures: false,
-            //     level: layers[8].children[0].Level,
-            //     minimumLevel: layers[8].children[0].minimumLevel,
-            //     maximumLevel: layers[8].children[0].maximumLevel,
-            //     tilingScheme:
-            //       layers[8].children[0].tileType === "Geo"
-            //         ? new Cesium.GeographicTilingScheme()
-            //         : new Cesium.WebMercatorTilingScheme(),
-            //     // alpha: layers[8].children[0].alpha,
-            //     alpha: this.alpha,
-            //   },
-            //   "0",
-            //   layers[8].children[0].zIndex,
-            //   true,
-            //   ""
-            // );
 
-            // console.log("gisserver-tms");
-            // var url = layers[8].children[0].urls;
-            // var projection = getProjection("EPSG:4326");
-            // var tileGrid = createXYZ({
-            //   extent: projection.getExtent(),
-            // });
-            // var source = new XYZ({
-            //   projection: projection,
-            //   tileGrid: tileGrid,
-            //   tileUrlFunction: function (tileCoord, pixelRatio, proj) {
-            //     return (
-            //       url +
-            //       (tileCoord[0] - 1) +
-            //       "/" +
-            //       tileCoord[1] +
-            //       "/" +
-            //       (Math.pow(2, tileCoord[0] - 1) + tileCoord[2]) +
-            //       ".jpeg"
-            //     );
-            //   },
-            // });
-            // window.tdglLayer = new Tile({
-            //   source: source,
-            // });
-            // window.map.addLayer(window.tdglLayer);
+            var url = layers[8].children[0].urls;
+            //"https://skyzt.bda.gov.cn/gisserver/tmsserver/chengshiguihua_dikuaibianhao_tms/";
 
-            // var url =
-            //   "https://skyzt.bda.gov.cn/gisserver/tmsserver/chengshiguihua_dikuaibianhao_tms/";
-
-            var tmslayer = new ol.layer.Tile({
+            window.map.removeLayer(window.tdgllayer);
+            window.tdgllayer = new ol.layer.Tile({
               source: new ol.source.XYZ({
-                projection: projection,
+                projection: "EPSG:4326",
                 tileGrid: ol.tilegrid.createXYZ({
-                  extent: [50.731, -90, 180, 70.0478],
+                  extent: [50.582, -90, 180, 70.1558],
                 }),
                 tileUrlFunction: function (tileCoord, pixelRatio, proj) {
                   // return url + (tileCoord[0] - 1) + '/' + tileCoord[1] + '/' + (Math.pow(2, tileCoord[0] - 1) + tileCoord[2]) + '.jpeg';
                   return (
                     url +
+                    "/" +
                     (tileCoord[0] - 1) +
                     "/" +
                     tileCoord[1] +
@@ -501,7 +461,7 @@
                 },
               }),
             });
-            window.map.addLayer(tmslayer);
+            window.map.addLayer(window.tdgllayer);
             //鏄剧ず婊戝姩鏉�
             store.setTdglFlag(true);
             break;
@@ -510,7 +470,7 @@
             store.setTdglFlag(false);
             if (window.tdglLayer) {
               store.setSliderShow(false);
-              sgworld.Creator.DeleteObject(window.tdglLayer);
+              window.map.removeLayer(window.tdgllayer);
             }
             store.setHistoryShow(true);
             break;
@@ -562,12 +522,6 @@
       immediate: true, //鍒锋柊鍔犺浇 绔嬮┈瑙﹀彂涓�娆andler
       deep: true, // 鍙互娣卞害妫�娴嬪埌 obj 瀵硅薄鐨勫睘鎬у�肩殑鍙樺寲
     },
-    // "state1.alpha": {
-    //   handler: function (newVal) {
-    //     this.handleFuncClick(0);
-    //   },
-    //   deep: true,
-    // },
   },
   computed: {
     alpha() {

--
Gitblit v1.9.3