From 9d2b72b545dad7a30e3ac650f403e5f2327bf151 Mon Sep 17 00:00:00 2001 From: chenjingyu Date: Tue, 24 Aug 2021 15:35:09 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E4=B8=89=E5=9B=9B=E4=BA=94?= =?UTF-8?q?=E7=BA=A7=E9=A2=84=E6=A1=88=E6=9F=A5=E7=9C=8B=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A2=84=E6=A1=88=E7=BA=A7=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../create-plan-online-five.component.ts | 118 ++++++++++-------- .../entry-plan-look.component.html | 6 +- .../entry-plan-look.component.ts | 2 +- 3 files changed, 71 insertions(+), 55 deletions(-) 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 ab76480..76b3de4 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 @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2021-06-16 13:56:54 * @LastEditors: sueRimn - * @LastEditTime: 2021-08-12 14:14:20 + * @LastEditTime: 2021-08-24 15:32:48 */ import { HttpClient } from '@angular/common/http'; import { Component, Inject, OnInit, Renderer2, ViewChild, Input } from '@angular/core'; @@ -636,19 +636,22 @@ export class CreatePlanOnlineFiveComponent implements OnInit { var orginputCount=0 var orgtextAreaCount=0 var orgtreeCount=0 - this.planTemplateData[4].attribute.forEach((orgvalue,orgi,orgArr) => { - if(orgArr[orgi].level=='1'){ - orgtableCount++ - this.yinJson.organizationCommands.tableCount.tables.push({itemCount:orgArr[orgi].tableth.length}) - }else if(orgArr[orgi].level=='2'){ - orginputCount++ - this.yinJson.organizationCommands.inputCount.inputs.push({colCount:orgArr[orgi].lieNumber,rowCount:orgArr[orgi].hNumber}) - }else if(orgArr[orgi].level=='3'){ - orgtextAreaCount++ - }else if(orgArr[orgi].level=='4'){ - orgtreeCount++ - } - }); + if(this.planTemplateData[4]!=undefined&&this.planTemplateData[4].groupName=='组织指挥'){ + this.planTemplateData[4].attribute.forEach((orgvalue,orgi,orgArr) => { + if(orgArr[orgi].level=='1'){ + orgtableCount++ + this.yinJson.organizationCommands.tableCount.tables.push({itemCount:orgArr[orgi].tableth.length}) + }else if(orgArr[orgi].level=='2'){ + orginputCount++ + this.yinJson.organizationCommands.inputCount.inputs.push({colCount:orgArr[orgi].lieNumber,rowCount:orgArr[orgi].hNumber}) + }else if(orgArr[orgi].level=='3'){ + orgtextAreaCount++ + }else if(orgArr[orgi].level=='4'){ + orgtreeCount++ + } + }); + } + this.yinJson.organizationCommands.tableCount.totalCount=orgtableCount this.yinJson.organizationCommands.inputCount.totalCount=orginputCount this.yinJson.organizationCommands.textAreaCount.totalCount=orgtextAreaCount @@ -657,19 +660,22 @@ export class CreatePlanOnlineFiveComponent implements OnInit { var sheinputCount=0 var shetextAreaCount=0 var shetreeCount=0 - this.planTemplateData[6].attribute.forEach((orgvalue,orgi,orgArr) => { - if(orgArr[orgi].level=='1'){ - shetableCount++ - //this.yinJson.organizationCommands.tableCount.tables.push({itemCount:orgtableCount}) - }else if(orgArr[orgi].level=='2'){ - sheinputCount++ - this.yinJson.socialLinkages.inputCount.inputs.push({colCount:orgArr[orgi].lieNumber,rowCount:orgArr[orgi].hNumber}) - }else if(orgArr[orgi].level=='3'){ - shetextAreaCount++ - }else if(orgArr[orgi].level=='4'){ - shetreeCount++ - } - }); + if(this.planTemplateData[6]!=undefined&&this.planTemplateData[6].groupName=='社会联动'){ + this.planTemplateData[6].attribute.forEach((orgvalue,orgi,orgArr) => { + if(orgArr[orgi].level=='1'){ + shetableCount++ + //this.yinJson.organizationCommands.tableCount.tables.push({itemCount:orgtableCount}) + }else if(orgArr[orgi].level=='2'){ + sheinputCount++ + this.yinJson.socialLinkages.inputCount.inputs.push({colCount:orgArr[orgi].lieNumber,rowCount:orgArr[orgi].hNumber}) + }else if(orgArr[orgi].level=='3'){ + shetextAreaCount++ + }else if(orgArr[orgi].level=='4'){ + shetreeCount++ + } + }); + } + this.yinJson.socialLinkages.tableCount.totalCount=shetableCount this.yinJson.socialLinkages.inputCount.totalCount=sheinputCount this.yinJson.socialLinkages.textAreaCount.totalCount=shetextAreaCount @@ -678,19 +684,22 @@ export class CreatePlanOnlineFiveComponent implements OnInit { var qininputCount=0 var qintextAreaCount=0 var qintreeCount=0 - this.planTemplateData[7].attribute.forEach((orgvalue,orgi,orgArr) => { - if(orgArr[orgi].level=='1'){ - qintableCount++ - //this.yinJson.organizationCommands.tableCount.tables.push({itemCount:orgtableCount}) - }else if(orgArr[orgi].level=='2'){ - qininputCount++ - this.yinJson.serviceSupports.inputCount.inputs.push({colCount:orgArr[orgi].lieNumber,rowCount:orgArr[orgi].hNumber}) - }else if(orgArr[orgi].level=='3'){ - qintextAreaCount++ - }else if(orgArr[orgi].level=='4'){ - qintreeCount++ - } - }); + if(this.planTemplateData[7]!=undefined&&this.planTemplateData[7].groupName=='勤务保障'){ + this.planTemplateData[7].attribute.forEach((orgvalue,orgi,orgArr) => { + if(orgArr[orgi].level=='1'){ + qintableCount++ + //this.yinJson.organizationCommands.tableCount.tables.push({itemCount:orgtableCount}) + }else if(orgArr[orgi].level=='2'){ + qininputCount++ + this.yinJson.serviceSupports.inputCount.inputs.push({colCount:orgArr[orgi].lieNumber,rowCount:orgArr[orgi].hNumber}) + }else if(orgArr[orgi].level=='3'){ + qintextAreaCount++ + }else if(orgArr[orgi].level=='4'){ + qintreeCount++ + } + }); + } + this.yinJson.serviceSupports.tableCount.totalCount=qintableCount this.yinJson.serviceSupports.inputCount.totalCount=qininputCount this.yinJson.serviceSupports.textAreaCount.totalCount=qintextAreaCount @@ -699,19 +708,22 @@ export class CreatePlanOnlineFiveComponent implements OnInit { var fuinputCount=0 var futextAreaCount=0 var futreeCount=0 - this.planTemplateData[9].attribute.forEach((orgvalue,orgi,orgArr) => { - if(orgArr[orgi].level=='1'){ - futableCount++ - //this.yinJson.organizationCommands.tableCount.tables.push({itemCount:orgtableCount}) - }else if(orgArr[orgi].level=='2'){ - fuinputCount++ - this.yinJson.decisionSupports.inputCount.inputs.push({colCount:orgArr[orgi].lieNumber,rowCount:orgArr[orgi].hNumber}) - }else if(orgArr[orgi].level=='3'){ - futextAreaCount++ - }else if(orgArr[orgi].level=='4'){ - futreeCount++ - } - }); + if(this.planTemplateData[9]!=undefined&&this.planTemplateData[9].groupName=='辅助决策'){ + this.planTemplateData[9].attribute.forEach((orgvalue,orgi,orgArr) => { + if(orgArr[orgi].level=='1'){ + futableCount++ + //this.yinJson.organizationCommands.tableCount.tables.push({itemCount:orgtableCount}) + }else if(orgArr[orgi].level=='2'){ + fuinputCount++ + this.yinJson.decisionSupports.inputCount.inputs.push({colCount:orgArr[orgi].lieNumber,rowCount:orgArr[orgi].hNumber}) + }else if(orgArr[orgi].level=='3'){ + futextAreaCount++ + }else if(orgArr[orgi].level=='4'){ + futreeCount++ + } + }); + } + this.yinJson.decisionSupports.tableCount.totalCount=futableCount this.yinJson.decisionSupports.inputCount.totalCount=fuinputCount this.yinJson.decisionSupports.textAreaCount.totalCount=futextAreaCount diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.html b/src/app/plan-management/entry-plan-look/entry-plan-look.component.html index b86f89d..64f92cd 100644 --- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.html +++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-24 10:59:48 * @LastEditors: sueRimn - * @LastEditTime: 2021-07-29 10:44:58 + * @LastEditTime: 2021-08-24 14:01:03 -->
@@ -54,6 +54,10 @@ {{element.modifiedTime | date:'yyyy-MM-dd'}} + + 预案级别 + {{element.planCategory=='3'?'Ⅲ级预案':element.planCategory=='4'?'Ⅳ级预案':'Ⅴ级预案'}} + 预案类型 {{element.planType | plantype}} 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 d443744..db3f0ef 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 @@ -39,7 +39,7 @@ export class EntryPlanLookComponent implements OnInit { myControl = new FormControl(); hasChild = (_: number, node: any) => node.expandable; - displayedColumns: string[] = ['planname', 'addpeople', 'addtime', 'plantype', 'auditstate', 'isopen', 'preparethelevel', 'operation']; + displayedColumns: string[] = ['planname', 'addpeople', 'addtime','planCategory', 'plantype', 'auditstate', 'isopen', 'preparethelevel', 'operation']; tabledataSource: any //分页 @ViewChild(MatPaginator, { static: true })