zjs_project 1 year ago
parent
commit
ed2837e5a2
3 changed files with 6 additions and 3 deletions
  1. 1 1
      src/mixins/wallMethod.js
  2. 3 0
      src/pages/webgl_rxdz/webgl_rxdz.vue
  3. 2 2
      src/static/layoutModelData.js

+ 1 - 1
src/mixins/wallMethod.js

@@ -361,7 +361,7 @@ export default {
 								}
 							})
 							instancedMesh.userType = "mesh";
-							instancedMesh.receiveShadow = true;//材质是否接收阴影
+							// instancedMesh.receiveShadow = true;//材质是否接收阴影
 							that.scene.add(instancedMesh);
 						}
 					});

+ 3 - 0
src/pages/webgl_rxdz/webgl_rxdz.vue

@@ -123,6 +123,7 @@
 				styleType:1,
 				sumArea:0,	//总面积
 				changeArea:0,	//当次变化的面积
+				fixedArea:0,	//初始面积值
 			}
 		},
 		beforeDestroy() {
@@ -1605,6 +1606,7 @@
 					).toFixed(2));
 					sumArea +=curSpaceArea;
 				})
+				//fixedArea
 				this.changeArea = parseFloat((sumArea - this.sumArea).toFixed(2));
 				this.sumArea = parseFloat(sumArea.toFixed(2));
 				let str = JSON.stringify(this.spaceList)
@@ -1662,6 +1664,7 @@
 				console.warn("***curHouseObj***",this.curHouseObj,this.aiData)
 				this.navbar.title = this.curHouseObj.name + "  " + this.curHouseObj.houseArea + "㎡";
 				this.sumArea = this.curHouseObj.houseArea;
+				this.fixedArea = this.curHouseObj.houseArea;
 			},
 			async getInitData(){
 				let parmas = {

+ 2 - 2
src/static/layoutModelData.js

@@ -63,7 +63,7 @@ var layoutModel = [
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_K_caozuotai001.glb', name: '操作台01',modelName: 'BP_K_caozuotai001', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_K_caozuotai002.glb', name: '操作台02',modelName: 'BP_K_caozuotai002', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_K_caozuotai03.glb', name: '操作台03',modelName: 'BP_K_caozuotai03', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_O_LightIndoorWall.gltf', name: '隔墙',modelName: 'BP_O_LightIndoorWall', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_O_LightIndoorWall.glb', name: '隔墙',modelName: 'BP_O_LightIndoorWall', type:1},
 	{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_L_children05.glb', name: '儿童家具05',modelName: 'BP_L_children05', type:1},
@@ -90,7 +90,7 @@ var layoutModel = [
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_AutoWall_CLosedFrenchWindow_5.1M.glb', name: '关闭落地窗-5.1M',modelName: 'BP_AutoWall_51M', type:1},
 
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_AutoWall_CLosedFrenchWindow_6.3M.glb', name: '关闭落地窗-6.3M',modelName: 'BP_AutoWall_63M', type:1},
-	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_AutoWall_FoldingInternalDoor_1.95M.gltf', name: '户内折叠门',modelName: 'BP_AutoWall_195M', type:1},
+	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_AutoWall_FoldingInternalDoor_1.95M.glb', name: '户内折叠门',modelName: 'BP_AutoWall_195M', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_AutoWall_OpenInternalDoor_0.8M.glb', name: '关闭户内门-0.8M',modelName: 'BP_AutoWallr_08M', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_tree00.glb', name: '大树',modelName: 'BP_G_tree00', type:1},
 	{url: 'https://dm.static.elab-plus.com/miniProgram/model/BP_G_tree01.glb', name: '中树',modelName: 'BP_G_tree01', type:1},