@kq_npm/client3d_webgl_vue 4.3.2 → 4.3.4

package/excavatefillanalysis/index.js

@@ -416,9 +416,9 @@ const __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",
       // 挖方颜色

package/index.js

@@ -7802,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;
@@ -7910,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²":
@@ -8142,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");
@@ -8176,7 +8181,7 @@ const Measurevue_type_script_setup_true_lang_js_default_ = {
         value: "m"
       }, {
         label: language.value.nauticalMile,
-        value: "nmi"
+        value: nauticalMileUnit
       }];
     };
 
@@ -8217,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") {
@@ -8394,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²":
@@ -14851,6 +14857,8 @@ class ModelExcavateViewModel {
 
     _defineProperty(this, "intervalId", null);
 
+    _defineProperty(this, "tileset1", null);
+
     _defineProperty(this, "g_flattenedPolygonTexture", null);
 
     this._viewer = scenceView._viewer;
@@ -14859,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();
       }
@@ -14873,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,
@@ -14895,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);
     });
   }
 
@@ -14983,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
@@ -15011,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;
@@ -15043,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();
   }
 
 }
@@ -15163,6 +15216,7 @@ const ModelExcavatevue_type_script_setup_true_lang_js_default_ = {
           viewModel = new ModelExcavateViewModel(scenceView, {
             height: formItem.excavationDepth
           });
+          window.scenceView = scenceView;
         }
       });
     });
@@ -20847,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",
       // 挖方颜色

package/measure/index.js

@@ -61,6 +61,8 @@ class MeasureViewModel {
 
     (0,_Users_zpc_Documents_KQGEOSpace_KQGISClientForVue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, "activeEvent", null);
 
+    (0,_Users_zpc_Documents_KQGEOSpace_KQGISClientForVue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, "nauticalMileUnit", "nmi");
+
     this._measureHandler = new Cesium.Kq3dMeasureHandler(viewer);
     this._viewer = viewer;
     this.measureEvent = this._measureHandler.measureEvent;
@@ -169,8 +171,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²":
@@ -572,8 +574,11 @@ const __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");
@@ -606,7 +611,7 @@ const __default__ = {
         value: "m"
       }, {
         label: language.value.nauticalMile,
-        value: "nmi"
+        value: nauticalMileUnit
       }];
     };
 
@@ -647,7 +652,8 @@ const __default__ = {
       });
       gis_utils_.utils.getWebMap(props.target, scenceView => {
         if (scenceView) {
-          viewModel = new MeasureViewModel/* default */.Z(scenceView._viewer); //注册测量事件，以获取测量结果
+          viewModel = new MeasureViewModel/* default */.Z(scenceView._viewer);
+          viewModel.nauticalMileUnit = nauticalMileUnit; //注册测量事件，以获取测量结果
 
           viewModel.measureEvent.addEventListener(function (res) {
             if (measureType.value === "distance") {
@@ -824,8 +830,8 @@ const __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²":

package/modelexcavate/index.js

@@ -237,6 +237,8 @@ class ModelExcavateViewModel {
 
     (0,defineProperty/* default */.Z)(this, "intervalId", null);
 
+    (0,defineProperty/* default */.Z)(this, "tileset1", null);
+
     (0,defineProperty/* default */.Z)(this, "g_flattenedPolygonTexture", null);
 
     this._viewer = scenceView._viewer;
@@ -245,12 +247,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 {
+          (0,message/* default */.Z)({
+            message: "请至少绘制3个点!",
+            type: "warning"
+          });
+        }
 
         that._drawManager.clear();
       }
@@ -259,12 +292,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,
@@ -281,43 +322,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);
     });
   }
 
@@ -369,19 +407,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
@@ -397,13 +438,10 @@ class ModelExcavateViewModel {
 
   setHeight(val) {
     this._options.height = Number(val);
-  } // 清除
-
-
-  clear() {
-    this._drawManager.stopDraw(); // 销毁地形开挖
-
+  }
 
+  remove() {
+    // 销毁地形开挖
     if (this.intervalId) {
       clearInterval(this.intervalId);
       this.ii = 0;
@@ -429,11 +467,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();
   }
 
 }
@@ -555,6 +602,7 @@ const __default__ = {
           viewModel = new ModelExcavateViewModel(scenceView, {
             height: formItem.excavationDepth
           });
+          window.scenceView = scenceView;
         }
       });
     });

package/package.json

@@ -1 +1 @@
-{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"4.3.2","homepage":"","keywords":["KQGIS","webGL","Vue"],"restrictedVersion":true,"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.0","echarts-stat":"1.2.0","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","css-vars-ponyfill":"2.4.8","html2canvas":"1.4.1","xe-utils":"3.5.4"}}
+{"name":"@kq_npm/client3d_webgl_vue","description":"KQGIS Client3D for Vue.js","version":"4.3.4","homepage":"","keywords":["KQGIS","webGL","Vue"],"restrictedVersion":true,"browserslist":["> 1%","last 2 versions","not dead","not ie 11"],"author":"KQWEB GROUP","license":"Apache-2.0","dependencies":{"colorcolor":"1.1.1","echarts":"4.9.0","echarts-stat":"1.2.0","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","@kq_npm/client_icons_vue":"0.7.9-beta","css-vars-ponyfill":"2.4.8","html2canvas":"1.4.1","xe-utils":"3.5.4"}}

package/sceneview/index.js

@@ -7820,9 +7820,9 @@ const __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",
       // 挖方颜色
@@ -17025,6 +17025,8 @@ class MeasureViewModel {
 
     (0,_Users_zpc_Documents_KQGEOSpace_KQGISClientForVue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, "activeEvent", null);
 
+    (0,_Users_zpc_Documents_KQGEOSpace_KQGISClientForVue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, "nauticalMileUnit", "nmi");
+
     this._measureHandler = new Cesium.Kq3dMeasureHandler(viewer);
     this._viewer = viewer;
     this.measureEvent = this._measureHandler.measureEvent;
@@ -17133,8 +17135,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²":
@@ -17396,8 +17398,11 @@ const __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");
@@ -17430,7 +17435,7 @@ const __default__ = {
         value: "m"
       }, {
         label: language.value.nauticalMile,
-        value: "nmi"
+        value: nauticalMileUnit
       }];
     };
 
@@ -17471,7 +17476,8 @@ const __default__ = {
       });
       gis_utils_.utils.getWebMap(props.target, scenceView => {
         if (scenceView) {
-          viewModel = new MeasureViewModel/* default */.Z(scenceView._viewer); //注册测量事件，以获取测量结果
+          viewModel = new MeasureViewModel/* default */.Z(scenceView._viewer);
+          viewModel.nauticalMileUnit = nauticalMileUnit; //注册测量事件，以获取测量结果
 
           viewModel.measureEvent.addEventListener(function (res) {
             if (measureType.value === "distance") {
@@ -17648,8 +17654,8 @@ const __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²":
@@ -18650,6 +18656,8 @@ class ModelExcavateViewModel {
 
     (0,defineProperty/* default */.Z)(this, "intervalId", null);
 
+    (0,defineProperty/* default */.Z)(this, "tileset1", null);
+
     (0,defineProperty/* default */.Z)(this, "g_flattenedPolygonTexture", null);
 
     this._viewer = scenceView._viewer;
@@ -18658,12 +18666,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 {
+          (0,message/* default */.Z)({
+            message: "请至少绘制3个点!",
+            type: "warning"
+          });
+        }
 
         that._drawManager.clear();
       }
@@ -18672,12 +18711,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,
@@ -18694,43 +18741,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);
     });
   }
 
@@ -18782,19 +18826,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
@@ -18810,13 +18857,10 @@ class ModelExcavateViewModel {
 
   setHeight(val) {
     this._options.height = Number(val);
-  } // 清除
-
-
-  clear() {
-    this._drawManager.stopDraw(); // 销毁地形开挖
-
+  }
 
+  remove() {
+    // 销毁地形开挖
     if (this.intervalId) {
       clearInterval(this.intervalId);
       this.ii = 0;
@@ -18842,11 +18886,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();
   }
 
 }
@@ -18968,6 +19021,7 @@ const __default__ = {
           viewModel = new ModelExcavateViewModel(scenceView, {
             height: formItem.excavationDepth
           });
+          window.scenceView = scenceView;
         }
       });
     });