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 518831f..0f00bb8 100644 --- a/src/app/plan-audit/plan-record/plan-record.component.html +++ b/src/app/plan-audit/plan-record/plan-record.component.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-25 10:19:31 * @LastEditors: sueRimn - * @LastEditTime: 2021-07-08 09:25:11 + * @LastEditTime: 2021-07-24 09:30:42 -->
@@ -52,6 +52,7 @@ {{item.name}} +
@@ -64,6 +65,15 @@ + 预案类型： + + + 二维预案 + 三维预案 + 其他预案 + 文本预案 + +
@@ -94,13 +104,14 @@
- - - - - - - + + + + + + + +
类型名称操作所属组织审核状态提交人提交时间类型预案类型名称操作所属组织审核状态提交人提交时间
@@ -110,13 +121,16 @@ {{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.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.creatorName}} + {{item.createTime|date:'yyyy-MM-dd'}}
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 9d22124..1d295c0 100644 --- a/src/app/plan-audit/plan-record/plan-record.component.scss +++ b/src/app/plan-audit/plan-record/plan-record.component.scss @@ -136,21 +136,25 @@ } } .headfour{ + @media screen and (max-device-width:1200px){ font-size: 13px; mat-form-field{ - width: 150px; + width: 80px; } } @media screen and (max-device-width:1400px) and (min-device-width:1200px){ margin-left: 15px; mat-form-field{ - width: 150px; + width: 80px; } } + @media screen and (min-device-width:1400px){ + margin-left: 30px; + } span{ @media screen and (min-device-width:1400px){ - margin-left: 30px; + //margin-left: 30px; } } button{ 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 2b0e425..c00ce85 100644 --- a/src/app/plan-audit/plan-record/plan-record.component.ts +++ b/src/app/plan-audit/plan-record/plan-record.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-25 10:19:31 * @LastEditors: sueRimn - * @LastEditTime: 2021-07-08 09:35:53 + * @LastEditTime: 2021-07-24 14:36:27 */ import { Component, OnInit, Inject } from '@angular/core'; import { FormControl } from '@angular/forms'; @@ -92,6 +92,7 @@ export class PlanRecordComponent implements OnInit { companyId fetchUrl companyName + plantypes //获取表格数据 getAlltabledate() { @@ -102,7 +103,8 @@ export class PlanRecordComponent implements OnInit { Level: this.PlanLevel || [], verifyState: this.verifyState || [1, 2, 4, 5], QueryStartTime: this.addtime || '', - QueryEndTime: this.endtime || '' + QueryEndTime: this.endtime || '', + PlanType:this.plantypes||[] } this.http.get("/api/ContentVerifies", { params: paramsdata }).subscribe((data: any) => { //console.log(data) @@ -124,6 +126,7 @@ export class PlanRecordComponent implements OnInit { this.endtime = '' let level = sessionStorage.getItem("level"); this.PlanLevel = '' + this.plantypes=[] this.getAlltabledate() } //表格点击事件 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 f34bc4d..23d36ce 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.html +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html @@ -41,7 +41,7 @@
预案类型： - + 二维预案 三维预案 其他预案 @@ -79,7 +79,9 @@ {{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}} 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 2ca7838..435d9f1 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-25 16:13:50 * @LastEditors: sueRimn - * @LastEditTime: 2021-07-08 09:32:41 + * @LastEditTime: 2021-07-24 14:34:24 */ import { Component, Inject, OnInit } from '@angular/core'; import { FormControl } from '@angular/forms'; @@ -106,6 +106,7 @@ export class WaitExamineerComponent implements OnInit { companyId fetchUrl companyName + plantypes //获取表格数据 getAlltabledate() { @@ -113,7 +114,8 @@ export class WaitExamineerComponent implements OnInit { Operation: this.level || [], ContentType: Number(this.projectlevel) || [], Level: this.PlanLevel || [], - verifyState: [0, 3] + verifyState: [0, 3], + PlanType:this.plantypes||[] } this.http.get("/api/ContentVerifies", { params: paramsdata }).subscribe((data: any) => { this.tableDate = data.items @@ -129,6 +131,7 @@ export class WaitExamineerComponent implements OnInit { this.level = '' this.projectlevel = '' this.PlanLevel = '' + this.plantypes=[] let level = sessionStorage.getItem("level"); this.getAlltabledate() } 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 b46cfdd..c2464a5 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-06-28 11:29:21 + * @LastEditTime: 2021-07-24 16:58:31 -->
@@ -87,7 +87,7 @@ 审批结果 提交审核 - 撤销审核 + 撤销审核 diff --git a/src/app/plan-management/meet-plan/meet-plan.component.html b/src/app/plan-management/meet-plan/meet-plan.component.html index ca3359c..c8116d3 100644 --- a/src/app/plan-management/meet-plan/meet-plan.component.html +++ b/src/app/plan-management/meet-plan/meet-plan.component.html @@ -149,7 +149,7 @@ 查看预案 提交审核 - 撤销审核 + 撤销审核 审批结果 下载 删除 diff --git a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html index c9613fe..5e012bf 100644 --- a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html +++ b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-24 14:15:10 * @LastEditors: sueRimn - * @LastEditTime: 2021-04-01 14:35:30 + * @LastEditTime: 2021-07-24 16:59:38 -->
@@ -141,7 +141,7 @@ 查看预案 提交审核 - 撤销审核 + 撤销审核 审批结果 下载 diff --git a/src/app/plan-management/type-plan/type-plan.component.html b/src/app/plan-management/type-plan/type-plan.component.html index 6863823..ab79d23 100644 --- a/src/app/plan-management/type-plan/type-plan.component.html +++ b/src/app/plan-management/type-plan/type-plan.component.html @@ -125,7 +125,7 @@ 查看预案 提交审核 - 撤销审核 + 撤销审核 审批结果 下载 删除 diff --git a/src/app/statistic-analysis/state/page-there-year/page-there-year.component.ts b/src/app/statistic-analysis/state/page-there-year/page-there-year.component.ts index 32187a6..7be7e89 100644 --- a/src/app/statistic-analysis/state/page-there-year/page-there-year.component.ts +++ b/src/app/statistic-analysis/state/page-there-year/page-there-year.component.ts @@ -24,6 +24,8 @@ export class PageThereYearComponent implements OnInit { tabledata//获取所有数据 lastyears//上个页面传过来的年份 count=0//总数 + pieonetype//判断是级别还是类型，上个页面传过来的参数 + planType//预案类型 ngOnInit(): void { this.dateInit () this.route.queryParams.subscribe(params => { @@ -32,8 +34,17 @@ export class PageThereYearComponent implements OnInit { this.type=params['type'] //this.lastyears=params['years'] this.tid=params.tid + this.pieonetype=params.pieonetype }); - + if(this.year=='二维预案'){ + this.planType=1 + }else if(this.year=='三维预案'){ + this.planType=2 + }else if(this.year=='其他预案'){ + this.planType=4 + }else if(this.year=='文本预案'){ + this.planType=16 + } this.setTimeoutObj = window.setTimeout(()=>{ this.getechartsData() }) @@ -46,9 +57,9 @@ export class PageThereYearComponent implements OnInit { async getechartsData(){ let paramdata={ planStatus:this.tid=='pieone'?'': this.type, - PlanCategory:this.tid=='pieone'?this.type:'', + PlanCategory:this.tid=='pieone'&&this.pieonetype=='true'?this.type:'', + objectType:this.tid=='pieone'&&this.pieonetype=='true'?2:this.tid=='pieone'&&this.pieonetype=='false'?5: 1, TrendYear:this.lastyears||'', - objectType:this.tid=='pieone'?2: 1, TrendType:0 } await this.serviceData.getData(paramdata,`/api/StatisticsAnalysis/Trends`) @@ -216,7 +227,7 @@ export class PageThereYearComponent implements OnInit { if(this.serviceData.level=='0'||this.serviceData.level=='1'||this.serviceData.level=='2'){ this.serviceData.isQuery=true //this.router.navigate(['/statisticanalysis/statePageOne/time'],{queryParams:{'level':this.option.xAxis.data[xIndex],'headtext':this.buildingTypeName,'zhong':'1','type':this.type}}); - this.router.navigate(['/statisticanalysis/statePageOne/time'],{queryParams:{'level':this.year,'headtext':this.buildingTypeName,'zhong':'1','type':this.type}}); + this.router.navigate(['/statisticanalysis/statePageOne/time'],{queryParams:{'level':this.year,'headtext':this.buildingTypeName,'zhong':'1','type':this.type,'pieonetype':this.pieonetype,'tid':this.tid}}); } else if(this.serviceData.level=='3'){ //中队跳转 diff --git a/src/app/statistic-analysis/state/page-two-time/page-two-time.component.ts b/src/app/statistic-analysis/state/page-two-time/page-two-time.component.ts index 7b66a7d..6d0456d 100644 --- a/src/app/statistic-analysis/state/page-two-time/page-two-time.component.ts +++ b/src/app/statistic-analysis/state/page-two-time/page-two-time.component.ts @@ -249,9 +249,9 @@ export class echartsComponent implements OnInit { this.echartsData.selectType=2 this.zongcount=0 let paramdata={ - objectType:this.tid=='pieone'?2: 1, planStatus:this.tid=='pieone'?'': this.type, - PlanCategory:this.tid=='pieone'?this.type:'', + PlanCategory:this.tid=='pieone'&&this.pieonetype=='true'?this.type:'', + objectType:this.tid=='pieone'&&this.pieonetype=='true'?2:this.tid=='pieone'&&this.pieonetype=='false'?5: 1, TrendType:this.echartsData.selectType } await this.echartsData.getData(paramdata,`/api/StatisticsAnalysis/Trends`) @@ -289,9 +289,9 @@ export class echartsComponent implements OnInit { this.datayuex=[] this.datayuey=[] let paramdata={ - objectType:this.tid=='pieone'?2: 1, planStatus:this.tid=='pieone'?'': this.type, - PlanCategory:this.tid=='pieone'?this.type:'', + PlanCategory:this.tid=='pieone'&&this.pieonetype=='true'?this.type:'', + objectType:this.tid=='pieone'&&this.pieonetype=='true'?2:this.tid=='pieone'&&this.pieonetype=='false'?5: 1, TrendType:this.echartsData.selectType } await this.echartsData.getData(paramdata,`/api/StatisticsAnalysis/Trends`) @@ -314,9 +314,9 @@ export class echartsComponent implements OnInit { this.dataYearX=[] this.dataYearY=[] let paramdata={ - objectType:this.tid=='pieone'?2: 1, planStatus:this.tid=='pieone'?'': this.type, - PlanCategory:this.tid=='pieone'?this.type:'', + PlanCategory:this.tid=='pieone'&&this.pieonetype=='true'?this.type:'', + objectType:this.tid=='pieone'&&this.pieonetype=='true'?2:this.tid=='pieone'&&this.pieonetype=='false'?5: 1, TrendType:this.echartsData.selectType } await this.echartsData.getData(paramdata,`/api/StatisticsAnalysis/Trends`) diff --git a/src/index.html b/src/index.html index 88ef21b..2ccf502 100644 --- a/src/index.html +++ b/src/index.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-11-25 15:44:29 * @LastEditors: sueRimn - * @LastEditTime: 2021-04-25 09:50:54 + * @LastEditTime: 2021-07-23 14:02:42 --> @@ -23,10 +23,10 @@ - - - + + +