@kq_npm/client3d_webgl_vue 4.1.1-beta → 4.1.2-beta

package/index.js

@@ -7403,6 +7403,20 @@ class MeasureViewModel {
     this._viewer.scene.globe.depthTestAgainstTerrain = true;
 
     this._measureHandler.startMeasure(Cesium.Kq3dMeasureMode.Coordinate);
+  } //地形坡度测量
+
+
+  terrainSlopeMeasure() {
+    this._viewer.scene.globe.depthTestAgainstTerrain = true;
+
+    this._measureHandler.startMeasure(Cesium.Kq3dMeasureMode.TerrainSlope);
+  } //场景坡度测量
+
+
+  sceneSlopeMeasure() {
+    this._viewer.scene.globe.depthTestAgainstTerrain = true;
+
+    this._measureHandler.startMeasure(Cesium.Kq3dMeasureMode.SceneSlope);
   } //结束测量
 
 
@@ -7724,12 +7738,18 @@ const Measurevue_type_script_setup_true_lang_js_default_ = {
                 spaceDistance: res.distance ? res.distance.toFixed(2) : 0,
                 horizontalDistance: res.hDistance ? res.hDistance.toFixed(2) : 0,
                 verticalDistance: res.vDistance ? res.vDistance.toFixed(2) : 0,
-                angle: res.angle ? res.angle.toFixed(2) : 0
+                angle: res.angle ? res.angle.toFixed(2).replace(/\.?0+$/, '') : 0
               };
             } else if (measureType.value === "area") {
               if (res && res.area) result.value = formatArea(res.area);
-            } else if (measureType.value === "azimuth") {
-              if (res && res.azimuth) result.value = formatAzimuth(res.azimuth);
+            } else if (measureType.value === "azimuth" && res) {
+              if (res.positions && res.positions.length > 0) {
+                result.value = res.azimuth.toFixed(4) + " °";
+              } else result.value = 0;
+            } else if (measureType.value === "slope" && res) {
+              if (res.positions && res.positions.length > 0) {
+                result.value = res.slopeAngle.toFixed(2).replace(/\.?0+$/, '') + " °";
+              } else result.value = 0;
             } else if (measureType.value === "coordinate") {
               if (res && res.coordinate) {
                 result.value = {
@@ -7749,8 +7769,9 @@ const Measurevue_type_script_setup_true_lang_js_default_ = {
           });
           viewModel.activeEvent.addEventListener(function (active) {
             if (!active) {
-              if (measureType.value === "height" && result.value.angle === 0) return;
               isActive.value = null;
+              if (measureType.value === "height" && result.value.angle === 0) return;
+              if (measureType.value === "azimuth" && result.value === 0) return;
               isResult.value = true;
             }
           });
@@ -7803,11 +7824,6 @@ const Measurevue_type_script_setup_true_lang_js_default_ = {
 
       return area.toFixed(2) + " " + unit;
     }
-
-    function formatAzimuth(azimuth) {
-      var unit = "°";
-      return azimuth.toFixed(4) + " " + unit;
-    }
     /**
      * @description 监听单位变化操作
      * @param {string} unit - 单位
@@ -7897,6 +7913,19 @@ const Measurevue_type_script_setup_true_lang_js_default_ = {
           viewModel.coordinateMeasure();
           break;
 
+        case "azimuth":
+          viewModel.azimuthMeasure();
+          break;
+
+        case "slope":
+          if (mode.value === "ground") {
+            viewModel.terrainSlopeMeasure();
+          } else if (mode.value === "model") {
+            viewModel.sceneSlopeMeasure();
+          }
+
+          break;
+
         default:
           break;
       }
@@ -7917,7 +7946,6 @@ const Measurevue_type_script_setup_true_lang_js_default_ = {
       loadModeData,
       formatDistance,
       formatArea,
-      formatAzimuth,
       startMeasure,
       clearMeasure
     });
@@ -8022,7 +8050,25 @@ const Measurevue_type_script_setup_true_lang_js_default_ = {
       }, 8
       /* PROPS */
       , ["class", "title"]), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.vShow, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(mode) == 'space']]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withDirectives)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_button, {
-        onClick: _cache[4] || (_cache[4] = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withModifiers)($event => startMeasure('coordinate'), ["stop"])),
+        onClick: _cache[4] || (_cache[4] = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withModifiers)($event => startMeasure('azimuth'), ["stop"])),
+        class: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.normalizeClass)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(isActive) == 'azimuth' ? 'is-active' : null),
+        title: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).azimuth
+      }, {
+        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)(client_icons_vue_namespaceObject.IconAzimuthMeasure))]),
+          _: 1
+          /* STABLE */
+
+        })]),
+        _: 1
+        /* STABLE */
+
+      }, 8
+      /* PROPS */
+      , ["class", "title"]), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.vShow, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(mode) == 'space']]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withDirectives)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_button, {
+        onClick: _cache[5] || (_cache[5] = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withModifiers)($event => startMeasure('coordinate'), ["stop"])),
         class: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.normalizeClass)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(isActive) == 'coordinate' ? 'is-active' : null),
         title: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).coordinate
       }, {
@@ -8039,7 +8085,25 @@ const Measurevue_type_script_setup_true_lang_js_default_ = {
 
       }, 8
       /* PROPS */
-      , ["class", "title"]), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.vShow, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(mode) == 'space']]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_button, {
+      , ["class", "title"]), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.vShow, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(mode) == 'space']]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withDirectives)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_button, {
+        onClick: _cache[6] || (_cache[6] = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withModifiers)($event => startMeasure('slope'), ["stop"])),
+        class: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.normalizeClass)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(isActive) == 'slope' ? 'is-active' : null),
+        title: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).slope
+      }, {
+        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)(client_icons_vue_namespaceObject.IconSlopeMeasure))]),
+          _: 1
+          /* STABLE */
+
+        })]),
+        _: 1
+        /* STABLE */
+
+      }, 8
+      /* PROPS */
+      , ["class", "title"]), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.vShow, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(mode) != 'space']]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_button, {
         type: "danger",
         plain: "",
         onClick: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withModifiers)(clearMeasure, ["stop"]),
@@ -8059,7 +8123,7 @@ const Measurevue_type_script_setup_true_lang_js_default_ = {
 
       }, 8
       /* PROPS */
-      , ["onClick", "title"])]), !!(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(isActive) ? ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementBlock)("div", Measurevue_type_script_setup_true_lang_js_hoisted_6, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_divider), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(measureType) === 'height' ? ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementBlock)("p", Measurevue_type_script_setup_true_lang_js_hoisted_7, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).measureTips1), 1
+      , ["onClick", "title"])]), !!(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(isActive) ? ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementBlock)("div", Measurevue_type_script_setup_true_lang_js_hoisted_6, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_divider), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(measureType) === 'height' || (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(measureType) === 'azimuth' ? ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementBlock)("p", Measurevue_type_script_setup_true_lang_js_hoisted_7, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).measureTips1), 1
       /* TEXT */
       )) : ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementBlock)("p", Measurevue_type_script_setup_true_lang_js_hoisted_8, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).measureTips), 1
       /* TEXT */
@@ -8067,7 +8131,7 @@ const Measurevue_type_script_setup_true_lang_js_default_ = {
       /* TEXT */
       ), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_select, {
         modelValue: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(distanceUnit),
-        "onUpdate:modelValue": _cache[5] || (_cache[5] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.isRef)(distanceUnit) ? distanceUnit.value = $event : distanceUnit = $event),
+        "onUpdate:modelValue": _cache[7] || (_cache[7] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.isRef)(distanceUnit) ? distanceUnit.value = $event : distanceUnit = $event),
         onChange: onChangeUnit
       }, {
         default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.openBlock)(true), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementBlock)(external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.Fragment, null, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.renderList)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(distanceUnits), item => {
@@ -14178,6 +14242,7 @@ class ModelExcavateViewModel {
   //Box裁剪存储参数对象
   //绘制管理对象
   //绘制完成监听事件
+  //Kq3dWallPrimitive
   constructor(scenceView, options) {
     _defineProperty(this, "_viewer", null);
 
@@ -14189,28 +14254,165 @@ class ModelExcavateViewModel {
 
     _defineProperty(this, "_removeEventListener", null);
 
+    _defineProperty(this, "_wallPrimitive", void 0);
+
+    _defineProperty(this, "entity0", null);
+
+    _defineProperty(this, "wall", null);
+
+    _defineProperty(this, "ratio", 0.01);
+
+    _defineProperty(this, "ii", 1);
+
+    _defineProperty(this, "scratchCartesian2", new window.Cesium.Cartesian3());
+
+    _defineProperty(this, "scratchCartesian3", new window.Cesium.Cartesian3());
+
+    _defineProperty(this, "scratchCartesian4", new window.Cesium.Cartesian3());
+
+    _defineProperty(this, "scratchCartesian5", new window.Cesium.Cartesian3());
+
+    _defineProperty(this, "scratchCartesian6", new window.Cesium.Cartesian3());
+
+    _defineProperty(this, "scratchCartesian7", new window.Cesium.Cartesian3());
+
+    _defineProperty(this, "intervalId", null);
+
+    _defineProperty(this, "g_flattenedPolygonTexture", null);
+
     this._viewer = scenceView._viewer;
     this._options = options;
     this._drawManager = scenceView._drawManager;
     this._viewer.scene.globe.depthTestAgainstTerrain = true; //开启深度检测
-    // var kq3dFlattenning = new window.Cesium.Kq3dFlattenning(this._viewer, {});
-    // var g_flattenedPolygonTexture = kq3dFlattenning.createFlattenedPolygonTexture();
 
+    let kq3dFlattenning = new window.Cesium.Kq3dFlattenning(this._viewer, {});
+    this.g_flattenedPolygonTexture = kq3dFlattenning.createFlattenedPolygonTexture();
     var that = this;
     this._removeEventListener = this._drawManager.drawFinishedEvent.addEventListener(shape => {
       if (shape) {
         that._options.positions = shape._controlPoints;
-        this._Kq3dTerrainExcavation = this._Kq3dTerrainExcavation && this._Kq3dTerrainExcavation.destroy();
-        this._Kq3dTerrainExcavation = new window.Cesium.Kq3dTerrainExcavation({
-          viewer: this.viewer,
-          height: this._options.height,
-          positions: that._options.positions,
-          hasWall: false
-        });
+        that.createDynamicExcavationEffect();
 
         that._drawManager.clear();
       }
     });
+  } // 创建开挖模型
+
+
+  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,
+      positions: this._options.positions,
+      elevationOnTerrain: false
+    });
+
+    this._viewer.scene.primitives.add(this._wallPrimitive);
+
+    let that = this;
+
+    this._wallPrimitive._readyEvent.addEventListener(function (eventType) {
+      if (eventType != "Ready") {
+        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);
+    });
+  }
+
+  createPolyline(positions) {
+    var material = window.Cesium.Material.fromType("Kq3dLightningMaterial", {});
+
+    if (this.wall) {
+      this._viewer.scene.primitives.remove(this.wall);
+
+      this.wall = undefined;
+    }
+
+    var geometryInstances = [];
+    geometryInstances.push(new window.Cesium.GeometryInstance({
+      geometry: new window.Cesium.WallGeometry({
+        positions: positions,
+        maximumHeights: [10, 10],
+        minimumHeights: [-10, -10],
+        vertexFormat: window.Cesium.VertexFormat.POSITION_NORMAL_AND_ST
+      })
+    }));
+    this.wall = new window.Cesium.Primitive({
+      geometryInstances: geometryInstances,
+      appearance: new window.Cesium.MaterialAppearance({
+        material: material
+      })
+    });
+
+    this._viewer.scene.primitives.add(this.wall);
+
+    var geo = new window.Cesium.GroundPolylineGeometry({
+      positions: positions,
+      width: 40.0,
+      vertexFormat: window.Cesium.PolylineMaterialAppearance.VERTEX_FORMAT
+    });
+    var primitive = new window.Cesium.GroundPolylinePrimitive({
+      asynchronous: false,
+      classificationType: window.Cesium.ClassificationType.BOTH,
+      geometryInstances: new window.Cesium.GeometryInstance({
+        geometry: geo
+      }),
+      appearance: new window.Cesium.PolylineMaterialAppearance({
+        material: material
+      })
+    });
+    return this._viewer.scene.primitives.add(primitive);
   }
 
   start() {
@@ -14220,6 +14422,9 @@ class ModelExcavateViewModel {
 
     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]);
         flag = true;
       }
     }
@@ -14232,16 +14437,41 @@ class ModelExcavateViewModel {
       });
     } else {
       message({
-        message: "请添加模型后拾取!",
+        message: "请添加模型后绘制!",
         type: "warning"
       });
     }
-  } //清除
+  } // qi切换高度重新计算
+
+
+  setHeight(val) {
+    this._options.height = Number(val);
+  } // 清除
 
 
   clear() {
     this._drawManager.stopDraw(); // 销毁地形开挖
 
+
+    if (this.intervalId) {
+      clearInterval(this.intervalId);
+      this.ii = 0;
+
+      if (this.entity0) {
+        this._viewer.scene.primitives.remove(this.entity0);
+
+        this.entity0 = undefined;
+      }
+
+      if (this.wall) {
+        this._viewer.scene.primitives.remove(this.wall);
+
+        this.wall = undefined;
+      }
+    }
+
+    this.Kq3dTerrainExcavation && this.Kq3dTerrainExcavation.destroy();
+    this.g_flattenedPolygonTexture && this.g_flattenedPolygonTexture.removeAllFlattenedPolygon();
   } //销毁
 
 
@@ -14360,7 +14590,7 @@ const ModelExcavatevue_type_script_setup_true_lang_js_default_ = {
       gis_utils_namespaceObject.utils.getWebMap(null, scenceView => {
         if (scenceView) {
           viewModel = new ModelExcavateViewModel(scenceView, {
-            excavationDepth: formItem.excavationDepth
+            height: formItem.excavationDepth
           });
         }
       });
@@ -14441,7 +14671,7 @@ const ModelExcavatevue_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_slider, {
             modelValue: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).excavationDepth,
             "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).excavationDepth = $event),
-            step: 100,
+            step: 1,
             min: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).minExcavationDepth,
             max: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(formItem).maxExcavationDepth,
             onChange: _cache[1] || (_cache[1] = $event => changeHeight()),
@@ -14481,9 +14711,9 @@ const ModelExcavatevue_type_script_setup_true_lang_js_default_ = {
       }), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createVNode)(_component_kq_row, {
         class: "kq3d-model-excavate-tip"
       }, {
-        default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("p", null, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).skylineTips), 1
+        default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createElementVNode)("p", null, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).skylineTips + '(' + (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.unref)(language).reverseDrawPolygon + ')'), 1
         /* TEXT */
-        ), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_namespaceObject.createCommentVNode)(" <p v-if=\"formItem.terrainStyle === 2\">{{ \"(\" + language.reverseDrawPolygon + \")\" }}</p> ")]),
+        )]),
         _: 1
         /* STABLE */
 
@@ -35839,7 +36069,7 @@ class SceneSetViewModel {
         break;
 
       case "fps":
-        open = this._viewer.scene.debugShowFramesPerSecound;
+        open = this._viewer.scene.debugShowFramesPerSecond;
         break;
 
       case "deep":

package/measure/index.js

@@ -94,6 +94,20 @@ class MeasureViewModel {
     this._viewer.scene.globe.depthTestAgainstTerrain = true;
 
     this._measureHandler.startMeasure(Cesium.Kq3dMeasureMode.Coordinate);
+  } //地形坡度测量
+
+
+  terrainSlopeMeasure() {
+    this._viewer.scene.globe.depthTestAgainstTerrain = true;
+
+    this._measureHandler.startMeasure(Cesium.Kq3dMeasureMode.TerrainSlope);
+  } //场景坡度测量
+
+
+  sceneSlopeMeasure() {
+    this._viewer.scene.globe.depthTestAgainstTerrain = true;
+
+    this._measureHandler.startMeasure(Cesium.Kq3dMeasureMode.SceneSlope);
   } //结束测量
 
 
@@ -593,12 +607,18 @@ const __default__ = {
                 spaceDistance: res.distance ? res.distance.toFixed(2) : 0,
                 horizontalDistance: res.hDistance ? res.hDistance.toFixed(2) : 0,
                 verticalDistance: res.vDistance ? res.vDistance.toFixed(2) : 0,
-                angle: res.angle ? res.angle.toFixed(2) : 0
+                angle: res.angle ? res.angle.toFixed(2).replace(/\.?0+$/, '') : 0
               };
             } else if (measureType.value === "area") {
               if (res && res.area) result.value = formatArea(res.area);
-            } else if (measureType.value === "azimuth") {
-              if (res && res.azimuth) result.value = formatAzimuth(res.azimuth);
+            } else if (measureType.value === "azimuth" && res) {
+              if (res.positions && res.positions.length > 0) {
+                result.value = res.azimuth.toFixed(4) + " °";
+              } else result.value = 0;
+            } else if (measureType.value === "slope" && res) {
+              if (res.positions && res.positions.length > 0) {
+                result.value = res.slopeAngle.toFixed(2).replace(/\.?0+$/, '') + " °";
+              } else result.value = 0;
             } else if (measureType.value === "coordinate") {
               if (res && res.coordinate) {
                 result.value = {
@@ -618,8 +638,9 @@ const __default__ = {
           });
           viewModel.activeEvent.addEventListener(function (active) {
             if (!active) {
-              if (measureType.value === "height" && result.value.angle === 0) return;
               isActive.value = null;
+              if (measureType.value === "height" && result.value.angle === 0) return;
+              if (measureType.value === "azimuth" && result.value === 0) return;
               isResult.value = true;
             }
           });
@@ -672,11 +693,6 @@ const __default__ = {
 
       return area.toFixed(2) + " " + unit;
     }
-
-    function formatAzimuth(azimuth) {
-      var unit = "°";
-      return azimuth.toFixed(4) + " " + unit;
-    }
     /**
      * @description 监听单位变化操作
      * @param {string} unit - 单位
@@ -766,6 +782,19 @@ const __default__ = {
           viewModel.coordinateMeasure();
           break;
 
+        case "azimuth":
+          viewModel.azimuthMeasure();
+          break;
+
+        case "slope":
+          if (mode.value === "ground") {
+            viewModel.terrainSlopeMeasure();
+          } else if (mode.value === "model") {
+            viewModel.sceneSlopeMeasure();
+          }
+
+          break;
+
         default:
           break;
       }
@@ -786,7 +815,6 @@ const __default__ = {
       loadModeData,
       formatDistance,
       formatArea,
-      formatAzimuth,
       startMeasure,
       clearMeasure
     });
@@ -891,7 +919,25 @@ const __default__ = {
       }, 8
       /* PROPS */
       , ["class", "title"]), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.vShow, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(mode) == 'space']]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withDirectives)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_button, {
-        onClick: _cache[4] || (_cache[4] = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withModifiers)($event => startMeasure('coordinate'), ["stop"])),
+        onClick: _cache[4] || (_cache[4] = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withModifiers)($event => startMeasure('azimuth'), ["stop"])),
+        class: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.normalizeClass)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(isActive) == 'azimuth' ? 'is-active' : null),
+        title: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).azimuth
+      }, {
+        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_icon, {
+          size: 24
+        }, {
+          default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(client_icons_vue_.IconAzimuthMeasure))]),
+          _: 1
+          /* STABLE */
+
+        })]),
+        _: 1
+        /* STABLE */
+
+      }, 8
+      /* PROPS */
+      , ["class", "title"]), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.vShow, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(mode) == 'space']]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withDirectives)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_button, {
+        onClick: _cache[5] || (_cache[5] = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withModifiers)($event => startMeasure('coordinate'), ["stop"])),
         class: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.normalizeClass)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(isActive) == 'coordinate' ? 'is-active' : null),
         title: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).coordinate
       }, {
@@ -908,7 +954,25 @@ const __default__ = {
 
       }, 8
       /* PROPS */
-      , ["class", "title"]), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.vShow, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(mode) == 'space']]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_button, {
+      , ["class", "title"]), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.vShow, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(mode) == 'space']]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withDirectives)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_button, {
+        onClick: _cache[6] || (_cache[6] = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withModifiers)($event => startMeasure('slope'), ["stop"])),
+        class: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.normalizeClass)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(isActive) == 'slope' ? 'is-active' : null),
+        title: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).slope
+      }, {
+        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_icon, {
+          size: 24
+        }, {
+          default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(client_icons_vue_.IconSlopeMeasure))]),
+          _: 1
+          /* STABLE */
+
+        })]),
+        _: 1
+        /* STABLE */
+
+      }, 8
+      /* PROPS */
+      , ["class", "title"]), [[external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.vShow, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(mode) != 'space']]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_button, {
         type: "danger",
         plain: "",
         onClick: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withModifiers)(clearMeasure, ["stop"]),
@@ -928,7 +992,7 @@ const __default__ = {
 
       }, 8
       /* PROPS */
-      , ["onClick", "title"])]), !!(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(isActive) ? ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementBlock)("div", _hoisted_6, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_divider), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(measureType) === 'height' ? ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementBlock)("p", _hoisted_7, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).measureTips1), 1
+      , ["onClick", "title"])]), !!(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(isActive) ? ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementBlock)("div", _hoisted_6, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_divider), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(measureType) === 'height' || (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(measureType) === 'azimuth' ? ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementBlock)("p", _hoisted_7, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).measureTips1), 1
       /* TEXT */
       )) : ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementBlock)("p", _hoisted_8, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).measureTips), 1
       /* TEXT */
@@ -936,7 +1000,7 @@ const __default__ = {
       /* TEXT */
       ), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_select, {
         modelValue: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(distanceUnit),
-        "onUpdate:modelValue": _cache[5] || (_cache[5] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.isRef)(distanceUnit) ? distanceUnit.value = $event : distanceUnit = $event),
+        "onUpdate:modelValue": _cache[7] || (_cache[7] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.isRef)(distanceUnit) ? distanceUnit.value = $event : distanceUnit = $event),
         onChange: onChangeUnit
       }, {
         default: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withCtx)(() => [((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)(distanceUnits), item => {

package/measure/style/measure.css

@@ -1 +1 @@
-.kq-measure3d{z-index:999;border-radius:var(--kq-border-radius-base);padding:16px;pointer-events:auto;cursor:default;background-color:var(--kq-bg-color)}.kq-measure3d .kq-measure3d-box{width:304px}.kq-measure3d p{margin:0}.kq-measure3d .kq-measure3d-mode .panel{width:100%}.kq-measure3d .kq-measure3d-mode .panel .title{color:var(--kq-text-color-regular);margin:0 0 8px;font-size:14px}.kq-measure3d .kq-measure3d-mode .panel .kq-select{width:100%}.kq-measure3d .kq-measure3d-btns{margin-top:12px}.kq-measure3d .kq-measure3d-btns .kq-button{width:48px;height:48px}.kq-measure3d .kq-measure3d-btns .kq-button .kq-icon{color:var(--kq-color-primary)}.kq-measure3d .kq-measure3d-btns .kq-button .icon-delete{color:var(--kq-color-danger)}.kq-measure3d .kq-measure3d-btns .kq-button:active .icon-delete,.kq-measure3d .kq-measure3d-btns .kq-button:focus .icon-delete,.kq-measure3d .kq-measure3d-btns .kq-button:hover .icon-delete{color:var(--kq-color-white)!important}.kq-measure3d .kq-measure3d-btns .kq-button+.kq-button{margin-left:16px}.kq-measure3d .kq-measure3d-tip{color:var(--kq-text-color-regular);font-size:13px}.kq-measure3d .kq-measure3d-tip .kq-divider{margin:16px 0}.kq-measure3d .kq-measure3d-tip>p{margin:0}.kq-measure3d .kq-measure3d-result .kq-divider{margin:16px 0}.kq-measure3d .kq-measure3d-result .kq-measure3d-result-panel .panel{padding-bottom:16px}.kq-measure3d .kq-measure3d-result .kq-measure3d-result-panel .panel:last-child{padding:0}.kq-measure3d .kq-measure3d-result .kq-measure3d-result-panel .panel .title{color:var(--kq-text-color-regular);margin:0 0 8px;font-size:14px}.kq-measure3d .kq-measure3d-result .kq-measure3d-result-panel .panel .kq-select{width:100%}.kq-measure3d .kq-measure3d-result .kq-measure3d-result-panel .panel .result{padding:8px;background:var(--kq-sub-bg-color);border-radius:var(--kq-border-radius-base);color:var(--kq-text-color-regular);font-size:14px}.kq-measure3d .kq-measure3d-result .kq-measure3d-result-panel .panel .result .tit{padding-bottom:8px}.kq-measure3d .kq-measure3d-result .kq-measure3d-result-panel .panel .result .res+.tit{padding-top:12px}
+.kq-measure3d{z-index:999;border-radius:var(--kq-border-radius-base);padding:16px;pointer-events:auto;cursor:default;background-color:var(--kq-bg-color)}.kq-measure3d .kq-measure3d-box{width:370px}.kq-measure3d p{margin:0}.kq-measure3d .kq-measure3d-mode .panel{width:100%}.kq-measure3d .kq-measure3d-mode .panel .title{color:var(--kq-text-color-regular);margin:0 0 8px;font-size:14px}.kq-measure3d .kq-measure3d-mode .panel .kq-select{width:100%}.kq-measure3d .kq-measure3d-btns{margin-top:12px}.kq-measure3d .kq-measure3d-btns .kq-button{width:48px;height:48px}.kq-measure3d .kq-measure3d-btns .kq-button .kq-icon{color:var(--kq-color-primary)}.kq-measure3d .kq-measure3d-btns .kq-button .icon-delete{color:var(--kq-color-danger)}.kq-measure3d .kq-measure3d-btns .kq-button:active .icon-delete,.kq-measure3d .kq-measure3d-btns .kq-button:focus .icon-delete,.kq-measure3d .kq-measure3d-btns .kq-button:hover .icon-delete{color:var(--kq-color-white)!important}.kq-measure3d .kq-measure3d-btns .kq-button+.kq-button{margin-left:16px}.kq-measure3d .kq-measure3d-tip{color:var(--kq-text-color-regular);font-size:13px}.kq-measure3d .kq-measure3d-tip .kq-divider{margin:16px 0}.kq-measure3d .kq-measure3d-tip>p{margin:0}.kq-measure3d .kq-measure3d-result .kq-divider{margin:16px 0}.kq-measure3d .kq-measure3d-result .kq-measure3d-result-panel .panel{padding-bottom:16px}.kq-measure3d .kq-measure3d-result .kq-measure3d-result-panel .panel:last-child{padding:0}.kq-measure3d .kq-measure3d-result .kq-measure3d-result-panel .panel .title{color:var(--kq-text-color-regular);margin:0 0 8px;font-size:14px}.kq-measure3d .kq-measure3d-result .kq-measure3d-result-panel .panel .kq-select{width:100%}.kq-measure3d .kq-measure3d-result .kq-measure3d-result-panel .panel .result{padding:8px;background:var(--kq-sub-bg-color);border-radius:var(--kq-border-radius-base);color:var(--kq-text-color-regular);font-size:14px}.kq-measure3d .kq-measure3d-result .kq-measure3d-result-panel .panel .result .tit{padding-bottom:8px}.kq-measure3d .kq-measure3d-result .kq-measure3d-result-panel .panel .result .res+.tit{padding-top:12px}