From 6a3408c554af005b54c89e082a519bd15d4ed1b2 Mon Sep 17 00:00:00 2001 From: chenjingyu <1148019379@qq.com> Date: Fri, 12 Nov 2021 16:39:09 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E9=A2=84=E6=A1=88=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E4=BA=BA=E5=91=98=E5=AF=86=E9=9B=86=E4=BA=94=E7=BA=A7?= =?UTF-8?q?=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../create-plan-online-five.component.html | 4 +- .../create-plan-online-five.component.scss | 10 +- .../create-plan-online-five.component.ts | 12 +- .../combined-query.component.ts | 2 +- .../scheduled-updates.component.html | 4 +- .../plan-template.component.html | 2 + .../plan-template/plan-template.component.ts | 237 ++++++++++++++++++ 7 files changed, 259 insertions(+), 12 deletions(-) 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 769e37c..2387bf2 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 @@ -738,7 +738,7 @@ color: #ffffff;">{{element.surveyName}} + (click)='unitadd(element.surveyName,uniti,elei)' *ngIf="pattern == 'edit'&&element.surveyName!='进攻通道'">
@@ -823,7 +823,7 @@ height: 40px; width: 60%; font-size: 16px; - text-align: center;">{{info.value}} + text-align: center;">{{info.propertyValue}}
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 37d7deb..f5573d9 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 @@ -874,7 +874,7 @@ width: 100%; height: 100%; .fileHead{ - height: 40px; + height: 42px; width: 100%; background-color: #FFFBE8; @@ -928,9 +928,9 @@ } } .fourTexttwo{ - height: 40px; + height: 42px; width: 50%; - border-bottom: 1px solid #F2F4F5; + border-bottom: 1px solid #E8E9E9; input{ height: 40px; //width: 60%; @@ -973,9 +973,9 @@ flex-direction: column; .duohang{ width: 100%; - height: 40px; + height: 42px; display: flex; - //border-bottom: 1px solid #FFFFFF; + border-bottom: 1px solid #E8E9E9; .duohangHalf{ height: 40px; width: 50%; 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 6988466..6fa5a75 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 @@ -159,7 +159,11 @@ export class CreatePlanOnlineFiveComponent implements OnInit { data.items.forEach(element => { if (element.id == this.route.snapshot.queryParams.companyId) { this.unitData = element - if((this.unitData.buildingTypes[0].name=='高层建筑'||this.unitData.buildingTypes[0].name=='居民楼')&&this.planLevel=='5'){ + if((this.unitData.buildingTypes[0].name=='高层建筑'||this.unitData.buildingTypes[0].name=='居民小区'||this.unitData.buildingTypes[0].name=='厂房' + ||this.unitData.buildingTypes[0].name=='商市场'||this.unitData.buildingTypes[0].name=='医院'||this.unitData.buildingTypes[0].name=='学校' + ||this.unitData.buildingTypes[0].name=='宾馆'||this.unitData.buildingTypes[0].name=='娱乐场所'||this.unitData.buildingTypes[0].name=='餐饮业' + ||this.unitData.buildingTypes[0].name=='影剧院'||this.unitData.buildingTypes[0].name=='展览建筑'||this.unitData.buildingTypes[0].name=='养老院' + ||this.unitData.buildingTypes[0].name=='会议中心')&&this.planLevel=='5'){ this.zaixianDr=true } //console.log('单位列表信息', this.unitData) @@ -1701,7 +1705,11 @@ export class CreatePlanOnlineFiveComponent implements OnInit { config.duration = 3000 let formData = new FormData() formData.append("file", e.target.files[0]) - let type=this.unitData.buildingTypes[0].name=='高层建筑'?1:2 + let type=this.unitData.buildingTypes[0].name=='高层建筑'?1:this.unitData.buildingTypes[0].name=='居民小区'?2:this.unitData.buildingTypes[0].name=='厂房'?3 + :(this.unitData.buildingTypes[0].name=='商市场'||this.unitData.buildingTypes[0].name=='医院'||this.unitData.buildingTypes[0].name=='学校' + ||this.unitData.buildingTypes[0].name=='宾馆'||this.unitData.buildingTypes[0].name=='娱乐场所'||this.unitData.buildingTypes[0].name=='餐饮业' + ||this.unitData.buildingTypes[0].name=='影剧院'||this.unitData.buildingTypes[0].name=='展览建筑'||this.unitData.buildingTypes[0].name=='养老院' + ||this.unitData.buildingTypes[0].name=='会议中心')?4:5 let fileData={ type:this.unitData.buildingTypes[0].name=='高层建筑'?1:2, file:formData diff --git a/src/app/statistic-analysis/combined-query/combined-query.component.ts b/src/app/statistic-analysis/combined-query/combined-query.component.ts index c1b1950..6cb7d81 100644 --- a/src/app/statistic-analysis/combined-query/combined-query.component.ts +++ b/src/app/statistic-analysis/combined-query/combined-query.component.ts @@ -104,7 +104,7 @@ export class CombinedQueryComponent implements OnInit { TimeIntervalStart:this.dwaddtime||'', TimeIntervalEnd:this.dwendtime||'', BuildingTypeIds:this.unittype||[], - CompanyStatus:this.preparelevel||[], + CompanyStatuses:this.preparelevel||[], SortBy:'totalCount', SortType:this.integritySort } diff --git a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.html b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.html index d1c0b0b..dec496c 100644 --- a/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.html +++ b/src/app/statistic-analysis/scheduled-updates/scheduled-updates.component.html @@ -30,10 +30,10 @@
-
+
-
+
\ No newline at end of file diff --git a/src/app/ui/plan-template/plan-template.component.html b/src/app/ui/plan-template/plan-template.component.html index 9877f42..9ad49ec 100644 --- a/src/app/ui/plan-template/plan-template.component.html +++ b/src/app/ui/plan-template/plan-template.component.html @@ -93,6 +93,8 @@ + diff --git a/src/app/ui/plan-template/plan-template.component.ts b/src/app/ui/plan-template/plan-template.component.ts index 6bc8b7a..17dfbde 100644 --- a/src/app/ui/plan-template/plan-template.component.ts +++ b/src/app/ui/plan-template/plan-template.component.ts @@ -652,6 +652,243 @@ export class PlanTemplateComponent implements OnInit { const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 + let linshi=[ + { + "attribute": [ + { + "attinf": [ + { + "value": "", + "olddata": "", + "completed": false, + "propertyName": "统一社会信用代码", + "propertyType": 0 + }, + { + "value": "", + "olddata": "", + "completed": false, + "propertyName": "单位类型", + "propertyType": 0 + }, + { + "value": "", + "olddata": "", + "completed": true, + "propertyName": "单位地址", + "propertyType": 0, + "analysisWord": { + "valueAxis": [ 1, 1 ], + "tableIndex": 0, + "valueField": "propertyValue" + } + }, + { + "value": "", + "olddata": "", + "completed": true, + "propertyName": "联系人", + "propertyType": 0, + "analysisWord": { + "valueAxis": [ 1, 5 ], + "tableIndex": 0, + "valueField": "propertyValue" + } + }, + { + "value": "", + "olddata": "", + "completed": false, + "propertyName": "辖区中队", + "propertyType": 0 + }, + { + "value": "", + "olddata": "", + "completed": true, + "propertyName": "联系电话", + "propertyType": 0, + "analysisWord": { + "valueAxis": [ 1, 5 ], + "tableIndex": 0, + "valueField": "propertyValue" + } + } + ], + "completed": true, + "surveyName": "单位基本信息" + }, + { + "completed": false, + "surveyName": "建筑信息" + }, + { + "attinf": [ + { + "name": "东", + "value": "", + "analysisWord": { + "valueAxis": [ 2, 2 ], + "tableIndex": 0, + "valueField": "value" + } + }, + { + "name": "西", + "value": "", + "analysisWord": { + "valueAxis": [ 2, 4 ], + "tableIndex": 0, + "valueField": "value" + } + }, + { + "name": "南", + "value": "", + "analysisWord": { + "valueAxis": [ 3, 2 ], + "tableIndex": 0, + "valueField": "value" + } + }, + { + "name": "北", + "value": "", + "analysisWord": { + "valueAxis": [ 3, 4 ], + "tableIndex": 0, + "valueField": "value" + } + } + ], + "completed": true, + "surveyName": "四周毗邻" + }, + { + "completed": false, + "surveyName": "消防设施" + }, + { + "completed": false, + "surveyName": "进攻通道" + }, + { + "attinf": [ + { + "body": [ + { + "name": "重点部位名称", + "value": "" + }, + { + "name": "重点部位所在位置", + "value": "" + }, + { + "name": "建筑结构", + "value": "" + }, + { + "name": "使用性质", + "value": "" + }, + { + "name": "主要危险性", + "value": "" + } + ], + "heafName": "" + } + ], + "completed": false, + "surveyName": "重点部位" + }, + { + "attinf": [ + { + "name": "", + "value": "" + } + ], + "completed": false, + "surveyName": "功能分区" + }, + { + "zdy": true, + "attinf": [ + { + "level": "3", + "tableth": "", + "headName": "备注详情", + "analysisWord": { + "valueAxis": [ 4, 1 ], + "tableIndex": 0, + "valueField": "tableth" + } + } + ], + "completed": true, + "surveyName": "备注" + } + ], + "completed": true, + "groupName": "单位概况" + }, + { + "completed": false, + "groupName": "灾情设定" + }, + { + "completed": false, + "groupName": "力量调集" + }, + { + "completed": false, + "groupName": "组织指挥" + }, + { + "completed": false, + "groupName": "作战行动" + }, + { + "completed": false, + "groupName": "社会联动" + }, + { + "completed": false, + "groupName": "勤务保障" + }, + { + "completed": false, + "groupName": "特别警示" + }, + { + "completed": false, + "groupName": "辅助决策" + }, + { + "completed": true, + "groupName": "交通水源", + "manualWord": { + "valueAxis": [ 1, 6 ], + "KeyAxis": [ 0, 6 ], + "tableIndex": 0 + } + }, + { + "completed": true, + "groupName": "重点图示" + }, + { + "completed": false, + "groupName": "处置要点" + }, + { + "completed": false, + "groupName": "预案附件" + } + ] + let body={ id:this.Id, basicCategoryId:this.newleftTabledata[this.leftclicki].basicCategoryId,