@kq_npm/client3d_webgl_vue 4.0.8-beta → 4.1.0-beta

package/scenceview/index.js

@@ -93,7 +93,7 @@ element_plus_es__WEBPACK_IMPORTED_MODULE_0__.ElMessage.install = (Vue, opts) =>
 
 /***/ }),
 
-/***/ 696:
+/***/ 5110:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 
@@ -123,11 +123,15 @@ var util_ = __webpack_require__(9519);
 var message = __webpack_require__(1349);
 // EXTERNAL MODULE: external "@kq_npm/client_common_vue/_utils/const-image"
 var const_image_ = __webpack_require__(9702);
+;// CONCATENATED MODULE: external "papaparse"
+var external_papaparse_namespaceObject = require("papaparse");
+var external_papaparse_default = /*#__PURE__*/__webpack_require__.n(external_papaparse_namespaceObject);
 ;// CONCATENATED MODULE: ./src/webgl/adddata/AddDataViewModel.js
 
 
 
 
+
  //添加数据逻辑类
 
 class AddDataViewModel {
@@ -151,13 +155,15 @@ class AddDataViewModel {
         style: Cesium.LabelStyle.FILL_AND_OUTLINE,
         eyeOffset: Cesium.Cartesian3.ZERO,
         pixelOffset: new Cesium.Cartesian2(0, -8),
-        disableDepthTestDistance: Number.POSITIVE_INFINITY
+        disableDepthTestDistance: 10000000 // disableDepthTestDistance: Number.POSITIVE_INFINITY
+
       },
       billboard: {
         image: const_image_.BILLBOARD_IMAGE_URL,
         width: 12,
         height: 12,
-        disableDepthTestDistance: Number.POSITIVE_INFINITY
+        disableDepthTestDistance: 10000000 // disableDepthTestDistance: Number.POSITIVE_INFINITY
+
       },
       polyline: {
         width: 2.0,
@@ -212,8 +218,7 @@ class AddDataViewModel {
               that._viewer.dataSources.add(ds); // ds.autoAvoid(that._viewer);
 
 
-              that._viewer.flyTo(ds);
-
+              that.flyToLayer(ds);
               resolve("success");
               var layer = {
                 guid: ds.guid,
@@ -231,7 +236,7 @@ class AddDataViewModel {
               cb && cb(layer);
             });
           } else {
-            reject(file.name + " service parse error.");
+            reject(file.name + " file parser error.");
             cb && cb("error");
           }
         });
@@ -254,8 +259,129 @@ class AddDataViewModel {
               that._viewer.dataSources.add(ds); // ds.autoAvoid(that._viewer);
 
 
-              that._viewer.flyTo(ds);
+              that.flyToLayer(ds);
+              resolve("success");
+              var layer = {
+                guid: ds.guid,
+                name: name,
+                visible: true,
+                serverType: "datasource",
+                lsType: "ls",
+                url: res,
+                addType: "geojson",
+                shapeType: that._layerManager.getShapeType(ds)
+              };
+
+              that._layerManager.addTempLayerNode(layer);
+
+              cb && cb(layer);
+            });
+          } else {
+            reject(file.name + " file parser error.");
+            cb && cb("error");
+          }
+        });
+      } else if (ext === "csv") {
+        (0,util_.readFile)(file, res => {
+          var features = external_papaparse_default().parse(res, {
+            skipEmptyLines: true,
+            header: true
+          }).data;
+          let _featureCollection = {
+            type: "FeatureCollection",
+            features: []
+          };
+
+          for (var i = 0; i < features.length; i++) {
+            let item = features[i];
+            let lat = null;
+            let lng = null;
+            let properties = {};
+
+            for (var j in item) {
+              if (j.toUpperCase().indexOf("LAT") != -1) {
+                lat = item[j];
+              } else if (j.toUpperCase().indexOf("LNG") != -1 || j.toUpperCase().indexOf("LON") != -1) {
+                lng = item[j];
+              } else if (j.toUpperCase() === "X") {
+                lat = item[j];
+              } else if (j.toUpperCase() === "Y") {
+                lng = item[j];
+              } else {
+                properties[j] = item[j];
+              }
+            } // 点数据
+
+
+            if (lat && lng) {
+              let _point = {
+                type: "Feature",
+                geometry: {
+                  type: "Point",
+                  coordinates: [Number(lng), Number(lat)]
+                },
+                properties: properties
+              };
+
+              _featureCollection.features.push(_point);
+            } else {}
+          }
+
+          if (_featureCollection.features.length > 0) {
+            var ds = new Cesium.Kq3dGeoJsonDataSource(name);
+            ds.load(_featureCollection, that._geojsonStyle).then(ds => {
+              ds.entities.values.forEach(entity => {
+                if (entity.polygon) {
+                  entity.polyline = {
+                    positions: entity.polygon.hierarchy._value.positions,
+                    width: that._geojsonStyle.polygon.outlineWidth,
+                    material: that._geojsonStyle.polygon.outlineColor
+                  };
+                }
+              });
+
+              that._viewer.dataSources.add(ds);
 
+              that.flyToLayer(ds);
+              resolve("success");
+              var layer = {
+                guid: ds.guid,
+                name: name,
+                visible: true,
+                serverType: "datasource",
+                lsType: "ls",
+                url: _featureCollection,
+                addType: "geojson",
+                shapeType: that._layerManager.getShapeType(ds)
+              };
+
+              that._layerManager.addTempLayerNode(layer);
+
+              cb && cb(layer);
+            });
+          } else {
+            reject(file.name + " file parser error.");
+            cb && cb("error");
+          }
+        });
+      } else if (ext === "xls" || ext === "xlsx") {
+        (0,util_.readExcel)(file, this._language, res => {
+          if (res) {
+            var ds = new Cesium.Kq3dGeoJsonDataSource(name);
+            ds.load(res, that._geojsonStyle).then(ds => {
+              ds.entities.values.forEach(entity => {
+                if (entity.polygon) {
+                  entity.polyline = {
+                    positions: entity.polygon.hierarchy._value.positions,
+                    width: that._geojsonStyle.polygon.outlineWidth,
+                    material: that._geojsonStyle.polygon.outlineColor
+                  };
+                }
+              });
+
+              that._viewer.dataSources.add(ds);
+
+              that.flyToLayer(ds);
               resolve("success");
               var layer = {
                 guid: ds.guid,
@@ -273,7 +399,8 @@ class AddDataViewModel {
               cb && cb(layer);
             });
           } else {
-            reject(file.name + " service parse error.");
+            reject(file.name + " file parser error.");
+            cb && cb("error");
           }
         });
       } else {
@@ -327,8 +454,7 @@ class AddDataViewModel {
                 that._viewer.dataSources.add(ds); // ds.autoAvoid(that._viewer);
 
 
-                that._viewer.flyTo(ds);
-
+                that.flyToLayer(ds);
                 resolve("success");
                 var layer = {
                   guid: ds.guid,
@@ -361,8 +487,7 @@ class AddDataViewModel {
               ds.load(data).then(ds => {
                 that._viewer.dataSources.add(ds);
 
-                that._viewer.flyTo(ds);
-
+                that.flyToLayer(ds);
                 resolve("success");
                 var layer = {
                   guid: ds.guid,
@@ -390,8 +515,7 @@ class AddDataViewModel {
               ds.load(file).then(ds => {
                 that._viewer.dataSources.add(ds);
 
-                that._viewer.flyTo(ds);
-
+                that.flyToLayer(ds);
                 resolve("success");
                 var layer = {
                   guid: ds.guid,
@@ -423,8 +547,7 @@ class AddDataViewModel {
               that._viewer.dataSources.add(Cesium.CzmlDataSource.load(ret, {
                 name: name
               })).then(ds => {
-                that._viewer.flyTo(ds);
-
+                that.flyToLayer(ds);
                 resolve("success");
                 var layer = {
                   guid: ds.guid,
@@ -464,7 +587,7 @@ class AddDataViewModel {
   } //解析数据源
 
 
-  parseDataSource(options, cb) {
+  parseDataSource(options, cb, loadCustom) {
     options = options || {};
 
     if (options.url && options.url !== "") {
@@ -483,13 +606,13 @@ class AddDataViewModel {
       } catch (error) {
         (0,message/* default */.Z)({
           message: this._language.errorUrlAddress,
-          type: "error"
+          type: "warning"
         });
         return;
       }
 
       if (options.type === "kml") {
-        this.parseService(options, cb);
+        this.parseService(options, cb, loadCustom);
         return;
       }
 
@@ -499,17 +622,17 @@ class AddDataViewModel {
         if (data.status !== 200) {
           (0,message/* default */.Z)({
             message: this._language.serviceNotAvailable,
-            type: "error"
+            type: "warning"
           });
         } else {
           try {
-            this.parseService(options, cb);
+            this.parseService(options, cb, loadCustom);
           } catch {}
         }
       }).catch(() => {
         (0,message/* default */.Z)({
           message: this._language.serviceNotAvailable,
-          type: "error"
+          type: "warning"
         });
       });
     } else {
@@ -521,7 +644,7 @@ class AddDataViewModel {
   } //解析服务
 
 
-  parseService(options, cb) {
+  parseService(options, cb, loadCustom) {
     let that = this;
     let url = options.url;
     let type = options.type || "";
@@ -652,6 +775,7 @@ class AddDataViewModel {
         break;
 
       case "kqgis3dserver":
+        // KQGIS 三维服务
         var geojsonStyle0 = { ...this._geojsonStyle
         };
 
@@ -775,7 +899,7 @@ class AddDataViewModel {
           children: [],
           lsType: "ls"
         };
-        const service = new KqGIS.Map.GetMapImageInfoService(url);
+        const service = new window.KqGIS.Map.GetMapImageInfoService(url);
         service.init(result => {
           if (result.resultcode === "success") {
             let list = service.collectionInfoList;
@@ -809,31 +933,24 @@ class AddDataViewModel {
           } else {
             console.log("解析服务原始信息失败.");
           }
-        }); // layer = this._viewer.imageryLayers.addImageryProvider(
-        //   new Cesium.Kq3dKQGISServerImageryProviderExt({
-        //     name: name,
-        //     url: url,
-        //     layerName: name
-        //   })
-        // );
-        // this.flyToLayer(layer);
-        // node = {
-        //   guid: layer.guid,
-        //   name: name,
-        //   visible: true,
-        //   serverType: "imagerylayer",
-        //   lsType: "ls",
-        //   url: url,
-        //   addType: type,
-        //   layerName: name,
-        //   type: "Image" // 图层树显示图标使用
-        // };
-        // this._layerManager.addTempLayerNode(node);
-        // cb && cb(node);
+        });
+        break;
 
+      case "kqgisdataserver":
+        // KQGIS 数据服务
+        // addDataServer(url, name);
         break;
 
       case "kqgismapserver":
+        // KQGIS 地图服务
+        if (loadCustom) {
+          loadCustom({
+            name,
+            url
+          });
+          return;
+        }
+
         node = {
           guid: Cesium.createGuid(),
           name: name,
@@ -857,7 +974,7 @@ class AddDataViewModel {
           if (mapInfo.resultcode === "error") {
             (0,message/* default */.Z)({
               message: mapInfo.message,
-              type: "error"
+              type: "warning"
             });
             return;
           }
@@ -910,6 +1027,7 @@ class AddDataViewModel {
         break;
 
       case "arcgismapserver":
+        // ARCGIS 地图服务
         layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dArcGISMapServerImageryProvider({
           name: name,
           url: url,
@@ -933,6 +1051,7 @@ class AddDataViewModel {
         break;
 
       case "mvt":
+        // 矢量瓦片
         layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dMvtImageryProviderExt({
           name: name,
           style: url
@@ -956,6 +1075,7 @@ class AddDataViewModel {
         break;
 
       case "kqgisdataflowserver":
+        // KQGIS 数据流服务
         let guid = Cesium.createGuid();
         layer = new Cesium.Kq3dDataFlowLayer(this._viewer, {
           url: url,
@@ -1023,8 +1143,10 @@ class AddDataViewModel {
         break;
 
       case "wmts":
-      case "kqgistileserver":
+      case "kqgistileserver": // KQGIS 瓦片服务
+
       case "kqgisaggregationserver":
+        // KQGIS 聚合服务
         if (type === "kqgistileserver") {
           if (url.indexOf("?") > 0) {
             url = url.replace("?", "/wmts?");
@@ -1088,8 +1210,7 @@ class AddDataViewModel {
             that._viewer.dataSources.add(ds); // ds.autoAvoid(that._viewer);
 
 
-            that._viewer.flyTo(ds);
-
+            that.flyToLayer(ds);
             node = {
               guid: ds.guid,
               name: name,
@@ -1123,8 +1244,7 @@ class AddDataViewModel {
           this._viewer.dataSources.add(ds); // ds.autoAvoid(this._viewer);
 
 
-          this._viewer.flyTo(ds);
-
+          that.flyToLayer(ds);
           node = {
             guid: ds.guid,
             name: name,
@@ -1160,8 +1280,7 @@ class AddDataViewModel {
 
           this._viewer.dataSources.add(ds);
 
-          this._viewer.flyTo(ds);
-
+          that.flyToLayer(ds);
           node = {
             guid: ds.guid,
             name: name,
@@ -1188,8 +1307,7 @@ class AddDataViewModel {
         ds.load(url).then(ds => {
           this._viewer.dataSources.add(ds);
 
-          this._viewer.flyTo(ds);
-
+          that.flyToLayer(ds);
           node = {
             guid: ds.guid,
             name: name,
@@ -1211,8 +1329,7 @@ class AddDataViewModel {
         ds.load(url).then(ds => {
           this._viewer.dataSources.add(ds);
 
-          this._viewer.flyTo(ds);
-
+          that.flyToLayer(ds);
           node = {
             guid: ds.guid,
             name: name,
@@ -1256,6 +1373,68 @@ class AddDataViewModel {
       default:
         break;
     }
+  } // 添加数据服务
+
+
+  addDataServer(url, name) {
+    window.KqGIS.datasourceService(url).getDatasources(async e => {
+      if (e.result.resultcode === 'success') {
+        let datasourceList = e.result.result.datasources;
+
+        if (datasourceList) {
+          for (let i = 0; i < datasourceList.length; i++) {
+            await _getDatasetList(url, datasourceList[i].datasourceName);
+          }
+        }
+      } else {
+        console.error(e);
+      }
+    }, err => {
+      console.error(err);
+    });
+  }
+
+  _getDatasetList(url, dataSourceName) {
+    let params = new window.KqGIS.Data.GetDatasetsInfoParams({
+      datasourceName: dataSourceName
+    });
+    return new Promise((resolve, reject) => {
+      window.KqGIS.datasetService(url).getDatasets(params, e => {
+        if (e.result.resultcode === 'success') {
+          resolve(e.result.result.datasets);
+        } else {
+          console.error(e);
+          reject([]);
+        }
+      }, err => {
+        console.error(err);
+        reject([]);
+      });
+    });
+  }
+
+  _getFeatureList(url, datasourceName, datasetName) {
+    let params = new window.KqGIS.Data.GetFeaturesParamsBase({
+      datasourceName: datasourceName,
+      datasetName: datasetName,
+      hasGeometry: true,
+      returnContent: true,
+      outSRS: 'EPSG:4326'
+    });
+    return new Promise((resolve, reject) => {
+      window.KqGIS.dataFeatureService(url).getFeatureList(params, e => {
+        if (e.result.resultcode === 'success') {
+          e.result.result['datasetName'] = datasetName;
+          resolve(e.result.result);
+        } else {
+          console.error(e);
+          reject(null);
+        }
+      }, err => {
+        console.error(err);
+        resolve(null);
+      });
+    });
   }
 
   flyToLayer(layer) {
@@ -1275,7 +1454,7 @@ class AddDataViewModel {
           destination: tileset.rectangle
         });
       });
-    } else if (layer instanceof Cesium.GeoJsonDataSource || layer instanceof Cesium.Kq3dGeoJsonDataSource) {
+    } else if (layer instanceof Cesium.GeoJsonDataSource || layer instanceof Cesium.Kq3dGeoJsonDataSource || layer instanceof Cesium.Kq3dEsriGeoJsonDataSource) {
       let offset = new Cesium.HeadingPitchRange(0, Cesium.Math.toRadians(-90), 0);
       viewer.flyTo(layer, {
         offset
@@ -1355,7 +1534,6 @@ const _hoisted_12 = {
 
 
 
- //accept=".zip,.geojson,.topojson,.json,.kml,.kmz,.czml,.csv,.xls,.xlsx,.txt"
 
 const __default__ = {
   name: "Kq3dAddData"
@@ -1392,6 +1570,11 @@ const __default__ = {
       type: Function,
       default: null
     },
+    // 自定义加载函数, 只对KQGIS REST服务生效, earthstudio使用
+    loadCustom: {
+      type: Function,
+      default: null
+    },
     // 是否生成HeaderTemp
     showHeaderTemp: {
       type: Boolean,
@@ -1426,6 +1609,7 @@ const __default__ = {
     expose
   }) {
     const props = __props;
+    let accept = ".zip,.geojson,.topojson,.json,.kml,.kmz,.czml,.csv,.xls,.xlsx,.txt";
     let language = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)({});
     let selectTypeIndex = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(0); //URL服务支持的数据源类型
 
@@ -1484,104 +1668,111 @@ const __default__ = {
       return [// {
       //     type: 'kq3dimageryfile',
       //     name: language.value.ImagertyTileFile,
-      //     namePlaceholder: language.value.unnamedLayer,
+      //     namePlaceholder: language.value.optional,
       //     urlPlaceholder: language.value.format +':http://<host>:<port>/xxx/<servername>/info.xml',
       //     description: language.value.imagertyTileFiledescription
       // }, {
       //     type: 'obterrain',
       //     name: language.value.ObTerrainTileFile,
-      //     namePlaceholder: language.value.unnamedLayer,
+      //     namePlaceholder: language.value.optional,
       //     urlPlaceholder: language.value.format +':http://<host>:<port>/xxx/<servername>/info.xml',
       //     description: language.value.imagertyObTerrainTileFiledescription
       // },
       {
         type: "kqgis3dserver",
         name: language.value.KQGIS3DServer,
-        namePlaceholder: language.value.unnamedLayer,
+        namePlaceholder: language.value.optional,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/realspace",
         description: language.value.imagerty3DServerdescription
       }, {
         type: "kqgismapserver",
         name: language.value.KQGISMapServer,
-        namePlaceholder: language.value.unnamedLayer,
+        namePlaceholder: language.value.optional,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/map",
         description: language.value.imagertyMapServerdescription
-      }, {
+      }, // {
+      //   type: "kqgisdataserver",
+      //   name: language.value.KQGISDataServer,
+      //   namePlaceholder: language.value.optional,
+      //   urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/data",
+      //   description: language.value.imagertyDataServerdescription
+      // },
+      {
         type: "kqgisimageserver",
         name: language.value.KQGISImageServer,
-        namePlaceholder: language.value.unnamedLayer,
+        namePlaceholder: language.value.optional,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/image",
         description: language.value.imagertyImageServerdescription
       }, {
         type: "kqgisdataflowserver",
         name: language.value.KQGISDataflowServer,
-        namePlaceholder: language.value.unnamedLayer,
+        namePlaceholder: language.value.optional,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/streaming/rest/services/<servername>/dataflow",
         description: language.value.imagertyDataflowServerdescription
       }, {
         type: "kqgistileserver",
         name: language.value.KQGISTileServer,
-        namePlaceholder: language.value.unnamedLayer,
+        namePlaceholder: language.value.optional,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/tile",
         description: language.value.imagertyTileServerdescription
       }, {
         type: "kqgisaggregationserver",
         name: language.value.KQGISAggregationServer,
-        namePlaceholder: language.value.unnamedLayer,
+        namePlaceholder: language.value.optional,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/map/wmts",
         description: language.value.imagertyAggregationServerdescription
       }, {
         type: "s3m",
         name: language.value.S3M,
-        namePlaceholder: language.value.unnamedLayer,
+        namePlaceholder: language.value.optional,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/xxx/realspace/datas/xxx/config",
         description: language.value.imagertyS3Mdescription
       }, {
         type: "arcgismapserver",
         name: language.value.ArcGISMapServer,
-        namePlaceholder: language.value.unnamedLayer,
+        namePlaceholder: language.value.optional,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/ArcGIS/rest/services/<servername>/MapServer",
         description: language.value.imagertyArcGISMapServerdescription
       }, {
         type: "wms",
         name: language.value.OGCWMS,
-        namePlaceholder: language.value.unnamedLayer,
+        namePlaceholder: language.value.optional,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/map/wms",
         description: language.value.imagertyOGCWMSdescription
       }, {
         type: "wmts",
         name: language.value.OGCWMTS,
-        namePlaceholder: language.value.unnamedLayer,
+        namePlaceholder: language.value.optional,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/kqgis/rest/services/<servername>/map/wmts",
         description: language.value.imagertyOGCWMTSdescription
       }, {
         type: "3dtiles",
         name: language.value.Cesium3DTilesFile,
-        namePlaceholder: language.value.unnamedLayer,
+        namePlaceholder: language.value.optional,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/tileset.json",
         description: language.value.imagerty3DTilesFiledescription
       }, {
         type: "stkterrain",
         name: language.value.StkTerrainTileFile,
-        namePlaceholder: language.value.unnamedLayer,
+        namePlaceholder: language.value.optional,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/xxx/<foldername>/",
         description: language.value.imagertyStkTerrainTileFiledescription
       }, {
         type: "geojson",
         name: language.value.GeoJson,
-        namePlaceholder: language.value.unnamedLayer,
+        namePlaceholder: language.value.optional,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/xxx.geojson",
         description: language.value.imagertyGeoJsondescription
       }, {
         type: "arcjson",
         name: language.value.ArcJson,
-        namePlaceholder: language.value.unnamedLayer,
+        namePlaceholder: language.value.optional,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/xxx.json",
         description: language.value.imagertyArcJsondescription
       }, {
         type: "mvt",
         name: language.value.MVT,
-        namePlaceholder: language.value.unnamedLayer,
+        namePlaceholder: language.value.optional,
         urlPlaceholder: language.value.format + ":http://<host>:<port>/mvt/style.json",
         description: language.value.imagertyMVTdescription
       }
@@ -1594,13 +1785,13 @@ const __default__ = {
       }, {
           type: 'kml',
           name: language.value.KML,
-          namePlaceholder: language.value.unnamedLayer,
+          namePlaceholder: language.value.optional,
           urlPlaceholder: language.value.format +': http://<host>:<port>/xxx/<servername>/xxx.kml',
           description: language.value.imagertyKMLdescription
       }, {
           type: 'czml',
           name: language.value.CZML,
-          namePlaceholder: language.value.unnamedLayer,
+          namePlaceholder: language.value.optional,
           urlPlaceholder: language.value.format +': http://<host>:<port>/xxx/<servername>/xxx.czml',
           description: language.value.imagertyCZMLdescription
       }*/
@@ -1688,7 +1879,7 @@ const __default__ = {
         type: dataSourceType.value.type,
         url: dataSource.url,
         name: dataSource.name
-      }, props.loadCallback);
+      }, props.loadCallback, props.loadCustom);
     } // 重置
 
 
@@ -1771,7 +1962,7 @@ const __default__ = {
             "auto-upload": false,
             "file-list": (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(fileList),
             "onUpdate:file-list": _cache[0] || (_cache[0] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.isRef)(fileList) ? fileList.value = $event : fileList = $event),
-            accept: ".zip,.geojson,.topojson,.json,.kml,.kmz,.czml,.txt",
+            accept: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(accept),
             "on-change": changeFile,
             ref_key: "upload_ref",
             ref: upload_ref
@@ -1784,7 +1975,7 @@ const __default__ = {
 
           }, 8
           /* PROPS */
-          , ["file-list"]), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.vShow, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(fileList).length === 0]]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withDirectives)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_4, [((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.openBlock)(true), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementBlock)(external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.Fragment, null, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.renderList)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(operatorArray), (rowItem, i) => {
+          , ["file-list", "accept"]), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.vShow, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(fileList).length === 0]]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withDirectives)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_4, [((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.openBlock)(true), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementBlock)(external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.Fragment, null, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.renderList)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(operatorArray), (rowItem, i) => {
             return (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createBlock)(_component_kq_row, {
               key: i,
               gutter: 20
@@ -1839,7 +2030,7 @@ const __default__ = {
             action: "",
             "show-file-list": false,
             "auto-upload": false,
-            accept: ".zip,.geojson,.topojson,.json,.kml,.kmz,.czml,.txt",
+            accept: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(accept),
             ref_key: "upload_btn_ref",
             ref: upload_btn_ref,
             class: "kq3d-add-data-footer-upload",
@@ -1861,9 +2052,9 @@ const __default__ = {
             _: 1
             /* STABLE */
 
-          }, 512
-          /* NEED_PATCH */
-          ), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_button, {
+          }, 8
+          /* PROPS */
+          , ["accept"]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_button, {
             onClick: _cache[1] || (_cache[1] = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withModifiers)($event => removeFiles(), ["stop"])),
             title: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).clearFiles,
             type: "primary"
@@ -1965,7 +2156,7 @@ const __default__ = {
 
             }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, null, {
               default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_form_item, {
-                label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).layerName
+                label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).nodeName
               }, {
                 default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_input, {
                   modelValue: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(dataSource).name,
@@ -15266,7 +15457,7 @@ const __default__ = {
               class: "rowclass"
             }, {
               default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_form_item, {
-                label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).pointLightSource
+                label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).lightColor
               }, {
                 default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, {
                   style: {
@@ -15755,7 +15946,9 @@ class LimitHeightAnalysisViewModel {
 
 
   destroy() {
-    this._limitHeightAnalysis && this._limitHeightAnalysis.destroy();
+    this.clear();
+    this._drawFinishedEventListener && this._drawFinishedEventListener();
+    this._drawFinishedEventListener = null;
   }
 
 }
@@ -23446,7 +23639,7 @@ ScanEffect.install = (Vue, opts) => {
 
 /***/ }),
 
-/***/ 9474:
+/***/ 8876:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 
@@ -23517,6 +23710,7 @@ class SceneSetViewModel {
 
     this._viewer = viewer;
     this._defaultSkyBox = viewer.scene.skyBox;
+    this._undergroundManager = new Cesium.Kq3dUndergroundManager(this._viewer.scene);
   } // 获取场景内容
 
 
@@ -23872,8 +24066,6 @@ class SceneSetViewModel {
 
 
   showGrid(type) {
-    console.log(this._viewer.scene.kq3dUndergroundManager);
-
     if (this._gridLayer) {
       this._viewer.imageryLayers.remove(this._gridLayer);
 
@@ -23897,10 +24089,6 @@ class SceneSetViewModel {
 
 
   openUnderground(isOpen) {
-    if (!this._undergroundManager) {
-      this._undergroundManager = new Cesium.Kq3dUndergroundManager(this._viewer.scene);
-    }
-
     this._undergroundManager.undergroundEnabled = isOpen;
     this._undergroundManager.transparentEnabled = isOpen;
   } // 设置地表透明度
@@ -25380,10 +25568,33 @@ const __default__ = {
 }));
 ;// CONCATENATED MODULE: ./src/webgl/sceneset/SceneSet.vue?vue&type=script&setup=true&lang=js
  
+// EXTERNAL MODULE: ./node_modules/style-loader/dist/runtime/injectStylesIntoStyleTag.js
+var injectStylesIntoStyleTag = __webpack_require__(3379);
+var injectStylesIntoStyleTag_default = /*#__PURE__*/__webpack_require__.n(injectStylesIntoStyleTag);
+// EXTERNAL MODULE: ./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/vue-loader/dist/index.js??ruleSet[0]!./src/webgl/sceneset/SceneSet.vue?vue&type=style&index=0&id=8e9dc1cc&lang=scss
+var SceneSetvue_type_style_index_0_id_8e9dc1cc_lang_scss = __webpack_require__(3825);
+;// CONCATENATED MODULE: ./node_modules/style-loader/dist/cjs.js!./node_modules/css-loader/dist/cjs.js!./node_modules/vue-loader/dist/stylePostLoader.js!./node_modules/sass-loader/dist/cjs.js!./node_modules/vue-loader/dist/index.js??ruleSet[0]!./src/webgl/sceneset/SceneSet.vue?vue&type=style&index=0&id=8e9dc1cc&lang=scss
+
+            
+
+var options = {};
+
+options.insert = "head";
+options.singleton = false;
+
+var update = injectStylesIntoStyleTag_default()(SceneSetvue_type_style_index_0_id_8e9dc1cc_lang_scss/* default */.Z, options);
+
+
+
+/* harmony default export */ var sceneset_SceneSetvue_type_style_index_0_id_8e9dc1cc_lang_scss = (SceneSetvue_type_style_index_0_id_8e9dc1cc_lang_scss/* default.locals */.Z.locals || {});
+;// CONCATENATED MODULE: ./src/webgl/sceneset/SceneSet.vue?vue&type=style&index=0&id=8e9dc1cc&lang=scss
+
 ;// CONCATENATED MODULE: ./src/webgl/sceneset/SceneSet.vue
 
 
 
+;
+
 const __exports__ = SceneSetvue_type_script_setup_true_lang_js;
 
 /* harmony default export */ var SceneSet = (__exports__);
@@ -31460,11 +31671,20 @@ class VideoFusiontViewModel {
 
 
   fusion() {
+    let type = 3;
+
+    if (this._options.videoPath.indexOf('.m3u8') > 0) {
+      type = 5;
+    }
+
     this.clear();
     let cartographic = Cesium.Cartographic.fromCartesian(this._viewer.camera.positionWC);
+    this._options.heading = Cesium.Math.toDegrees(this._viewer.camera.heading);
+    this._options.pitch = Cesium.Math.toDegrees(this._viewer.camera.pitch);
+    this._options.roll = Cesium.Math.toDegrees(this._viewer.camera.roll);
     var param = {
       url: this._options.videoPath,
-      type: 3,
+      type: type,
       position: {
         x: Cesium.Math.toDegrees(cartographic.longitude),
         y: Cesium.Math.toDegrees(cartographic.latitude),
@@ -31494,6 +31714,15 @@ class VideoFusiontViewModel {
     if (this._videoFusion) {
       return this._videoFusion.param.position;
     }
+  } // 获取HeadingPitchRoll
+
+
+  getHeadingPitchRoll() {
+    return {
+      heading: Math.round(this._options.heading),
+      pitch: Math.round(this._options.pitch),
+      roll: Math.round(this._options.roll)
+    };
   } //飞入
 
 
@@ -31719,9 +31948,6 @@ const __default__ = {
     expose
   }) {
     const props = __props;
-    const {
-      proxy
-    } = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.getCurrentInstance)();
     let language = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)({});
     let collapseValue = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(""); // 获取组件传参
 
@@ -31740,15 +31966,17 @@ const __default__ = {
       videoPath: props.settingParams && props.settingParams.videoPath || "",
       fov: props.settingParams && props.settingParams.fov || 40,
       far: props.settingParams && props.settingParams.far || 50,
-      heading: props.settingParams && props.settingParams.heading || 40,
-      pitch: props.settingParams && props.settingParams.pitch || -40,
-      roll: props.settingParams && props.settingParams.roll || 15,
+      heading: 0,
+      pitch: 0,
+      roll: 0,
       alpha: props.settingParams && props.settingParams.alpha || 1.0,
       eclosion: props.settingParams && props.settingParams.eclosion || 0.5,
       showHideLine: props.settingParams && props.settingParams.showHideLine !== undefined || false
     }); // 显示坐标
 
-    let showCoordinate = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(false);
+    let showCoordinate = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(false); // 显示朝向角俯仰角翻转角
+
+    let showHpr = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(false);
     let viewModel = null; // 组件容器Ref
 
     let boxRef = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(null); // 生成组件默认header
@@ -31781,9 +32009,6 @@ const __default__ = {
             videoPath: formItem.videoPath,
             fov: formItem.fov,
             far: formItem.far,
-            heading: formItem.heading,
-            pitch: formItem.pitch,
-            roll: formItem.roll,
             alpha: formItem.alpha,
             eclosion: formItem.eclosion,
             showHideLine: formItem.showHideLine
@@ -31870,6 +32095,7 @@ const __default__ = {
         if (viewModel) {
           viewModel.fusion();
           setCoordinate();
+          serHpr();
         }
       }
     }
@@ -31889,6 +32115,18 @@ const __default__ = {
         formItem.maxHeight = coordinate.z + heightOffset;
         showCoordinate.value = true;
       }
+    } // 设置朝向角俯仰角翻转角
+
+
+    function serHpr() {
+      let hpr = viewModel.getHeadingPitchRoll();
+
+      if (hpr) {
+        formItem.heading = hpr.heading;
+        formItem.pitch = hpr.pitch;
+        formItem.roll = hpr.roll;
+        showHpr.value = true;
+      }
     } // 飞入
 
 
@@ -31899,6 +32137,7 @@ const __default__ = {
 
     function clearResult() {
       showCoordinate.value = false;
+      showHpr.value = false;
       viewModel && viewModel.clear();
     } // 销毁
 
@@ -32305,7 +32544,7 @@ const __default__ = {
               _: 1
               /* STABLE */
 
-            }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, null, {
+            }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withDirectives)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, null, {
               default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_form_item, {
                 label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).heading
               }, {
@@ -32361,7 +32600,9 @@ const __default__ = {
               _: 1
               /* STABLE */
 
-            }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, null, {
+            }, 512
+            /* NEED_PATCH */
+            ), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.vShow, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(showHpr)]]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withDirectives)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, null, {
               default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_form_item, {
                 label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).pitch
               }, {
@@ -32417,7 +32658,9 @@ const __default__ = {
               _: 1
               /* STABLE */
 
-            }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, null, {
+            }, 512
+            /* NEED_PATCH */
+            ), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.vShow, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(showHpr)]]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withDirectives)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, null, {
               default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_form_item, {
                 label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).roll
               }, {
@@ -32473,7 +32716,9 @@ const __default__ = {
               _: 1
               /* STABLE */
 
-            }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, null, {
+            }, 512
+            /* NEED_PATCH */
+            ), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.vShow, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(showHpr)]]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, null, {
               default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_form_item, {
                 label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).transparents
               }, {
@@ -32762,11 +33007,14 @@ class VideoProjectViewModel {
   project() {
     this.clear();
     let position = Cesium.Cartesian3.clone(this._viewer.camera.positionWC);
+    this._options.heading = this._viewer.camera.heading;
+    this._options.pitch = this._viewer.camera.pitch;
+    this._options.roll = this._viewer.camera.roll;
     let options = {
       position: position,
-      heading: Cesium.Math.toRadians(this._options.heading),
-      pitch: Cesium.Math.toRadians(this._options.pitch),
-      roll: Cesium.Math.toRadians(this._options.roll),
+      heading: this._options.heading,
+      pitch: this._options.pitch,
+      roll: this._options.roll,
       fov: Cesium.Math.toRadians(this._options.fov),
       aspectRatio: this._options.aspectRatio,
       far: this._options.far,
@@ -32795,6 +33043,15 @@ class VideoProjectViewModel {
         height: cartographic.height
       };
     }
+  } // 获取HeadingPitchRoll
+
+
+  getHeadingPitchRoll() {
+    return {
+      heading: Math.round(Cesium.Math.toDegrees(this._options.heading)),
+      pitch: Math.round(Cesium.Math.toDegrees(this._options.pitch)),
+      roll: Math.round(Cesium.Math.toDegrees(this._options.roll))
+    };
   } //飞入
 
 
@@ -32803,9 +33060,9 @@ class VideoProjectViewModel {
       this._viewer.camera.flyTo({
         destination: this._projectVideo.position,
         orientation: {
-          heading: Cesium.Math.toRadians(this._options.heading),
-          pitch: Cesium.Math.toRadians(this._options.pitch),
-          roll: Cesium.Math.toRadians(this._options.roll)
+          heading: this._options.heading,
+          pitch: this._options.pitch,
+          roll: this._options.roll
         }
       });
     }
@@ -32988,9 +33245,6 @@ const __default__ = {
     expose
   }) {
     const props = __props;
-    const {
-      proxy
-    } = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.getCurrentInstance)();
     let language = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)({});
     let collapseValue = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(""); // 获取组件传参
 
@@ -33006,18 +33260,20 @@ const __default__ = {
       height: 0,
       minHeight: -heightOffset,
       maxHeight: heightOffset,
+      heading: 0,
+      pitch: 0,
+      roll: 0,
       videoPath: props.settingParams && props.settingParams.videoPath || "",
       projectType: props.settingParams && props.settingParams.projectType || 1,
       fov: props.settingParams && props.settingParams.fov || 20,
       aspectRatio: props.settingParams && props.settingParams.aspectRatio || 1.6,
       far: props.settingParams && props.settingParams.far || 50,
-      heading: props.settingParams && props.settingParams.heading || 330,
-      pitch: props.settingParams && props.settingParams.pitch || -12,
-      roll: props.settingParams && props.settingParams.roll || 0,
       showHideLine: props.settingParams && props.settingParams.showHideLine !== undefined || true
     }); // 显示坐标
 
-    let showCoordinate = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(false);
+    let showCoordinate = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(false); // 显示朝向角俯仰角翻转角
+
+    let showHpr = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(false);
     let viewModel = null; // 组件容器Ref
 
     let boxRef = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(null); // 生成组件默认header
@@ -33052,9 +33308,6 @@ const __default__ = {
             fov: formItem.fov,
             aspectRatio: formItem.aspectRatio,
             far: formItem.far,
-            heading: formItem.heading,
-            pitch: formItem.pitch,
-            roll: formItem.roll,
             showHideLine: formItem.showHideLine
           };
           viewModel = new VideoProjectViewModel/* default */.Z(scenceView, options);
@@ -33139,9 +33392,11 @@ const __default__ = {
         if (viewModel) {
           viewModel.project();
           setCoordinate();
+          serHpr();
         }
       }
-    }
+    } // 设置坐标
+
 
     function setCoordinate() {
       let coordinate = viewModel.getProjectCoordinate();
@@ -33158,6 +33413,18 @@ const __default__ = {
         formItem.maxHeight = coordinate.height + heightOffset;
         showCoordinate.value = true;
       }
+    } // 设置朝向角俯仰角翻转角
+
+
+    function serHpr() {
+      let hpr = viewModel.getHeadingPitchRoll();
+
+      if (hpr) {
+        formItem.heading = hpr.heading;
+        formItem.pitch = hpr.pitch;
+        formItem.roll = hpr.roll;
+        showHpr.value = true;
+      }
     } // 飞入
 
 
@@ -33168,6 +33435,7 @@ const __default__ = {
 
     function clearResult() {
       showCoordinate.value = false;
+      showHpr.value = false;
       viewModel && viewModel.clear();
     } // 销毁
 
@@ -33689,7 +33957,7 @@ const __default__ = {
               _: 1
               /* STABLE */
 
-            }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, null, {
+            }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withDirectives)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, null, {
               default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_form_item, {
                 label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).heading
               }, {
@@ -33745,7 +34013,9 @@ const __default__ = {
               _: 1
               /* STABLE */
 
-            }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, null, {
+            }, 512
+            /* NEED_PATCH */
+            ), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.vShow, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(showHpr)]]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withDirectives)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, null, {
               default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_form_item, {
                 label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).pitch
               }, {
@@ -33801,7 +34071,9 @@ const __default__ = {
               _: 1
               /* STABLE */
 
-            }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, null, {
+            }, 512
+            /* NEED_PATCH */
+            ), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.vShow, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(showHpr)]]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withDirectives)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, null, {
               default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_form_item, {
                 label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).roll
               }, {
@@ -33857,7 +34129,9 @@ const __default__ = {
               _: 1
               /* STABLE */
 
-            }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, {
+            }, 512
+            /* NEED_PATCH */
+            ), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.vShow, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(showHpr)]]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_row, {
               style: {
                 "margin-bottom": "8px"
               }
@@ -35939,6 +36213,22 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".coord-sightline{background:rgba(42,42
 /* harmony default export */ __webpack_exports__["Z"] = (___CSS_LOADER_EXPORT___);
 
 
+/***/ }),
+
+/***/ 3825:
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+/* harmony import */ var _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(7705);
+/* harmony import */ var _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_0__);
+// Imports
+
+var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_0___default()(function(i){return i[1]});
+// Module
+___CSS_LOADER_EXPORT___.push([module.id, ".cesium-performanceDisplay-defaultContainer{top:unset !important;bottom:16px;right:64px !important}", ""]);
+// Exports
+/* harmony default export */ __webpack_exports__["Z"] = (___CSS_LOADER_EXPORT___);
+
+
 /***/ }),
 
 /***/ 6854:
@@ -36482,8 +36772,8 @@ var isolineanalysis = __webpack_require__(9783);
 var boxclip = __webpack_require__(4510);
 // EXTERNAL MODULE: ./src/webgl/planeclip/index.js + 4 modules
 var planeclip = __webpack_require__(9736);
-// EXTERNAL MODULE: ./src/webgl/adddata/index.js + 4 modules
-var adddata = __webpack_require__(696);
+// EXTERNAL MODULE: ./src/webgl/adddata/index.js + 5 modules
+var adddata = __webpack_require__(5110);
 // EXTERNAL MODULE: ./src/webgl/particleeffect/index.js + 4 modules
 var particleeffect = __webpack_require__(828);
 // EXTERNAL MODULE: ./src/webgl/weathereffect/index.js + 4 modules
@@ -36504,8 +36794,8 @@ var statusbar = __webpack_require__(4388);
 var videoproject = __webpack_require__(7413);
 // EXTERNAL MODULE: ./src/webgl/videofusion/index.js + 3 modules
 var videofusion = __webpack_require__(7942);
-// EXTERNAL MODULE: ./src/webgl/sceneset/index.js + 5 modules
-var sceneset = __webpack_require__(9474);
+// EXTERNAL MODULE: ./src/webgl/sceneset/index.js + 7 modules
+var sceneset = __webpack_require__(8876);
 // EXTERNAL MODULE: ./src/webgl/light/index.js + 3 modules
 var light = __webpack_require__(9001);
 // EXTERNAL MODULE: ./src/webgl/geologicalbodyanalysis/index.js + 4 modules
@@ -37586,6 +37876,105 @@ class DrawManager {
     return layerList;
   }
 
+  createShapeFromFeature(feature, callFun, style, isLocation) {
+    let type = feature.geometry.type;
+    let shape = null,
+        coordinate = null;
+    let positions = [];
+
+    switch (type) {
+      case "Point":
+      case "MultiPoint":
+        coordinate = feature.geometry.coordinates;
+        if (type === "MultiPoint") coordinate = coordinate[0];
+        let position = Cesium.Cartesian3.fromDegrees(coordinate[0], coordinate[1]);
+        shape = this._drawHandler.createShape(this._drawHandler.ShapeTypes.MARKER.type, '', {
+          position: position,
+          disableDepthTestDistance: Number.POSITIVE_INFINITY,
+          width: 32,
+          height: 32,
+          image: const_image_.MARKER_URL
+        });
+        break;
+
+      case "LineString":
+      case "MultiLineString":
+        coordinate = feature.geometry.coordinates;
+        if (type === "MultiLineString") coordinate = coordinate[0];
+        positions = [];
+        coordinate.forEach(arr => {
+          positions.push(Cesium.Cartesian3.fromDegrees(arr[0], arr[1]));
+        });
+        shape = this._drawHandler.createShape(this._drawHandler.ShapeTypes.POLYLINE.type, '线', {
+          controlPoints: positions,
+          color: Cesium.Color.fromCssColorString(style.color),
+          width: style.weight,
+          clampToGround: true
+        });
+        break;
+
+      case "Polygon":
+      case "MultiPolygon":
+        coordinate = feature.geometry.coordinates[0];
+        if (type === "MultiPolygon") coordinate = coordinate[0];
+        positions = [];
+        coordinate.forEach(arr => {
+          positions.push(Cesium.Cartesian3.fromDegrees(arr[0], arr[1]));
+        });
+        shape = this._drawHandler.createShape(this._drawHandler.ShapeTypes.POLYGON.type, '面', {
+          controlPoints: positions,
+          color: Cesium.Color.fromCssColorString(style.color),
+          width: style.weight,
+          fillColor: Cesium.Color.fromCssColorString(style.fillColor).withAlpha(style.fillOpacity),
+          fill: true,
+          clampToGround: true
+        });
+        break;
+
+      default:
+        break;
+    }
+
+    if (shape) {
+      this._drawLayer.add(shape);
+
+      if (callFun) callFun(shape.guid);
+
+      if (isLocation) {
+        setTimeout(() => {
+          this._drawHandler.startEdit(shape);
+
+          let offset = new Cesium.HeadingPitchRange(0, Cesium.Math.toRadians(-90), 0);
+
+          this._viewer.camera.flyToBoundingSphere(shape.boundingSphere, {
+            duration: 1.5,
+            offset
+          });
+        }, 200);
+      }
+    }
+  }
+
+  startEditById(id) {
+    let shape = this._drawLayer.getById(id);
+
+    if (shape) {
+      this._drawHandler.startEdit(shape);
+    }
+  }
+
+  getFeatureById(id) {
+    let feature = null;
+
+    let shape = this._drawLayer.getById(id);
+
+    if (shape) {
+      feature = shapeToGeoFeature(shape);
+    }
+
+    return feature;
+  }
+
   removeGeometryById(id) {
     this._drawLayer.removeById(id); // 删除图形关联的样式设置框
 
@@ -38076,6 +38465,10 @@ class LayerManager {
             }
           } else if (layerData.sourceType === "kqimageserver") {
             type = "kqgisimageserver";
+
+            if (layerData.renderType === "weather") {
+              type = "kqgisweatherserver";
+            }
           } else if (layerData.sourceType === "kq3dserver") {
             type = "kqgis3dserver";
           } else if (layerData.sourceType === "mvt") {
@@ -38229,7 +38622,8 @@ class LayerManager {
       case "kqgis3dserver":
         var that = this;
         layerData.visible = isAdd;
-        promise = this._viewer.addKq3dServerLayerGroupExt(url).then(group => {
+        promise = this._viewer.addKq3dServerLayerGroupExt(url, { ...params
+        }).then(group => {
           var layers = group._addedLayers || group._layers;
 
           if (layers && layers.length > 0) {
@@ -38269,6 +38663,7 @@ class LayerManager {
         break;
 
       case "kqgisimageserver":
+        //kqgis影像服务-栅格数据
         layerData.visible = isAdd;
         layerData.serverType = "imagerylayer";
         layerData.type = "Image"; // 图层树显示图标使用
@@ -38285,6 +38680,26 @@ class LayerManager {
 
         break;
 
+      case "kqgisweatherserver":
+        //kqgis影像服务-气象数据
+        layerData.visible = isAdd;
+        layerData.serverType = "imagerylayer";
+
+        if (isAdd) {
+          if (url.indexOf("/image/wmts") < 0) {
+            url = url.replace("/image", "/image/wmts");
+          }
+
+          layer = this._viewer.imageryLayers.addImageryProvider(new Cesium.Kq3dContourImageryProviderExt({
+            name: name,
+            url: url,
+            ...params
+          }));
+          layer._guid = layerData.guid;
+        }
+
+        break;
+
       case "kqgismapserver":
         if (layerData.sourceLayers) {
           var layerInfo = layerData.sourceLayers.find(item => {
@@ -38376,7 +38791,7 @@ class LayerManager {
 
       case "wms":
         //配置id时只能是单个图层
-        if (layerData.rect84 && layerData.sourceType !== "service") {
+        if (layerData.rect84 && layerData.sourceType !== "service" && layerData.dataSourceType !== "service") {
           // 大数据wms服务使用
           layerData.visible = isAdd;
           layerData.serverType = "imagerylayer";
@@ -38417,6 +38832,8 @@ class LayerManager {
           layerData.serverType = "imagerylayer";
 
           if (isAdd) {
+            if (params.url) url = params.url; // 设置多子域时使用
+
             promise = this._viewer.addWMSLayerGroup(url, { ...params,
               layers: layerData.id + ""
             }).then(group => {
@@ -38455,6 +38872,8 @@ class LayerManager {
         layerData.serverType = "imagerylayer"; //配置id时只能是单个图层
 
         if (isAdd) {
+          if (params.url) url = params.url; // 设置多子域时使用
+
           promise = this._viewer.addWMTSLayerGroup(url, { ...params,
             layers: layerData.id + ""
           }).then(group => {