zjs_project 1 år sedan
förälder
incheckning
957f15e409

+ 2 - 2
src/components/newBottomCom/viewMask/viewMask.html

@@ -5,7 +5,7 @@
 	:autoplay="false" :loop="false" ref="carousel"
 	 @change="swiperChangeImg" :initial-index="currentIndex" :indicator-dots="false">
 		<el-carousel-item v-for="(item,index1) in aiImagesList" :key="index1">
-			<img @touchstart="mytouchstart" @touchmove="mytouchmove" @touchend="mytouchend" style="width:100%;height:100%;" mode="aspectFill" :src="item.image"></image>
+			<img @touchstart="mytouchstart" @touchmove="mytouchmove" @touchend="mytouchend" style="width:100%;height:100%;object-fit: cover;" mode="aspectFill" :src="item.image"></image>
 		</el-carousel-item>
 	</el-carousel>
 	<div class="indicator-view rows" v-if="aiImagesList && aiImagesList.length>1 && showAIImage">
@@ -50,7 +50,7 @@
 	</div>
 	<!-- 微信客服 -->
 	<div class="connect-view columns"
-		@click="mynavigateFuc" data-jumptype="50">
+		@click.stop="mynavigateFuc" data-jumptype="50">
 		<img class="defaultHead" src="https://dm.static.elab-plus.com/miniProgram/conentUs.png" mode="widthFix"/>
 	</div>
 	<!-- 风格层主操作视图 -->

+ 2 - 0
src/components/newBottomCom/viewMask/viewMask.scss

@@ -306,6 +306,8 @@
 	bottom: 605rem;
 	right:24rem; 
 	box-sizing: border-box;
+	z-index: 13;
+	pointer-events: auto;
 	.defaultHead{
 		width: 139rem;
 		height: 184rem;

+ 17 - 9
src/components/newBottomCom/viewMask/viewMask.vue

@@ -160,7 +160,7 @@
 			},
 			//视角切换
 			switchActor(){
-				this.$parent.clearHandle()
+				// this.$parent.clearHandle()
 				this.$emit('switchActor');
 				this.showAIImage = false;//隐藏AI结果集合-执行切换视角
 				let index = this.$parent.currentActor.userIndex;//当前视角的序号
@@ -177,7 +177,7 @@
 				util.trackRequest(param);
 			},
 			showOrHideWebGl(){
-				this.$parent.clearHandle()
+				// this.$parent.clearHandle()
 				this.showAIImage = !this.showAIImage;
 				let param = {
 					type: 'CLK', //埋点类型
@@ -188,13 +188,13 @@
 					}
 				};
 				util.trackRequest(param);
-				setTimeout(()=> {
-					if(this.showAIImage==true){
-						this.$parent.clearHandle()
-					}else{
-						this.$parent.attendEvent()
-					}
-				}, 100);
+				// setTimeout(()=> {
+				// 	if(this.showAIImage==true){
+				// 		this.$parent.clearHandle()
+				// 	}else{
+				// 		this.$parent.attendEvent()
+				// 	}
+				// }, 100);
 			},
 			//保存到相册
 			save() {
@@ -309,6 +309,7 @@
 			},
 			mynavigateFuc(e) {
 				if (e) {
+					// this.$parent.clearHandle();
 					let param = {
 						type: 'CLK', //埋点类型
 						clkId: 'clk_2cmina_23080408', //点击ID
@@ -323,6 +324,13 @@
 					}else{
 						this.$message.warning("敬请期待");
 					}
+					// setTimeout(()=> {
+					// 	if(this.showAIImage==true){
+					// 		this.$parent.clearHandle()
+					// 	}else{
+					// 		this.$parent.attendEvent()
+					// 	}
+					// }, 100);
 				}
 			},
 			catchTapEvent:function(){

+ 8 - 8
src/pages/webgl_rxdz_roam/webgl_rxdz_roam.vue

@@ -395,8 +395,8 @@
 				let _x =  point.x - camera.position.x;//x轴移动的距离
 				let _z =  point.z - camera.position.z;//z轴移动的距离
 				// console.warn("***moveCarmer***",_x,_z)
-				let cameraNewPosition = {x:camera.position.x + _x,y:1.2,z:camera.position.z + _z};
-				let targetNewPosition = {x:controls.target.x + _x,y:1.2,z:controls.target.z + _z};
+				let cameraNewPosition = {x:camera.position.x + _x,y:1.0,z:camera.position.z + _z};
+				let targetNewPosition = {x:controls.target.x + _x,y:1.0,z:controls.target.z + _z};
 				let oldUp = {x:0,y:1,z:0};	
 				let newUp = {x:0,y:1,z:0};
 				moveTip(cameraNewPosition)
@@ -510,13 +510,13 @@
 						let py = spaceObj.centerY + Y_C;
 						let position = {
 							x:(parseInt(px))/100,
-							y:1.2, 
+							y:1.0, 
 							z:-(parseInt(py))/100,//模型Y轴坐标系正负值跟webglZ轴是相反的
 						}
-						//新的观察点的位置-取模型的中心点坐标,加上高度,由于模型都是贴地的,所以高度设置为1.2
+						//新的观察点的位置-取模型的中心点坐标,加上高度,由于模型都是贴地的,所以高度设置为1.0
 						let targetNewPosition = {
 							x:position.x + Math.sin(_hd),
-							y:1.2 + Math.tan(_hdY),
+							y:1.0 + Math.tan(_hdY),
 							z:(position.z - Math.cos(_hd)),
 						}
 						cube.position.set(position.x,position.y,position.z)
@@ -576,7 +576,7 @@
 				//新的摄像机的位置-新的摄像机角度是倾斜角度,所以z值需要计算,高度设置为模型高度的2倍
 				let cameraNewPosition = {
 					x:(parseInt(px))/100,
-					y:1.2, 
+					y:1.0, 
 					z:-(parseInt(py))/100,//模型Y轴坐标系正负值跟webglZ轴是相反的
 				}
 				if(cameraNewPosition){
@@ -596,10 +596,10 @@
 						console.warn("**roamPositionHandle-观察点不在空间范围-强制修正观察点位置****",JSON.stringify(cameraNewPosition))
 					}
 				}
-				//新的观察点的位置-取模型的中心点坐标,加上高度,由于模型都是贴地的,所以高度设置为1.2
+				//新的观察点的位置-取模型的中心点坐标,加上高度,由于模型都是贴地的,所以高度设置为1.0
 				let targetNewPosition = {
 					x:cameraNewPosition.x + Math.sin(_hd),
-					y:1.2 + Math.tan(_hdY),
+					y:1.0 + Math.tan(_hdY),
 					z:(cameraNewPosition.z - Math.cos(_hd)),
 				}
 				return {cameraNewPosition,targetNewPosition}

+ 1 - 1
src/static/layoutModelData.js

@@ -69,7 +69,7 @@ var layoutModel = [
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_children07.glb', name: '儿童家具07',modelName: 'BP_L_children07', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_X_ReadingArea01.gltf', name: '阅读角01',modelName: 'BP_X_ReadingArea01', type:1},
 	
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_T_OpenShower01.glb', name: '开敞侧淋浴间',modelName: 'BP_T_OpenShower01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_T_OpenShower01.gltf', name: '开敞侧淋浴间',modelName: 'BP_T_OpenShower01', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_T_matong.gltf', name: '马桶',modelName: 'BP_T_matong', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_T_1PeopleBasin01.glb', name: '1人台盆01',modelName: 'BP_T_1PeopleBasin01', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_T_flue001.glb', name: '水井管道01',modelName: 'BP_T_flue001', type:1},