@kq_npm/client3d_webgl_vue 4.3.3-beta → 4.3.5

package/limitheightanalysis/index.js

@@ -12,17 +12,133 @@ return /******/ (function() { // webpackBootstrap
 /******/ 	"use strict";
 /******/ 	var __webpack_modules__ = ({
 
-/***/ 348:
-/***/ (function(module) {
+/***/ 1769:
+/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
-module.exports = require("@kq_npm/client_icons_vue");
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "Z": function() { return /* binding */ LimitHeightAnalysisViewModel; }
+/* harmony export */ });
+/* harmony import */ var _Users_zpc_Documents_KQGEOSpace_KQGISClientForVue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8270);
+
+//限高分析逻辑类
+class LimitHeightAnalysisViewModel {
+  //三维viewer对象
+  //限高分析存储参数对象
+  constructor(scenceView, options) {
+    (0,_Users_zpc_Documents_KQGEOSpace_KQGISClientForVue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, "_viewer", null);
+
+    (0,_Users_zpc_Documents_KQGEOSpace_KQGISClientForVue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, "_options", {});
+
+    (0,_Users_zpc_Documents_KQGEOSpace_KQGISClientForVue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, "_drawManager", null);
+
+    (0,_Users_zpc_Documents_KQGEOSpace_KQGISClientForVue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, "_drawFinishedEventListener", null);
+
+    (0,_Users_zpc_Documents_KQGEOSpace_KQGISClientForVue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, "_limitHeightAnalysis", null);
+
+    this._viewer = scenceView._viewer;
+    this._options = options;
+    this._drawManager = scenceView._drawManager;
+    this._viewer.scene.globe.depthTestAgainstTerrain = true; //开启深度检测
+
+    this._viewer.scene.postProcessStages._fxaa.enabled = true;
+    var that = this;
+    this._drawFinishedEventListener = this._drawManager.drawFinishedEvent.addEventListener(shape => {
+      if (shape) {
+        that._options.positions = shape._controlPoints;
+        that.drawPolygon();
+
+        that._drawManager.clear();
+      }
+    });
+  } // 绘制限高分析，显示分析体
+
+
+  drawPolygon() {
+    if (!this._options.positions) return;
+    var newPositions = [];
+
+    this._options.positions.forEach(item => {
+      var newPos = window.Cesium.Cartographic.fromCartesian(item);
+      newPositions.push(newPos.longitude);
+      newPositions.push(newPos.latitude);
+      newPositions.push(newPos.height);
+    });
+
+    var options = {
+      viewer: this._viewer,
+      baseHeight: Number(this._options.baseHeight),
+      limitHeight: Number(this._options.limitHeight),
+      limitColor: window.Cesium.Color.fromCssColorString(this._options.limitHeightColor).withAlpha(this._options.limitColorAlpha),
+      overColor: window.Cesium.Color.fromCssColorString(this._options.overHeightColor).withAlpha(this._options.overHeightColorAlpha),
+      positions: newPositions,
+      perPositionHeight: false,
+      classificationType: window.Cesium.ClassificationType.CESIUM_3D_TILE
+    };
+    this._limitHeightAnalysis = new window.Cesium.Kq3dLimitHeightAnalysis(options);
+
+    this._limitHeightAnalysis.add();
+  } // 开始分析
+
+
+  start() {
+    this.clear();
+
+    if (this._drawManager) {
+      this._drawManager.startDraw("polygon", {
+        clampToGround: true
+      });
+    }
+  } // 修改基底高度
+
+
+  changeBaseHeight(val) {
+    this._options.baseHeight = val;
+    this.clear();
+    this.drawPolygon();
+  } // 修改限制高度
+
+
+  changeLimitHeight(val) {
+    this._options.limitHeight = val;
+    this.clear();
+    this.drawPolygon();
+  } // 修改限制高度颜色
+
+
+  changeLimitHeightColor(val) {
+    this._options.limitHeightColor = val;
+    this.clear();
+    this.drawPolygon();
+  } // 修改超出高度颜色
+
+
+  changeOverHeightColor(val) {
+    this._options.overHeightColor = val;
+    this.clear();
+    this.drawPolygon();
+  } // 清除全部
+
+
+  clear() {
+    this._limitHeightAnalysis && this._limitHeightAnalysis.remove();
+    this._drawManager && this._drawManager.stopDraw();
+  } // 销毁
+
+
+  destroy() {
+    this.clear();
+    this._drawFinishedEventListener && this._drawFinishedEventListener();
+    this._drawFinishedEventListener = null;
+  }
+
+}
 
 /***/ }),
 
-/***/ 2118:
+/***/ 348:
 /***/ (function(module) {
 
-module.exports = require("core-js/modules/es.array.push.js");
+module.exports = require("@kq_npm/client_icons_vue");
 
 /***/ }),
 
@@ -160,7 +276,7 @@ __webpack_require__.r(__webpack_exports__);
 
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
-  "LimitHeightAnalysisViewModel": function() { return /* reexport */ LimitHeightAnalysisViewModel; },
+  "LimitHeightAnalysisViewModel": function() { return /* reexport */ LimitHeightAnalysisViewModel/* default */.Z; },
   "default": function() { return /* reexport */ LimitHeightAnalysis; }
 });
 
@@ -170,125 +286,8 @@ var external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_ = __webpack_require__(
 var gis_utils_ = __webpack_require__(7135);
 // EXTERNAL MODULE: external "@kq_npm/client_icons_vue"
 var client_icons_vue_ = __webpack_require__(348);
-// EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/defineProperty.js
-var defineProperty = __webpack_require__(8270);
-// EXTERNAL MODULE: external "core-js/modules/es.array.push.js"
-var es_array_push_js_ = __webpack_require__(2118);
-;// CONCATENATED MODULE: ./src/webgl/limitheightanalysis/LimitHeightAnalysisViewModel.js
-
-
-//限高分析逻辑类
-class LimitHeightAnalysisViewModel {
-  //三维viewer对象
-  //限高分析存储参数对象
-  constructor(scenceView, options) {
-    (0,defineProperty/* default */.Z)(this, "_viewer", null);
-
-    (0,defineProperty/* default */.Z)(this, "_options", {});
-
-    (0,defineProperty/* default */.Z)(this, "_drawManager", null);
-
-    (0,defineProperty/* default */.Z)(this, "_drawFinishedEventListener", null);
-
-    (0,defineProperty/* default */.Z)(this, "_limitHeightAnalysis", null);
-
-    this._viewer = scenceView._viewer;
-    this._options = options;
-    this._drawManager = scenceView._drawManager;
-    this._viewer.scene.globe.depthTestAgainstTerrain = true; //开启深度检测
-
-    this._viewer.scene.postProcessStages._fxaa.enabled = true;
-    var that = this;
-    this._drawFinishedEventListener = this._drawManager.drawFinishedEvent.addEventListener(shape => {
-      if (shape) {
-        that._options.positions = shape._controlPoints;
-        that.drawPolygon();
-
-        that._drawManager.clear();
-      }
-    });
-  } // 绘制限高分析，显示分析体
-
-
-  drawPolygon() {
-    if (!this._options.positions) return;
-    var newPositions = [];
-
-    this._options.positions.forEach(item => {
-      var newPos = window.Cesium.Cartographic.fromCartesian(item);
-      newPositions.push(newPos.longitude);
-      newPositions.push(newPos.latitude);
-      newPositions.push(newPos.height);
-    });
-
-    var options = {
-      viewer: this._viewer,
-      baseHeight: Number(this._options.baseHeight),
-      limitHeight: Number(this._options.limitHeight),
-      limitColor: window.Cesium.Color.fromCssColorString(this._options.limitHeightColor).withAlpha(this._options.limitColorAlpha),
-      overColor: window.Cesium.Color.fromCssColorString(this._options.overHeightColor).withAlpha(this._options.overHeightColorAlpha),
-      positions: newPositions,
-      perPositionHeight: false,
-      classificationType: window.Cesium.ClassificationType.CESIUM_3D_TILE
-    };
-    this._limitHeightAnalysis = new window.Cesium.Kq3dLimitHeightAnalysis(options);
-
-    this._limitHeightAnalysis.add();
-  } // 开始分析
-
-
-  start() {
-    this.clear();
-
-    if (this._drawManager) {
-      this._drawManager.startDraw("polygon", {
-        clampToGround: true
-      });
-    }
-  } // 修改基底高度
-
-
-  changeBaseHeight(val) {
-    this._options.baseHeight = val;
-    this.clear();
-    this.drawPolygon();
-  } // 修改限制高度
-
-
-  changeLimitHeight(val) {
-    this._options.limitHeight = val;
-    this.clear();
-    this.drawPolygon();
-  } // 修改限制高度颜色
-
-
-  changeLimitHeightColor(val) {
-    this._options.limitHeightColor = val;
-    this.clear();
-    this.drawPolygon();
-  } // 修改超出高度颜色
-
-
-  changeOverHeightColor(val) {
-    this._options.overHeightColor = val;
-    this.clear();
-    this.drawPolygon();
-  } // 清除全部
-
-
-  clear() {
-    this._limitHeightAnalysis && this._limitHeightAnalysis.remove();
-    this._drawManager && this._drawManager.stopDraw();
-  } // 销毁
-
-
-  destroy() {
-    this.clear();
-    this._drawFinishedEventListener && this._drawFinishedEventListener();
-    this._drawFinishedEventListener = null;
-  }
-
-}
+// EXTERNAL MODULE: ./src/webgl/limitheightanalysis/LimitHeightAnalysisViewModel.js
+var LimitHeightAnalysisViewModel = __webpack_require__(1769);
 // EXTERNAL MODULE: external "@kq_npm/client_common_vue/_utils/util"
 var util_ = __webpack_require__(3458);
 // EXTERNAL MODULE: external "vue-i18n/dist/vue-i18n.cjs.js"
@@ -414,7 +413,7 @@ const __default__ = {
 
       gis_utils_.utils.getWebMap(null, scenceView => {
         if (scenceView) {
-          viewModel = new LimitHeightAnalysisViewModel(scenceView, {
+          viewModel = new LimitHeightAnalysisViewModel/* default */.Z(scenceView, {
             baseHeight: formItem.baseHeight,
             limitHeight: formItem.limitHeight,
             limitHeightColor: formItem.limitHeightColor,

package/limitheightanalysis/style/limitheightanalysis.css

@@ -1,88 +1 @@
-.kq3d-limitheight-analysis {
-  z-index: 999;
-  border-radius: var(--kq-border-radius-base);
-  padding: 16px;
-  pointer-events: auto;
-  cursor: default;
-  background-color: var(--kq-bg-color);
-}
-.kq3d-limitheight-analysis .kq3d-limitheight-analysis-box {
-  width: 372px;
-}
-.kq3d-limitheight-analysis .kq3d-limitheight-analysis-tip {
-  color: var(--kq-text-color-regular);
-  font-size: var(--kq-font-size-base);
-}
-.kq3d-limitheight-analysis .kq3d-limitheight-analysis-tip p {
-  margin-top: 0px;
-  margin-bottom: 16px;
-}
-.kq3d-limitheight-analysis .kq-collapse {
-  border: unset;
-}
-.kq3d-limitheight-analysis .kq-collapse .kq-collapse-item__header {
-  border: unset;
-  height: 38px;
-  background-color: var(--kq-fill-color-light);
-  font-weight: bold;
-  padding: 0px 16px;
-  font-size: 16px;
-}
-.kq3d-limitheight-analysis .kq-collapse .kq-collapse-item__arrow {
-  margin: 0 0px 0 auto;
-}
-.kq3d-limitheight-analysis .kq-collapse .kq-collapse-item__wrap .kq-collapse-item__content {
-  padding-bottom: unset;
-  border: unset;
-  padding-top: 10px;
-}
-.kq3d-limitheight-analysis .kq-form-item {
-  margin-bottom: 8px;
-}
-.kq3d-limitheight-analysis .kq-form-item__content {
-  text-align: end;
-  display: block;
-}
-.kq3d-limitheight-analysis .kq-row {
-  display: block;
-}
-.kq3d-limitheight-analysis .kq-slider {
-  width: 95%;
-  padding-left: 7px;
-}
-.kq3d-limitheight-analysis .kq-slider .kq-slider__button {
-  width: 14px;
-  height: 14px;
-}
-.kq3d-limitheight-analysis .kq-input-number {
-  width: 65px;
-}
-.kq3d-limitheight-analysis .kq-input-number .kq-input-number__increase,
-.kq3d-limitheight-analysis .kq-input-number .kq-input-number__decrease {
-  width: 20px;
-}
-.kq3d-limitheight-analysis .kq-input-number .kq-input__wrapper {
-  padding-left: 0px;
-  padding-right: 20px;
-}
-.kq3d-limitheight-analysis .kq-col-8 .kq-input-number .kq-input__wrapper {
-  padding-left: 0px;
-  padding-right: 20px;
-}
-.kq3d-limitheight-analysis .kq-color-picker {
-  width: 100%;
-}
-.kq3d-limitheight-analysis .kq-color-picker .kq-color-picker__mask {
-  width: 100%;
-}
-.kq3d-limitheight-analysis .kq-color-picker .kq-color-picker__trigger {
-  width: 100%;
-}
-.kq3d-limitheight-analysis .kq3d-limitheight-analysis-footer {
-  text-align: right;
-  padding: 16px 0px 0px;
-}
-
-.cesium-viewer-cesiumWidgetContainer .twipsy {
-  display: none !important;
-}
+.kq3d-limitheight-analysis{z-index:999;border-radius:var(--kq-border-radius-base);padding:16px;pointer-events:auto;cursor:default;background-color:var(--kq-bg-color)}.kq3d-limitheight-analysis .kq3d-limitheight-analysis-box{width:372px}.kq3d-limitheight-analysis .kq3d-limitheight-analysis-tip{color:var(--kq-text-color-regular);font-size:var(--kq-font-size-base)}.kq3d-limitheight-analysis .kq3d-limitheight-analysis-tip p{margin-top:0;margin-bottom:16px}.kq3d-limitheight-analysis .kq-collapse{border:unset}.kq3d-limitheight-analysis .kq-collapse .kq-collapse-item__header{border:unset;height:38px;background-color:var(--kq-fill-color-light);font-weight:700;padding:0 16px;font-size:16px}.kq3d-limitheight-analysis .kq-collapse .kq-collapse-item__arrow{margin:0 0 0 auto}.kq3d-limitheight-analysis .kq-collapse .kq-collapse-item__wrap .kq-collapse-item__content{padding-bottom:unset;border:unset;padding-top:10px}.kq3d-limitheight-analysis .kq-form-item{margin-bottom:8px}.kq3d-limitheight-analysis .kq-form-item__content{text-align:end;display:block}.kq3d-limitheight-analysis .kq-row{display:block}.kq3d-limitheight-analysis .kq-slider{width:95%;padding-left:7px}.kq3d-limitheight-analysis .kq-slider .kq-slider__button{width:14px;height:14px}.kq3d-limitheight-analysis .kq-input-number{width:65px}.kq3d-limitheight-analysis .kq-input-number .kq-input-number__decrease,.kq3d-limitheight-analysis .kq-input-number .kq-input-number__increase{width:20px}.kq3d-limitheight-analysis .kq-col-8 .kq-input-number .kq-input__wrapper,.kq3d-limitheight-analysis .kq-input-number .kq-input__wrapper{padding-left:0;padding-right:20px}.kq3d-limitheight-analysis .kq-color-picker,.kq3d-limitheight-analysis .kq-color-picker .kq-color-picker__mask,.kq3d-limitheight-analysis .kq-color-picker .kq-color-picker__trigger{width:100%}.kq3d-limitheight-analysis .kq3d-limitheight-analysis-footer{text-align:right;padding:16px 0 0}.cesium-viewer-cesiumWidgetContainer .twipsy{display:none!important}

package/measure/index.js

@@ -45,7 +45,7 @@ index_full_js_namespaceObject.ElMessage.install = (Vue, opts) => {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "Z": function() { return /* binding */ MeasureViewModel; }
 /* harmony export */ });
-/* harmony import */ var G_0929_zl_kqgis_client_vue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8270);
+/* harmony import */ var _Users_zpc_Documents_KQGEOSpace_KQGISClientForVue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(8270);
 
 //测量操作类
 class MeasureViewModel {
@@ -53,13 +53,15 @@ class MeasureViewModel {
   //测量事件
   //活动事件
   constructor(viewer) {
-    (0,G_0929_zl_kqgis_client_vue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, "_viewer", null);
+    (0,_Users_zpc_Documents_KQGEOSpace_KQGISClientForVue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, "_viewer", null);
 
-    (0,G_0929_zl_kqgis_client_vue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, "_measureHandler", null);
+    (0,_Users_zpc_Documents_KQGEOSpace_KQGISClientForVue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, "_measureHandler", null);
 
-    (0,G_0929_zl_kqgis_client_vue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, "measureEvent", null);
+    (0,_Users_zpc_Documents_KQGEOSpace_KQGISClientForVue_node_modules_babel_runtime_helpers_esm_defineProperty_js__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(this, "measureEvent", null);
 
-    (0,G_0929_zl_kqgis_client_vue_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, "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;
@@ -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²":
@@ -509,6 +511,22 @@ const _hoisted_32 = {
 const _hoisted_33 = {
   class: "res"
 };
+const _hoisted_34 = {
+  class: "tit"
+};
+const _hoisted_35 = {
+  class: "res"
+};
+const _hoisted_36 = {
+  key: 3,
+  class: "result"
+};
+const _hoisted_37 = {
+  class: "tit"
+};
+const _hoisted_38 = {
+  class: "res"
+};
 
 
 
@@ -572,11 +590,15 @@ 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 isTips = (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 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");
+    let result = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)(0);
     let language = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)({});
     let mode = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)("space");
     let modeList = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.ref)([]);
@@ -606,7 +628,7 @@ const __default__ = {
         value: "m"
       }, {
         label: language.value.nauticalMile,
-        value: "nmi"
+        value: nauticalMileUnit
       }];
     };
 
@@ -647,7 +669,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") {
@@ -681,7 +704,10 @@ const __default__ = {
               }
             } else if (measureType.value === "azimuth" && res) {
               if (res.positions && res.positions.length > 0) {
-                result.value = res.azimuth.toFixed(4) + " °";
+                result.value = {
+                  azimuth: res.azimuth.toFixed(4),
+                  distance: res.distance.toFixed(2)
+                };
               } else result.value = 0;
             } else if (measureType.value === "slope" && res) {
               if (res.positions && res.positions.length > 0) {
@@ -706,8 +732,6 @@ const __default__ = {
                   };
                 }
 
-                viewModel.stopMeasure();
-
                 if (res.measureResult && res.measureResult.labels && res.measureResult.labels.length > 0) {
                   res.measureResult.labels._labels.forEach(label => {
                     label.text = label.text.replace('X', language.value.longitude).replace('Y', language.value.latitude).replace('Z', language.value.elevation).replace(/\n/g, '°\n');
@@ -722,12 +746,52 @@ const __default__ = {
           });
           viewModel.activeEvent.addEventListener(function (active) {
             if (!active) {
-              isActive.value = null;
+              // isActive.value = null;
+              isTips.value = false;
+              if (result.value === 0) return;
               if (measureType.value === "height" && result.value.angle === 0) return;
               if (measureType.value === "azimuth" && result.value === 0) return;
               isResult.value = true;
             }
           });
+          let handler = new Cesium.ScreenSpaceEventHandler(scenceView._viewer.scene.canvas);
+          handler.setInputAction(function () {
+            if (!viewModel._measureHandler.active) return;
+            let isDrawing = viewModel._measureHandler.isDrawing;
+
+            if (!isDrawing) {
+              let measureResults = viewModel._measureHandler.measureResults;
+
+              if (measureResults && measureResults.length > 0) {
+                measureResults[0].destroy();
+              }
+
+              if (measureType.value === "coordinate") {
+                isTips.value = false;
+                isResult.value = true;
+              } else {
+                isTips.value = true;
+                isResult.value = false;
+              }
+            }
+
+            if (isDrawing) {
+              if (measureType.value !== 'distance' && measureType.value !== 'area') {
+                continueMeasure();
+              }
+            }
+          }, Cesium.ScreenSpaceEventType.LEFT_CLICK);
+          handler.setInputAction(function () {
+            let isDrawing = viewModel._measureHandler.isDrawing;
+
+            if (!isDrawing) {
+              isActive.value = null;
+              viewModel.stopMeasure();
+            } else {
+              continueMeasure();
+            }
+          }, Cesium.ScreenSpaceEventType.RIGHT_CLICK);
+          window.measureClickHandler = handler;
         }
       });
     }); // 经纬度转度分秒
@@ -824,8 +888,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²":
@@ -854,6 +918,11 @@ const __default__ = {
 
     (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.onBeforeUnmount)(() => {
       clearMeasure();
+
+      if (window.measureClickHandler) {
+        window.measureClickHandler.removeInputAction(Cesium.ScreenSpaceEventType.LEFT_CLICK);
+        window.measureClickHandler.removeInputAction(Cesium.ScreenSpaceEventType.RIGHT_CLICK);
+      }
     }); //开始测量
 
     function startMeasure(type) {
@@ -878,6 +947,8 @@ const __default__ = {
       }
 
       viewModel.clear();
+      result.value = 0;
+      isTips.value = true;
       isResult.value = false;
       measureType.value = type;
       isActive.value = type;
@@ -916,6 +987,44 @@ const __default__ = {
           break;
       }
     }
+
+    function continueMeasure() {
+      setTimeout(() => {
+        switch (measureType.value) {
+          case "distance":
+            viewModel.distanceMeasure(mode.value);
+            break;
+
+          case "area":
+            viewModel.areaMeasure(mode.value);
+            break;
+
+          case "height":
+            viewModel.heightMeasure();
+            break;
+
+          case "coordinate":
+            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;
+        }
+      }, 300);
+    }
     /**
      * 清除测量
      */
@@ -925,6 +1034,7 @@ const __default__ = {
       viewModel && viewModel.clear();
       measureType.value = null;
       isActive.value = null;
+      isTips.value = false;
       isResult.value = false;
     }
 
@@ -962,8 +1072,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)(mode),
-        "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.isRef)(mode) ? mode.value = $event : mode = $event),
-        disabled: !!(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(isActive)
+        "onUpdate:modelValue": _cache[0] || (_cache[0] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.isRef)(mode) ? mode.value = $event : mode = $event)
       }, {
         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)(modeList), item => {
           return (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createBlock)(_component_kq_option, {
@@ -981,7 +1090,7 @@ const __default__ = {
 
       }, 8
       /* PROPS */
-      , ["modelValue", "disabled"])])]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_5, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_button, {
+      , ["modelValue"])])]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("div", _hoisted_5, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_button, {
         onClick: _cache[1] || (_cache[1] = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withModifiers)($event => startMeasure('distance'), ["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) == 'distance' ? 'is-active' : null),
         title: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).distance
@@ -1109,7 +1218,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_.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
+      , ["onClick", "title"])]), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(isTips) ? ((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 */
@@ -1189,9 +1298,17 @@ const __default__ = {
       /* TEXT */
       ), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("p", _hoisted_30, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(result).height) + " m", 1
       /* TEXT */
-      )])) : ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementBlock)("div", _hoisted_31, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("p", _hoisted_32, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language)[(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(measureType)]), 1
+      )])) : (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)("div", _hoisted_31, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("p", _hoisted_32, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).azimuth), 1
+      /* TEXT */
+      ), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("p", _hoisted_33, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(result).azimuth) + " °", 1
+      /* TEXT */
+      ), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("p", _hoisted_34, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).distance), 1
+      /* TEXT */
+      ), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("p", _hoisted_35, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(result).distance) + " m", 1
+      /* TEXT */
+      )])) : ((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.openBlock)(), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementBlock)("div", _hoisted_36, [(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("p", _hoisted_37, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language)[(0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(measureType)]), 1
       /* TEXT */
-      ), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("p", _hoisted_33, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(result)), 1
+      ), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createElementVNode)("p", _hoisted_38, (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.toDisplayString)((0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(result)), 1
       /* TEXT */
       )]))])])])) : (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createCommentVNode)("v-if", true)])], 2
       /* CLASS */