Browse Source

应急模板

dev
刘向辉 3 years ago
parent
commit
3818e516dd
  1. 15
      src/app/babylon/view/mark-window/mark-window.ts
  2. 1
      src/app/service/babylon/building-basic-infos.service.ts

15
src/app/babylon/view/mark-window/mark-window.ts

@ -17,6 +17,7 @@ import { IndoorStatus } from "../../controller/status/indoor-status";
import { StatusManager } from "../../controller/status/status-manager";
import { UIManager } from "../../controller/ui-manager";
import { ArcRotateCameraData } from "../../model/data/camera-data";
import { BuildingType } from "../../model/data/institution/building/building-data";
import { MarkData, MarkKindType, MarkTagPos, MarkType } from "../../model/data/mark/mark-data";
import { AllMarkPlanData, MarkNodeData, MarkPlanData, WeatherType, WindDirectionType, EnvironmentData, NatureData } from "../../model/data/mark/mark-plan-data";
import { MarkTemplate } from "../../model/data/mark/mark-template-data";
@ -1253,10 +1254,14 @@ export class MarkWindow extends UIBase {
}));
instance.clearEnterObserver(true);
let updateMark = false;//更新了标绘物 //为了复制功能,不再匹配key,而是在第一个主建筑进入时更新标绘物
for (let i = 0; i < StatusManager.s_currentStatus.buildingWindow.buildingUIItems.length; i++) {
let buildingInfo = StatusManager.s_currentStatus.buildingWindow.buildingUIItems[i].buildingInfo
instance.onEnterSuccess(buildingInfo, buildingInfo.buildingData.normalData.key);
if (!updateMark && buildingInfo.buildingData.buildingType == BuildingType.Normal) {
updateMark = true;
instance.onEnterSuccess(buildingInfo, buildingInfo.buildingData.normalData.key);
}
}
}
else {
@ -1327,12 +1332,9 @@ export class MarkWindow extends UIBase {
return;
}
instance.enterSuccessKey.set(key, buildingInfo);
for (let i = 0; i < environmentData.markDatas.length; i++) {
let markData = environmentData.markDatas[i];
//if (markData.belongtoBuildingId == key) {
//if (markData.belongtoBuildingId == key) { //为了复制功能,不再匹配key
this.createMark(0, markData, false, null, buildingInfo, true, null, (modelInfo: ModelInfo_mark) => {
modelInfo.showFollowUI(instance.isShowProperty3d);
});
@ -1617,6 +1619,7 @@ export class MarkWindow extends UIBase {
ServeManager.instance.getOneMarkTemplate(id, (data: any) => {
let value = plainToClass(MarkPlanData, data);
instance.allMarkPlanData.createPlanDataByTemplate(value);
instance.saveAllMarkPlanData();
})
}

1
src/app/service/babylon/building-basic-infos.service.ts

@ -157,7 +157,6 @@ export class BuildingBasicInfosService {
let headers = this.headers;
let l_body = `'${JSON.stringify(body)}'`;
console.log("postInfos", l_body, api);
return this.http.post<any>(api + this.c_post, l_body, { headers, params })
.pipe(

Loading…
Cancel
Save