|
|
@@ -548,6 +548,8 @@ export default {
|
|
|
|
|
|
if (curSpace.spaceWallInfo.wallN && curSpace.spaceWallInfo.wallS) {
|
|
|
spaceHeight -= 20 + parseFloat(cubeInfo.marginTop) + parseFloat(cubeInfo.marginBottom);
|
|
|
+ positionY += parseFloat(cubeInfo.marginTop) / 2 ;
|
|
|
+ positionY -= parseFloat(cubeInfo.marginBottom) / 2;
|
|
|
} else if (curSpace.spaceWallInfo.wallN) {
|
|
|
spaceHeight -= 10 + parseFloat(cubeInfo.marginTop) + parseFloat(cubeInfo.marginBottom);
|
|
|
positionY += 10 / 2;
|
|
|
@@ -579,6 +581,8 @@ export default {
|
|
|
|
|
|
if (curSpace.spaceWallInfo.wallW && curSpace.spaceWallInfo.wallE) {
|
|
|
spaceWidth -= 20 + parseFloat(cubeInfo.marginLeft) + parseFloat(cubeInfo.marginRight);
|
|
|
+ positionX += parseFloat(cubeInfo.marginLeft) / 2;
|
|
|
+ positionX -= parseFloat(cubeInfo.marginRight) / 2;
|
|
|
} else if (curSpace.spaceWallInfo.wallW) {
|
|
|
spaceWidth -= 10 + parseFloat(cubeInfo.marginLeft) + parseFloat(cubeInfo.marginRight);
|
|
|
positionX += 10 / 2;
|
|
|
@@ -914,10 +918,10 @@ export default {
|
|
|
}
|
|
|
|
|
|
// 边距
|
|
|
- oldCubeInfo.marginLeft = cubeInfo.marginTop;
|
|
|
- oldCubeInfo.marginTop = cubeInfo.marginRight;
|
|
|
- oldCubeInfo.marginRight = cubeInfo.marginBottom;
|
|
|
- oldCubeInfo.marginBottom = cubeInfo.marginLeft;
|
|
|
+ oldCubeInfo.marginLeft = cubeInfo.marginBottom;
|
|
|
+ oldCubeInfo.marginTop = cubeInfo.marginLeft;
|
|
|
+ oldCubeInfo.marginRight = cubeInfo.marginTop;
|
|
|
+ oldCubeInfo.marginBottom = cubeInfo.marginRight;
|
|
|
oldCubeInfo.modelWidth = cubeInfo.modelHeight;
|
|
|
oldCubeInfo.modelHeight = cubeInfo.modelWidth;
|
|
|
|
|
|
@@ -1037,6 +1041,7 @@ export default {
|
|
|
|
|
|
// 合适的布局更现有布局相同
|
|
|
if(spaceObj.layoutId == layoutObj.id){
|
|
|
+ this.calculateLayoutModelSize() // 提前计算模型的位置
|
|
|
this.changeLayoutModelState(true); // 显示家具模型
|
|
|
return resolve()
|
|
|
}
|
caodongdong