@kq_npm/client3d_webgl_vue 4.1.0-beta → 4.1.2-beta

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/measure/index.js CHANGED
@@ -94,6 +94,20 @@ class MeasureViewModel {
94
94
  this._viewer.scene.globe.depthTestAgainstTerrain = true;
95
95
 
96
96
  this._measureHandler.startMeasure(Cesium.Kq3dMeasureMode.Coordinate);
97
+ } //地形坡度测量
98
+
99
+
100
+ terrainSlopeMeasure() {
101
+ this._viewer.scene.globe.depthTestAgainstTerrain = true;
102
+
103
+ this._measureHandler.startMeasure(Cesium.Kq3dMeasureMode.TerrainSlope);
104
+ } //场景坡度测量
105
+
106
+
107
+ sceneSlopeMeasure() {
108
+ this._viewer.scene.globe.depthTestAgainstTerrain = true;
109
+
110
+ this._measureHandler.startMeasure(Cesium.Kq3dMeasureMode.SceneSlope);
97
111
  } //结束测量
98
112
 
99
113
 
@@ -593,12 +607,18 @@ const __default__ = {
593
607
  spaceDistance: res.distance ? res.distance.toFixed(2) : 0,
594
608
  horizontalDistance: res.hDistance ? res.hDistance.toFixed(2) : 0,
595
609
  verticalDistance: res.vDistance ? res.vDistance.toFixed(2) : 0,
596
- angle: res.angle ? res.angle.toFixed(2) : 0
610
+ angle: res.angle ? res.angle.toFixed(2).replace(/\.?0+$/, '') : 0
597
611
  };
598
612
  } else if (measureType.value === "area") {
599
613
  if (res && res.area) result.value = formatArea(res.area);
600
- } else if (measureType.value === "azimuth") {
601
- if (res && res.azimuth) result.value = formatAzimuth(res.azimuth);
614
+ } else if (measureType.value === "azimuth" && res) {
615
+ if (res.positions && res.positions.length > 0) {
616
+ result.value = res.azimuth.toFixed(4) + " °";
617
+ } else result.value = 0;
618
+ } else if (measureType.value === "slope" && res) {
619
+ if (res.positions && res.positions.length > 0) {
620
+ result.value = res.slopeAngle.toFixed(2).replace(/\.?0+$/, '') + " °";
621
+ } else result.value = 0;
602
622
  } else if (measureType.value === "coordinate") {
603
623
  if (res && res.coordinate) {
604
624
  result.value = {
@@ -618,8 +638,9 @@ const __default__ = {
618
638
  });
619
639
  viewModel.activeEvent.addEventListener(function (active) {
620
640
  if (!active) {
621
- if (measureType.value === "height" && result.value.angle === 0) return;
622
641
  isActive.value = null;
642
+ if (measureType.value === "height" && result.value.angle === 0) return;
643
+ if (measureType.value === "azimuth" && result.value === 0) return;
623
644
  isResult.value = true;
624
645
  }
625
646
  });
@@ -672,11 +693,6 @@ const __default__ = {
672
693
 
673
694
  return area.toFixed(2) + " " + unit;
674
695
  }
675
-
676
- function formatAzimuth(azimuth) {
677
- var unit = "°";
678
- return azimuth.toFixed(4) + " " + unit;
679
- }
680
696
  /**
681
697
  * @description 监听单位变化操作
682
698
  * @param {string} unit - 单位
@@ -766,6 +782,19 @@ const __default__ = {
766
782
  viewModel.coordinateMeasure();
767
783
  break;
768
784
 
785
+ case "azimuth":
786
+ viewModel.azimuthMeasure();
787
+ break;
788
+
789
+ case "slope":
790
+ if (mode.value === "ground") {
791
+ viewModel.terrainSlopeMeasure();
792
+ } else if (mode.value === "model") {
793
+ viewModel.sceneSlopeMeasure();
794
+ }
795
+
796
+ break;
797
+
769
798
  default:
770
799
  break;
771
800
  }
@@ -786,7 +815,6 @@ const __default__ = {
786
815
  loadModeData,
787
816
  formatDistance,
788
817
  formatArea,
789
- formatAzimuth,
790
818
  startMeasure,
791
819
  clearMeasure
792
820
  });
@@ -891,7 +919,25 @@ const __default__ = {
891
919
  }, 8
892
920
  /* PROPS */
893
921
  , ["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, {
894
- onClick: _cache[4] || (_cache[4] = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withModifiers)($event => startMeasure('coordinate'), ["stop"])),
922
+ onClick: _cache[4] || (_cache[4] = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withModifiers)($event => startMeasure('azimuth'), ["stop"])),
923
+ 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),
924
+ title: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).azimuth
925
+ }, {
926
+ 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, {
927
+ size: 24
928
+ }, {
929
+ 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))]),
930
+ _: 1
931
+ /* STABLE */
932
+
933
+ })]),
934
+ _: 1
935
+ /* STABLE */
936
+
937
+ }, 8
938
+ /* PROPS */
939
+ , ["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, {
940
+ onClick: _cache[5] || (_cache[5] = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withModifiers)($event => startMeasure('coordinate'), ["stop"])),
895
941
  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),
896
942
  title: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).coordinate
897
943
  }, {
@@ -908,7 +954,25 @@ const __default__ = {
908
954
 
909
955
  }, 8
910
956
  /* PROPS */
911
- , ["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, {
957
+ , ["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, {
958
+ onClick: _cache[6] || (_cache[6] = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withModifiers)($event => startMeasure('slope'), ["stop"])),
959
+ 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),
960
+ title: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(language).slope
961
+ }, {
962
+ 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, {
963
+ size: 24
964
+ }, {
965
+ 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))]),
966
+ _: 1
967
+ /* STABLE */
968
+
969
+ })]),
970
+ _: 1
971
+ /* STABLE */
972
+
973
+ }, 8
974
+ /* PROPS */
975
+ , ["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, {
912
976
  type: "danger",
913
977
  plain: "",
914
978
  onClick: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.withModifiers)(clearMeasure, ["stop"]),
@@ -928,7 +992,7 @@ const __default__ = {
928
992
 
929
993
  }, 8
930
994
  /* PROPS */
931
- , ["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
995
+ , ["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
932
996
  /* TEXT */
933
997
  )) : ((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
934
998
  /* TEXT */
@@ -936,7 +1000,7 @@ const __default__ = {
936
1000
  /* TEXT */
937
1001
  ), (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.createVNode)(_component_kq_select, {
938
1002
  modelValue: (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.unref)(distanceUnit),
939
- "onUpdate:modelValue": _cache[5] || (_cache[5] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.isRef)(distanceUnit) ? distanceUnit.value = $event : distanceUnit = $event),
1003
+ "onUpdate:modelValue": _cache[7] || (_cache[7] = $event => (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.isRef)(distanceUnit) ? distanceUnit.value = $event : distanceUnit = $event),
940
1004
  onChange: onChangeUnit
941
1005
  }, {
942
1006
  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 => {
@@ -1 +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}
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: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}