zjs_project 3 settimane fa
parent
commit
d015a1c092

+ 1 - 0
src/components/newQCCom/viewCareful/viewCareful.vue

@@ -240,6 +240,7 @@
 				let item = this.lastCareList[this.selectIndex];
                 if(!item || !item.spaceId){
                     console.warn("***goRoam***",item,this.selectIndex);
+                    this.$message.warning("请选择空间后进入漫游");
                     return false;
                 }
 				this.$parent.$parent.goRoam1(item.spaceId);

+ 1 - 1
src/components/newQCCom/viewMask/viewMask.vue

@@ -1410,7 +1410,7 @@
                         	"layoutName": layoutStruct.name,
                         	"layoutArea": layoutStruct.houseArea,
                         	"floor": layoutStruct.houseFloor || (index+1),
-                        	"layoutImgCustomized": layoutStruct.shottingImg || shottingImg,
+                        	"layoutImgCustomized": layoutStruct.shottingImg || "",
                         	"style": layoutStruct.style || "",
                         	"houseJson": JSON.parse(layoutStruct.houseJson),
                         };

+ 10 - 1
src/pages/webgl_rxdz_test_all/webgl_rxdz_test_all.vue

@@ -2227,6 +2227,15 @@
 					this.$message.warning("空间正在调整");
 					return false
 				}
+                if(!spaceId){
+                	this.$message.warning("请选择空间后进入漫游");
+                	return false
+                }
+                let gltf = this.lableItem.find(it=>it.spaceId==spaceId);
+                if(gltf.spaceType==13){//楼梯不能跳转
+                    this.$message.warning("楼梯间不能漫游!");
+                	return false
+                }
                 this.locationHandle();
                 setTimeout( async ()=>{
                     let shottingImg = await this.shottingAction() + "?x-oss-process=image/auto-orient,1/quality,Q_46/format,jpg";//开始截图
@@ -2244,7 +2253,6 @@
                     	this.changeSpaceColor(this.selectSpace.spaceId,2);//取消上一个空间的颜色
                         this.selectSpace = null;
                     }
-                    let gltf = this.lableItem.find(it=>it.spaceId==spaceId);
                     if(gltf){
                         this.goRoam(gltf)
                     }
@@ -2255,6 +2263,7 @@
 			goRoam(gltf){
 				console.warn('goRoam',gltf,this.selectSpace);
 				if(gltf.spaceType==13){//楼梯不能跳转
+                    this.$message.warning("楼梯间不能漫游!");
 					return false
 				}
 				let spaceId = this.selectSpace ? this.selectSpace.spaceId : gltf.spaceId;//具体的空间Id