From 70ab48eceee7db29bde8140ae7b3b2b8cbae9d8b Mon Sep 17 00:00:00 2001 From: chenjingyu <1148019379@qq.com> Date: Wed, 12 Jan 2022 10:55:15 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E9=A2=84?= =?UTF-8?q?=E6=A1=88=E5=AE=A1=E6=A0=B8=E6=A8=A1=E5=9D=97=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../key-unit-management.component.ts | 2 +- .../plan-record/plan-record.component.html | 19 +++- .../plan-record/plan-record.component.scss | 11 ++- .../plan-record/plan-record.component.ts | 4 +- .../wait-examineer.component.html | 98 +++++++++++-------- .../wait-examineer.component.scss | 10 +- .../wait-examineer.component.ts | 4 +- .../create-plan-online-five.component.html | 70 +++++++------ .../create-plan-online-five.component.ts | 4 +- .../entry-plan-look.component.ts | 4 +- 10 files changed, 130 insertions(+), 96 deletions(-) diff --git a/src/app/key-unit/key-unit-management/key-unit-management.component.ts b/src/app/key-unit/key-unit-management/key-unit-management.component.ts index 5a90430..76c1fdc 100644 --- a/src/app/key-unit/key-unit-management/key-unit-management.component.ts +++ b/src/app/key-unit/key-unit-management/key-unit-management.component.ts @@ -744,7 +744,7 @@ export class KeyUnitManagementComponent implements OnInit { console.log(element) let body:any = { title:element.name, - Operation:element.contentVerify==null? 0:1, + Operation:element.contentVerify==null&&element.isNewData? 0:1, itemId:element.id, verifyState:3, contentType:11 diff --git a/src/app/plan-audit/plan-record/plan-record.component.html b/src/app/plan-audit/plan-record/plan-record.component.html index 74cb863..3e17754 100644 --- a/src/app/plan-audit/plan-record/plan-record.component.html +++ b/src/app/plan-audit/plan-record/plan-record.component.html @@ -46,7 +46,14 @@ 联动力量 - 编制级别： + 状态： + + + 新增 + 维护更新 + + + 编制级别： {{item.name}} @@ -104,9 +111,10 @@
- + + - + @@ -117,14 +125,15 @@
类型状态类型 预案类型名称名称 操作 所属组织 审核状态
- + - +
+ {{item.itemMaintenanceState=='0'?'新增':'维护'}} {{item.contentType=='1'?'Ⅰ级预案':item.contentType=='2'?'Ⅱ级预案':item.contentType=='3'?'Ⅲ级预案':item.contentType=='4'?'Ⅳ级预案':item.contentType=='5'? 'Ⅴ级预案':item.contentType=='6'?'应急预案（国家级）':item.contentType=='7'?'应急预案（市级）':item.contentType=='8'?'类型预案':item.contentType=='11'?'重点单位':item.contentType=='12'?'水源':item.contentType=='13'?'消防力量':item.contentType=='14'?'联动力量':'未知'}} {{item.planType=='1'?'二维预案':item.planType=='2'?'三维预案':item.planType=='4'?'其它预案':item.planType=='16'?'文本预案':''}} {{item.title}}{{item.title}} {{item.operation=='0'?'新增':item.operation=='1'?'更新':'删除'}} {{item.organizationName}} {{item.verifyState=='0'?'待初审':item.verifyState=='1'? diff --git a/src/app/plan-audit/plan-record/plan-record.component.scss b/src/app/plan-audit/plan-record/plan-record.component.scss index 17424ce..9d0a39d 100644 --- a/src/app/plan-audit/plan-record/plan-record.component.scss +++ b/src/app/plan-audit/plan-record/plan-record.component.scss @@ -118,6 +118,7 @@ } } .headthree{ + height: 45px; @media screen and (min-device-width:1400px){ margin-left: 30px; @@ -125,13 +126,13 @@ @media screen and (max-device-width:1200px){ font-size: 13px; mat-form-field{ - width: 120px; + width: 50px; } } @media screen and (max-device-width:1400px) and (min-device-width:1200px){ margin-left: 15px; mat-form-field{ - width: 120px; + width: 50px; } } } @@ -188,6 +189,7 @@ } } } + .tablediv{ width: 100%; height: 100%; @@ -326,4 +328,7 @@ th,td{ } ::-webkit-scrollbar-thumb{ background-color: #2196F3; - } \ No newline at end of file + } + .mat-form-field-infix{ + width: 100px; +} \ No newline at end of file diff --git a/src/app/plan-audit/plan-record/plan-record.component.ts b/src/app/plan-audit/plan-record/plan-record.component.ts index 546791b..f683be1 100644 --- a/src/app/plan-audit/plan-record/plan-record.component.ts +++ b/src/app/plan-audit/plan-record/plan-record.component.ts @@ -93,6 +93,7 @@ export class PlanRecordComponent implements OnInit { fetchUrl companyName plantypes + IsNewData=[true,false] //获取表格数据 getAlltabledate() { @@ -103,7 +104,8 @@ export class PlanRecordComponent implements OnInit { verifyState: this.verifyState || [1, 2, 4, 5], QueryStartTime: this.addtime || '', QueryEndTime: this.endtime || '', - PlanType:this.plantypes||[] + PlanType:this.plantypes||[], + IsNewData:this.IsNewData } this.http.get("/api/ContentVerifies", { params: paramsdata }).subscribe((data: any) => { //console.log(data) diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.html b/src/app/plan-audit/wait-examineer/wait-examineer.component.html index 873c99e..3e3d469 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.html +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html @@ -39,7 +39,14 @@
- 预案类型： + 状态： + + + 新增 + 维护更新 + + + 预案类型： 二维预案 @@ -48,6 +55,7 @@ 文本预案 + @@ -56,52 +64,56 @@
-
- - - - - - - - - - - + + +
+
类型预案类型名称操作所属组织审核状态提交人提交时间
+ + + + + + + + + + + +
状态类型预案类型名称操作所属组织审核状态提交人提交时间
+
+ + + + + + + + + + + +
+ + + {{item.itemMaintenanceState=='0'?'新增':'维护'}} + + {{item.contentType=='1'?'Ⅰ级预案':item.contentType=='2'?'Ⅱ级预案':item.contentType=='3'?'Ⅲ级预案':item.contentType=='4'?'Ⅳ级预案':item.contentType=='5'? + 'Ⅴ级预案':item.contentType=='6'?'应急预案（国家级）':item.contentType=='7'?'应急预案（市级）':item.contentType=='8'?'类型预案':item.contentType=='11'?'重点单位':item.contentType=='12'?'水源':item.contentType=='13'?'消防力量':item.contentType=='14'?'联动力量':'未知'}} + + {{item.planType=='1'?'二维预案':item.planType=='2'?'三维预案':item.planType=='4'?'其它预案':item.planType=='16'?'文本预案':''}} + {{item.title}} + {{item.operation=='0'?'新增':item.operation=='1'?'更新':'删除'}}{{item.organizationName}} + {{item.verifyState=='0'?'待初审':item.verifyState=='1'? + '初审通过':item.verifyState=='2'?'初审驳回':item.verifyState=='3'?'待终审':item.verifyState=='4'?'终审通过':'终审驳回'}} + {{item.creatorName}}{{item.createTime|date:'yyyy-MM-dd'}}
-
- - - - - - - - - - - -
- - - {{item.contentType=='1'?'Ⅰ级预案':item.contentType=='2'?'Ⅱ级预案':item.contentType=='3'?'Ⅲ级预案':item.contentType=='4'?'Ⅳ级预案':item.contentType=='5'? - 'Ⅴ级预案':item.contentType=='6'?'应急预案（国家级）':item.contentType=='7'?'应急预案（市级）':item.contentType=='8'?'类型预案':item.contentType=='11'?'重点单位':item.contentType=='12'?'水源':item.contentType=='13'?'消防力量':item.contentType=='14'?'联动力量':'未知'}} - - {{item.planType=='1'?'二维预案':item.planType=='2'?'三维预案':item.planType=='4'?'其它预案':item.planType=='16'?'文本预案':''}} - {{item.title}} - {{item.operation=='0'?'新增':item.operation=='1'?'更新':'删除'}}{{item.organizationName}} - {{item.verifyState=='0'?'待初审':item.verifyState=='1'? - '初审通过':item.verifyState=='2'?'初审驳回':item.verifyState=='3'?'待终审':item.verifyState=='4'?'终审通过':'终审驳回'}} - {{item.creatorName}}{{item.createTime|date:'yyyy-MM-dd'}}
-
+
-
-
diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.scss b/src/app/plan-audit/wait-examineer/wait-examineer.component.scss index 4b9ebc4..89f01ff 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.scss +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.scss @@ -85,7 +85,7 @@ } .find{ @media screen and (min-device-width: 1400px){ - margin-left: 100px; + margin-left: 200px; } } @media screen and (min-device-width: 1400px) { @@ -132,13 +132,11 @@ } .tablediv { width: 100%; - height: 70%; + height: 62%; .tbodycss { - @media screen and (min-device-width: 1400px) { - overflow-y: auto; - } + overflow-y: auto; - height: 600px; + height: 100%; width: 100%; .selectedTr { background-color: #b3d3ee; diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts index 9440632..72dd752 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts @@ -110,6 +110,7 @@ export class WaitExamineerComponent implements OnInit { fetchUrl companyName plantypes + IsNewData=[true,false] //获取表格数据 getAlltabledate() { @@ -118,7 +119,8 @@ export class WaitExamineerComponent implements OnInit { ContentType: Number(this.projectlevel) || [], Level: this.PlanLevel || [], verifyState: [0, 3], - PlanType:this.plantypes||[] + PlanType:this.plantypes||[], + IsNewData:this.IsNewData } this.http.get("/api/ContentVerifies", { params: paramsdata }).subscribe((data: any) => { this.tableDate = data.items 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 2b6ecd6..490a57a 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 @@ -520,24 +520,27 @@ - - - - - -
- {{itemthj.head}} - - {{itemthj.body}} -
+
+ + + + + + +
+ {{itemthj.head}} + {{itemthj.body}} +
@@ -1137,24 +1140,27 @@ - - - - - -
- {{itemthj.head}} - - {{itemthj.body}} -
+ + + + + + + +
+ {{itemthj.head}} + {{itemthj.body}} +
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 cc6bf19..a6147b8 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 @@ -587,8 +587,8 @@ export class CreatePlanOnlineFiveComponent implements OnInit { } getTemplateData() { this.http.get(`/api/PlanComponents/${this.route.snapshot.queryParams.planId}/WebText`).subscribe((data: any) => { - console.log('预案内容', data) - if(this.route.snapshot.queryParams.haveNew!=undefined&&this.route.snapshot.queryParams.planMode==4){ + console.log('预案内容', data.webTextData) + if(this.route.snapshot.queryParams.planMode==4&&data.webTextData==null){ this.planTemplateData=[] let obj = { completed: true, 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 080d621..6c963a1 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 @@ -191,7 +191,7 @@ export class EntryPlanLookComponent implements OnInit { else if (e.planType == 16) { if (e.attachmentUrls == null) { if(e.planMode==4){ - 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}&pattern=true&haveNew=true&planMode=${e.planMode}`) + 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}&pattern=true&planMode=${e.planMode}`) }else{ 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}&pattern=true&planMode=${e.planMode}`) } @@ -308,7 +308,7 @@ export class EntryPlanLookComponent implements OnInit { else if (e.planType == 16) { if (e.attachmentUrls == null) { if(e.planMode==4){ - 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}&pattern=true&haveNew=true&planMode=${e.planMode}`) + 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}&pattern=true&planMode=${e.planMode}`) }else{ 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}&pattern=true&planMode=${e.planMode}`) }