@kq_npm/client3d_webgl_vue 0.3.2-beta → 0.3.3-beta

package/flight/index.js

@@ -576,7 +576,7 @@ const __default__ = {
           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, {
             size: 24
           }, {
-            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)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(icons_vue_namespaceObject.Download))]),
+            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)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(icons_vue_namespaceObject.Upload))]),
             _: 1
             /* STABLE */
 

package/floodanalysis/index.js

@@ -310,6 +310,11 @@ const __default__ = {
   props: {
     // 每个地图相关组件的必须参数 非必传 指定组件绑定的map对象的div的id
     mapTarget: String,
+    // 是否显示淹没模式下拉选择框
+    isShowMode: {
+      type: Boolean,
+      default: true
+    },
     // 设置参数
     settingParams: {
       type: Object
@@ -477,7 +482,8 @@ const __default__ = {
             "label-position": "left"
           }, {
             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_row, null, {
-              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_form_item, {
+              default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [__props.isShowMode ? ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createBlock)(_component_kq_form_item, {
+                key: 0,
                 label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).floodMode
               }, {
                 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_select, {
@@ -507,7 +513,7 @@ const __default__ = {
 
               }, 8
               /* PROPS */
-              , ["label"])]),
+              , ["label"])) : (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createCommentVNode)("v-if", true)]),
               _: 1
               /* STABLE */
 

package/gpuspatialquery/index.js

@@ -146,24 +146,26 @@ class GpuSpatialQueryViewModel {
           const tile = tileset._selectedTiles[n];
           const content = tile.content;
 
-          for (let i = 0; i < content.featuresLength; i++) {
-            const feature = content.getFeature(i);
-            let bFind = false;
+          if (content) {
+            for (let i = 0; i < content.featuresLength; i++) {
+              const feature = content.getFeature(i);
+              let bFind = false;
 
-            if (feature.pickId) {
-              const id = feature.pickId.key;
+              if (feature.pickId) {
+                const id = feature.pickId.key;
 
-              for (let j = 0; j < queryIds.length; j++) {
-                if (queryIds[j] == id) {
-                  bFind = true;
+                for (let j = 0; j < queryIds.length; j++) {
+                  if (queryIds[j] == id) {
+                    bFind = true;
+                  }
                 }
               }
-            }
 
-            if (bFind) {
-              feature.color = Cesium.Color.AQUA;
-            } else {
-              feature.color = Cesium.Color.WHITE;
+              if (bFind) {
+                feature.color = Cesium.Color.AQUA;
+              } else {
+                feature.color = Cesium.Color.WHITE;
+              }
             }
           }
         }

package/index.js

@@ -2825,7 +2825,6 @@ const Measurevue_type_script_setup_true_lang_js_default_ = {
             } else if (measureType.value === 'area') {
               if (res.area) result.value = formatArea(res.area);
             } else if (measureType.value === 'azimuth') {
-              console.log(222, res);
               if (res.azimuth) result.value = formatAzimuth(res.azimuth);
             }
           });
@@ -3608,7 +3607,7 @@ const Flightvue_type_script_setup_true_lang_js_default_ = {
           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, {
             size: 24
           }, {
-            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)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(icons_vue_namespaceObject.Download))]),
+            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)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(icons_vue_namespaceObject.Upload))]),
             _: 1
             /* STABLE */
 
@@ -4059,24 +4058,26 @@ class GpuSpatialQueryViewModel {
           const tile = tileset._selectedTiles[n];
           const content = tile.content;
 
-          for (let i = 0; i < content.featuresLength; i++) {
-            const feature = content.getFeature(i);
-            let bFind = false;
+          if (content) {
+            for (let i = 0; i < content.featuresLength; i++) {
+              const feature = content.getFeature(i);
+              let bFind = false;
 
-            if (feature.pickId) {
-              const id = feature.pickId.key;
+              if (feature.pickId) {
+                const id = feature.pickId.key;
 
-              for (let j = 0; j < queryIds.length; j++) {
-                if (queryIds[j] == id) {
-                  bFind = true;
+                for (let j = 0; j < queryIds.length; j++) {
+                  if (queryIds[j] == id) {
+                    bFind = true;
+                  }
                 }
               }
-            }
 
-            if (bFind) {
-              feature.color = Cesium.Color.AQUA;
-            } else {
-              feature.color = Cesium.Color.WHITE;
+              if (bFind) {
+                feature.color = Cesium.Color.AQUA;
+              } else {
+                feature.color = Cesium.Color.WHITE;
+              }
             }
           }
         }
@@ -9855,6 +9856,11 @@ const FloodAnalysisvue_type_script_setup_true_lang_js_default_ = {
   props: {
     // 每个地图相关组件的必须参数 非必传 指定组件绑定的map对象的div的id
     mapTarget: String,
+    // 是否显示淹没模式下拉选择框
+    isShowMode: {
+      type: Boolean,
+      default: true
+    },
     // 设置参数
     settingParams: {
       type: Object
@@ -10022,7 +10028,8 @@ const FloodAnalysisvue_type_script_setup_true_lang_js_default_ = {
             "label-position": "left"
           }, {
             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_row, null, {
-              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_form_item, {
+              default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [__props.isShowMode ? ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createBlock)(_component_kq_form_item, {
+                key: 0,
                 label: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).floodMode
               }, {
                 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_select, {
@@ -10052,7 +10059,7 @@ const FloodAnalysisvue_type_script_setup_true_lang_js_default_ = {
 
               }, 8
               /* PROPS */
-              , ["label"])]),
+              , ["label"])) : (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createCommentVNode)("v-if", true)]),
               _: 1
               /* STABLE */
 
@@ -10475,6 +10482,17 @@ class SlopeAnalysisViewModel {
     this._globaOptions.viewer.scene.globe.enableLighting = true;
     this._globaOptions._drawManager = scenceView._drawManager;
     var that = this;
+    that._slopeAnalysis = new Cesium.Kq3dSlope({
+      viewer: that._globaOptions.viewer,
+      positions: [new Cesium.Cartesian3(528486.4951355414, 5591866.071664512, 3011848.5874731047), new Cesium.Cartesian3(511851.92328430264, 5590161.386242805, 3017839.604729828), new Cesium.Cartesian3(512863.7934440037, 5579087.150988879, 3037957.9974059854), new Cesium.Cartesian3(526764.7827270611, 5574253.865524863, 3044401.4321003747), new Cesium.Cartesian3(544782.217496756, 5578126.194618411, 3034189.5478781504), new Cesium.Cartesian3(546626.3798432688, 5588179.698741777, 3015426.663665117)],
+      isFilter: false,
+      colorTableDegree: that._globaOptions.viewModel.colorTableDegree,
+      colorTable: that._globaOptions.viewModel.colorTable
+    });
+
+    that._slopeAnalysis.destroy();
+
+    that._slopeAnalysis = null;
     this._globaOptions._drawFinishedEventListener = this._globaOptions._drawManager.drawFinishedEvent.addEventListener(shape => {
       if (shape) {
         that._globaOptions.viewModel.positions = shape._controlPoints; // 实例化分析对象
@@ -10548,6 +10566,7 @@ class SlopeAnalysisViewModel {
           color: Cesium.Color.fromCssColorString(this._globaOptions.viewModel.slopeColorText).withAlpha(Number(this._globaOptions.viewModel.slopeColorAlpha))
         });
       } else {
+        // this.clear();
         if (this._globaOptions._drawManager) {
           this._globaOptions._drawManager.startDraw("polygon", {
             clampToGround: true
@@ -11465,11 +11484,39 @@ class IsolineAnalysisViewModel {
     } // 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);
 
 
+    options.positions = Cesium.Cartesian3.fromDegreesArray([86.207634, 28.056729, 86.102906, 28.00936]);
+    this._elevation = new Cesium.Kq3dContourAnalysis(options);
+
+    this._elevation.destroy();
+
+    this._elevation = null;
     this._drawManager = scenceView._drawManager;
+    var that = this;
+    that._removeEventListener = that._drawManager.drawFinishedEvent.addEventListener(shape => {
+      if (shape) {
+        that._options.positions = shape._controlPoints;
+
+        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);
+      }
+    });
   } // 设置等高面区间
 
 
@@ -11590,33 +11637,10 @@ class IsolineAnalysisViewModel {
 
 
   start() {
-    var that = this;
-    this._removeEventListener = this._drawManager.drawFinishedEvent.addEventListener(shape => {
-      if (shape) {
-        that._options.positions = shape._controlPoints;
-
-        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;
+    var that = this; // 判断是否添加了地形
 
-          case 2:
-            that._options.type = Cesium.Kq3dContourAnalysisType.SUFACE_LINE;
-            break;
-        }
-
-        that._elevation = new Cesium.Kq3dContourAnalysis(that._options);
-      }
-    }); // 判断是否添加了地形
-
-    if (this._options.viewer.terrainProvider.availability) {
-      this._drawManager.startDraw("polygon", {
+    if (that._options.viewer.terrainProvider.availability) {
+      that._drawManager.startDraw("polygon", {
         clampToGround: true
       });
     } else {
@@ -11629,8 +11653,7 @@ class IsolineAnalysisViewModel {
 
 
   clear() {
-    this._drawManager.stopDraw();
-
+    this._drawManager && this._drawManager.stopDraw();
     this._elevation && this._elevation.destroy();
     this._elevation = null; //移除监听事件
 
@@ -11640,8 +11663,7 @@ class IsolineAnalysisViewModel {
 
 
   destroy() {
-    this._drawManager.stopDraw();
-
+    this._drawManager && this._drawManager.stopDraw();
     this._elevation && this._elevation.destroy();
     this._elevation = null; //移除监听事件
 

package/isolineanalysis/index.js

@@ -153,11 +153,39 @@ class IsolineAnalysisViewModel {
     } // 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);
 
 
+    options.positions = Cesium.Cartesian3.fromDegreesArray([86.207634, 28.056729, 86.102906, 28.00936]);
+    this._elevation = new Cesium.Kq3dContourAnalysis(options);
+
+    this._elevation.destroy();
+
+    this._elevation = null;
     this._drawManager = scenceView._drawManager;
+    var that = this;
+    that._removeEventListener = that._drawManager.drawFinishedEvent.addEventListener(shape => {
+      if (shape) {
+        that._options.positions = shape._controlPoints;
+
+        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);
+      }
+    });
   } // 设置等高面区间
 
 
@@ -278,33 +306,10 @@ class IsolineAnalysisViewModel {
 
 
   start() {
-    var that = this;
-    this._removeEventListener = this._drawManager.drawFinishedEvent.addEventListener(shape => {
-      if (shape) {
-        that._options.positions = shape._controlPoints;
-
-        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);
-      }
-    }); // 判断是否添加了地形
+    var that = this; // 判断是否添加了地形
 
-    if (this._options.viewer.terrainProvider.availability) {
-      this._drawManager.startDraw("polygon", {
+    if (that._options.viewer.terrainProvider.availability) {
+      that._drawManager.startDraw("polygon", {
         clampToGround: true
       });
     } else {
@@ -317,8 +322,7 @@ class IsolineAnalysisViewModel {
 
 
   clear() {
-    this._drawManager.stopDraw();
-
+    this._drawManager && this._drawManager.stopDraw();
     this._elevation && this._elevation.destroy();
     this._elevation = null; //移除监听事件
 
@@ -328,8 +332,7 @@ class IsolineAnalysisViewModel {
 
 
   destroy() {
-    this._drawManager.stopDraw();
-
+    this._drawManager && this._drawManager.stopDraw();
     this._elevation && this._elevation.destroy();
     this._elevation = null; //移除监听事件
 

package/measure/index.js

@@ -266,7 +266,6 @@ const __default__ = {
             } else if (measureType.value === 'area') {
               if (res.area) result.value = formatArea(res.area);
             } else if (measureType.value === 'azimuth') {
-              console.log(222, res);
               if (res.azimuth) result.value = formatAzimuth(res.azimuth);
             }
           });

package/package.json

@@ -1 +1 @@
-{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"0.3.2-beta","homepage":"","keywords":["KQGIS","webGL","Vue"],"browserslist":["> 1%","last 2 versions","not dead","not ie 11"],"author":"KQWEB GROUP","license":"Apache-2.0","dependencies":{"colorcolor":"^1.1.1","echarts":"^5.3.3","js-cookie":"^3.0.1","omit.js":"^2.0.2","save":"^2.5.0","tinycolor2":"^1.4.2","vue-i18n":"^9.2.0-beta.36","xlsx":"^0.18.5","@turf/turf":"^6.5.0","css-vars-ponyfill":"^2.4.7","xe-utils":"^3.5.4"}}
+{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"0.3.3-beta","homepage":"","keywords":["KQGIS","webGL","Vue"],"browserslist":["> 1%","last 2 versions","not dead","not ie 11"],"author":"KQWEB GROUP","license":"Apache-2.0","dependencies":{"colorcolor":"^1.1.1","echarts":"^5.3.3","js-cookie":"^3.0.1","omit.js":"^2.0.2","save":"^2.5.0","tinycolor2":"^1.4.2","vue-i18n":"^9.2.0-beta.36","xlsx":"^0.18.5","@turf/turf":"^6.5.0","css-vars-ponyfill":"^2.4.7","xe-utils":"^3.5.4"}}

package/slopeanalysis/index.js

@@ -140,6 +140,17 @@ class SlopeAnalysisViewModel {
     this._globaOptions.viewer.scene.globe.enableLighting = true;
     this._globaOptions._drawManager = scenceView._drawManager;
     var that = this;
+    that._slopeAnalysis = new Cesium.Kq3dSlope({
+      viewer: that._globaOptions.viewer,
+      positions: [new Cesium.Cartesian3(528486.4951355414, 5591866.071664512, 3011848.5874731047), new Cesium.Cartesian3(511851.92328430264, 5590161.386242805, 3017839.604729828), new Cesium.Cartesian3(512863.7934440037, 5579087.150988879, 3037957.9974059854), new Cesium.Cartesian3(526764.7827270611, 5574253.865524863, 3044401.4321003747), new Cesium.Cartesian3(544782.217496756, 5578126.194618411, 3034189.5478781504), new Cesium.Cartesian3(546626.3798432688, 5588179.698741777, 3015426.663665117)],
+      isFilter: false,
+      colorTableDegree: that._globaOptions.viewModel.colorTableDegree,
+      colorTable: that._globaOptions.viewModel.colorTable
+    });
+
+    that._slopeAnalysis.destroy();
+
+    that._slopeAnalysis = null;
     this._globaOptions._drawFinishedEventListener = this._globaOptions._drawManager.drawFinishedEvent.addEventListener(shape => {
       if (shape) {
         that._globaOptions.viewModel.positions = shape._controlPoints; // 实例化分析对象
@@ -213,6 +224,7 @@ class SlopeAnalysisViewModel {
           color: Cesium.Color.fromCssColorString(this._globaOptions.viewModel.slopeColorText).withAlpha(Number(this._globaOptions.viewModel.slopeColorAlpha))
         });
       } else {
+        // this.clear();
         if (this._globaOptions._drawManager) {
           this._globaOptions._drawManager.startDraw("polygon", {
             clampToGround: true