odjbin/tunnel-cloud-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

唐润平：模型接口重写

Browse Source
This commit is contained in:
trp
2023-12-29 13:39:23 +08:00
parent 20bfc32d08 7d3aa9ef46
commit 196eac3cee
9 changed files with 221 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/content/tunnelScene/request/index.js
View File

@@ -36,7 +36,6 @@ export const saveEquipment = (equipmentInfo, pointGap) => {
} = originData;
let tempModelEquipmentList = [...modelEquipmentList]; //数组克隆
tempModelEquipmentList.push(toRaw(equipmentInfo));
return new Promise((resolve, reject) => {
apiSaveEquipment({
constructionLength: autoComputeConstructionLength(
@@ -70,6 +69,13 @@ export const deleteEquipment = (equipmentId, pointGap) => {
tempModelEquipmentList = tempModelEquipmentList.filter(
(item) => item.equipmentId != equipmentId
);
console.log(
"del",
modelEquipmentList,
tempModelEquipmentList,
"id",
equipmentId
);
const {
constructionLength,
isDefault,
@@ -123,6 +129,5 @@ function autoComputeConstructionLength(modelEquipmentList, pointGap) {
maxLength = length;
}
});
console.log("max", maxLength);
return maxLength;
}

68
src/components/content/tunnelScene/sceneClass/editEquipment/index.js
View File

@@ -67,40 +67,40 @@ function handleOtherEqu(targetPoint, equipmentInfo) {
targetPoint.scale.set(0.03, 0.06, 0.05);
this.scene.add(equMesh);
targetPoint.visible = false;
targetPoint.hasWall = true;
//处理风压阀的代码片段
let lineIndex = targetPoint.name.slice(7, 9);
for (let line = Number(lineIndex); line <= 20; line++) {
if (line < 10) {
let wall = "wall_" + "0" + line;
this.scene.getObjectByName(wall).visible = true;
let point = "point_" + "00" + line + "_tc";
this.scene.getObjectByName(point).visible = false;
this.scene.getObjectByName(point).layers.set(-2);
if (this.scene.getObjectByName(point).hasDevice == true) {
let EquID = this.scene.getObjectByName(point).info.id;
this.scene.getObjectById(EquID).visible = false;
}
} else if (line >= 10) {
let wall = "wall_" + line;
this.scene.getObjectByName(wall).visible = true;
let point = "point_" + "0" + line + "_tc";
this.scene.getObjectByName(point).visible = false;
this.scene.getObjectByName(point).layers.set(-2);
if (this.scene.getObjectByName(point).hasDevice == true) {
let EquID = this.scene.getObjectByName(point).info.id;
this.scene.getObjectById(EquID).visible = false;
}
}
//处理21行的设备和附着点
let point = "point_" + "0" + 21 + "_tc";
this.scene.getObjectByName(point).visible = false;
this.scene.getObjectByName(point).layers.set(-2);
if (this.scene.getObjectByName(point).hasDevice == true) {
let EquID = this.scene.getObjectByName(point).info.id;
this.scene.getObjectById(EquID).visible = false;
}
}
// targetPoint.hasWall = true;
// //处理风压阀的代码片段
// let lineIndex = targetPoint.name.slice(7, 9);
// for (let line = Number(lineIndex); line <= 20; line++) {
// if (line < 10) {
// let wall = "wall_" + "0" + line;
// this.scene.getObjectByName(wall).visible = true;
// let point = "point_" + "00" + line + "_tc";
// this.scene.getObjectByName(point).visible = false;
// this.scene.getObjectByName(point).layers.set(-2);
// if (this.scene.getObjectByName(point).hasDevice == true) {
// let EquID = this.scene.getObjectByName(point).info.id;
// this.scene.getObjectById(EquID).visible = false;
// }
// } else if (line >= 10) {
// let wall = "wall_" + line;
// this.scene.getObjectByName(wall).visible = true;
// let point = "point_" + "0" + line + "_tc";
// this.scene.getObjectByName(point).visible = false;
// this.scene.getObjectByName(point).layers.set(-2);
// if (this.scene.getObjectByName(point).hasDevice == true) {
// let EquID = this.scene.getObjectByName(point).info.id;
// this.scene.getObjectById(EquID).visible = false;
// }
// }
// //处理21行的设备和附着点
// let point = "point_" + "0" + 21 + "_tc";
// this.scene.getObjectByName(point).visible = false;
// this.scene.getObjectByName(point).layers.set(-2);
// if (this.scene.getObjectByName(point).hasDevice == true) {
// let EquID = this.scene.getObjectByName(point).info.id;
// this.scene.getObjectById(EquID).visible = false;
// }
// }
// this.scene.getObjectByName('wall_01').visible = true
// console.log(this.scene);
// 保存该设备模型id，后期直接从附附着点进行删除

17
src/components/content/tunnelScene/sceneClass/editTunnelInit/index.js
View File

@@ -1,21 +1,6 @@
export function editTunnelInit(equipmentList) {
//初始化将墙壁隐藏起来
// for (let line = 1; line <= 20; line++) {
// if (line < 10) {
// let wall = 'wall_' + '0' + line
// this.scene.getObjectByName(wall).visible = false
// } else if (line >= 10) {
// let wall = 'wall_' + line
// this.scene.getObjectByName(wall).visible = false
// }
// }
equipmentList.forEach((item) => {
const formInfo = {
equipmentType: item.equipmentType, //设备类型
chooseEquipment: item.chooseEquipment, //设备选择(设备名称)
threshold: item.threshold,
};
this.addEquipment(this.scene.getObjectByName(item.position), formInfo);
this.addEquipment(this.scene.getObjectByName(item.position), item);
});
}