shaojiahao
/
ShangHaiYuan-AnXin
2
0
Fork 0
Code Issues 11 Pull Requests Projects Releases Wiki Activity
Browse Source

[新增]三四五级预案查看页面新增预案级别

tangshan
chenjingyu 4 years ago
parent
a118c075ef
commit
9d2b72b545
3 changed files with 71 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 118
      src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
  2. 6
      src/app/plan-management/entry-plan-look/entry-plan-look.component.html
  3. 2
      src/app/plan-management/entry-plan-look/entry-plan-look.component.ts

118
src/app/plan-management/create-plan-online-five/create-plan-online-five.component.ts
Unescape View File

@ -4,7 +4,7 @@
* @Author: sueRimn * @Author: sueRimn
* @Date: 2021-06-16 13:56:54 * @Date: 2021-06-16 13:56:54
* @LastEditors: sueRimn * @LastEditors: sueRimn
* @LastEditTime: 2021-08-12 14:14:20 * @LastEditTime: 2021-08-24 15:32:48
*/ */
import { HttpClient } from '@angular/common/http'; import { HttpClient } from '@angular/common/http';
import { Component, Inject, OnInit, Renderer2, ViewChild, Input } from '@angular/core'; import { Component, Inject, OnInit, Renderer2, ViewChild, Input } from '@angular/core';
@ -636,19 +636,22 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
var orginputCount=0 var orginputCount=0
var orgtextAreaCount=0 var orgtextAreaCount=0
var orgtreeCount=0 var orgtreeCount=0
this.planTemplateData[4].attribute.forEach((orgvalue,orgi,orgArr) => { if(this.planTemplateData[4]!=undefined&&this.planTemplateData[4].groupName=='组织指挥'){
if(orgArr[orgi].level=='1'){ this.planTemplateData[4].attribute.forEach((orgvalue,orgi,orgArr) => {
orgtableCount++ if(orgArr[orgi].level=='1'){
this.yinJson.organizationCommands.tableCount.tables.push({itemCount:orgArr[orgi].tableth.length}) orgtableCount++
}else if(orgArr[orgi].level=='2'){ this.yinJson.organizationCommands.tableCount.tables.push({itemCount:orgArr[orgi].tableth.length})
orginputCount++ }else if(orgArr[orgi].level=='2'){
this.yinJson.organizationCommands.inputCount.inputs.push({colCount:orgArr[orgi].lieNumber,rowCount:orgArr[orgi].hNumber}) orginputCount++
}else if(orgArr[orgi].level=='3'){ this.yinJson.organizationCommands.inputCount.inputs.push({colCount:orgArr[orgi].lieNumber,rowCount:orgArr[orgi].hNumber})
orgtextAreaCount++ }else if(orgArr[orgi].level=='3'){
}else if(orgArr[orgi].level=='4'){ orgtextAreaCount++
orgtreeCount++ }else if(orgArr[orgi].level=='4'){
} orgtreeCount++
}); }
});
}
this.yinJson.organizationCommands.tableCount.totalCount=orgtableCount this.yinJson.organizationCommands.tableCount.totalCount=orgtableCount
this.yinJson.organizationCommands.inputCount.totalCount=orginputCount this.yinJson.organizationCommands.inputCount.totalCount=orginputCount
this.yinJson.organizationCommands.textAreaCount.totalCount=orgtextAreaCount this.yinJson.organizationCommands.textAreaCount.totalCount=orgtextAreaCount
@ -657,19 +660,22 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
var sheinputCount=0 var sheinputCount=0
var shetextAreaCount=0 var shetextAreaCount=0
var shetreeCount=0 var shetreeCount=0
this.planTemplateData[6].attribute.forEach((orgvalue,orgi,orgArr) => { if(this.planTemplateData[6]!=undefined&&this.planTemplateData[6].groupName=='社会联动'){
if(orgArr[orgi].level=='1'){ this.planTemplateData[6].attribute.forEach((orgvalue,orgi,orgArr) => {
shetableCount++ if(orgArr[orgi].level=='1'){
//this.yinJson.organizationCommands.tableCount.tables.push({itemCount:orgtableCount}) shetableCount++
}else if(orgArr[orgi].level=='2'){ //this.yinJson.organizationCommands.tableCount.tables.push({itemCount:orgtableCount})
sheinputCount++ }else if(orgArr[orgi].level=='2'){
this.yinJson.socialLinkages.inputCount.inputs.push({colCount:orgArr[orgi].lieNumber,rowCount:orgArr[orgi].hNumber}) sheinputCount++
}else if(orgArr[orgi].level=='3'){ this.yinJson.socialLinkages.inputCount.inputs.push({colCount:orgArr[orgi].lieNumber,rowCount:orgArr[orgi].hNumber})
shetextAreaCount++ }else if(orgArr[orgi].level=='3'){
}else if(orgArr[orgi].level=='4'){ shetextAreaCount++
shetreeCount++ }else if(orgArr[orgi].level=='4'){
} shetreeCount++
}); }
});
}
this.yinJson.socialLinkages.tableCount.totalCount=shetableCount this.yinJson.socialLinkages.tableCount.totalCount=shetableCount
this.yinJson.socialLinkages.inputCount.totalCount=sheinputCount this.yinJson.socialLinkages.inputCount.totalCount=sheinputCount
this.yinJson.socialLinkages.textAreaCount.totalCount=shetextAreaCount this.yinJson.socialLinkages.textAreaCount.totalCount=shetextAreaCount
@ -678,19 +684,22 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
var qininputCount=0 var qininputCount=0
var qintextAreaCount=0 var qintextAreaCount=0
var qintreeCount=0 var qintreeCount=0
this.planTemplateData[7].attribute.forEach((orgvalue,orgi,orgArr) => { if(this.planTemplateData[7]!=undefined&&this.planTemplateData[7].groupName=='勤务保障'){
if(orgArr[orgi].level=='1'){ this.planTemplateData[7].attribute.forEach((orgvalue,orgi,orgArr) => {
qintableCount++ if(orgArr[orgi].level=='1'){
//this.yinJson.organizationCommands.tableCount.tables.push({itemCount:orgtableCount}) qintableCount++
}else if(orgArr[orgi].level=='2'){ //this.yinJson.organizationCommands.tableCount.tables.push({itemCount:orgtableCount})
qininputCount++ }else if(orgArr[orgi].level=='2'){
this.yinJson.serviceSupports.inputCount.inputs.push({colCount:orgArr[orgi].lieNumber,rowCount:orgArr[orgi].hNumber}) qininputCount++
}else if(orgArr[orgi].level=='3'){ this.yinJson.serviceSupports.inputCount.inputs.push({colCount:orgArr[orgi].lieNumber,rowCount:orgArr[orgi].hNumber})
qintextAreaCount++ }else if(orgArr[orgi].level=='3'){
}else if(orgArr[orgi].level=='4'){ qintextAreaCount++
qintreeCount++ }else if(orgArr[orgi].level=='4'){
} qintreeCount++
}); }
});
}
this.yinJson.serviceSupports.tableCount.totalCount=qintableCount this.yinJson.serviceSupports.tableCount.totalCount=qintableCount
this.yinJson.serviceSupports.inputCount.totalCount=qininputCount this.yinJson.serviceSupports.inputCount.totalCount=qininputCount
this.yinJson.serviceSupports.textAreaCount.totalCount=qintextAreaCount this.yinJson.serviceSupports.textAreaCount.totalCount=qintextAreaCount
@ -699,19 +708,22 @@ export class CreatePlanOnlineFiveComponent implements OnInit {
var fuinputCount=0 var fuinputCount=0
var futextAreaCount=0 var futextAreaCount=0
var futreeCount=0 var futreeCount=0
this.planTemplateData[9].attribute.forEach((orgvalue,orgi,orgArr) => { if(this.planTemplateData[9]!=undefined&&this.planTemplateData[9].groupName=='辅助决策'){
if(orgArr[orgi].level=='1'){ this.planTemplateData[9].attribute.forEach((orgvalue,orgi,orgArr) => {
futableCount++ if(orgArr[orgi].level=='1'){
//this.yinJson.organizationCommands.tableCount.tables.push({itemCount:orgtableCount}) futableCount++
}else if(orgArr[orgi].level=='2'){ //this.yinJson.organizationCommands.tableCount.tables.push({itemCount:orgtableCount})
fuinputCount++ }else if(orgArr[orgi].level=='2'){
this.yinJson.decisionSupports.inputCount.inputs.push({colCount:orgArr[orgi].lieNumber,rowCount:orgArr[orgi].hNumber}) fuinputCount++
}else if(orgArr[orgi].level=='3'){ this.yinJson.decisionSupports.inputCount.inputs.push({colCount:orgArr[orgi].lieNumber,rowCount:orgArr[orgi].hNumber})
futextAreaCount++ }else if(orgArr[orgi].level=='3'){
}else if(orgArr[orgi].level=='4'){ futextAreaCount++
futreeCount++ }else if(orgArr[orgi].level=='4'){
} futreeCount++
}); }
});
}
this.yinJson.decisionSupports.tableCount.totalCount=futableCount this.yinJson.decisionSupports.tableCount.totalCount=futableCount
this.yinJson.decisionSupports.inputCount.totalCount=fuinputCount this.yinJson.decisionSupports.inputCount.totalCount=fuinputCount
this.yinJson.decisionSupports.textAreaCount.totalCount=futextAreaCount this.yinJson.decisionSupports.textAreaCount.totalCount=futextAreaCount

6
src/app/plan-management/entry-plan-look/entry-plan-look.component.html
Unescape View File

@ -4,7 +4,7 @@
* @Author: sueRimn * @Author: sueRimn
* @Date: 2020-12-24 10:59:48 * @Date: 2020-12-24 10:59:48
* @LastEditors: sueRimn * @LastEditors: sueRimn
* @LastEditTime: 2021-07-29 10:44:58 * @LastEditTime: 2021-08-24 14:01:03
--> -->
<!-- <p>录入预案</p> --> <!-- <p>录入预案</p> -->
<div style="overflow: auto;height: 100%;"> <div style="overflow: auto;height: 100%;">
@ -54,6 +54,10 @@
{{element.modifiedTime | date:'yyyy-MM-dd'}} {{element.modifiedTime | date:'yyyy-MM-dd'}}
</td> </td>
</ng-container> </ng-container>
<ng-container matColumnDef="planCategory">
<th mat-header-cell *matHeaderCellDef>预案级别</th>
<td mat-cell *matCellDef="let element">{{element.planCategory=='3'?'Ⅲ级预案':element.planCategory=='4'?'Ⅳ级预案':'Ⅴ级预案'}}</td>
</ng-container>
<ng-container matColumnDef="plantype"> <ng-container matColumnDef="plantype">
<th mat-header-cell *matHeaderCellDef>预案类型</th> <th mat-header-cell *matHeaderCellDef>预案类型</th>
<td mat-cell *matCellDef="let element">{{element.planType | plantype}}</td> <td mat-cell *matCellDef="let element">{{element.planType | plantype}}</td>

2
src/app/plan-management/entry-plan-look/entry-plan-look.component.ts
Unescape View File

@ -39,7 +39,7 @@ export class EntryPlanLookComponent implements OnInit {
myControl = new FormControl(); myControl = new FormControl();
hasChild = (_: number, node: any) => node.expandable; 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 tabledataSource: any
//分页 //分页
@ViewChild(MatPaginator, { static: true }) @ViewChild(MatPaginator, { static: true })

Write Preview
Loading…
Cancel
Save