|
@@ -1160,7 +1160,7 @@
|
|
directionIndex01 = directionIndex01 == 4 ? 3 : 4; // 往西移动
|
|
directionIndex01 = directionIndex01 == 4 ? 3 : 4; // 往西移动
|
|
}
|
|
}
|
|
|
|
|
|
- console.log("要变化的宽度", newWidth, newHeight)
|
|
|
|
|
|
+ console.warn(curSpace.spaceId, "要变化的宽度:", newWidth, "要变化的高度:",newHeight)
|
|
// 目标宽度
|
|
// 目标宽度
|
|
if(newHeight > curSpace.spaceHeightMax){
|
|
if(newHeight > curSpace.spaceHeightMax){
|
|
newHeight = curSpace.spaceHeightMax;
|
|
newHeight = curSpace.spaceHeightMax;
|
|
@@ -1925,7 +1925,7 @@
|
|
// 获取墙体数据
|
|
// 获取墙体数据
|
|
async getHouseTypeSpaceWalls(){
|
|
async getHouseTypeSpaceWalls(){
|
|
let data = {id:this.wallIds}
|
|
let data = {id:this.wallIds}
|
|
- // let data = {id:[2313]}
|
|
|
|
|
|
+ // let data = {id:[2385]}
|
|
const res = await requestConfig('getHouseTypeSpaceWalls', data, true);
|
|
const res = await requestConfig('getHouseTypeSpaceWalls', data, true);
|
|
console.log("墙体数据:", res.list)
|
|
console.log("墙体数据:", res.list)
|
|
let wallList = [];
|
|
let wallList = [];
|
|
@@ -1952,7 +1952,7 @@
|
|
}
|
|
}
|
|
}
|
|
}
|
|
this.loadSpaceObjWalls(wallArr, wallList);
|
|
this.loadSpaceObjWalls(wallArr, wallList);
|
|
- this.getOverallArrangementDetailsList(2);
|
|
|
|
|
|
+ this.getOverallArrangementDetailsList(1);
|
|
},
|
|
},
|
|
// 加载单个空间墙体资源
|
|
// 加载单个空间墙体资源
|
|
async loadSpaceObjWalls(wallArr, wallList){
|
|
async loadSpaceObjWalls(wallArr, wallList){
|
|
@@ -2227,7 +2227,7 @@
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|
|
- this.changeLayoutModelState();
|
|
|
|
|
|
+ this.changeLayoutModelState();
|
|
console.log("关联空间XXXXX", this.leftSpaces, this.rightSpaces)
|
|
console.log("关联空间XXXXX", this.leftSpaces, this.rightSpaces)
|
|
for (let index = 0; index < this.leftSpaces.length; index++) {
|
|
for (let index = 0; index < this.leftSpaces.length; index++) {
|
|
const element = this.leftSpaces[index];
|
|
const element = this.leftSpaces[index];
|
|
@@ -2263,7 +2263,7 @@
|
|
// moveOut:是否外移
|
|
// moveOut:是否外移
|
|
// moveValue: 移动距离
|
|
// moveValue: 移动距离
|
|
moveWall(spaceObj, direction, moveOut, moveValue){
|
|
moveWall(spaceObj, direction, moveOut, moveValue){
|
|
- console.log(`移动的空间的id-------:${spaceObj.spaceId};移动方向:${direction};是否外移:${moveOut};移动距离:${moveValue}`)
|
|
|
|
|
|
+ console.log(`移动的空间的id-------:${spaceObj.spaceId};移动方向:${direction};是否外移:${moveOut};移动距离:${moveValue}`,spaceObj)
|
|
const oldSpaceObj = JSON.parse(JSON.stringify(spaceObj))
|
|
const oldSpaceObj = JSON.parse(JSON.stringify(spaceObj))
|
|
|
|
|
|
const cube = this.gltfSpaces.find((item)=>{
|
|
const cube = this.gltfSpaces.find((item)=>{
|
|
@@ -2271,6 +2271,7 @@
|
|
})
|
|
})
|
|
|
|
|
|
if(!cube){
|
|
if(!cube){
|
|
|
|
+ console.warn("不存在 cube",this.gltfSpaces)
|
|
return
|
|
return
|
|
}
|
|
}
|
|
|
|
|