@kq_npm/client3d_webgl_vue 4.5.40 → 4.5.42

package/skylineanalysis/index.js

@@ -251,11 +251,11 @@ class SkylineAnalysisViewModel {
       lineWidth: option.skylineWidth, //天际线线宽
       radius: option.skylineRadius //天际线分析范围
     };
-    if (option.viewPosition) this._options.viewPosition = option.viewPosition;
-    if (option.heading) this._options.heading = option.heading;
-    if (option.pitch) this._options.pitch = option.pitch;
-    if (option.roll) this._options.viewPosition = option.roll;
-    if (option.fov) this._options.fov = option.fov;
+    // if (option.viewPosition) this._options.viewPosition = option.viewPosition;
+    // if (option.heading) this._options.heading = option.heading;
+    // if (option.pitch) this._options.pitch = option.pitch;
+    // if (option.roll) this._options.viewPosition = option.roll;
+    // if (option.fov) this._options.fov = option.fov;
     // 实例化天际线分析类
     this._skylineAnalysis = new window.Cesium.Kq3dSkyline(this._options);
   }
@@ -272,7 +272,7 @@ class SkylineAnalysisViewModel {
       }
     }
     if (flag) {
-      if (!this._skylineAnalysis || this._skylineAnalysis.isDestroyed()) {
+      if (this._skylineAnalysis?.isDestroyed?.()) {
         this._skylineAnalysis = new window.Cesium.Kq3dSkyline(this._options);
       }
       this._skylineAnalysis.updateBuffer();
@@ -302,8 +302,6 @@ class SkylineAnalysisViewModel {
         this._skylineAnalysis = new window.Cesium.Kq3dSkyline(this._options);
       }
       this._showLimitHeightBody = true;
-      this._skylineAnalysis.faceColor = this._options.faceColor;
-      this._skylineAnalysis.faceOutlineColor = this._options.faceOutlineColor;
       this._skylineAnalysis.drawHeightGeo();
       this._skylineAnalysis.viewer.camera.moveBackward(1);
     } else {
@@ -402,7 +400,7 @@ class SkylineAnalysisViewModel {
     if (this._skylineAnalysis && !this._skylineAnalysis.isDestroyed()) {
       this._skylineAnalysis.removeAlllimitHeights();
       this._skylineAnalysis.removeAllFaces();
-      // this._skylineAnalysis.removeGeoJsonDataSource();
+      this._skylineAnalysis.removeGeoJsonDataSource();
       this._skylineAnalysis.removeCzmlJsonDataSource();
     }
   }
@@ -567,7 +565,9 @@ let resultEcahrtVis = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.r
 
 
 let formItem = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.reactive)({
-  collapseValue: (props.settingParams && props.settingParams.collapseValue) || ((props.settingParams && props.settingParams.collapseValue)==''? "":"setting"), // 默认展开属性设置
+  collapseValue:
+    (props.settingParams && props.settingParams.collapseValue) ||
+    ((props.settingParams && props.settingParams.collapseValue) == "" ? "" : "setting"), // 默认展开属性设置
   skylineColor: (props.settingParams && props.settingParams.skylineColor) || "#ff0000", // 天际线颜色
   skylineRadius: (props.settingParams && props.settingParams.skylineRadius) || 1000, // 天际线半径
   minSkylineRadius: (props.settingParams && props.settingParams.minSkylineRadius) || 0, // 天际线半径范围最小值
@@ -576,7 +576,7 @@ let formItem = (0,external_root_Vue_commonjs_vue_commonjs2_vue_amd_vue_.reactive
   limitHeightBodyAlpha: (props.settingParams && props.settingParams.limitHeightBodyAlpha) || 0.7, // 限高体透明度
   minLimitHeightBodyAlpha: (props.settingParams && props.settingParams.minLimitHeightBodyAlpha) || 0, // 限高体透明度范围最小值
   maxLimitHeightBodyAlpha: (props.settingParams && props.settingParams.maxLimitHeightBodyAlpha) || 1, // 限高体透明度范围最大值
-  skylineWidth: 2 // 天际线宽度
+  skylineWidth: props?.settingParams?.skylineWidth ?? 2 // 天际线宽度
 });
 
 // 组件容器Ref
@@ -620,17 +620,7 @@ headerTempTitle.value = language.value.skylineAnalysis;
 
   gis_utils_.utils.getWebMap(null, scenceView => {
     if (scenceView) {
-      viewModel = new SkylineAnalysisViewModel(
-        scenceView,
-        {
-          skylineColor: formItem.skylineColor,
-          skylineRadius: formItem.skylineRadius,
-          limitHeightBodyColor: formItem.limitHeightBodyColor,
-          limitHeightBodyAlpha: formItem.limitHeightBodyAlpha,
-          skylineWidth: formItem.skylineWidth
-        },
-        setEchartsColor()
-      );
+      viewModel = new SkylineAnalysisViewModel(scenceView, formItem, setEchartsColor());
       viewModel._skylineAnalysisChartTitle = scenceView._language["skylineAnalysisChartTitle"];
     }
   });

package/slopeaspectanalysis/index.js

@@ -268,7 +268,11 @@ class SlopeAspectAnalysisViewModel {
       colorImage: this.getImagePath(viewModel.colorImage),
     };
     this._globaOptions.viewer.scene.globe.depthTestAgainstTerrain = true; //开启深度检测
-    this._globaOptions.viewer.scene.globe.enableLighting = true;
+    // this._globaOptions.viewer.scene.globe.enableLighting = true;
+    this._globaOptions.viewer.scene.logarithmicDepthBuffer = true;
+    this._globaOptions.viewer.scene.pickTranslucentDepth = true;
+    this._globaOptions.viewer.scene._environmentState.renderTranslucentDepthForPick = true;
+
     this._globaOptions._drawManager = scenceView._drawManager;
     // 坡度对象
     this._aspectAnalysis = new window.Cesium.Kq3dAspect({