@kq_npm/client3d_webgl_vue 0.1.0-beta → 0.1.2-beta

package/index.js

@@ -923,8 +923,8 @@ class LayerManager {
   //图层树数据
   //图层列表数据（不包含文件夹节点,不包含融合子图层），特殊图层数据（BaseLayer、OnLineLayer）除外
   //图层原数据列表（包含文件夹节点，融合子图层）
-  //影像图层guid集合
   //置顶图层guid
+  //记录置顶图层index
   //地形集合
   constructor(scenceView) {
     _defineProperty(this, "_scenceView", null);
@@ -937,10 +937,10 @@ class LayerManager {
 
     _defineProperty(this, "_layerListData_old", []);
 
-    _defineProperty(this, "_imageryLayerGuids", []);
-
     _defineProperty(this, "_frontLayerGuid", null);
 
+    _defineProperty(this, "_frontLayerIndex", null);
+
     _defineProperty(this, "_emptyTerrainProvider", new Cesium.EllipsoidTerrainProvider({}));
 
     _defineProperty(this, "_terrainProviders", []);
@@ -1005,9 +1005,8 @@ class LayerManager {
 
         that._viewer.imageryLayers.add(imageryLayer);
       }
-
-      that._imageryLayerGuids.push(layer.guid);
     });
+    that.recordImageryLayerOriginIndex();
 
     if (rect) {
       that._viewer.camera.flyTo({
@@ -1078,6 +1077,8 @@ class LayerManager {
           } else if (visible) {
             //如果不存在该图层则添加
             if (this._layerListData[i].serverType === "kqserver") {
+              //添加图层之前重置图层顺序
+              this.resetLayerIndex();
               var imageryProvider = new Cesium.Kq3dKQGISMapServerImageryProviderExt({
                 url: this._layerListData[i].url,
                 ua_token: this._layerListData[i].accessToken,
@@ -1085,8 +1086,15 @@ class LayerManager {
               });
               var imageryLayer = new Cesium.ImageryLayer(imageryProvider);
               imageryLayer.name = this._layerListData[i].guid;
+              var addIndex = this.getImageryLayerAddIndex(ids[z]);
+
+              if (addIndex > -1) {
+                this._viewer.imageryLayers.add(imageryLayer, addIndex);
+              } else {
+                this._viewer.imageryLayers.add(imageryLayer);
+              }
 
-              this._viewer.imageryLayers.add(imageryLayer);
+              this.recordImageryLayerOriginIndex();
             }
           }
         }
@@ -1097,27 +1105,68 @@ class LayerManager {
 
   getImageryLayerAddIndex(guid) {
     let layers = [];
-    let layerListIndex = -1;
-    let data = this._layerListData; //从_layerListData中找出所有ImageryLayer图层
+    let layerIndex = -1;
+    let layerAddIndex = -1; //从_layerListData中找出所有ImageryLayer图层
 
-    data.forEach((layer, index) => {
+    this._layerListData.forEach(layer => {
       if (layer.serverType === "kqserver" || layer.serverType === "imagerylayer") {
         layers.push(layer);
 
         if (layer.guid === guid) {
-          layerListIndex = index;
+          layerIndex = layers.length - 1;
         }
       }
     });
 
-    if (layerListIndex > -1) {
-      //搜索左边相邻显示的图层
-      let isLeftLayerShow = false;
+    if (layerIndex > -1) {
+      var isLeftShow = false;
+      var adjacentLayerShowIndex = -1; //搜索左边相邻显示的图层
 
-      for (var i = layerListIndex - 1; i >= 0; i--) {
-        if (data[i].visible) {}
+      for (var i = layerIndex - 1; i >= 0; i--) {
+        if (layers[i].visible) {
+          adjacentLayerShowIndex = i;
+          isLeftShow = true;
+          break;
+        }
+      }
+
+      if (adjacentLayerShowIndex === -1) {
+        //搜索右边相邻显示的图层
+        for (var j = layerIndex + 1; j < layers.length; j++) {
+          if (layers[j].visible) {
+            adjacentLayerShowIndex = j;
+            break;
+          }
+        }
+      }
+
+      if (adjacentLayerShowIndex > -1) {
+        var adjacentLayer = this.getLayerByGuid(layers[adjacentLayerShowIndex].guid);
+
+        if (adjacentLayer) {
+          var adjacentLayerIndex = adjacentLayer._layerIndex;
+
+          if (isLeftShow) {
+            layerAddIndex = adjacentLayerIndex + 1;
+          } else {
+            if (this.getBaseLayerIndex() === adjacentLayerIndex) {
+              layerAddIndex = adjacentLayerIndex;
+            } else {
+              layerAddIndex = adjacentLayerIndex - 1;
+            }
+          }
+        }
       }
     }
+
+    return layerAddIndex;
+  } //记录ImageryLayer原始index
+
+
+  recordImageryLayerOriginIndex() {
+    this._viewer.imageryLayers._layers.forEach(layer => {
+      layer._originIndex = layer._layerIndex;
+    });
   } //通过guid获取图层对象
 
 
@@ -1291,15 +1340,6 @@ class LayerManager {
     // });
     // return baseIndex;
     return 1;
-  } //获取图层原始Index
-
-
-  getLayerOldIndex(guid) {
-    let baseIndex = this.getBaseLayerIndex();
-
-    let layerIndex = this._imageryLayerGuids.indexOf(guid);
-
-    return baseIndex + layerIndex;
   } //设置图层置顶或取消置顶
 
 
@@ -1314,34 +1354,40 @@ class LayerManager {
         if (this._frontLayerGuid) {
           // 如果已经有置顶图层 先把已经置顶的图层还原 再继续操作
           let frontLayer = this.getLayerByGuid(this._frontLayerGuid);
-          let frontOldIndex = this.getLayerOldIndex(this._frontLayerGuid);
-          var length = frontLayer._layerIndex - frontOldIndex;
 
-          for (let i = 0; i < length; i++) {
-            if (frontLayer instanceof Cesium.ImageryLayer) {
-              this._viewer.imageryLayers.lower(frontLayer);
+          if (this._frontLayerIndex !== null) {
+            var length = frontLayer._layerIndex - this._frontLayerIndex;
+
+            for (let i = 0; i < length; i++) {
+              if (frontLayer instanceof Cesium.ImageryLayer) {
+                this._viewer.imageryLayers.lower(frontLayer);
+              }
             }
           }
         }
 
         if (layer instanceof Cesium.ImageryLayer) {
+          this._frontLayerGuid = guid;
+          this._frontLayerIndex = layer._layerIndex;
+
           this._viewer.imageryLayers.raiseToTop(layer);
         }
-
-        this._frontLayerGuid = guid;
       } else {
         //取消置顶
         if (this._frontLayerGuid !== guid) return;
-        let oldIndex = this.getLayerOldIndex(guid);
-        let length = layer._layerIndex - oldIndex;
 
-        for (let j = 0; j < length; j++) {
-          if (layer instanceof Cesium.ImageryLayer) {
-            this._viewer.imageryLayers.lower(layer);
+        if (this._frontLayerIndex !== null) {
+          let length = layer._layerIndex - this._frontLayerIndex;
+
+          for (let j = 0; j < length; j++) {
+            if (layer instanceof Cesium.ImageryLayer) {
+              this._viewer.imageryLayers.lower(layer);
+            }
           }
         }
 
         this._frontLayerGuid = null;
+        this._frontLayerIndex = null;
       }
     }
   } //图层上移
@@ -1370,18 +1416,30 @@ class LayerManager {
 
 
   resetLayerIndex() {
-    let that = this;
-    let oldIndex, layer; //重置影像图层顺序
+    this._layerListData.forEach(layer => {
+      if (layer.serverType === "kqserver" || layer.serverType === "imagerylayer") {
+        var imageryLayer = this.getLayerByGuid(layer.guid);
 
-    that._imageryLayerGuids.forEach(guid => {
-      oldIndex = that.getLayerOldIndex(guid);
-      layer = that.getLayerByGuid(guid);
-      let length = layer._layerIndex - oldIndex;
+        if (imageryLayer) {
+          if (imageryLayer._layerIndex > imageryLayer._originIndex) {
+            var length = imageryLayer._layerIndex - imageryLayer._originIndex;
 
-      for (let j = 0; j < length; j++) {
-        that._viewer.imageryLayers.lower(layer);
+            for (var i = 0; i < length; i++) {
+              this._viewer.imageryLayers.lower(imageryLayer);
+            }
+          } else if (imageryLayer._layerIndex < imageryLayer._originIndex) {
+            var length = imageryLayer._originIndex - imageryLayer._layerIndex;
+
+            for (var j = 0; j < length; j++) {
+              this._viewer.imageryLayers.raise(imageryLayer);
+            }
+          }
+        }
       }
-    });
+    }, this);
+
+    this._frontLayerGuid = null;
+    this._frontLayerIndex = null;
   } //设置图层透明度
 
 
@@ -1430,6 +1488,12 @@ class LayerManager {
       }
     }
 
+    if (layer.serverType === "imagerylayer") {
+      this._viewer.imageryLayers._layers.forEach(layer => {
+        if (!layer._originIndex) layer._originIndex = layer._layerIndex;
+      });
+    }
+
     this._scenceView.fire("resetLayerDatas");
   } //设置地形
 
@@ -2809,7 +2873,9 @@ const Measurevue_type_script_setup_true_lang_js_default_ = {
       const _component_kq_divider = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.resolveComponent)("kq-divider");
 
       return (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementBlock)("section", {
-        class: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.normalizeClass)(["kq-measure3d", __props.showShadow ? 'shadow' : null])
+        class: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.normalizeClass)(["kq-measure3d", {
+          'kq-shadow': __props.showShadow
+        }])
       }, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("div", Measurevue_type_script_setup_true_lang_js_hoisted_1, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("div", Measurevue_type_script_setup_true_lang_js_hoisted_2, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("p", Measurevue_type_script_setup_true_lang_js_hoisted_3, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).mode), 1
       /* TEXT */
       ), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_select, {
@@ -3427,7 +3493,9 @@ const Flightvue_type_script_setup_true_lang_js_default_ = {
       const _component_kq_divider = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.resolveComponent)("kq-divider");
 
       return (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementBlock)("section", {
-        class: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.normalizeClass)(["kq-flight3d", __props.showShadow ? 'shadow' : null])
+        class: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.normalizeClass)(["kq-flight3d", {
+          'kq-shadow': __props.showShadow
+        }])
       }, [!(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(isAdd) ? ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementBlock)("div", Flightvue_type_script_setup_true_lang_js_hoisted_1, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("div", Flightvue_type_script_setup_true_lang_js_hoisted_2, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_button, {
         onClick: addPath,
         title: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).addPath
@@ -9378,7 +9446,8 @@ ExcavateFillAnalysis.install = (Vue, opts) => {
 
 ;// CONCATENATED MODULE: ./src/webgl/floodanalysis/FloodAnalysisViewModel.js
 
-//地形淹没分析逻辑类
+ //地形淹没分析逻辑类
+
 class FloodAnalysisViewModel {
   //地形淹没
   //模型淹没
@@ -9393,9 +9462,21 @@ class FloodAnalysisViewModel {
 
     _defineProperty(this, "_mode", 0);
 
+    _defineProperty(this, "_colorImages", [{
+      value: "0",
+      src: const_image_namespaceObject.RED_TO_PURPLE_URL
+    }, {
+      value: "1",
+      src: const_image_namespaceObject.PURPLE_TO_YELLOW_URL
+    }, {
+      value: "2",
+      src: const_image_namespaceObject.GREEN_TO_BLUE_URL
+    }]);
+
     options.viewer = scenceView._viewer;
     options.viewer.scene.globe.depthTestAgainstTerrain = true;
     this._mode = options.mode;
+    options.colorImage = this.getImagePath(options.colorImage);
     this._floodModelAnalysis = new Cesium.Kq3dFloodModelAnalysis(options);
     var that = this;
     this._measureHandler = new Cesium.Kq3dMeasureHandler(scenceView._viewer, {
@@ -9438,6 +9519,19 @@ class FloodAnalysisViewModel {
         }
       }
     });
+  } //获取图片路径
+
+
+  getImagePath(value) {
+    var imagePath = '';
+
+    var image = this._colorImages.find(item => item.value === value);
+
+    if (image) {
+      imagePath = image.src;
+    }
+
+    return imagePath;
   } //开始分析
 
 
@@ -9593,7 +9687,7 @@ const FloodAnalysisvue_type_script_setup_true_lang_js_default_ = {
             alpha: formItem.floodAlpha,
             minHeight: formItem.floodMinHeight,
             maxHeight: formItem.floodMaxHeight,
-            colorImage: getImagePath(formItem.floodColorImage)
+            colorImage: formItem.floodColorImage
           };
           viewModel = new FloodAnalysisViewModel(scenceView, options);
         }
@@ -10131,6 +10225,17 @@ class SlopeAnalysisViewModel {
 
     _defineProperty(this, "_defaultPositions", [new Cesium.Cartesian3(320344.97912128427, 5634145.630522612, 2962308.690344629), new Cesium.Cartesian3(324448.6451820951, 5639835.805638826, 2951088.4423702545), new Cesium.Cartesian3(320344.97912128427, 5634145.630522612, 2962308.690344629)]);
 
+    _defineProperty(this, "_colorImages", [{
+      value: "0",
+      src: const_image_namespaceObject.RED_TO_PURPLE_URL
+    }, {
+      value: "1",
+      src: const_image_namespaceObject.PURPLE_TO_YELLOW_URL
+    }, {
+      value: "2",
+      src: const_image_namespaceObject.GREEN_TO_BLUE_URL
+    }]);
+
     this._globaOptions.viewer = scenceView._viewer;
     this._globaOptions.viewModel = {
       fillStyle: viewModel.fillStyle,
@@ -10145,7 +10250,8 @@ class SlopeAnalysisViewModel {
       minSlope: viewModel.minSlope,
       maxSlope: viewModel.maxSlope,
       slopeColorText: viewModel.slopeColorText,
-      slopeColorAlpha: viewModel.slopeColorAlpha
+      slopeColorAlpha: viewModel.slopeColorAlpha,
+      colorImage: this.getImagePath(viewModel.colorImage)
     };
     this._globaOptions.viewer.scene.globe.depthTestAgainstTerrain = true; //开启深度检测
 
@@ -10195,6 +10301,19 @@ class SlopeAnalysisViewModel {
         that._globaOptions._drawManager.clear();
       }
     });
+  } //获取图片路径
+
+
+  getImagePath(value) {
+    var imagePath = '';
+
+    var image = this._colorImages.find(item => item.value === value);
+
+    if (image) {
+      imagePath = image.src;
+    }
+
+    return imagePath;
   } // 开始分析
 
 
@@ -10439,9 +10558,8 @@ const SlopeAnalysisvue_type_script_setup_true_lang_js_default_ = {
         if (scenceView) {
           language.value = scenceView._language;
           refactorArr();
-          viewModel = new SlopeAnalysisViewModel(scenceView, formItem);
-          var imageUrl = getImagePath(formItem.colorImage);
-          viewModel.setColorImage(imageUrl);
+          viewModel = new SlopeAnalysisViewModel(scenceView, formItem); // var imageUrl = getImagePath(formItem.colorImage);
+          // viewModel.setColorImage(imageUrl);
         }
       });
     }); // 刷新自定义样式数组
@@ -11086,16 +11204,45 @@ class IsolineAnalysisViewModel {
 
     _defineProperty(this, "_surfaceLineColorTable", ["#2a2828", "#2747E0", "#D33B7D", "#D33038", "#FF9742"]);
 
+    _defineProperty(this, "_colorImages", [{
+      value: 0,
+      src: const_image_namespaceObject.RED_TO_PURPLE_URL
+    }, {
+      value: 1,
+      src: const_image_namespaceObject.PURPLE_TO_YELLOW_URL
+    }, {
+      value: 2,
+      src: const_image_namespaceObject.GREEN_TO_BLUE_URL
+    }]);
+
     _defineProperty(this, "_options", null);
 
     this._options = options;
     this._options.viewer = scenceView._viewer;
-    this._options.viewer.scene.globe.depthTestAgainstTerrain = true; // scenceView._viewer.imageryLayers.addImageryProvider(new Cesium.SingleTileImageryProvider({
+    this._options.viewer.scene.globe.depthTestAgainstTerrain = true;
+    this._options.colorImage = this.getImagePath(this._options.colorImage);
+
+    if (options.firstCurve.color) {
+      options.firstCurve.color = Cesium.Color.fromCssColorString(options.firstCurve.color);
+    }
+
+    if (options.rememberCurve.color) {
+      options.rememberCurve.color = Cesium.Color.fromCssColorString(options.rememberCurve.color);
+    }
+
+    if (options.timeCurve.color) {
+      options.timeCurve.color = Cesium.Color.fromCssColorString(options.timeCurve.color);
+    }
+
+    if (options.helpCurve.color) {
+      options.helpCurve.color = Cesium.Color.fromCssColorString(options.helpCurve.color);
+    } // scenceView._viewer.imageryLayers.addImageryProvider(new Cesium.SingleTileImageryProvider({
     //     url: './images/5e1e7ff00b274.jpg"'
     //   }));
     // options.positions = Cesium.Cartesian3.fromDegreesArray([86.207634, 28.056729, 86.102906, 28.00936, 86.08717, 27.91235, 86.125613, 27.819748, 86.198224, 27.795282, 86.296004, 27.781972, 86.350588, 27.789578, 86.392595, 27.844577, 86.45492, 27.953339, 86.447793, 28.072028, 86.391228, 28.124686, 86.307634, 28.121425, 86.224272, 28.086173, 86.207, 28.062356, 86.206765, 28.062273]);
     // this._elevation = new Cesium.Kq3dContourAnalysis(options);
 
+
     this._drawManager = scenceView._drawManager;
   } // 设置等高面区间
 
@@ -11142,6 +11289,19 @@ class IsolineAnalysisViewModel {
         this._elevation.colorImage = this._surfaceColorImage;
         break;
     }
+  } //获取图片路径
+
+
+  getImagePath(value) {
+    var imagePath = "";
+
+    var image = this._colorImages.find(item => item.value === value);
+
+    if (image) {
+      imagePath = image.src;
+    }
+
+    return imagePath;
   } //修改填充图片
 
 
@@ -11149,24 +11309,16 @@ class IsolineAnalysisViewModel {
     var path = "";
 
     switch (value) {
-      case 1:
+      case 0:
         path = const_image_namespaceObject.RED_TO_PURPLE_URL;
         break;
 
-      case 2:
-        path = const_image_namespaceObject.PURPLE_TO_YELLOW_URL;
-        break;
-
-      case 3:
-        path = const_image_namespaceObject.PURPLE_TO_YELLOW_URL;
-        break;
-
-      case 4:
+      case 1:
         path = const_image_namespaceObject.PURPLE_TO_YELLOW_URL;
         break;
 
-      default:
-        path = const_image_namespaceObject.PURPLE_TO_YELLOW_URL;
+      case 2:
+        path = const_image_namespaceObject.GREEN_TO_BLUE_URL;
         break;
     }
 
@@ -11219,6 +11371,20 @@ class IsolineAnalysisViewModel {
 
         that._drawManager.clear();
 
+        switch (that._options.filltype) {
+          case 0:
+            that._options.type = Cesium.Kq3dContourAnalysisType.LINE;
+            break;
+
+          case 1:
+            that._options.type = Cesium.Kq3dContourAnalysisType.SURFACE;
+            break;
+
+          case 2:
+            that._options.type = Cesium.Kq3dContourAnalysisType.SUFACE_LINE;
+            break;
+        }
+
         that._elevation = new Cesium.Kq3dContourAnalysis(that._options);
       }
     });
@@ -11453,13 +11619,13 @@ const IsolineAnalysisvue_type_script_setup_true_lang_js_default_ = {
       colorTable: "#FF0000"
     }]);
     const colorImages = [{
-      value: 0,
+      value: "0",
       src: const_image_namespaceObject.RED_TO_PURPLE_URL
     }, {
-      value: 1,
+      value: "1",
       src: const_image_namespaceObject.PURPLE_TO_YELLOW_URL
     }, {
-      value: 2,
+      value: "2",
       src: const_image_namespaceObject.GREEN_TO_BLUE_URL
     }];
     let activeName = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)("line"); // 获取组件传参
@@ -11497,46 +11663,34 @@ const IsolineAnalysisvue_type_script_setup_true_lang_js_default_ = {
             minHeight: formItem.minHeight,
             maxHeight: formItem.maxHeight,
             spaceing: 600,
-            width: 2.0,
-            colorLabel: "#ffff00",
-            color: Cesium.Color.fromCssColorString("#ffff00"),
-            filltype: formItem.filltype,
-            type: Cesium.Kq3dContourAnalysisType.LINE,
+            filltype: formItem.fillType,
+            fillStyle: formItem.fillStyle,
             colorTableValue: [0.0, 0.1, 0.2, 0.3, 0.4],
             colorTable: formItem.colorTable,
-            firstCurveText: "#ffff00",
-            rememberCurveText: "#ffff00",
-            timeCurveText: "#00ff00",
-            helpCurveText: "#0000ff",
-            firstCurveWidth: 2,
-            rememberCurveWidth: 4,
-            timeCurveWidth: 1,
-            helpCurveWidth: 1,
             firstCurve: {
-              color: Cesium.Color.fromCssColorString(formItem.firstCurveColor),
+              color: formItem.firstCurveColor,
               show: formItem.firstCurve,
               width: formItem.firstCurveWidth
             },
             rememberCurve: {
-              color: Cesium.Color.fromCssColorString(formItem.rememberCurveColor),
+              color: formItem.rememberCurveColor,
               show: formItem.rememberCurve,
               width: formItem.rememberCurveWidth
             },
             timeCurve: {
-              color: Cesium.Color.fromCssColorString(formItem.intervalCurveColor),
+              color: formItem.intervalCurveColor,
               show: formItem.intervalCurve,
               width: formItem.intervalCurveWidth
             },
             helpCurve: {
-              color: Cesium.Color.fromCssColorString(formItem.extraCurveColor),
+              color: formItem.extraCurveColor,
               show: formItem.extraCurve,
               width: formItem.extraCurveWidth
             },
-            surfaceAlpha: formItem.surfaceAlpha
+            surfaceAlpha: formItem.surfaceAlpha,
+            colorImage: formItem.colorImage
           };
           viewModel = new IsolineAnalysisViewModel(scenceView, options);
-          var imageUrl = getImagePath(formItem.colorImage);
-          viewModel.setFillStyleImage(imageUrl);
         }
       });
     }); // 刷新自定义样式数组
@@ -15618,8 +15772,7 @@ class AddDataViewModel {
             });
             imageryLayer.name = layer.guid;
 
-            this._viewer.imageryLayers.add(imageryLayer); //this._layerManager._imageryLayerGuids.push(layer.guid);
-
+            this._viewer.imageryLayers.add(imageryLayer);
           }, this);
 
           if (mapInfo.rect84) {
@@ -15630,6 +15783,7 @@ class AddDataViewModel {
 
           mapServerInfo.layerTreeData.forEach(node => {
             node.lsType = "ls";
+            node.serverType = "imagerylayer";
 
             this._layerManager.addTempLayerNode(node, 1);
           }, this);
@@ -18380,6 +18534,10 @@ const CompareMapvue_type_script_setup_true_lang_js_default_ = {
     showShadow: {
       type: Boolean,
       default: false
+    },
+    offsetTop: {
+      type: String,
+      default: "16px"
     }
   },
   emits: ["back"],
@@ -18389,6 +18547,7 @@ const CompareMapvue_type_script_setup_true_lang_js_default_ = {
     emit
   }) {
     const props = __props;
+    let offsetTop = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)("auto");
     let language = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)({});
     let btnShow = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)(false); // 分屏返回按钮
 
@@ -18406,6 +18565,7 @@ const CompareMapvue_type_script_setup_true_lang_js_default_ = {
     let tree3Index = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)(2);
     let tree4Index = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.ref)(3);
     (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.onMounted)(() => {
+      offsetTop.value = props.offsetTop;
       gis_utils_namespaceObject.utils.getWebMap(null, scenceView => {
         if (scenceView) {
           language.value = scenceView._language;
@@ -18464,7 +18624,10 @@ const CompareMapvue_type_script_setup_true_lang_js_default_ = {
       resetMode();
     });
     expose({
-      changeMode
+      changeMode,
+      goBack,
+      resetMode,
+      setLayerState
     });
     return (_ctx, _cache) => {
       const _component_kq_icon = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.resolveComponent)("kq-icon");
@@ -18474,18 +18637,24 @@ const CompareMapvue_type_script_setup_true_lang_js_default_ = {
       return (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementBlock)("section", CompareMapvue_type_script_setup_true_lang_js_hoisted_1, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(showTree1) ? ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createBlock)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(CompareMapTree), {
         key: 0,
         class: "layer-tree-1",
+        style: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.normalizeStyle)({
+          'top': (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(offsetTop)
+        }),
         index: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(tree1Index),
         setLayerState: setLayerState
       }, null, 8
       /* PROPS */
-      , ["index"])) : (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createCommentVNode)("v-if", true), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(showTree2) ? ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createBlock)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(CompareMapTree), {
+      , ["style", "index"])) : (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createCommentVNode)("v-if", true), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(showTree2) ? ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createBlock)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(CompareMapTree), {
         key: 1,
         class: "layer-tree-2",
+        style: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.normalizeStyle)({
+          'top': (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(offsetTop)
+        }),
         index: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(tree2Index),
         setLayerState: setLayerState
       }, null, 8
       /* PROPS */
-      , ["index"])) : (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createCommentVNode)("v-if", true), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(showTree3) ? ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createBlock)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(CompareMapTree), {
+      , ["style", "index"])) : (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createCommentVNode)("v-if", true), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(showTree3) ? ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createBlock)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(CompareMapTree), {
         key: 2,
         class: "layer-tree-3",
         index: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(tree3Index),
@@ -18503,6 +18672,9 @@ const CompareMapvue_type_script_setup_true_lang_js_default_ = {
         circle: "",
         title: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).return,
         class: "close-button",
+        style: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.normalizeStyle)({
+          'top': (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(offsetTop)
+        }),
         onClick: _cache[0] || (_cache[0] = $event => goBack())
       }, {
         default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_icon, null, {
@@ -18516,7 +18688,7 @@ const CompareMapvue_type_script_setup_true_lang_js_default_ = {
 
       }, 8
       /* PROPS */
-      , ["title"]), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.vShow, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(btnShow)]])]);
+      , ["title", "style"]), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.vShow, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(btnShow)]])]);
     };
   }