@kq_npm/client3d_webgl_vue 4.3.3-beta → 4.3.4

package/index.js

@@ -12,7 +12,7 @@ return /******/ (function() { // webpackBootstrap
 /******/ 	var __webpack_modules__ = ({
 
 /***/ 705:
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
+/***/ (function(module) {
 
 "use strict";
 
@@ -23,8 +23,6 @@ return /******/ (function() { // webpackBootstrap
 // css base code, injected by the css-loader
 // eslint-disable-next-line func-names
 
-__webpack_require__(118);
-
 module.exports = function (cssWithMappingToString) {
   var list = []; // return the list of modules as css string
 
@@ -87,7 +85,9 @@ module.exports = function (cssWithMappingToString) {
 /***/ }),
 
 /***/ 961:
-/***/ (function(module) {
+/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
+
+__webpack_require__(271);
 
 !function (e, t) {
    true ? module.exports = t() : 0;
@@ -744,11 +744,11 @@ module.exports = function (list, options) {
 
 /***/ }),
 
-/***/ 118:
+/***/ 271:
 /***/ (function(module) {
 
 "use strict";
-module.exports = require("core-js/modules/es.array.push.js");
+module.exports = require("core-js/modules/es.error.cause.js");
 
 /***/ }),
 
@@ -1016,13 +1016,13 @@ function _defineProperty(obj, key, value) {
 
   return obj;
 }
-// EXTERNAL MODULE: external "core-js/modules/es.array.push.js"
-var es_array_push_js_ = __webpack_require__(118);
 // EXTERNAL MODULE: external "@kq_npm/client_common_vue/_utils/mitt"
 var mitt_ = __webpack_require__(905);
 var mitt_default = /*#__PURE__*/__webpack_require__.n(mitt_);
 ;// CONCATENATED MODULE: external "core-js/modules/web.dom-exception.stack.js"
 var web_dom_exception_stack_js_namespaceObject = require("core-js/modules/web.dom-exception.stack.js");
+;// CONCATENATED MODULE: external "core-js/modules/es.array.includes.js"
+var es_array_includes_js_namespaceObject = require("core-js/modules/es.array.includes.js");
 // EXTERNAL MODULE: external "@kq_npm/client_common_vue/_utils/const-image"
 var const_image_ = __webpack_require__(277);
 ;// CONCATENATED MODULE: ./src/webgl/sceneview/DrawManager.js
@@ -2326,7 +2326,6 @@ var global_event_default = /*#__PURE__*/__webpack_require__.n(global_event_);
 
 
 
-
  //图层管理类
 
 class LayerManager {
@@ -4036,7 +4035,6 @@ function delTreeDataByGuid(data, guid) {
 }
 ;// CONCATENATED MODULE: ./src/webgl/sceneview/SceneViewViewModel.js
 
-
 //SceneView逻辑类
 
 
@@ -7804,6 +7802,8 @@ class MeasureViewModel {
 
     _defineProperty(this, "activeEvent", null);
 
+    _defineProperty(this, "nauticalMileUnit", "nmi");
+
     this._measureHandler = new Cesium.Kq3dMeasureHandler(viewer);
     this._viewer = viewer;
     this.measureEvent = this._measureHandler.measureEvent;
@@ -7912,8 +7912,8 @@ class MeasureViewModel {
         newValue = (value / 1000).toFixed(2) + " km";
         break;
 
-      case "nmi":
-        newValue = (value / 1852).toFixed(2) + " nmi";
+      case this.nauticalMileUnit:
+        newValue = (value / 1852).toFixed(2) + " " + this.nauticalMileUnit;
         break;
 
       case "m²":
@@ -8144,8 +8144,11 @@ const Measurevue_type_script_setup_true_lang_js_default_ = {
 
     let isActive = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(null);
     let isResult = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(false);
-    let distanceValue = null;
-    let distanceUnit = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(props.settingParams && props.settingParams.distanceUnit || ""); // 单位
+    let distanceValue = null; // 默认显示距离的单位
+
+    let distanceUnit = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(props.settingParams && props.settingParams.distanceUnit || ""); // 海里单位选择
+
+    let nauticalMileUnit = props.settingParams && props.settingParams.nauticalMileUnit || "nmi"; // 面积单位
 
     let areaUnit = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(props.settingParams && props.settingParams.areaUnit || "");
     let result = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)("0");
@@ -8178,7 +8181,7 @@ const Measurevue_type_script_setup_true_lang_js_default_ = {
         value: "m"
       }, {
         label: language.value.nauticalMile,
-        value: "nmi"
+        value: nauticalMileUnit
       }];
     };
 
@@ -8219,7 +8222,8 @@ const Measurevue_type_script_setup_true_lang_js_default_ = {
       });
       gis_utils_.utils.getWebMap(props.target, scenceView => {
         if (scenceView) {
-          viewModel = new MeasureViewModel(scenceView._viewer); //注册测量事件，以获取测量结果
+          viewModel = new MeasureViewModel(scenceView._viewer);
+          viewModel.nauticalMileUnit = nauticalMileUnit; //注册测量事件，以获取测量结果
 
           viewModel.measureEvent.addEventListener(function (res) {
             if (measureType.value === "distance") {
@@ -8396,8 +8400,8 @@ const Measurevue_type_script_setup_true_lang_js_default_ = {
           newValue = (value / 1000).toFixed(2) + " km";
           break;
 
-        case "nmi":
-          newValue = (value / 1852).toFixed(2) + " nmi";
+        case nauticalMileUnit:
+          newValue = (value / 1852).toFixed(2) + " " + nauticalMileUnit;
           break;
 
         case "m²":
@@ -8900,7 +8904,6 @@ class FlightViewModel {
 }
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js!./node_modules/vue-loader/dist/index.js??ruleSet[0]!./src/webgl/flight/Flight.vue?vue&type=script&setup=true&lang=js
 
-
 const Flightvue_type_script_setup_true_lang_js_hoisted_1 = {
   class: "kq-flight3d-box"
 };
@@ -9850,7 +9853,6 @@ var external_xe_utils_namespaceObject = require("xe-utils");
 var external_xe_utils_default = /*#__PURE__*/__webpack_require__.n(external_xe_utils_namespaceObject);
 ;// CONCATENATED MODULE: ./src/webgl/gpuspatialquery/GPUSpatialQueryViewModel.js
 
-
 //GPU空间查询逻辑类
 
 class GPUSpatialQueryViewModel {
@@ -10932,7 +10934,6 @@ class ModelSelectViewModel {
 }
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js!./node_modules/vue-loader/dist/index.js??ruleSet[0]!./src/webgl/modelselect/ModelSelect.vue?vue&type=script&setup=true&lang=js
 
-
 const ModelSelectvue_type_script_setup_true_lang_js_hoisted_1 = {
   class: "title"
 };
@@ -11250,7 +11251,6 @@ ModelSelect.install = (Vue, opts) => {
 
 ;// CONCATENATED MODULE: ./src/webgl/modelfilter/ModelFilterViewModel.js
 
-
 //模型滤镜逻辑类
 
 class ModelFilterViewModel {
@@ -12034,7 +12034,6 @@ class WireframeSketchViewModel {
 
 
 
-
  //语言
 
 const WireframeSketchvue_type_script_setup_true_lang_js_default_ = {
@@ -12290,7 +12289,6 @@ WireframeSketch.install = (Vue, opts) => {
 
 ;// CONCATENATED MODULE: ./src/webgl/limitheightanalysis/LimitHeightAnalysisViewModel.js
 
-
 //限高分析逻辑类
 class LimitHeightAnalysisViewModel {
   //三维viewer对象
@@ -12868,7 +12866,6 @@ LimitHeightAnalysis.install = (Vue, opts) => {
 ;// CONCATENATED MODULE: ./src/webgl/terrainprofileanalysis/TerrainProfileAnalysisViewModel.js
 
 
-
 class TerrainProfileAnalysisViewModel {
   // 三维viewer对象
   //绘制管理对象
@@ -13294,7 +13291,6 @@ TerrainProfileAnalysis.install = (Vue, opts) => {
 
 
 
-
 class ScanEffectViewModel {
   //参数
   // 绘制对象
@@ -14818,7 +14814,6 @@ ScanEffect.install = (Vue, opts) => {
 
 ;// CONCATENATED MODULE: ./src/webgl/modelexcavate/ModelExcavateViewModel.js
 
-
 //模型开挖逻辑类
 
 class ModelExcavateViewModel {
@@ -14862,6 +14857,8 @@ class ModelExcavateViewModel {
 
     _defineProperty(this, "intervalId", null);
 
+    _defineProperty(this, "tileset1", null);
+
     _defineProperty(this, "g_flattenedPolygonTexture", null);
 
     this._viewer = scenceView._viewer;
@@ -14870,12 +14867,43 @@ class ModelExcavateViewModel {
     this._viewer.scene.globe.depthTestAgainstTerrain = true; //开启深度检测
 
     let kq3dFlattenning = new window.Cesium.Kq3dFlattenning(this._viewer, {});
-    this.g_flattenedPolygonTexture = kq3dFlattenning.createFlattenedPolygonTexture();
+    this.g_flattenedPolygonTexture = kq3dFlattenning.createFlattenedPolygonTexture(); // this.tileset1 = this._viewer.scene.primitives.add(new Cesium.Cesium3DTileset({
+    //   url: "http://support.kqgeo.com:18700/SampleData/3DTiles/Oblique/tileset.json"
+    // }));
+    // this.tileset1.readyPromise.then(function (tileset) {
+    //   that._viewer.zoomTo(tileset);
+    // }).otherwise(function (error) {
+    //   console.log(error);
+    // });
+    // this.tileset1.enableFlattenning = true;
+    // this.tileset1.flattenDiscard = true;
+    // this.g_flattenedPolygonTexture.attachTileset(this.tileset1);
+
     var that = this;
+    var models = this._viewer.scene.primitives._primitives;
+
+    for (let i = 0; i < models.length; i++) {
+      if (models[1] instanceof Cesium.Cesium3DTileset && models[i]._url) {
+        models[i].enableFlattenning = true;
+        models[i].flattenDiscard = true;
+        models[i].readyPromise.then(function (tileset) {
+          that.g_flattenedPolygonTexture.attachTileset(tileset);
+        });
+      }
+    }
+
     this._removeEventListener = this._drawManager.drawFinishedEvent.addEventListener(shape => {
       if (shape) {
         that._options.positions = shape._controlPoints;
-        that.createDynamicExcavationEffect();
+
+        if (shape._controlPoints && shape._controlPoints.length > 3 || shape._controlPoints && shape._controlPoints.length == 3 && shape._controlPoints[2] != shape._controlPoints[0]) {
+          that.createDynamicExcavationEffect();
+        } else {
+          message({
+            message: "请至少绘制3个点!",
+            type: "warning"
+          });
+        }
 
         that._drawManager.clear();
       }
@@ -14884,12 +14912,20 @@ class ModelExcavateViewModel {
 
 
   createDynamicExcavationEffect() {
+    this._Kq3dTerrainExcavation && this._Kq3dTerrainExcavation.destroy();
     this._Kq3dTerrainExcavation = new window.Cesium.Kq3dTerrainExcavation({
       viewer: this._viewer,
       height: this._options.height,
       positions: this._options.positions,
       hasWall: false
     });
+
+    if (this._wallPrimitive) {
+      this._viewer.scene.primitives.remove(this._wallPrimitive);
+
+      this._wallPrimitive = undefined;
+    }
+
     this._wallPrimitive = new window.Cesium.Kq3dWallPrimitive({
       viewer: this._viewer,
       height: this._options.height,
@@ -14906,43 +14942,40 @@ class ModelExcavateViewModel {
         return;
       }
 
-      that.intervalId = setInterval(function () {
-        if (that.ii > 100) {
-          if (that.entity0) {
-            that._viewer.scene.primitives.remove(that.entity0);
-
-            that.entity0 = undefined;
-          }
-
-          if (that.wall) {
-            that._viewer.scene.primitives.remove(that.wall);
-
-            that.wall = undefined;
-          }
-
-          clearInterval(that.intervalId);
-          that.ii = 0;
-          return;
-        }
-
-        var carto2 = window.Cesium.Cartesian3.lerp(that._options.positions[0], that._options.positions[3], that.ratio * that.ii, that.scratchCartesian2);
-        var carto3 = window.Cesium.Cartesian3.lerp(that._options.positions[1], that._options.positions[2], that.ratio * that.ii, that.scratchCartesian3);
-
-        if (that.entity0) {
-          that._viewer.scene.primitives.remove(that.entity0);
-
-          that.entity0 = undefined;
-        }
-
-        that.entity0 = that.createPolyline([carto2, carto3]);
-        that.ii++;
-        that.g_flattenedPolygonTexture.removeAllFlattenedPolygon();
-        var myPolygon = window.Cesium.PolygonGeometry.fromPositions({
-          positions: [that._options.positions[0], that._options.positions[1], carto3, carto2],
-          height: window.Cesium.Cartographic.fromCartesian(that._options.positions[0]).height
-        });
-        that.g_flattenedPolygonTexture.addFlattenedPolygon(myPolygon);
-      }, 100);
+      that.g_flattenedPolygonTexture && that.g_flattenedPolygonTexture.removeAllFlattenedPolygon();
+      var myPolygon = window.Cesium.PolygonGeometry.fromPositions({
+        positions: that._options.positions,
+        height: window.Cesium.Cartographic.fromCartesian(that._options.positions[0]).height
+      });
+      that.g_flattenedPolygonTexture && that.g_flattenedPolygonTexture.addFlattenedPolygon(myPolygon); // that.intervalId = setInterval(function () {
+      //   if (that.ii > 100) {
+      //     if (that.entity0) {
+      //       that._viewer.scene.primitives.remove(that.entity0);
+      //       that.entity0 = undefined;
+      //     }
+      //     if (that.wall) {
+      //       that._viewer.scene.primitives.remove(that.wall);
+      //       that.wall = undefined;
+      //     }
+      //     clearInterval(that.intervalId);
+      //     that.ii = 0;
+      //     return;
+      //   }
+      //   var carto2 = window.Cesium.Cartesian3.lerp(that._options.positions[0], that._options.positions[3], that.ratio * that.ii, that.scratchCartesian2);
+      //   var carto3 = window.Cesium.Cartesian3.lerp(that._options.positions[1], that._options.positions[2], that.ratio * that.ii, that.scratchCartesian3);
+      //   if (that.entity0) {
+      //     that._viewer.scene.primitives.remove(that.entity0);
+      //     that.entity0 = undefined;
+      //   }
+      //   that.entity0 = that.createPolyline([carto2, carto3]);
+      //   that.ii++;
+      //   that.g_flattenedPolygonTexture.removeAllFlattenedPolygon();
+      //   var myPolygon = window.Cesium.PolygonGeometry.fromPositions({
+      //     positions: [that._options.positions[0], that._options.positions[1], carto3, carto2],
+      //     height: window.Cesium.Cartographic.fromCartesian(that._options.positions[0]).height
+      //   });
+      //   that.g_flattenedPolygonTexture.addFlattenedPolygon(myPolygon);
+      // }, 100);
     });
   }
 
@@ -14994,19 +15027,22 @@ class ModelExcavateViewModel {
   start() {
     // 判断是否添加了模型
     var flag = false;
+    var that = this;
     var models = this._viewer.scene.primitives._primitives;
 
     for (let i = 0; i < models.length; i++) {
-      if (models[i]._url) {
-        models[i].enableFlattenning = true;
-        models[i].flattenDiscard = true;
-        this.g_flattenedPolygonTexture.attachTileset(models[i]);
+      if (models[i] instanceof Cesium.Cesium3DTileset && models[i]._url) {
+        // models[i].enableFlattenning = true;
+        // models[i].flattenDiscard = true;
+        // models[i].readyPromise.then(function (tileset) {
+        //   that.g_flattenedPolygonTexture.attachTileset(tileset);
+        // });
         flag = true;
       }
     }
 
     if (flag) {
-      this.clear();
+      this.remove();
 
       this._drawManager.startDraw("polygon", {
         clampToGround: true
@@ -15022,13 +15058,10 @@ class ModelExcavateViewModel {
 
   setHeight(val) {
     this._options.height = Number(val);
-  } // 清除
-
-
-  clear() {
-    this._drawManager.stopDraw(); // 销毁地形开挖
-
+  }
 
+  remove() {
+    // 销毁地形开挖
     if (this.intervalId) {
       clearInterval(this.intervalId);
       this.ii = 0;
@@ -15054,11 +15087,20 @@ class ModelExcavateViewModel {
 
     this._Kq3dTerrainExcavation && this._Kq3dTerrainExcavation.destroy();
     this.g_flattenedPolygonTexture && this.g_flattenedPolygonTexture.removeAllFlattenedPolygon();
+  } // 清除
+
+
+  clear() {
+    this._drawManager.stopDraw();
+
+    this.remove();
   } //销毁
 
 
   destroy() {
     this.clear();
+    this.g_flattenedPolygonTexture && this.g_flattenedPolygonTexture.detachAllTileset();
+    this.g_flattenedPolygonTexture && this.g_flattenedPolygonTexture.destroy();
   }
 
 }
@@ -15174,6 +15216,7 @@ const ModelExcavatevue_type_script_setup_true_lang_js_default_ = {
           viewModel = new ModelExcavateViewModel(scenceView, {
             height: formItem.excavationDepth
           });
+          window.scenceView = scenceView;
         }
       });
     });
@@ -15355,7 +15398,6 @@ ModelExcavate.install = (Vue, opts) => {
 
 ;// CONCATENATED MODULE: ./src/webgl/modelFlat/ModelFlatViewModel.js
 
-
 //模型拾取逻辑类
 
 class ModelFlatViewModel {
@@ -18352,7 +18394,6 @@ ShadowAnalysis.install = (Vue, opts) => {
 
 ;// CONCATENATED MODULE: ./src/webgl/modelprofileanalysis/ModelProfileAnalysisViewModel.js
 
-
 //分析逻辑类
 let floatingPoint;
 let drawPoints = [];
@@ -20080,7 +20121,6 @@ SkylineAnalysis.install = (Vue, opts) => {
 
 ;// CONCATENATED MODULE: ./src/webgl/terrainoperation/TerrainOperationViewModel.js
 
-
 //地形淹没分析逻辑类
 
 class TerrainOperationViewModel {
@@ -20861,9 +20901,9 @@ const ExcavateFillAnalysisvue_type_script_setup_true_lang_js_default_ = {
     let formItem = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.reactive)({
       altitudeHeight: props.settingParams && props.settingParams.altitudeHeight || 2920,
       // 基准高度
-      minAltitudeHeight: props.settingParams && props.settingParams.altitudeHeight || 0,
+      minAltitudeHeight: props.settingParams && props.settingParams.minAltitudeHeight || 0,
       // 基准高度区间最小值
-      maxAltitudeHeight: props.settingParams && props.settingParams.altitudeHeight || 5000,
+      maxAltitudeHeight: props.settingParams && props.settingParams.maxAltitudeHeight || 5000,
       // 基准高度区间最大值
       excavateColor: props.settingParams && props.settingParams.excavateColor || "#67C23A",
       // 挖方颜色
@@ -26589,7 +26629,6 @@ IsolineAnalysis.install = (Vue, opts) => {
 
 ;// CONCATENATED MODULE: ./src/webgl/boxclip/BoxClipViewModel.js
 
-
 //Box裁剪逻辑类
 
 class BoxClipViewModel {
@@ -27698,7 +27737,6 @@ BoxClip.install = (Vue, opts) => {
 
 ;// CONCATENATED MODULE: ./src/webgl/planeclip/PlaneClipViewModel.js
 
-
 //平面裁剪逻辑类
 
 class PlaneClipViewModel {
@@ -28465,12 +28503,6 @@ PlaneClip.install = (Vue, opts) => {
 };
 
 
-;// CONCATENATED MODULE: external "core-js/modules/web.url-search-params.delete.js"
-var web_url_search_params_delete_js_namespaceObject = require("core-js/modules/web.url-search-params.delete.js");
-;// CONCATENATED MODULE: external "core-js/modules/web.url-search-params.has.js"
-var web_url_search_params_has_js_namespaceObject = require("core-js/modules/web.url-search-params.has.js");
-;// CONCATENATED MODULE: external "core-js/modules/web.url-search-params.size.js"
-var web_url_search_params_size_js_namespaceObject = require("core-js/modules/web.url-search-params.size.js");
 ;// CONCATENATED MODULE: external "papaparse"
 var external_papaparse_namespaceObject = require("papaparse");
 var external_papaparse_default = /*#__PURE__*/__webpack_require__.n(external_papaparse_namespaceObject);
@@ -28480,10 +28512,6 @@ var external_papaparse_default = /*#__PURE__*/__webpack_require__.n(external_pap
 
 
 
-
-
-
-
  //添加数据逻辑类
 
 class AddDataViewModel {
@@ -30608,7 +30636,6 @@ AddData.install = (Vue, opts) => {
 ;// CONCATENATED MODULE: ./src/webgl/particleeffect/ParticleEffectViewModel.js
 
 
-
 let _gravityScratch = null;
 let _gravity = 1.0; //粒子特效逻辑类
 
@@ -32557,7 +32584,6 @@ WeatherEffect.install = (Vue, opts) => {
 
 ;// CONCATENATED MODULE: ./src/webgl/comparemap/CompareMapViewModel.js
 
-
 //多窗口逻辑类
 class CompareMapViewModel {
   // 三维视图对象
@@ -32685,6 +32711,7 @@ class CompareMapViewModel {
 }
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js!./node_modules/vue-loader/dist/index.js??ruleSet[0]!./src/webgl/comparemap/CompareMapTree.vue?vue&type=script&setup=true&lang=js
 
+
 const CompareMapTreevue_type_script_setup_true_lang_js_hoisted_1 = {
   class: "kq3d-compare-map-tree"
 };
@@ -33038,7 +33065,6 @@ CompareMap.install = (Vue, opts) => {
 
 ;// CONCATENATED MODULE: ./src/webgl/screenshot/ScreenshotViewModel.js
 
-
 //截图逻辑类
 class ScreenshotViewModel {
   //三维viewer对象
@@ -33764,7 +33790,6 @@ Hawkeye.install = (Vue, opts) => {
 
 ;// CONCATENATED MODULE: ./src/webgl/roller/RollerViewModel.js
 
-
 //卷帘逻辑类
 class RollerViewModel {
   //三维viewer对象
@@ -34892,9 +34917,6 @@ class VideoProjectViewModel {
 }
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js!./node_modules/vue-loader/dist/index.js??ruleSet[0]!./src/webgl/videoproject/VideoProject.vue?vue&type=script&setup=true&lang=js
 
-
-
-
 const VideoProjectvue_type_script_setup_true_lang_js_hoisted_1 = {
   class: "kq3d-video-project-box"
 };
@@ -36180,9 +36202,6 @@ class VideoFusiontViewModel {
 }
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js!./node_modules/vue-loader/dist/index.js??ruleSet[0]!./src/webgl/videofusion/VideoFusion.vue?vue&type=script&setup=true&lang=js
 
-
-
-
 const VideoFusionvue_type_script_setup_true_lang_js_hoisted_1 = {
   class: "kq3d-video-fusion-box"
 };
@@ -39347,7 +39366,6 @@ SceneSet.install = (Vue, opts) => {
 
 ;// CONCATENATED MODULE: ./src/webgl/light/LightViewModel.js
 
-
 //灯光特效逻辑类
 class LightViewModel {
   //灯光对象
@@ -40238,7 +40256,6 @@ Light.install = (Vue, opts) => {
 
 ;// CONCATENATED MODULE: ./src/webgl/geologicalbodyanalysis/GeologicalBodyAnalysisViewModel.js
 
-
 //地质体分析逻辑类
 
 class GeologicalBodyAnalysisViewModel {