From 9e9e42ee8309ccd814a2d1f10538bfbc83a5a21e Mon Sep 17 00:00:00 2001 From: chenjingyu <1148019379@qq.com> Date: Fri, 22 Oct 2021 17:10:22 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=94=B9]=E5=9C=A8=E7=BA=BF=E7=BC=96?= =?UTF-8?q?=E5=88=B6word=E5=A4=9A=E8=A1=8C=E6=96=87=E6=9C=AC=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E8=A1=8C=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resultcompanyPlan.html | 2 +- .../create-plan-online-five.component.html | 240 ++++------ .../create-plan-online-five.component.scss | 131 +++--- .../create-plan-online-five.component.ts | 413 ++++++++++++++---- .../create-plan-online-five/updatal.html | 34 ++ .../plan-management/plan-management.module.ts | 3 +- .../plan-template.component.html | 8 +- src/assets/images/addyello.png | Bin 0 -> 447 bytes src/assets/images/delyello.png | Bin 0 -> 328 bytes src/assets/images/downyello.png | Bin 0 -> 339 bytes src/assets/images/uoyello.png | Bin 0 -> 342 bytes src/assets/images/updatabai.png | Bin 0 -> 298 bytes src/assets/images/updateyello.png | Bin 0 -> 328 bytes 13 files changed, 528 insertions(+), 303 deletions(-) create mode 100644 src/app/plan-management/create-plan-online-five/updatal.html create mode 100644 src/assets/images/addyello.png create mode 100644 src/assets/images/delyello.png create mode 100644 src/assets/images/downyello.png create mode 100644 src/assets/images/uoyello.png create mode 100644 src/assets/images/updatabai.png create mode 100644 src/assets/images/updateyello.png diff --git a/src/app/key-unit/key-unit-management/resultcompanyPlan.html b/src/app/key-unit/key-unit-management/resultcompanyPlan.html index 4159eb7..4cfb2ac 100644 --- a/src/app/key-unit/key-unit-management/resultcompanyPlan.html +++ b/src/app/key-unit/key-unit-management/resultcompanyPlan.html @@ -11,7 +11,7 @@
-

预案名称：{{planName}}

+

单位名称：{{planName}}

提交时间：{{createTime| date:'yyyy-MM-dd HH:mm:ss'||''}}

发起申请：{{organizationName ||''}}

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 2b4e290..bd0a257 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 @@ -266,7 +266,6 @@
-
@@ -435,12 +434,11 @@
-
- {{item.groupName}} + *ngIf="item.groupName!='单位概况'&&item.groupName!='交通水源'&&item.groupName!='重点图示'&&item.groupName!='预案附件'&&item.groupName!='封面'"> +
+ {{item.groupName}} + +
{{element.headName}} - - + + + + +
@@ -483,14 +482,16 @@ - + + + @@ -568,7 +569,7 @@
-
+ +
- + - +
@@ -614,7 +615,7 @@
- +
@@ -656,15 +657,15 @@
-
+
-->
-
{{item.groupName}} -
+
-->
-
- {{item.groupName}} -
-
-
- -
{{ i.name }}
- delete - -
-
- -
- {{i.cantent}} -
-
-
- -
- -
-
-
-
- {{item.groupName}} -
-
-
- -
{{ i.name }}
-
-
- -
- {{i.cantent}} -
-
-
-
-
+
{{element.surveyName}} + (click)='unitadd(element.surveyName,uniti,elei)' *ngIf="element.surveyName!='进攻通道'">
@@ -875,14 +803,15 @@
-
-
+
+
- + - + + -
{{info.value}}
-
-
-
-
-
-
- - - - - - - - - - -
{{info.propertyName}}{{info.propertyValue}}
+
+
@@ -933,17 +838,19 @@ width: 100%; background-color: #FFFBE8; text-align: center;"> - {{attack.name}} + + +
-
+
- - + + + -
{{info.value}}
+
@@ -968,9 +875,10 @@
-
- - +
+ + + -
{{info.value}}
+
- + @@ -1006,7 +914,7 @@ font-size: 16px; text-align: center;">{{info.value}} -
+
@@ -1028,7 +936,7 @@
- + @@ -1048,7 +956,7 @@
- + @@ -1073,7 +981,7 @@
- +
@@ -1095,7 +1003,7 @@
- + @@ -1118,7 +1026,7 @@
- +
@@ -1146,31 +1054,28 @@
- +
- + + +
@@ -1193,13 +1098,14 @@ - + + @@ -1277,7 +1183,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 e03f010..37d7deb 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 @@ -1,6 +1,34 @@ * { scrollbar-width: none; /* Firefox */ } +//黄色标题右侧添加删除按钮样式封装 +@mixin amg(){ + img { + cursor: pointer; + width: 18px; + height: 18px; + float: right; + margin-top: 10px; + margin-right: 10px; + } +} +//span标签通用 +@mixin span { + text-align: center; + font-size: 16px; + color: #2196F3; + height: 40px; + line-height: 40px; +} +//input标签 +@mixin input($backgroudcolor) { + height: 100%; + width: 100%; + font-size: 16px; + border: none; + outline: none; + background-color: $backgroudcolor; +} ::-webkit-scrollbar { display: none; /* Chrome Safari */ } @@ -259,11 +287,7 @@ text-align: center; background-color: #e1f1ff; span{ - text-align: center; - font-size: 16px; - color: #2196F3; - height: 40px; - line-height: 40px; + @include span() } } .newBody{ @@ -499,14 +523,7 @@ line-height: 40px; color: #b99a00; } - img { - cursor: pointer; - width: 20px; - height: 20px; - float: right; - margin-top: 10px; - margin-right: 10px; - } + @include amg() } .body { width: 100%; @@ -519,6 +536,16 @@ width: 100%; border-collapse: collapse; //background-color: #E8E9E9; + img{ + /* position: relative; + bottom: 30px; + left: 700px; */ + float: right; + width: 30px; + height: 26px; + margin-top: 12px; + cursor: pointer; + } } th { //background-color: #E8E9E9; @@ -735,14 +762,7 @@ line-height: 40px; color: #ffffff; } - img { - cursor: pointer; - width: 20px; - height: 20px; - float: right; - margin-top: 10px; - margin-right: 10px; - } + @include amg() } .body { width: 100%; @@ -764,14 +784,15 @@ line-height: 40px; color: #b99a00; } - img { + /* img { cursor: pointer; width: 20px; height: 20px; float: right; margin-top: 10px; margin-right: 10px; - } + } */ + @include amg() } .attackbody { width: 100%; @@ -823,15 +844,13 @@ width: 100%; display: flex; flex-direction: column; - - } .onetext{ - height: 40px; + height: 42px; width: 100%; - border-bottom: 1px solid #F2F4F5; + border-bottom: 1px solid #E8E9E9; span{ - height: 40px; + height: 100%; width: 40%; font-size: 16px; background-color: #F2F4F5; @@ -842,13 +861,13 @@ font-size: 16px; border: none; outline: none; - border-bottom: 1px solid #F2F4F5; + //border-bottom: 1px solid #E8E9E9; } img{ height: 20px; width: 20px; position: relative; - top: 10px; + top: 12px; } } .file{ @@ -858,7 +877,7 @@ height: 40px; width: 100%; background-color: #FFFBE8; - text-align: center; + span { font-size: 16px; text-align: center; @@ -866,6 +885,16 @@ line-height: 40px; color: #b99a00; } + input{ + height: 40px; + background-color: #FFFBE8; + font-size: 16px; + border: none; + outline: none; + color: #b99a00; + text-align: center; + } + @include amg() } .fileBody{ height: 100%; @@ -908,7 +937,12 @@ font-size: 16px; border: none; outline: none; - + } + img{ + height: 20px; + width: 20px; + position: relative; + //top: 12px; } } } @@ -930,14 +964,7 @@ background-color: #FFFBE8; color: #b99a00; } - img { - cursor: pointer; - width: 20px; - height: 20px; - float: right; - margin-top: 10px; - margin-right: 10px; - } + @include amg() } .partsBody{ width: 100%; @@ -1031,13 +1058,14 @@ width: 100%; height: 36px; line-height: 36px; - background-color: #e1f1ff; - text-align: center; - color: white; + background-color: #e8f4fe; + //text-align: center; + color: #2196F3; input { background-color: #e1f1ff; color: #2196F3; - text-align: center; + //text-align: center; + margin-left: 20px; height: 100%; width: 90%; font-size: 16px; @@ -1050,6 +1078,9 @@ top: 4px; cursor: pointer; } + span{ + margin-left: 20px; + } } .attack { width: 100%; @@ -1235,14 +1266,7 @@ line-height: 40px; color: #b99a00; } - img { - cursor: pointer; - width: 20px; - height: 20px; - float: right; - margin-top: 10px; - margin-right: 10px; - } + @include amg() } .body { width: 100%; @@ -1255,6 +1279,7 @@ width: 100%; border-collapse: collapse; //background-color: #E8E9E9; + } th { //background-color: #E8E9E9; @@ -1266,7 +1291,7 @@ background-color: #e8e9e9; text-align: center; height: 100%; - width: 100%; + width: 95%; font-size: 16px; border: none; outline: none; 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 d21a440..e0cca1e 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 @@ -62,6 +62,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit { if (this.route.snapshot.queryParams.pattern == 'false') { this.pattern = 'look' this.blockyl = false + this.clickTitleItem('单位概况') } else { this.pattern = 'edit' } @@ -249,6 +250,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit { selectedContent:any async clickTitleItem(item) { //this.planTemplateData[key].new=true + this.selectedContent = item this.addNumber = -1 this.yinruData = { @@ -372,9 +374,7 @@ export class CreatePlanOnlineFiveComponent implements OnInit { console.log(this.planTemplateData) - } /* else if (this.selectedItem == '单位概况') { - //this.getAllBuildings() - } */ else if (this.selectedItem == '预案附件') { + } else if (this.selectedItem == '预案附件') { this.getTwoDPlanList() }else if(this.selectedItem == '新建'){ const dialogRef = this.dialog.open(newTitle, {//调用open方法打开对话框并且携带参数过去 @@ -606,11 +606,27 @@ export class CreatePlanOnlineFiveComponent implements OnInit { element.attribute = [{ name: '特别警示', content: '' }] } } + if(element.groupName=='三位概况'){ + this.clickTitleItem('单位概况') + } }); if(this.planLevel=='4'){ this.planTemplateData.push({completed: true,groupName: '新建'}) } - + this.planTemplateData.forEach(element => { + if(element.attribute!=undefined){ + /* element.attribute.forEach((item,index,value) => { + if(value[index].level!=undefined&&value[index].level==1){ + value[index].lieNumber=value[index].tableth.length + } + }); */ + for(let i=0;i { + if(result!=undefined){ + //外层四种类型编辑行跟列 + if((num.length<3? this.planTemplateData[num[0]].attribute[num[1]]:this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).level==1){ + //表格类型编辑列数 + if((num.length<3? this.planTemplateData[num[0]].attribute[num[1]]:this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).tabletr==undefined){ + (num.length<3? this.planTemplateData[num[0]].attribute[num[1]]:this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).tabletr = [] + } + if((num.length<3? this.planTemplateData[num[0]].attribute[num[1]]:this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).tableth.length { + element.tabletd.push('') + }); + } + + } + }else{ + //表格类型减少列数 + for(let i=(num.length<3? this.planTemplateData[num[0]].attribute[num[1]]:this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).tableth.length;i>result.lieNumber;i--){ + (num.length<3? this.planTemplateData[num[0]].attribute[num[1]]:this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).tableth.splice(i-1,1) + if((num.length<3? this.planTemplateData[num[0]].attribute[num[1]]:this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).tabletr!=undefined){ + (num.length<3? this.planTemplateData[num[0]].attribute[num[1]]:this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).tabletr.forEach((element) => { + element.tabletd.splice(element.tabletd.length-1,1) + }); + } + } + } + }else if((num.length<3? this.planTemplateData[num[0]].attribute[num[1]]:this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).level==2){ + //多行文本编辑行列 + if((num.length<3? this.planTemplateData[num[0]].attribute[num[1]]:this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).tableth.lengthresult.hNumber;i--){ + (num.length<3? this.planTemplateData[num[0]].attribute[num[1]]:this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).tableth.splice(i-1,1) + } + } + + (num.length<3? this.planTemplateData[num[0]].attribute[num[1]]:this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]]).tableth.forEach((element,index,value) => { + if(value[index].lengthresult.lieNumber;a--){ + value[index].splice(index-1,1) + } + } + + }); + + } + + console.log(this.planTemplateData) + } + + }); + } + //新建内容向上排序 + upPai(zi,attributei){ + var temp + if(attributei!=0){ + for (let index = attributei-1; index >=0; index--) { + temp=this.planTemplateData[zi].attribute[index] + this.planTemplateData[zi].attribute[index]=this.planTemplateData[zi].attribute[attributei] + this.planTemplateData[zi].attribute[attributei]=temp + return + } + + } + } + //新建内容向下排序 + downPai(zi,attributei){ + var temp + if (attributei!=this.planTemplateData[zi].attribute.length-1) { + for (let index = attributei+1; index < this.planTemplateData[zi].attribute.length; index++) { + temp=this.planTemplateData[zi].attribute[index] + this.planTemplateData[zi].attribute[index]=this.planTemplateData[zi].attribute[attributei] + this.planTemplateData[zi].attribute[attributei]=temp + return + + } + + } } //单位概况左侧建筑点击事件 buildingName @@ -1236,61 +1363,117 @@ export class CreatePlanOnlineFiveComponent implements OnInit { // console.log(item, this.clicki) } //单位概况增加一行 - unitadd(surveyName, attacki, i) { -  let index = this.getArrayIndex(this.planTemplateData,'单位概况') - + unitadd(surveyName, attacki, i,fileNum?:number) { + let index = this.getArrayIndex(this.planTemplateData,'单位概况') this.addNumber++ - if (surveyName == '进攻通道') { - if (this.planTemplateData[index].building[attacki].body[4].attinf[i].tabletr == undefined) { - this.planTemplateData[index].building[attacki].body[4].attinf[i].tabletr = [] - } - this.planTemplateData[index].building[attacki].body[4].attinf[i].tabletr.push({ tabletd: [] }) - for (var j = 0; j < this.planTemplateData[index].building[attacki].body[4].attinf[i].tableth.length; j++) { - if (this.planTemplateData[index].building[attacki].body[4].attinf[i].tabletr != undefined) { - this.planTemplateData[index].building[attacki].body[4].attinf[i].tabletr[this.planTemplateData[index].building[attacki].body[4].attinf[i].tabletr.length - 1].tabletd.push('') - } - else { - this.planTemplateData[index].building[attacki].body[4].attinf[i].tabletr[this.addNumber].tabletd.push('') + this.planTemplateData[index].building[attacki].body.forEach((value,bodyi,arr)=>{ + if(surveyName==arr[bodyi].surveyName){ + if(arr[bodyi].zdy==undefined){ + if (surveyName == '进攻通道') { + if (this.planTemplateData[index].building[attacki].body[bodyi].attinf[i].tabletr == undefined) { + this.planTemplateData[index].building[attacki].body[bodyi].attinf[i].tabletr = [] + } + this.planTemplateData[index].building[attacki].body[bodyi].attinf[i].tabletr.push({ tabletd: [] }) + for (var j = 0; j < this.planTemplateData[index].building[attacki].body[bodyi].attinf[i].tableth.length; j++) { + if (this.planTemplateData[index].building[attacki].body[bodyi].attinf[i].tabletr != undefined) { + this.planTemplateData[index].building[attacki].body[bodyi].attinf[i].tabletr[this.planTemplateData[index].building[attacki].body[4].attinf[i].tabletr.length - 1].tabletd.push('') + } + else { + this.planTemplateData[index].building[attacki].body[bodyi].attinf[i].tabletr[this.addNumber].tabletd.push('') + } + } + + // console.log(this.planTemplateData) + } + else if (surveyName == '功能分区') { + // console.log(attacki) + this.planTemplateData[index].building[attacki].body[bodyi].attinf.push({ name: '', value: '' }) + } else if (surveyName == '重点部位') { + this.planTemplateData[index].building[attacki].body[bodyi].attinf.push({ heafName: '', body: [{ name: '重点部位名称', value: '' }, { name: '重点部位所在位置', value: '' }, { name: '建筑结构', value: '' }, { name: '使用性质', value: '' }, { name: '主要危险性', value: '' }] }) + } + else if(surveyName == '单位基本信息'||surveyName == '建筑信息'){ + this.planTemplateData[index].building[attacki].body[bodyi].attinf.push({ propertyName: '', value: '',completed:true,zdy:true }) + } else if(surveyName == '四周毗邻'){ + this.planTemplateData[index].building[attacki].body[bodyi].attinf.push({ name: '', value: '',completed:true,zdy:false }) + this.planTemplateData[index].building[attacki].body[bodyi].attinf.push({ name: '', value: '',completed:true,zdy:true }) + }else if(surveyName == '消防设施'){ + if(fileNum==0){ + this.planTemplateData[index].building[attacki].body[bodyi].attinf[i].facilityItems.push({ name: '', value: '',completed:true,zdy:true}) + }else{ + this.planTemplateData[index].building[attacki].body[bodyi].attinf.push({ propertyName: '', value: '',completed:true,zdy:true,facilityItems:[] }) + } + + } + }else{ + this.addAttribute(surveyName,attacki,i,1,surveyName) } + + } + }) + console.log(this.planTemplateData) + } + //单位概况自定义表格新增一行 + unitNewadd(...num:number[]){ + console.log(num) + if (this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]].tableth == undefined) { + //this.planTemplateData[key].attribute[i].tabletr = [] + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('请先编辑列!', '确定', config); + }else{ + if(this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]].tabletr == undefined){ + this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]].tabletr = [] + } + this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]].tabletr.push({ tabletd: [] }) + for(var j = 0; j < this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]].tableth.length; j++) { + if (this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]].tabletr != undefined) { + this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]].tabletr[this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]].tabletr.length - 1].tabletd.push('') + } + else { + this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]].tabletr[this.addNumber].tabletd.push('') } - - // console.log(this.planTemplateData) } - else if (surveyName == '功能分区') { - // console.log(attacki) - this.planTemplateData[index].building[attacki].body[6].attinf.push({ name: '', value: '' }) - } else if (surveyName == '重点部位') { - this.planTemplateData[index].building[attacki].body[5].attinf.push({ heafName: '', body: [{ name: '重点部位名称', value: '' }, { name: '重点部位所在位置', value: '' }, { name: '建筑结构', value: '' }, { name: '使用性质', value: '' }, { name: '主要危险性', value: '' }] }) } + //this.planTemplateData[num[0]].building[num[1]].body[num[2]].attinf[num[3]].push() } //单位概况删除一行 - unitDel(surveyName, attacki, i) { + unitDel(surveyName, attacki, i,fileNum?:number) { let index = this.getArrayIndex(this.planTemplateData,'单位概况') const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 let isTrue = confirm('您确定要删除该条信息吗') - if (surveyName == '进攻通道') { - if (isTrue) { - if (this.planTemplateData[index].building[attacki].body[4].attinf[i].tabletr != undefined) { - this.planTemplateData[index].building[attacki].body[4].attinf[i].tabletr.splice(this.planTemplateData[index].building[attacki].body[4].attinf[i].tabletr.length - 1, 1) - this.addNumber-- - if (this.planTemplateData[index].building[attacki].body[4].attinf[i].tabletr.length == 0) { - this.addNumber = -1 + this.planTemplateData[index].building[attacki].body.forEach((value,bodyi,arr) => { + if(surveyName==arr[bodyi].surveyName){ + if (surveyName == '进攻通道') { + if (isTrue) { + if (this.planTemplateData[index].building[attacki].body[bodyi].attinf[i].tabletr != undefined) { + this.planTemplateData[index].building[attacki].body[bodyi].attinf[i].tabletr.splice(this.planTemplateData[index].building[attacki].body[4].attinf[i].tabletr.length - 1, 1) + this.addNumber-- + if (this.planTemplateData[index].building[attacki].body[bodyi].attinf[i].tabletr.length == 0) { + this.addNumber = -1 + } + } else { + this.snackBar.open('请先增加一行!', '确定', config); + } } - } else { - this.snackBar.open('请先增加一行!', '确定', config); + } else if (surveyName == '功能分区'||surveyName=='重点部位'||surveyName=='单位基本信息'||surveyName=='建筑信息'||surveyName=='消防设施') { + if (isTrue) { + if(surveyName=='消防设施'&&fileNum!=undefined){ + this.planTemplateData[index].building[attacki].body[bodyi].attinf[i].facilityItems.splice(fileNum,1) + }else{ + this.planTemplateData[index].building[attacki].body[bodyi].attinf.splice(i, 1) + } + + } + }else if(surveyName == '四周毗邻'){ + this.planTemplateData[index].building[attacki].body[bodyi].attinf.splice(i, 1) + this.planTemplateData[index].building[attacki].body[bodyi].attinf.splice(i-1, 1) } } - } else if (surveyName == '功能分区') { - if (isTrue) { - this.planTemplateData[index].building[attacki].body[6].attinf.splice(i, 1) - } - } else if (surveyName == '重点部位') { - if (isTrue) { - this.planTemplateData[index].building[attacki].body[5].attinf.splice(i, 1) - } - } + }); + } //分段上传 @@ -1403,13 +1586,13 @@ export class CreatePlanOnlineFiveComponent implements OnInit { oldData = false clickoldData() { this.oldData = !this.oldData - } //新增功能(社会联动等引用) searchType = '0' //打开自定义新增具体内容 tuTrue=false - addAttribute(groupName,key){ + addAttribute(groupName,attacki?:any, i?:any,fileNum?:any,surveyName?:string){ + let index = this.getArrayIndex(this.planTemplateData,'单位概况') const dialogRef = this.dialog.open(disaster, {//调用open方法打开对话框并且携带参数过去 width: '340px', height:'450px', @@ -1419,24 +1602,29 @@ export class CreatePlanOnlineFiveComponent implements OnInit { dialogRef.afterClosed().subscribe(result => { console.log(result) if(result!=undefined){ - this.planTemplateData.forEach((value,index,array)=>{ - if(array[index].groupName==groupName){ - if(array[index].attribute==undefined){ - array[index].attribute=[] - array[index].attribute.push(result) - }else{ - array[index].attribute.push(result) - } - if(result.level==2){ - for(var i=0;i{ + if(array[index].groupName==groupName){ + if(array[index].attribute==undefined){ + array[index].attribute=[] + array[index].attribute.push(result) + }else{ + array[index].attribute.push(result) + } + if(result.level==2){ + for(var i=0;i { + console.log(result) + if(result!=undefined){ + this.planTemplateData.forEach((value,index,array)=>{ + if(array[index].groupName==groupName){ + if(array[index].attribute==undefined){ + array[index].attribute=[] + array[index].attribute.push(result) + }else{ + array[index].attribute.push(result) + } + if(result.level==2){ + for(var i=0;i,@Inject(MAT_DIALOG_DATA) public data,public snackBar: MatSnackBar) {} + ngOnInit(): void{ + JSON.parse(JSON.stringify(this.data)) + this.level=Number(this.data.level) + console.log(this.data) + } + level//类型 + headName=this.data.headName//表头名称 + lieNumber=this.data.zdy!=undefined?0:this.data.lieNumber//最小列数 + hNumber=this.data.zdy!=undefined?0:this.data.hNumber//行数 + //取消按钮 + close(){ + this.dialogRef.close(); + } + //确定按钮 + newdisaster(){ + console.log(this.data) + let result={ + lieNumber:this.level==2? this.data.tableth[0].length:this.data.tableth.length, + hNumber:this.data.tableth.length + } + this.dialogRef.close(result); + } } \ No newline at end of file diff --git a/src/app/plan-management/create-plan-online-five/updatal.html b/src/app/plan-management/create-plan-online-five/updatal.html new file mode 100644 index 0000000..0a3b90b --- /dev/null +++ b/src/app/plan-management/create-plan-online-five/updatal.html @@ -0,0 +1,34 @@ +
+
+ 修改内容 +
+
+ + + {{headName}} +
+
+ + + + +
+
+ + + + +
+
+ + + + +
+
+ + +
+
\ No newline at end of file diff --git a/src/app/plan-management/plan-management.module.ts b/src/app/plan-management/plan-management.module.ts index 9266f39..969afe1 100644 --- a/src/app/plan-management/plan-management.module.ts +++ b/src/app/plan-management/plan-management.module.ts @@ -72,12 +72,13 @@ import { KeyUnitModule } from '../key-unit/key-unit.module'; import { yinYong } from './create-plan-online-five/create-plan-online-five.component' import { newTitle } from './create-plan-online-five/create-plan-online-five.component' import { disaster } from './create-plan-online-five/create-plan-online-five.component' +import { updataHl } from './create-plan-online-five/create-plan-online-five.component' @NgModule({ declarations: [EntryPlanComponent, PassPlanComponent, OpenPlanComponent, EntryPlanLookComponent, AddPlanone, PlanType, AuditSatus, PlanLevel, DownloadFile, AuditResult, ChangeName, WebLookComponent, OnetwoEntryPlanComponent, newunitComponent, MeetPlanComponent, newunitMeet, TypePlanComponent, newunitType, PsViewer, onetwoAuditResult, meetAuditResult, typeAuditResult, MaintainUpComponent, GkPsViewer, GkhtmlPsViewer, UnitInfo, ReinforcePlanComponent, state, ImgDetails, CreatePlanOnlineFiveComponent, CreatePlanOnlineThreeComponent, - OpenPlanToolDialog,yinYong,newTitle,disaster], + OpenPlanToolDialog,yinYong,newTitle,disaster,updataHl], imports: [ CommonModule, PlanManagementRoutingModule, diff --git a/src/app/ui/plan-template/plan-template.component.html b/src/app/ui/plan-template/plan-template.component.html index de4d98b..4ddb7d7 100644 --- a/src/app/ui/plan-template/plan-template.component.html +++ b/src/app/ui/plan-template/plan-template.component.html @@ -19,7 +19,7 @@
-
+
{{item.unitname}}
@@ -66,7 +66,7 @@
- 编辑 + {{item.groupName=='单位概况'?'编辑':'新增'}}
@@ -92,7 +92,7 @@
+ *ngIf="item.groupName=='单位概况'&&(element.surveyName!='四周毗邻'&&element.surveyName!='重点部位'&&element.surveyName!='功能分区')"> 编辑
@@ -173,7 +173,7 @@ (click)='delattAndfileOne(item.groupName,element.surveyName,i)'> 删除 diff --git a/src/assets/images/addyello.png b/src/assets/images/addyello.png new file mode 100644 index 0000000000000000000000000000000000000000..dc78a140f0064fe724b1ee01eff342a57a7ead2f GIT binary patch literal 447 zcmV;w0YLtVP)Px$c}YY;R5(wql)+KLKoo|*mj<*Gu>#;i;HDLT2f}z#D-bF$SK>jaKs`C(B6JWs zumml@JZCpqTw+ul*_oZmyxn}e@89=+p=LbY(h{XF(4d%RWNM}`?+sa2e-l5jNND76 zBhcE!m9_mAj$BM(8NgL1B6G0~$UqdHfkR-05{Dxm{DaadCkU576L=M9JD3Ie5P`E! z#H=o57h5C@6z+VO1*M72xmgEEr;G{EaLA-0gN2ziyAf?M!Uk$nT7{9PP5D=vpyo4- z*wWL#KrXZ;oian{qnuVXDK~!)Dm1%CnHx}MUZn2C-$34aCid#eIvf@CVl@%2e-ayI z5{?*``|U*v5M*J*@&7>kNKIMqPi*)6t{$q|?EL&Y6{M-7Qrw#Aw)OYfBFYls;7={0 zyot~<{kGk-CCsFW5O;?>R-0CZ3+oOZq%a3>l+7EL-R)MKRXATV@m2oLpm)y87aQ?` p_5pGR*3_I26~2_^0kb+|`v55C%mY|98L0pO002ovPDHLkV1lKR!M6Ya literal 0 HcmV?d00001 diff --git a/src/assets/images/delyello.png b/src/assets/images/delyello.png new file mode 100644 index 0000000000000000000000000000000000000000..2294fb198893915f92725fb55186eae6ea07f5bc GIT binary patch literal 328 zcmV-O0k{5%P)Px$0!c(cR5(xVl)X{IKoEt$rwT*`lz>W*69f@1!48l@=m67!Q;7gdFcFp$xdf{d zS8&UmJYr-l8<~t5F1oq5`)>E`k2rFc1#`he7dCjiNtyP!sPFOPg*Y%OgLfGlZ(|}7 z+&MA2y=VR1Ppg87iOW5}7y}W;oPceEIYPuEut6;L>>ahryaBF`r8wx_sJ~Jx3k>5q z$(RjsE^}sxrzEA}_(Mdig2l9GqI)0<8vK!*1#SiJ;NQu}Ct) zR%{nAZpUM=M&7x4B^*t6BhtN}RkfeG`>cpgk)0$mSWAa1qL0vwSP&o1+HbaiQ70LZ a|L7A)pU2lo60wB<0000Px$4M{{nR5(w~lQC|>KoCXWkl;2PA)Fu_AvBKYas!~i5gnWWj^Ga26n0KQOha;m za09pjHHclbmK-ev)^ZbNtCeQ-^yklf!FpN5D?;McX}0_97Be1e_jK)^Yk$#fa6yPx$5J^NqR5(wqlRZ+xKoo$#M`mcn6X+4}2HGTa906@MZ9IV-fzAmO#uHE?G{Oz= z1nLd2bR6e7n@OBC(M@37YX9E1?|r)~IBl7dAq*qKaXGzA8Ph@Cebv4wui^w)$jFW( zLq5N_xpU&{l=@z>wrVDxk%T^FaT0 z6dE=*xo<~Bi9bNrQ77QpD;my1!`2J3fYp@#r_lQi7AQLlY0PLZ*_C%xbJP}gup?Ej z2QicKphiazDTz>b)a^34xMJ5D^e?5gg*4vU;~l;C59TgVluZ;fu6sXy#N3J07*qoM6N<$f~EY8Jpcdz literal 0 HcmV?d00001 diff --git a/src/assets/images/updatabai.png b/src/assets/images/updatabai.png new file mode 100644 index 0000000000000000000000000000000000000000..f009270e71cb3eaa97ea0624ec23118d494510ce GIT binary patch literal 298 zcmV+_0oDGAP)ihx70_i#CgG(zqdOjO^1tHB=aZReh$XbD?r$!lo6SDOqvIE= wn`&Lp{Px$0!c(cR5(wi)4OrPKoEf8f0;2couCd336G2tAc3I^Tm}#zN+4n&5gi~ppaeU$ z8Lj6SNuxXQIE3QePy0H-^NUtAe*cI}c>RNRd&GA!ReYQR5~T65i#>%bL|Kb)P*?#L z_7HNB?u4PKXun|SVt1i?ND2iC5sD-UL4V5mCgh8V(CUnd4PJt(ASI|OVnOd97POla zBQ#Og*>>E)7H8t#-*raYC9RqgDQtRU23gR4LB5?wNM2C}p?q~G%wDM^`>9(|Sc5PT z8lr^ePM%d_L1_y|t8eAU7qNzI+OwbwXLGSWkNW08`X-jPwwp6k;j=1m%~Lj#-_JXe aa{336A*%M}Cdd~60000
- +