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/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() + } } 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 c5f78f0..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-20 16:35:27 + * @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//閫変腑鐨刬d + 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() }) } - } - //鎷掔粷鎿嶄綔 - 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.shenheTable=[] + + } //鍒嗘暟楗肩姸鍥 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 @@
- + 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.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 @@
- + @@ -145,7 +146,8 @@
- + + {{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.auditStatus | auditsatus}}{{element.auditStatus=='8'?'鏈彁浜ゅ鏍':element.auditStatus=='1'?'瀹℃牳涓':element.auditStatus=='2'?'瀹℃牳閫氳繃':element.auditStatus=='4'? + '瀹℃牳閫鍥':element.auditStatus=='16'?'鍒濆閫氳繃':'鍒濆椹冲洖'}} 鏄惁鍏紑 瀹℃牳鐘舵{{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/meet-plan/meet-plan.component.ts b/src/app/plan-management/meet-plan/meet-plan.component.ts index c879164..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', @@ -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..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-20 14:28:39 + * @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', @@ -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..6c0411c 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,16 @@ 鍖呭惈涓嬬骇
+
+ + + + + 馃爦 + + + +
@@ -86,18 +96,24 @@
- + + + + + + 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..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[] = ['unitname', '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: '' @@ -108,6 +110,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);//杞崲涓簉gb鏁扮粍妯″紡 + 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 +236,10 @@ export class PassPlanComponent implements OnInit { } ) } + addtime//寮濮嬫椂闂 + endtime//缁撴潫鏃堕棿 + integrityScoreMin//瀹屾暣搴︽渶灏忓 + integrityScoreMax//瀹屾暣搴︽渶澶у organizationName:any //褰撳墠鍗曚綅缁勭粐鏈烘瀯鍚嶇О treedata:any //缁勭粐鏈烘瀯鏍戝瀷鏁版嵁 newArr:any = [] @@ -223,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.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.planCategory==1?'鈪犵骇棰勬':element.planCategory==2?'鈪＄骇棰勬': + element.planCategory==3?'鈪㈢骇棰勬':element.planCategory==4?'鈪ｇ骇棰勬':element.planCategory==5?'鈪ょ骇棰勬':element.planCategory==8?'绫诲瀷棰勬':'搴旀ラ妗'}} 娣诲姞鏃堕棿 {{element.creationTime | date:'yyyy-MM-dd'}} 瀹℃牳鐘舵{{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..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-20 15:03:08 + * @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', @@ -99,6 +99,11 @@ export class TypePlanComponent implements OnInit { this.tabledataSource = data.items }) } + //鍒嗛〉浜嬩欢 + changePage(e){ + this.PageNumber = e.pageIndex+1 + this.getAlltabledate() + } //閲嶇疆 reset(){ @@ -366,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)=>{ @@ -456,6 +462,7 @@ export class newunitType{ PlanCategory:8, PlanLevel:PlanLevel, PlanMode:1, + PlanType:8, attachmentUrls:[`${this.objectName}`] } diff --git a/src/app/working-area/working-area.component.ts b/src/app/working-area/working-area.component.ts index 73adefd..2b9c93f 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鐗: 璇ョ増鏈剰鍛斥滄渶缁堢増鏈濓紝鍦ㄥ墠闈㈢増鏈殑涓绯诲垪娴嬭瘯鐗堜箣鍚庯紝缁堝綊浼氭湁涓涓寮忕増鏈紝鏄渶缁堜氦浠樼敤鎴蜂娇鐢ㄧ殑涓涓増鏈傝鐗堟湰鏈夋椂涔熺О涓烘爣鍑嗙増銆備竴鑸儏鍐典笅锛孯elease涓嶄細浠ュ崟璇嶅舰寮忓嚭鐜板湪杞欢灏侀潰涓婏紝鍙栬屼唬涔嬬殑鏄鍙仿 */ - public VERSION = '1.0.10.20210118_beta'; + public VERSION = '1.0.11.20210122_beta'; /** * 鏁版嵁鍒濆鍖 */ @@ -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); + } /** * 鍒涘缓瀹変俊鍥句緥 */