From dcf53a7d4bf51e81db2a0a438d3abc5fa2c17822 Mon Sep 17 00:00:00 2001 From: liuxianghui <519646741@qq.com> Date: Thu, 21 Jul 2022 11:28:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=A6=81=E6=B1=82=EF=BC=8C?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=89=80=E6=9C=89=E4=B8=89=E7=BB=B4=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E6=9D=83=EF=BC=8C=E5=8F=AA=E7=95=99=E4=B8=8B=E8=B6=85?= =?UTF-8?q?=E7=BA=A7=E7=AE=A1=E7=90=86=E5=91=98=E5=8F=AF=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/babylon/controller/serve-manager.ts | 1 + src/app/pages/plan/plan.component.ts | 15 +++++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/app/babylon/controller/serve-manager.ts b/src/app/babylon/controller/serve-manager.ts index 93e4b6f..0d721f0 100644 --- a/src/app/babylon/controller/serve-manager.ts +++ b/src/app/babylon/controller/serve-manager.ts @@ -235,6 +235,7 @@ export class ServeManager { //#region 导出excel的信息 saveGasStationExcelData(exportData: ExportData) { + // console.log("保存导出信息:", exportData); this.buildingBISrv.postGasStationExcelData(DataManager.institutionData_simple.name, DataManager.institutionData_simple.id, exportData) .subscribe(data => { // console.log("保存导出信息成功:" + DataManager.institutionData_simple.id, `'${JSON.stringify(exportData)}'`); diff --git a/src/app/pages/plan/plan.component.ts b/src/app/pages/plan/plan.component.ts index cfc6484..4ebc584 100644 --- a/src/app/pages/plan/plan.component.ts +++ b/src/app/pages/plan/plan.component.ts @@ -73,6 +73,13 @@ export class PlanComponent implements OnInit { this.game.init(this.canvas); this.companyData = (JSON.parse(sessionStorage.getItem('userdataOfgasstation'))).organization || {} let editMode = sessionStorage.getItem('isGasStation') + let userdata = JSON.parse(sessionStorage.getItem('userdata')) + if (userdata.userName == 'superadmin') { //是superadmin,是内部制作账号 + editMode = "false"; //客户要求,关闭所有三维编辑权,只留下超级管理员可编辑 2022年7月21日 + } else { + editMode = "true"; + } + if (editMode == 'false') { this.editMode = true ModeManager.currentMode = ModeType.Edit @@ -157,7 +164,7 @@ export class PlanComponent implements OnInit { ngOnDestroy(): void { //组件销毁前 销毁canvas if (this.selectFence === 8) { //初始化 应急预案模块 this.initializePlan() - } + } this.game.pauseRender(); this.game = null; } @@ -265,8 +272,8 @@ export class PlanComponent implements OnInit { //监听inputValue change事件 changeTankFarmValue() { if (this.isShowChildComponent && this.leftDomain) { - this.leftDomain.FacilityList.forEach(item=>{ - item.getPropertyData().tankFarm != undefined? item.getPropertyData().tankFarm = this.tankFarm.content : null; + this.leftDomain.FacilityList.forEach(item => { + item.getPropertyData().tankFarm != undefined ? item.getPropertyData().tankFarm = this.tankFarm.content : null; }) } } @@ -496,7 +503,7 @@ export class PlanComponent implements OnInit { let institutionKey = `${this.companyData.id}` || "ceshi"; //单位id let buildingKey = this.buildingUIItems.find(item => { return item.getBuildingID() == this.beforeOneBuildingID }) let facility = this.beforeOnePropertyData - let url = DataManager.getResPath_facilityProperty(institutionKey, buildingKey? buildingKey.getBuildingID() : "building", facility.getType(), facility.getID(), null) + let url = DataManager.getResPath_facilityProperty(institutionKey, buildingKey ? buildingKey.getBuildingID() : "building", facility.getType(), facility.getID(), null) ServeManager.instance.openFileSelect(file, url, (name: string, path: string) => { //上传 this.beforeOnePropertyData.getPropertyData().img = ObjectsService.getFullPath(path + name) if (!this.beforeOnePropertyData.getPropertyData().is360) {