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

src/components/Combinations/LayerManage/LayerManage.vue

@@ -75,7 +75,9 @@ export default {
       switch (obj.type) {
         case "S3M": //场景
           if (this.sceneLayers[obj.title]) {
-            this.sceneLayers[obj.title][0][0].visible = visible;
+            for (let i = 0; i < this.sceneLayers[obj.title][0].length; i++) {
+              this.sceneLayers[obj.title][0][i].visible = visible;
+            }
           }
           break;
         case "3DTiles": //场景
@@ -201,9 +203,9 @@ export default {
         promiseArray,
         (layers) => {
           this_.sceneLayers[obj.title] = layers;
-          if (sceneName) {
-            this.flyTo(sceneName);
-          }
+          // if (sceneName) {
+          //   this.flyTo(sceneName);
+          // }
           if (obj.title == "分层分户") {
             store.setLayerList(layers[0][0]);
             layers[0][0].setQueryParameter({
@@ -276,7 +278,9 @@ export default {
         this.addlayerdata.push(obj);
         switch (obj.type) {
           case "S3M": //场景
-            let s = viewer.scene.open(obj.url);
+            let s = viewer.scene.open(obj.url, undefined, {
+              autoSetView: false
+            });
             this.vectorlayerlist.push(obj);
             this.promiseWhen([s], undefined, obj);
             // store.setModelLayerList(this.vectorlayerlist);

src/components/Combinations/toolBar/toolBar.vue

@@ -152,7 +152,7 @@ export default {
       scene.cloudBox = null;
       this.currentSkyBox = this.ViewerSkyBox[this.Skybox];
       if (!this.last) {
-        this.defaultSkyBox = window.scene.skyBox;
+        // this.defaultSkyBox = window.viewer.scene.skyBox;
         this.last = !this.last;
         for (let attr in this.ViewerSkyBox) {
           this.ViewerSkyBox[attr].update(scene.frameState, true);