Merge branch 'master' of http://114.244.114.158:8802/siwei/real3d-portalsite

src/components/Combinations/LayerManage/LayerManage.vue

@@ -1,14 +1,8 @@
 <template>
   <div>
-    <layer-manage-split
-      :addlayerdata="addlayerdata"
-      @visibleChange="visibleChange"
-      @transSliderChange="transSliderChange"
-      @handleCheckChange="handleCheckChange"
-      @location="location"
-      @raise="raise"
-      @lower="lower"
-    ></layer-manage-split>
+    <layer-manage-split :addlayerdata="addlayerdata" @visibleChange="visibleChange"
+      @transSliderChange="transSliderChange" @handleCheckChange="handleCheckChange" @location="location" @raise="raise"
+      @lower="lower"></layer-manage-split>
     <LayerLegend></LayerLegend>
   </div>
 </template>
@@ -215,11 +209,12 @@ export default {
       Cesium.when.all(
         promiseArray,
         (layers) => {
+          console.log(layers, 'layerslayers')
           this_.sceneLayers[obj.title] = layers;
           // if (sceneName) {
           //   this.flyTo(sceneName);
           // }
-          
+
           if (obj.url.indexOf("3D-HeBing8HaoLou") > 0) {
             store.setLayerList(layers[0][0]);
             layers[0][0].setQueryParameter({
@@ -241,8 +236,8 @@ export default {
               item.style3D = style;
               item.brightness = 1.2
               item.contrast = 1.2
-              item.saturation  = 1.2
-              item.gamma  = 1.1
+              item.saturation = 1.2
+              item.gamma = 1.1
             }
             if (
               item.name.indexOf("雨水") > -1 ||
@@ -309,6 +304,14 @@ export default {
             this.vectorlayerlist.push(obj);
             this.promiseWhen([s], undefined, obj);
             this.bus.$emit("setDepthAgainst", true);
+            if (
+              obj.title.indexOf("雨水") > -1 ||
+              obj.title.indexOf("管线") > -1
+            ) {
+              console.log(obj.checked, 'obj.checked')
+              this.bus.$emit("setnUderground", obj.checked)
+            }
+
             // store.setModelLayerList(this.vectorlayerlist);
             // console.log(store.state.modellayerlist,'vvvvv');
             // store.state.S3MList.push(obj)
@@ -393,6 +396,13 @@ export default {
         if (type == "split")
           this.bus.$emit("setImagerySplit", obj, obj.checked, splitId, true);
       } else {
+        if (
+          obj.title.indexOf("雨水") > -1 ||
+          obj.title.indexOf("管线") > -1
+        ) {
+          console.log(obj.checked, 'obj.checked')
+          this.bus.$emit("setnUderground", obj.checked)
+        }
         for (let i = 0; i < this.addlayerdata.length; i++) {
           if (this.addlayerdata[i].title == obj.title) {
             this.addlayerdata.splice(i, 1);

src/components/sceneAtttribute/camera/camera.vue

@@ -328,7 +328,7 @@ export default {
       flyCirclePoint: null,
       speed: 1,
       underground: false,
-      SurfaceTransparency: 0,
+      SurfaceTransparency: 1,
       cameraMinimumZoomDistance: -1000,
       isDestroyFlag: true,
       // 设置默认值数据
@@ -485,6 +485,7 @@ export default {
         });
       }
     });
+    this.bus.$on("setnUderground", (val) => (this.underground = val));
   },
   methods: {
     //子组件部分
@@ -908,7 +909,7 @@ export default {
     underground(val) {
       viewer.scene.undergroundMode = val;
       if (val) {
-        this.SurfaceTransparency = 0;
+        this.SurfaceTransparency = 0.5;
         viewer.scene.screenSpaceCameraController.minimumZoomDistance = Number(
           this.cameraMinimumZoomDistance
         );