From 6f44bd6882c6668b90831f47a3474c7f9e2bee71 Mon Sep 17 00:00:00 2001 From: chenjingyu Date: Thu, 21 Jan 2021 10:55:27 +0800 Subject: [PATCH 1/5] =?UTF-8?q?[=E6=96=B0=E5=BB=BA]=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=8A=9F=E8=83=BD=E7=9C=9F=E5=AE=9E=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plan-record/plan-record.component.html | 95 +++++++++++++----- .../plan-record/plan-record.component.scss | 25 ++++- .../plan-record/plan-record.component.ts | 98 +++++++++++++++++-- 3 files changed, 182 insertions(+), 36 deletions(-) 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 82f5085..8ee2b14 100644 --- a/src/app/plan-audit/plan-record/plan-record.component.html +++ b/src/app/plan-audit/plan-record/plan-record.component.html @@ -4,46 +4,65 @@ * @Author: sueRimn * @Date: 2020-12-25 10:19:31 * @LastEditors: sueRimn - * @LastEditTime: 2020-12-25 15:31:29 + * @LastEditTime: 2021-01-21 10:12:20 -->
+
- 操作类型： - 全部 - 更新 - 新增 - 删除 - 共计：80条 + 操作类型： + 全部 + 更新 + 新增 + 删除 + 共计：{{count}}条
审核状态： - 全部 - 已通过 - 已拒绝 + 全部 + 初审通过 + 初审驳回 + 终审通过 + 终审驳回
类型： - - Ⅰ级 - Ⅱ级 - - - 所属组织： + + Ⅰ级预案 + Ⅱ级预案 + Ⅲ级预案 + Ⅳ级预案 + Ⅴ级预案 + 应急预案(国家级) + 应急预案(市级) + 类型预案 + + + 编制级别： - - Ⅰ级 - Ⅱ级 - + + {{item.name}} + - 时间： + +
+
+ 时间： + 🠊 + + + + +
-
+ + + +
+ + + + + + + + + +
类型操作所属组织审核状态提交人提交时间
+
+ + + + + + + + + +
+ + {{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.operation=='0'?'新增':item.operation=='1'?'更新':'删除'}}{{item.verifyOrganizationName}}{{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/plan-record/plan-record.component.scss b/src/app/plan-audit/plan-record/plan-record.component.scss index 67d555f..14ee4bc 100644 --- a/src/app/plan-audit/plan-record/plan-record.component.scss +++ b/src/app/plan-audit/plan-record/plan-record.component.scss @@ -32,10 +32,17 @@ } } .tablediv{ - width: 95%; - table{ - margin: 20px 20px; + width: 100%; + height: 70%; + .tbodycss{ + overflow-y: auto; + height: 600px; width: 100%; + } + table{ + //margin: 20px 20px; + margin-left: 20px; + width: 97%; //border: 1px solid #2196F3; thead{ @@ -45,6 +52,7 @@ font-size: 16px; } + tr:nth-child(odd){ background: #FAFAFA; } @@ -65,4 +73,13 @@ th,td{ } .green{color: #00C756;} .red{color: #FF4D4D;} -.blue{color: #2196F3;} \ No newline at end of file +.blue{color: #2196F3;} + +//滚动条样式 +::-webkit-scrollbar{ + width: 6px; + background-color: white; + } + ::-webkit-scrollbar-thumb{ + background-color: #2196F3; + } \ 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 9ed4c77..3fc1f35 100644 --- a/src/app/plan-audit/plan-record/plan-record.component.ts +++ b/src/app/plan-audit/plan-record/plan-record.component.ts @@ -4,10 +4,12 @@ * @Author: sueRimn * @Date: 2020-12-25 10:19:31 * @LastEditors: sueRimn - * @LastEditTime: 2020-12-25 14:53:46 + * @LastEditTime: 2021-01-21 10:15:50 */ import { Component, OnInit } from '@angular/core'; import { FormControl } from '@angular/forms'; +import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; +import { HttpClient } from '@angular/common/http' @Component({ selector: 'app-plan-record', @@ -16,18 +18,96 @@ import { FormControl } from '@angular/forms'; }) export class PlanRecordComponent implements OnInit { - constructor() { } + constructor(private http:HttpClient,public snackBar: MatSnackBar) { } ngOnInit(): void { + let level = sessionStorage.getItem("level"); + if(level == "0"){//如果是总队 + this.preparelevels = [ + {name:"总队",value:"1"}, + {name:"支队",value:"2"}, + {name:"大队",value:"4"}, + {name:"中队",value:"8"} + ] + this.PlanLevel=0 + } + if(level == "1"){//如果是支队 + this.preparelevels = [ + {name:"支队",value:"1"}, + {name:"大队",value:"2"}, + {name:"中队",value:"3"} + ] + this.PlanLevel=1 + } + if(level == "2"){//如果是大队 + this.preparelevels = [ + {name:"大队",value:"4"}, + {name:"中队",value:"8"} + ] + this.PlanLevel=2 + } + if(level == "3"){//如果是中队 + this.preparelevels = [ + {name:"中队",value:"8"} + ] + this.PlanLevel=3 + } + this.getAlltabledate() } selected = new FormControl(0); //选项卡 实例 - level//类型 - js//组织机构 + preparelevels:any + level=''//类型 + verifyState=''//审核状态 + projectlevel//组织机构 + PlanLevel//编制级别 addtime//时间 - tableDate=[ - {level:"Ⅰ级预案",option:"更新",orgication:"浦东支队",unitstate:"已通过",addname:"赵信",addtime:"2020-12-15 10:36:24"}, - {level:"消火栓",option:"新增",orgication:"闵行支队",unitstate:"已拒绝",addname:"张三",addtime:"2020-12-15 10:36:24"}, - {level:"天然取水点",option:"删除",orgication:"上海总队",unitstate:"已拒绝",addname:"王五",addtime:"2020-12-15 10:36:24"} - ] + endtime//结束时间 + count//一共多少条 + tableDate + + //获取表格数据 + getAlltabledate(){ + + let paramsdata:any = { + Operation:this.level||[], + ContentType:Number(this.projectlevel)||[], + Level:this.PlanLevel||[], + verifyState:this.verifyState||[1,2,4,5], + QueryStartTime:this.addtime||'', + QueryEndTime:this.endtime||'' + } + this.http.get("/api/ContentVerifies",{params:paramsdata}).subscribe((data:any)=>{ + //console.log(data) + this.tableDate=data.items + this.count=data.totalCount + }) + } + //提交查询 + onSubmit(value){ + //console.log(value) + this.getAlltabledate() + } + //刷新 + record(){ + this.verifyState='' + this.level='' + this.projectlevel='' + this.addtime='' + this.endtime='' + let level = sessionStorage.getItem("level"); + if(level == "0"){//如果是总队 + this.PlanLevel=0 + } + if(level == "1"){//如果是支队 + this.PlanLevel=1 + } + if(level == "2"){//如果是大队 + this.PlanLevel=2 + } + if(level == "3"){//如果是中队 + this.PlanLevel=3 + } + this.getAlltabledate() + } } From 8e0f0d4ce7f52e42154005bf0b5f44899b3bdcd5 Mon Sep 17 00:00:00 2001 From: chenjingyu Date: Thu, 21 Jan 2021 16:37:30 +0800 Subject: [PATCH 2/5] =?UTF-8?q?[=E6=96=B0=E5=BB=BA]=E9=A2=84=E6=A1=88?= =?UTF-8?q?=E5=BD=95=E5=85=A5=E5=88=86=E9=A1=B5=E5=8A=9F=E8=83=BD=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wait-examineer.component.ts | 4 +- .../entry-plan-look.component.html | 5 +- .../meet-plan/meet-plan.component.html | 6 +- .../meet-plan/meet-plan.component.ts | 5 + .../onetwo-entry-plan.component.html | 8 +- .../onetwo-entry-plan.component.ts | 8 +- .../pass-plan/pass-plan.component.html | 140 +++++++++++++++++- .../pass-plan/pass-plan.component.scss | 117 +++++++++++++++ .../pass-plan/pass-plan.component.ts | 121 ++++++++++++++- .../type-plan/type-plan.component.html | 6 +- .../type-plan/type-plan.component.ts | 7 +- 11 files changed, 411 insertions(+), 16 deletions(-) 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 c5f78f0..a444aff 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-01-20 16:35:27 + * @LastEditTime: 2021-01-21 11:17:39 */ import { Component, OnInit } from '@angular/core'; import { FormControl } from '@angular/forms'; @@ -165,6 +165,7 @@ export class WaitExamineerComponent implements OnInit { this.getAlltabledate() }) } + this.chuorzhong=undefined } //拒绝操作 refuse(){ @@ -188,6 +189,7 @@ this.http.put(`/api/PlanAudits/${this.radioid}`,{auditStatus:4}).subscribe(data= this.getAlltabledate() }) } +this.chuorzhong=undefined } //分数饼状图 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 fdf827c..1a809b8 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-01-20 08:41:09 + * @LastEditTime: 2021-01-21 15:10:08 -->
@@ -60,7 +60,8 @@ 审核状态 - {{element.auditStatus | auditsatus}} + {{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'? + '审核退回':element.auditStatus=='16'?'初审通过':'初审驳回'}} 是否公开 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 e8a02da..b4d9df3 100644 --- a/src/app/plan-management/meet-plan/meet-plan.component.html +++ b/src/app/plan-management/meet-plan/meet-plan.component.html @@ -119,7 +119,8 @@ 审核状态 - {{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'?'审核退回':'待终审'}} + {{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'? + '审核退回':element.auditStatus=='16'?'初审通过':'初审驳回'}} 是否公开 @@ -145,7 +146,8 @@ + [pageSizeOptions]="pageSizeOptions" + (page)="changePage($event)"> diff --git a/src/app/plan-management/meet-plan/meet-plan.component.ts b/src/app/plan-management/meet-plan/meet-plan.component.ts index c879164..8ff1a69 100644 --- a/src/app/plan-management/meet-plan/meet-plan.component.ts +++ b/src/app/plan-management/meet-plan/meet-plan.component.ts @@ -100,6 +100,11 @@ export class MeetPlanComponent implements OnInit { this.tabledataSource = data.items }) } + //分页事件 + changePage(e){ + this.PageNumber = e.pageIndex+1 + this.getAlltabledate() + } //查询 onSubmit (value) { 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 4ef9cb6..e634de5 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-01-20 09:36:09 + * @LastEditTime: 2021-01-21 15:02:25 -->
@@ -119,7 +119,8 @@ 审核状态 - {{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'?'审核退回':'待终审'}} + {{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'? + '审核退回':element.auditStatus=='16'?'初审通过':'初审驳回'}} 是否公开 @@ -146,7 +147,8 @@ + [pageSizeOptions]="pageSizeOptions" + (page)="changePage($event)"> diff --git a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts index cc6f32e..693ad3a 100644 --- a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts +++ b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-24 14:15:10 * @LastEditors: sueRimn - * @LastEditTime: 2021-01-20 14:28:39 + * @LastEditTime: 2021-01-21 14:32:43 */ import { Component, OnInit, ViewChild, Inject } from '@angular/core'; import { HttpClient } from '@angular/common/http' @@ -109,9 +109,13 @@ export class OnetwoEntryPlanComponent implements OnInit { this.http.get("/api/PlanComponentsMajor",{params:paramsdata}).subscribe((data:any)=>{ this.length = data.totalCount this.tabledataSource = data.items - console.log(this.tabledataSource) }) } + //分页事件 + changePage(e){ + this.PageNumber = e.pageIndex+1 + this.getAlltabledate() + } //重置 reset(){ diff --git a/src/app/plan-management/pass-plan/pass-plan.component.html b/src/app/plan-management/pass-plan/pass-plan.component.html index 38ebbd4..8c34ed6 100644 --- a/src/app/plan-management/pass-plan/pass-plan.component.html +++ b/src/app/plan-management/pass-plan/pass-plan.component.html @@ -73,6 +73,26 @@ 包含下级
+
+ + + + + 🠊 + + + +
+
+ + + + + 🠊 + + + +
@@ -86,14 +106,130 @@
- + + diff --git a/src/app/plan-management/pass-plan/pass-plan.component.scss b/src/app/plan-management/pass-plan/pass-plan.component.scss index 3769e5e..59b2a1b 100644 --- a/src/app/plan-management/pass-plan/pass-plan.component.scss +++ b/src/app/plan-management/pass-plan/pass-plan.component.scss @@ -89,4 +89,121 @@ .mat-cell{ text-align: center; +} + +//完整度 +.integrityDiv{ + width: 180px; + height: 30px; + background-color: #e2e7ee; + // background-image: linear-gradient(to right, #e2e7ee ,#FF4500, #FF8C00,#32cd32); + margin: 0 auto; + position: relative; + .integrityNum{ + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%, -50%); + color: black; + font-weight: 800; + font-size: 15px; + cursor: default; + } + .integrityColorDiv{ + height: 100%; + } + .integrityDetails{ + position: absolute; + display: none; + width: 350px; + height:280px; + border: 1px solid rgba(0, 0, 0, 0.22); + background-color: white; + .integrityDetailsTop{ + width: 100%; + height: 23px; + line-height:23px; + border-bottom: 1px solid rgba(0, 0, 0, 0.22); + margin-bottom: 1px; + font-size: 14px; + span{ + display: inline-block; + text-align: center; + font-weight: 800; + } + .span1{ + width: 25%; + } + .span2{ + width: 60%; + } + .span3{ + width: 15%; + } + } + .integrityDetailsBody{ + ul{ + li{ + width: 100%; + height: 23px; + line-height: 23px; + margin: 3px 0; + div{ + float: left; + font-size: 13px; + } + .name{ + width: 25%; + height: 100%; + } + .colorDiv{ + width: 60%; + height: 100%; + position: relative; + .colorDivBac{ + width: 90%; + height: 100%; + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%,-50%); + background-color: #dfe5ec; + border-radius: 5px; + .colorDivCon{ + border-radius: 5px; + height: 100%; + background-color: #2398f1; + } + } + span{ + position: absolute; + left: 50%; + top: 50%; + transform: translate(-50%,-50%); + // color: white; + font-weight: 600; + } + } + .number{ + width: 15%; + height: 100%; + } + } + } + + } + } + .bottomposition{ + top: 2px; + left: 188px; + } + .topposition{ + top: -252px; + left: 188px; + } +} +.integrityDiv:hover{ + .integrityDetails{ + display: block; + } } \ No newline at end of file diff --git a/src/app/plan-management/pass-plan/pass-plan.component.ts b/src/app/plan-management/pass-plan/pass-plan.component.ts index 6a3bf37..0f0334d 100644 --- a/src/app/plan-management/pass-plan/pass-plan.component.ts +++ b/src/app/plan-management/pass-plan/pass-plan.component.ts @@ -42,7 +42,7 @@ export class PassPlanComponent implements OnInit { pageSizeOptions: number[] = [10] //设置每页条数 PageNumber:any; //第几页 - displayedColumns: string[] = ['unitname', 'planname', 'addpeople','addtime','plantype','auditStatus','openRange','projectlevel','operation']; + displayedColumns: string[] = ['planname', 'addpeople','addtime','plantype','auditStatus','openRange','projectlevel','operation']; allorganizations:any //所有组织机构 allunittype:any //所有单位类型 tabledataSource:any //表格数据 @@ -108,6 +108,121 @@ export class PassPlanComponent implements OnInit { }) } + colorRgb(sColor){ + var reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/; + var sColor = sColor.toLowerCase(); + if (sColor && reg.test(sColor)) { + if (sColor.length === 4) { + var sColorNew = "#"; + for (var i = 1; i < 4; i += 1) { + sColorNew += sColor.slice(i, i + 1).concat(sColor.slice(i, i + 1)); + } + sColor = sColorNew; + } + //处理六位的颜色值 + var sColorChange = []; + for (var i = 1; i < 7; i += 2) { + sColorChange.push(parseInt("0x" + sColor.slice(i, i + 2))); + } + return sColorChange; + } else { + return sColor; + } + } + colorHex(rgb){ + var _this = rgb; + var reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/; + if (/^(rgb|RGB)/.test(_this)) { + var aColor = _this.replace(/(?:(|)|rgb|RGB)*/g, "").split(","); + var strHex = "#"; + for (var i = 0; i < aColor.length; i++) { + var hex:any = Number(aColor[i]).toString(16); + hex = hex < 10 ? 0 + '' + hex : hex;// 保证每个rgb的值为2位 + if (hex === "0") { + hex += hex; + } + strHex += hex; + } + if (strHex.length !== 7) { + strHex = _this; + } + return strHex; + } else if (reg.test(_this)) { + var aNum = _this.replace(/#/, "").split(""); + if (aNum.length === 6) { + return _this; + } else if (aNum.length === 3) { + var numHex = "#"; + for (var i = 0; i < aNum.length; i += 1) { + numHex += (aNum[i] + aNum[i]); + } + return numHex; + } + } else { + return _this; + } + } + + gradientColor(startColor, endColor, step) { + let _this = this + let startRGB = _this.colorRgb(startColor);//转换为rgb数组模式 + let startR = startRGB[0]; + let startG = startRGB[1]; + let startB = startRGB[2]; + + let endRGB = _this.colorRgb(endColor); + let endR = endRGB[0]; + let endG = endRGB[1]; + let endB = endRGB[2]; + + let sR = (endR - startR) / step;//总差值 + let sG = (endG - startG) / step; + let sB = (endB - startB) / step; + + var colorArr = []; + for (var i = 0; i < step; i++) { + //计算每一步的hex值 + var hex = _this.colorHex('rgb('+ parseInt((sR * i + startR))+ ',' + parseInt((sG * i + startG))+ ',' + parseInt((sB * i + startB)) + ')'); + colorArr.push(hex); + } + return colorArr; +} + integrity(width){ + let _this = this + + let style:any = {} + style.width = width +'%'; + if(width < 30){ + let colorArr = this.gradientColor('#D50000', '#E53935', 30); + for(let i = 0; i < 30; i++){ + if( i == width){ + style.background = colorArr[i] + } + } + } + if(width >= 30 && width < 60){ + let colorArr = this.gradientColor('#FF9800', '#E65100', 30); + for(let i = 30; i < 60; i++){ + if( i == width){ + style.background = colorArr[i-30] + } + } + } + if(width >= 60){ + let colorArr = this.gradientColor('#81C784', '#2E7D32', 41); + for(let i = 60; i <= 100; i++){ + if( i == width){ + style.background = colorArr[i-60] + } + } + } + return style + } + integrityDetails(width,zong){ + let style:any = {} + style.width = (width/zong)*100 +'%'; + return style + } @@ -119,6 +234,10 @@ export class PassPlanComponent implements OnInit { } ) } + addtime//开始时间 + endtime//结束时间 + integrityScoreMin//完整度最小值 + integrityScoreMax//完整度最大值 organizationName:any //当前单位组织机构名称 treedata:any //组织机构树型数据 newArr:any = [] 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 652f247..dc12cb5 100644 --- a/src/app/plan-management/type-plan/type-plan.component.html +++ b/src/app/plan-management/type-plan/type-plan.component.html @@ -97,7 +97,8 @@ - + @@ -123,7 +124,8 @@
预案名称 {{element.name}} 添加人 {{element.creatorName}} 审核状态{{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'?'审核退回':'待终审'}}{{element.auditStatus=='8'?'未提交审核':element.auditStatus=='1'?'审核中':element.auditStatus=='2'?'审核通过':element.auditStatus=='4'? + '审核退回':element.auditStatus=='16'?'初审通过':'初审驳回'}} 是否公开
+ [pageSizeOptions]="pageSizeOptions" + (page)="changePage($event)"> diff --git a/src/app/plan-management/type-plan/type-plan.component.ts b/src/app/plan-management/type-plan/type-plan.component.ts index b658d26..0a1163c 100644 --- a/src/app/plan-management/type-plan/type-plan.component.ts +++ b/src/app/plan-management/type-plan/type-plan.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2021-01-06 09:47:43 * @LastEditors: sueRimn - * @LastEditTime: 2021-01-20 15:03:08 + * @LastEditTime: 2021-01-21 14:15:40 */ import { Component, OnInit, ViewChild, Inject } from '@angular/core'; import { HttpClient } from '@angular/common/http' @@ -99,6 +99,11 @@ export class TypePlanComponent implements OnInit { this.tabledataSource = data.items }) } + //分页事件 + changePage(e){ + this.PageNumber = e.pageIndex+1 + this.getAlltabledate() + } //重置 reset(){ From ae374266bd5caafcdd57d0d5824b656adfb1b308 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=8C=AF=E5=8D=87?= <359059686@qq.com> Date: Fri, 22 Jan 2021 10:03:44 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=97=A0=E5=85=B3?= =?UTF-8?q?=E8=81=94=E4=BF=A1=E6=81=AF=E5=A4=84=E7=BD=AE=E9=A2=84=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debug.log | 1 + src/app/canvas-share-data.service.ts | 8 +++++++ .../working-area/working-area.component.ts | 21 +++++++++++++++++++ 3 files changed, 30 insertions(+) diff --git a/debug.log b/debug.log index 5f9ed26..c4638ef 100644 --- a/debug.log +++ b/debug.log @@ -1,2 +1,3 @@ [1229/141605.754:ERROR:directory_reader_win.cc(43)] FindFirstFile: ϵͳҲָ· (0x3) [0104/100053.968:ERROR:directory_reader_win.cc(43)] FindFirstFile: ϵͳҲָ· (0x3) +[0122/085819.900:ERROR:directory_reader_win.cc(43)] FindFirstFile: ϵͳҲָ· (0x3) diff --git a/src/app/canvas-share-data.service.ts b/src/app/canvas-share-data.service.ts index adf46a6..753ce9a 100644 --- a/src/app/canvas-share-data.service.ts +++ b/src/app/canvas-share-data.service.ts @@ -588,6 +588,14 @@ export class DisposalNodeData { * 版本号 */ public Version: string; + /** + * 图片地址 + */ + public BackgroundImageUrl: string; + /** + * 图片地址 + */ + public BackgroundImageAngle: number; /** * 处置节点编号 */ diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts index 04d2c17..43a2acd 100644 --- a/src/app/working-area/working-area.component.ts +++ b/src/app/working-area/working-area.component.ts @@ -974,6 +974,27 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV this.createNodeShape(this.canvasData.selectPanelPoint.Data); this.createAxLegend(); } + /** + * 加载无关联信息处置预案 + * @data 处置预案数据 + */ + public async loadNoRelevantInformationDisposalPlan(data:DisposalNodeData): Promise { + await this.refreshBackgroundImage(data.BackgroundImageUrl,data.BackgroundImageAngle); + // 清空所有图形 + this.selection.deselectAll(); + const itemList = []; + this.backgroundImage.children.forEach(item => { + if (item instanceof AxShape && item instanceof AxPreviewImageShape === false) { + itemList.push(item.name); + } + }); + + itemList.forEach(item => { + this.backgroundImage.getChildByName(item).destroy(); + }); + // 创建处置预案图形 + this.createNodeShape(this.canvasData.selectPanelPoint.Data); + } /** * 创建安信图例 */ From 9ec8ef05d4347402c14ab47af23e62bb74989d79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=90=E6=8C=AF=E5=8D=87?= <359059686@qq.com> Date: Fri, 22 Jan 2021 15:32:09 +0800 Subject: [PATCH 4/5] 1.0.11.20210122 --- src/app/working-area/working-area.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts index 43a2acd..adaa4d7 100644 --- a/src/app/working-area/working-area.component.ts +++ b/src/app/working-area/working-area.component.ts @@ -148,7 +148,7 @@ export class WorkingAreaComponent extends EventEmitter implements OnInit, AfterV * RC版: 该版本已经相当成熟了，基本上不存在导致错误的BUG，与即将发行的正式版相差无几。 * Release版: 该版本意味“最终版本”，在前面版本的一系列测试版之后，终归会有一个正式版本，是最终交付用户使用的一个版本。该版本有时也称为标准版。一般情况下，Release不会以单词形式出现在软件封面上，取而代之的是符号®。 */ - public VERSION = '1.0.10.20210118_beta'; + public VERSION = '1.0.11.20210122_beta'; /** * 数据初始化 */ From e2df63a0f31a04de8cdef60dd87a92e7573222f4 Mon Sep 17 00:00:00 2001 From: chenjingyu Date: Sat, 23 Jan 2021 14:31:34 +0800 Subject: [PATCH 5/5] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wait-examineer.component.html | 3 +- .../wait-examineer.component.ts | 119 +++++++++++----- .../entry-plan/entry-plan.component.html | 9 ++ .../entry-plan/entry-plan.component.ts | 3 + .../meet-plan/meet-plan.component.ts | 4 +- .../onetwo-entry-plan.component.ts | 6 +- .../pass-plan/pass-plan.component.html | 132 +----------------- .../pass-plan/pass-plan.component.ts | 6 +- .../type-plan/type-plan.component.ts | 8 +- 9 files changed, 117 insertions(+), 173 deletions(-) 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 c7961ea..fccb149 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.html +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html @@ -56,7 +56,8 @@ 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 a444aff..d7e833a 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-01-21 11:17:39 + * @LastEditTime: 2021-01-23 14:16:10 */ import { Component, OnInit } from '@angular/core'; import { FormControl } from '@angular/forms'; @@ -91,6 +91,7 @@ export class WaitExamineerComponent implements OnInit { checked//是否选中 chuorzhong//判断初审还是终审 radioid//选中的id + shenheTable=[]//选中要审核的对象 //获取表格数据 getAlltabledate(){ @@ -132,11 +133,21 @@ export class WaitExamineerComponent implements OnInit { this.getAlltabledate() } //radio点击事件 - radioClick(item){ + radioClick(e,item){ //e.target.parentElement.bgColor='#2196F3' - console.log(item) - this.chuorzhong=item.verifyState - this.radioid=item.itemId + //console.log(e,item) + if(e.checked){ + this.shenheTable.push(item) + } + else{ + for(var i=0;i{ + this.snackBar.open('操作成功!','确定',config); + this.getAlltabledate() + }) + }else if(this.shenheTable[0].verifyState==3){ + this.http.put(`/api/PlanAudits/${this.radioid}`,{auditStatus:2}).subscribe(data=>{ + this.snackBar.open('操作成功!','确定',config); + this.getAlltabledate() + }) + } + } + else{ + for(var i=0;i{ + this.snackBar.open('操作成功!','确定',config); + this.getAlltabledate() + }) } - if(this.chuorzhong==0){ - this.http.put(`/api/PlanAudits/${this.radioid}/First`,{auditStatus:16}).subscribe(data=>{ + this.shenheTable=[] + } + //拒绝操作 + refuse(){ + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + var refuseList=[] + if(this.shenheTable.length==0){ + this.snackBar.open('请选择要审核的预案!','确定',config); + } + else if(this.shenheTable.length==1){ + if(this.shenheTable[0].verifyState==0){ + this.http.put(`/api/PlanAudits/${this.shenheTable[0].itemId}/First`,{auditStatus:32}).subscribe(data=>{ + this.snackBar.open('操作成功!','确定',config); + this.getAlltabledate() + }) + }else if(this.shenheTable[0].verifyState==3){ + this.http.put(`/api/PlanAudits/${this.radioid}`,{auditStatus:4}).subscribe(data=>{ this.snackBar.open('操作成功!','确定',config); - this.checked='' this.getAlltabledate() }) + } } - else if(this.chuorzhong==3){ - this.http.put(`/api/PlanAudits/${this.radioid}`,{auditStatus:2}).subscribe(data=>{ + else{ + for(var i=0;i{ this.snackBar.open('操作成功!','确定',config); - this.checked='' this.getAlltabledate() }) } - this.chuorzhong=undefined - } - //拒绝操作 - refuse(){ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - if(this.chuorzhong==2){ - this.snackBar.open('审核未通过，请修改后再来审核!','确定',config); - } -if(this.chuorzhong==0){ - this.http.put(`/api/PlanAudits/${this.radioid}/First`,{auditStatus:32}).subscribe(data=>{ - this.snackBar.open('操作成功!','确定',config); - this.checked='' - this.getAlltabledate() - }) -} -else if(this.chuorzhong==3){ -this.http.put(`/api/PlanAudits/${this.radioid}`,{auditStatus:4}).subscribe(data=>{ - this.snackBar.open('操作成功!','确定',config); - this.checked='' - this.getAlltabledate() -}) -} -this.chuorzhong=undefined + this.shenheTable=[] + + } //分数饼状图 diff --git a/src/app/plan-management/entry-plan/entry-plan.component.html b/src/app/plan-management/entry-plan/entry-plan.component.html index fcc41f3..67ad0fb 100644 --- a/src/app/plan-management/entry-plan/entry-plan.component.html +++ b/src/app/plan-management/entry-plan/entry-plan.component.html @@ -94,6 +94,15 @@ +
+ + + + 有预案 + 无预案 + + +
diff --git a/src/app/plan-management/entry-plan/entry-plan.component.ts b/src/app/plan-management/entry-plan/entry-plan.component.ts index feb6b5d..807af6f 100644 --- a/src/app/plan-management/entry-plan/entry-plan.component.ts +++ b/src/app/plan-management/entry-plan/entry-plan.component.ts @@ -53,6 +53,7 @@ export class EntryPlanComponent implements OnInit { organizationName:any //当前单位组织机构名称 preparelevels:any integritySort:any //完整度排序 + haveyuan//有无预案 colorRgb(sColor){ var reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/; var sColor = sColor.toLowerCase(); @@ -304,6 +305,7 @@ export class EntryPlanComponent implements OnInit { PageSize: this.pageSizeOptions[0], Sort: this.integritySort ? 'integrityscore' : '', SortType: this.integritySort || '', + HasPlanComponents:this.haveyuan||'' } this.http.get("/api/Plans",{params:paramsdata}).subscribe((data:any)=>{ @@ -349,6 +351,7 @@ export class EntryPlanComponent implements OnInit { this.preparelevel = '' this.integritySort = '' this.plcheck = false + this.haveyuan='' //重新获取初始化列表 // console.log(this.pageEvent) this.pageEvent.pageIndex = 0 diff --git a/src/app/plan-management/meet-plan/meet-plan.component.ts b/src/app/plan-management/meet-plan/meet-plan.component.ts index 8ff1a69..cc7d5f8 100644 --- a/src/app/plan-management/meet-plan/meet-plan.component.ts +++ b/src/app/plan-management/meet-plan/meet-plan.component.ts @@ -87,8 +87,8 @@ export class MeetPlanComponent implements OnInit { PlanType:reservePlanType||'', CreatorName:this.addname||'', AuditStatus:this.unitstate|| '', - QueryStartTime:this.addtime||'', - QueryEndTime:this.endtime||'', + CreationTimeRangeStart:this.addtime||'', + CreationTimeRangeEnd:this.endtime||'', PlanLevel:this.projectlevel||'', HasChildrenPlanLevel:this.plcheck||'', PageNumber: this.PageNumber || '1', diff --git a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts index 693ad3a..01ff599 100644 --- a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts +++ b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-24 14:15:10 * @LastEditors: sueRimn - * @LastEditTime: 2021-01-21 14:32:43 + * @LastEditTime: 2021-01-22 09:17:40 */ import { Component, OnInit, ViewChild, Inject } from '@angular/core'; import { HttpClient } from '@angular/common/http' @@ -98,8 +98,8 @@ export class OnetwoEntryPlanComponent implements OnInit { PlanType:reservePlanType||'', CreatorName:this.addname||'', AuditStatus:this.unitstate|| '', - QueryStartTime:this.addtime||'', - QueryEndTime:this.endtime||'', + CreationTimeRangeStart:this.addtime||'', + CreationTimeRangeEnd:this.endtime||'', PlanLevel:this.projectlevel||'', HasChildrenPlanLevel:this.plcheck||'', PageNumber: this.PageNumber || '1', diff --git a/src/app/plan-management/pass-plan/pass-plan.component.html b/src/app/plan-management/pass-plan/pass-plan.component.html index 8c34ed6..6c0411c 100644 --- a/src/app/plan-management/pass-plan/pass-plan.component.html +++ b/src/app/plan-management/pass-plan/pass-plan.component.html @@ -83,16 +83,6 @@
-
- - - - - 🠊 - - - -
@@ -114,126 +104,16 @@
- + + + + + diff --git a/src/app/plan-management/pass-plan/pass-plan.component.ts b/src/app/plan-management/pass-plan/pass-plan.component.ts index 0f0334d..9096503 100644 --- a/src/app/plan-management/pass-plan/pass-plan.component.ts +++ b/src/app/plan-management/pass-plan/pass-plan.component.ts @@ -42,7 +42,7 @@ export class PassPlanComponent implements OnInit { pageSizeOptions: number[] = [10] //设置每页条数 PageNumber:any; //第几页 - displayedColumns: string[] = ['planname', 'addpeople','addtime','plantype','auditStatus','openRange','projectlevel','operation']; + displayedColumns: string[] = ['planname', 'addpeople','level','addtime','plantype','auditStatus','openRange','projectlevel','operation']; allorganizations:any //所有组织机构 allunittype:any //所有单位类型 tabledataSource:any //表格数据 @@ -97,6 +97,8 @@ export class PassPlanComponent implements OnInit { AuditStatus:'', //审核状态 PlanLevel: this.preparelevel || '', HasChildrenPlanLevel: this.plcheck || '', + CreationTimeRangeStart:this.addtime||'', + CreationTimeRangeEnd:this.endtime||'', PageNumber: this.PageNumber || '1', PageSize: this.pageSizeOptions[0], Sort: '' @@ -342,6 +344,8 @@ export class PassPlanComponent implements OnInit { this.unittype = '' this.reservePlanType = '' this.preparelevel = '' + this.addtime='' + this.endtime='' this.plcheck = false //重新获取初始化列表 this.pageEvent.pageIndex = 0 diff --git a/src/app/plan-management/type-plan/type-plan.component.ts b/src/app/plan-management/type-plan/type-plan.component.ts index 0a1163c..91227db 100644 --- a/src/app/plan-management/type-plan/type-plan.component.ts +++ b/src/app/plan-management/type-plan/type-plan.component.ts @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2021-01-06 09:47:43 * @LastEditors: sueRimn - * @LastEditTime: 2021-01-21 14:15:40 + * @LastEditTime: 2021-01-23 09:45:17 */ import { Component, OnInit, ViewChild, Inject } from '@angular/core'; import { HttpClient } from '@angular/common/http' @@ -86,8 +86,8 @@ export class TypePlanComponent implements OnInit { planCategories:8, CreatorName:this.addname||'', AuditStatus:this.unitstate|| '', - QueryStartTime:this.addtime||'', - QueryEndTime:this.endtime||'', + CreationTimeRangeStart:this.addtime||'', + CreationTimeRangeEnd:this.endtime||'', PlanLevel:this.projectlevel||'', HasChildrenPlanLevel:this.plcheck||'', PageNumber: this.PageNumber || '1', @@ -371,6 +371,7 @@ export class newunitType{ PlanCategory:8, PlanLevel:PlanLevel, PlanMode:1, + PlanType:8, attachmentUrls:[`${this.objectName}`] } this.http.post("/api/PlanComponentsMajor",body).subscribe((data:any)=>{ @@ -461,6 +462,7 @@ export class newunitType{ PlanCategory:8, PlanLevel:PlanLevel, PlanMode:1, + PlanType:8, attachmentUrls:[`${this.objectName}`] }
- + + {{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.operation=='0'?'新增':item.operation=='1'?'更新':'删除'}}预案名称 {{element.name}} 添加人 {{element.creatorName}} 预案级别{{element.planCategory==1?'Ⅰ级预案':element.planCategory==2?'Ⅱ级预案': + element.planCategory==3?'Ⅲ级预案':element.planCategory==4?'Ⅳ级预案':element.planCategory==5?'Ⅴ级预案':element.planCategory==8?'类型预案':'应急预案'}} 添加时间 {{element.creationTime | date:'yyyy-MM-dd'}}