From b3e28a0e7ac4fa4c9c385c1f6a33ce5e91afd46c Mon Sep 17 00:00:00 2001 From: SHAOJIAHAO <55341701@qq.com> Date: Tue, 29 Jun 2021 09:29:28 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E4=BF=AE=E5=A4=8D=E6=B6=88?= =?UTF-8?q?=E9=98=B2=E8=AE=BE=E6=96=BD=E8=BE=93=E5=85=A5=E6=A1=86=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fire-fighting-device.component.ts | 2 +- .../create-plan-online-five.component.html | 42 +++++++-- .../create-plan-online-five.component.scss | 3 + .../create-plan-online-five.component.ts | 89 +++++++++++++----- .../create-plan-online-five/openPlanTool.html | 19 ++-- .../entry-plan-look.component.ts | 5 +- .../collection-tools.component.ts | 4 +- src/assets/images/2Dplan.png | Bin 0 -> 8045 bytes 8 files changed, 116 insertions(+), 48 deletions(-) create mode 100644 src/assets/images/2Dplan.png diff --git a/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.ts b/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.ts index 557341f..a07ce50 100644 --- a/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.ts +++ b/src/app/key-unit/fire-fighting-device/fire-fighting-device.component.ts @@ -520,7 +520,7 @@ export class FireFightingDeviceComponent implements OnInit { }else if(item.name == '其它设施'){ putBody = returnBody(this.otherFacilities,'其它设施') }else if(item.name == '自动消防设施'){ - putBody = returnBody(this.otherFacilities,'自动消防设施') + putBody = returnBody(this.automaticFireProtectionFacility,'自动消防设施') } if(putBody.length != 0){ this.http.put('/api/BuildingFacilities/FacilityStatUpdate',putBody,{ diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html index aa1c378..6009892 100644 --- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html +++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.html @@ -1,11 +1,11 @@
-
+
1.封面
+ [ngClass]="{'selectedItem': selectedItem == item.groupName}" [title]="item.groupName"> {{key + 2}}.{{item.groupName}}
@@ -38,7 +38,7 @@
-
@@ -63,7 +63,7 @@
-
@@ -141,6 +141,35 @@
+
+
+ 预案附件 +
+
+
+ + + + + 二维预案列表 + + +
+
+
+ +
+

{{TwoDPlan.name}}

+
+
+
+
+
+
+
建筑列表 @@ -256,9 +285,8 @@
-
+ *ngIf="item.groupName!='单位概况'&&item.groupName!='交通水源'&&item.groupName!='重点图示'&&item.groupName!='预案附件'&&item.groupName!='特别警示'&&item.groupName!='处置要点'">
{{item.groupName}}
@@ -313,7 +341,7 @@
-
+
diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss index 17fb3f2..1306561 100644 --- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss +++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.scss @@ -42,6 +42,9 @@ box-sizing: border-box; padding: 0 10px; font-size: 14px; + overflow: hidden; /*超出部分隐藏*/ + white-space: nowrap; /*不换行*/ + text-overflow: ellipsis; /*超出部分文字以...显示*/ } .item:hover { background: #e8f4fe; diff --git a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts index f666237..697d2a7 100644 --- a/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts +++ b/src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts @@ -78,11 +78,32 @@ export class CreatePlanOnlineFiveComponent implements OnInit { this.getAllBuildings() this.getSitePlan() this.getRealPicture() - }else if(this.selectedItem == '单位概况'){ + } else if (this.selectedItem == '单位概况') { //this.getAllBuildings() + } else if (this.selectedItem == '预案附件') { + this.getTwoDPlanList() } } + //获取当前单位的二维预案 + TwoDPlanList: any + getTwoDPlanList() { + let paramsData = { + companyId: this.route.snapshot.queryParams.companyId, + pageSize: "999" + } + this.http.get("/api/PlanComponents", { params: paramsData }).subscribe((data: any) => { + this.TwoDPlanList = data.items.filter((item) => { + return item.planType == 1 + }) + console.log(this.TwoDPlanList) + }) + } + + + + + //获取实景图 allRealPicture getRealPicture() { @@ -125,10 +146,11 @@ export class CreatePlanOnlineFiveComponent implements OnInit { planTemplateData: any //获得模板信息 getTemplateData() { - this.http.get('/api/PlanTemplate').subscribe(data => { - this.planTemplateData = JSON.parse(data[2].data).filter(item => - item.completed == true - ) + this.http.get(`/api/PlanComponents/${this.route.snapshot.queryParams.planId}/WebText`).subscribe(data => { + console.log('预案内容',data) + // this.planTemplateData = JSON.parse(data.webdata).filter(item => + // item.completed == true + // ) console.log(this.planTemplateData) this.planTemplateData.forEach(element => { if (element.groupName == '重点图示') { @@ -141,6 +163,11 @@ export class CreatePlanOnlineFiveComponent implements OnInit { element.attribute = [{ name: '', imgArr: [] }] } } + if (element.groupName == '预案附件') { + if (!element.attribute) { + element.attribute = [{ name: '', imgArr: [] }] + } + } if (element.groupName == '处置要点') { if (!element.attribute) { element.attribute = [{ name: '', content: '' }] @@ -153,6 +180,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit { } }); }) + } @@ -166,7 +194,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit { } //通过左侧查看实景图 gallery - lookkeyImgItemLeft(key1, key2,i) { + lookkeyImgItemLeft(key1, key2, i) { let dom = document.getElementById(`viewerjs`) let pObjs = dom.childNodes; let node = document.createElement("img") @@ -243,12 +271,12 @@ export class CreatePlanOnlineFiveComponent implements OnInit { }) }) this.allBuildings = data - this.planTemplateData[0].building=[] - for(var i=0;i -
- -
- - -
- -
-
\ No newline at end of file +
+ +
+
+ +
+
+ +
\ No newline at end of file diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts index 9eb53dc..e90a214 100644 --- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts +++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.ts @@ -94,7 +94,7 @@ export class EntryPlanLookComponent implements OnInit { ngOnInit(): void { this.tabledataSource = [ ] - // this.getCompanyData() + this.getCompanyData() this.isoperation = this.route.snapshot.queryParams.operation this.unitdata.unitname = this.route.snapshot.queryParams.unitName this.unitdata.organizationName = this.route.snapshot.queryParams.orName @@ -207,7 +207,8 @@ export class EntryPlanLookComponent implements OnInit { } else if (e.planType == 16) { if (e.attachmentUrls == null) { - window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}&planId=${e.id}`) + console.log(this.compantData) + window.open(`/planManagement/createplanonlinefive?navIsOpen=false&companyId=${this.companyId}&planName=${e.name}&unitName=${this.unitdata.unitname}&planCategory=${e.planCategory}&planId=${e.id}&unitTypeId=${this.compantData.buildingTypes[0].id}&orName=${this.compantData.organizationName}&orId=${this.compantData.organizationId}`) } else { let body = {}; diff --git a/src/app/ui/collection-tools/collection-tools.component.ts b/src/app/ui/collection-tools/collection-tools.component.ts index 7771edd..5cd37cb 100644 --- a/src/app/ui/collection-tools/collection-tools.component.ts +++ b/src/app/ui/collection-tools/collection-tools.component.ts @@ -662,8 +662,8 @@ export class CollectionToolsComponent implements OnInit { }//多个素材共同属性 multipleAssetData: any//当前多选的素材 firstMultipleAssetData: any//当前多选的第一个素材 - organizationName: any = this.route.snapshot.queryParams.orName//当前预案单位所属机构名称 - organizationId: any = this.route.snapshot.queryParams.orId//当前预案单位所属机构名称 + organizationName: any = this.route.snapshot.queryParams.orName || sessionStorage.getItem('orName')//当前预案单位所属机构名称 + organizationId: any = this.route.snapshot.queryParams.orId || sessionStorage.getItem('orId')//当前预案单位所属机构名称 ngOnInit(): void { this.canvasData.isInheritSky = { weather: '', airTemperature: '', windDirection: '', windScale: '', }; //缓存 节点 天气 AxMessageSystem.addListener('selectionChanged', () => { diff --git a/src/assets/images/2Dplan.png b/src/assets/images/2Dplan.png new file mode 100644 index 0000000000000000000000000000000000000000..d3ff80e155de0f51e9099ba146c0312872a8cc73 GIT binary patch literal 8045 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 literal 0 HcmV?d00001