zjs_project hai 1 ano
pai
achega
52a145ea14

+ 1 - 1
src/mixins/wallMethod.js

@@ -504,7 +504,7 @@ export default {
 						modelItem.wallScaleX = wallScaleX;
 						modelItem.wallScaleY = wallScaleY;
 						modelItem.wallRotateY = wallRotateY;
-						console.log("XXXXXXXXXXXXXXXX", modelWidth, modelItem)
+						// console.log("XXXXXXXXXXXXXXXX", modelWidth, modelItem)
 						//新版下,符合条件的不止一个了,因为新版下是以模型里面的几何体为单元,个数较多
 						this.gltfWalls.forEach(gltfItem=>{
 							if(gltfItem.spaceId == spaceObj.spaceId 

+ 2 - 2
src/pages/webgl_rxdz/webgl_rxdz.vue

@@ -166,8 +166,8 @@
         mounted() {
 			console.log("***onLoad-webgl_rxdz***", this.$route.query)
 			var that = this;
-			this.houseId = '100296';//
-			this.childLayout = '4';//4-测试户型
+			this.houseId = this.$route.query ? this.$route.query.houseId : '100296';//
+			this.childLayout = '0';//4-测试户型
 			let unit = window.screen.width / 750;//单位rpm 对应 px 的值
 			that.canvasHeight = window.screen.height - (200 * unit) + (20 * unit);
 			

+ 14 - 4
src/static/layoutModelData.js

@@ -15,7 +15,7 @@ var layoutModel = [
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_6people_long.gltf', name: '6人长桌',modelName: 'BP_D_6people_long01', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_6people_long.gltf', name: '6人长桌',modelName: 'BP_D_6people_long01', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_8people_long.gltf', name: '8人长桌',modelName: 'BP_D_8people_long', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_12people_round1.gltf', name: '12人圆桌',modelName: 'BP_D_12people_round', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_RoundTable01.glb', name: '12人圆桌',modelName: 'BP_D_12people_round', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_B_penzai01.glb', name: '盆栽',modelName: 'BP_B_penzai02', type:1},
 
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_backsofa01.gltf', name: '靠背沙发01',modelName: 'BP_D_backsofa01', type:1},
@@ -65,9 +65,6 @@ var layoutModel = [
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_TeaTable01.glb', name: '茶几01',modelName: 'BP_L_TeaRTable', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_children04.gltf', name: '儿童家具04',modelName: 'BP_L_children04', 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_matong.gltf', name: '马桶',modelName: 'BP_T_matong', type:1},
@@ -125,10 +122,22 @@ var layoutModel = [
 
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_X_OutdoorBar01.gltf', name: '户外酒吧台',modelName: 'BP_X_OutdoorBar01', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_DinnerChair_red.glb', name: '单人餐椅01',modelName: 'BP_D_DinnerChair01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_DinningChiar01_90Degree.glb', name: '餐椅01_90度',modelName: 'BP_D_DinningChiar01_90Degree', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_DinningChiar01_60Degree.glb', name: '餐椅01_60度',modelName: 'BP_D_DinningChiar01_60Degree', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_DinningChiar01_30Degree.glb', name: '餐椅01_30度',modelName: 'BP_D_DinningChiar01_30Degree', type:1},
+	
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_LongDiningTable_240CM.glb', name: '2.4M长餐桌',modelName: 'BP_D_LongDiningTable_240CM', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_DiningDecration01.glb', name: '桌面饰品01',modelName: 'BP_D_DiningDecoration01', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_DinningDecration03.glb', name: '餐桌装饰03',modelName: 'BP_D_DinningDecration03', type:1},
+	
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_DinningDecration02_30D.glb', name: '餐桌饰品02_30度',modelName: 'BP_D_DinningDecration02_30D', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_DinningDecration02_60D.glb', name: '餐桌饰品02_60度',modelName: 'BP_D_DinningDecration02_60D', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_D_DinningDecration02_90D.glb', name: '餐桌饰品02_90度',modelName: 'BP_D_DinningDecration02_90D', type:1},
+	
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_TeaTable02.glb', name: '茶几02',modelName: 'BP_L_TeaTable02', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_TeaTable03.glb', name: '茶几03',modelName: 'BP_L_Teatable03', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_TeaTable04.glb', name: '茶几04',modelName: 'BP_L_TeaTable04', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_TeaTable05.glb', name: '茶几05',modelName: 'BP_L_TeaTable05', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_carpet01.glb', name: '地毯01',modelName: 'BP_L_carpet01', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_2Sofa01.glb', name: '双人沙发01',modelName: 'BP_L_2Sofa01', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_2Sofa02.glb', name: '双人沙发02',modelName: 'BP_L_2Sofa02', type:1},
@@ -142,6 +151,7 @@ var layoutModel = [
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_B_pillow01.glb', name: '枕头',modelName: 'BP_B_pillow01', type:1},
 	
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_XSPACE_deng_01.glb', name: '吊顶灯',modelName: 'BP_XSPACE_deng_01', type:2},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_L_FloorLamp01.glb', name: '地灯05',modelName: 'BP_L_FloorLamp01', type:2},
 ];
 
 module.exports = layoutModel;