diff --git a/package-lock.json b/package-lock.json index d6c4941..b0b3765 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12876,6 +12876,15 @@ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", "dev": true }, + "photo-sphere-viewer": { + "version": "4.0.7", + "resolved": "https://registry.npm.taobao.org/photo-sphere-viewer/download/photo-sphere-viewer-4.0.7.tgz", + "integrity": "sha1-UPNlOACbVPqi+3S2QCvsFSvnFnc=", + "requires": { + "three": "^0.120.1", + "uevent": "~2.0.0" + } + }, "picomatch": { "version": "2.2.1", "resolved": "https://registry.npm.taobao.org/picomatch/download/picomatch-2.2.1.tgz", @@ -15880,6 +15889,11 @@ } } }, + "three": { + "version": "0.120.1", + "resolved": "https://registry.npm.taobao.org/three/download/three-0.120.1.tgz?cache=0&sync_timestamp=1608797656465&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fthree%2Fdownload%2Fthree-0.120.1.tgz", + "integrity": "sha1-29iJT4q4fBCfFgKTPnx0DJgTc3c=" + }, "through": { "version": "2.3.8", "resolved": "https://registry.npm.taobao.org/through/download/through-2.3.8.tgz", @@ -16169,6 +16183,11 @@ "integrity": "sha1-BpLiH2X9QQi5MwI4qsEd0uF3oa4=", "dev": true }, + "uevent": { + "version": "2.0.0", + "resolved": "https://registry.npm.taobao.org/uevent/download/uevent-2.0.0.tgz", + "integrity": "sha1-g9OifcdG8ODJjbPKHIUP/krvSZM=" + }, "uglify-js": { "version": "3.7.3", "resolved": "https://registry.npm.taobao.org/uglify-js/download/uglify-js-3.7.3.tgz?cache=0&sync_timestamp=1577407829710&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fuglify-js%2Fdownload%2Fuglify-js-3.7.3.tgz", diff --git a/package.json b/package.json index 55d3aba..31b12f3 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "ngx-countdown": "^9.0.1", "ngx-echarts": "^4.2.2", "ngx-perfect-scrollbar": "^8.0.0", + "photo-sphere-viewer": "^4.0.7", "pixi-filters": "^3.1.1", "pixi.js": "^5.3.2", "rxjs": "~6.5.4", 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 487e759..18ca1f3 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.html +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html @@ -1,33 +1,48 @@
+
- 操作类型： - 全部 - 更新 - 新增 - 删除 - 共计：80条 -
-
- 类型： - - - Ⅰ级 - Ⅱ级 - - - 编制级别： - - - Ⅰ级 - Ⅱ级 - - - -
+ 操作类型： + + + 全部 + 更新 + 新增 + 删除 + + 共计：80条 +
+
+ 类型： + + + Ⅰ级预案 + Ⅱ级预案 + Ⅲ级预案 + Ⅳ级预案 + Ⅴ级预案 + 应急预案(国家级) + 应急预案(市级) + 类型预案 + + + 编制级别： + + + {{item.name}} + + + + +
+ +
- +
@@ -36,17 +51,23 @@ - - - - - - - - - - -
类型 操作提交人 提交时间
{{item.level}}{{item.option}}{{item.orgication}}{{item.unitstate}}{{item.addname}}{{item.addtime}}
+ +
+ + + + + + + + + +
+ + {{item.contentType=='3'?'预案':''}}{{item.option}}{{item.verifyOrganizationName}}{{item.verifyState}}{{item.creatorName}}{{item.verifyTime|date:'yyyy-MM-dd'}}
+
+ +
diff --git a/src/app/plan-audit/wait-examineer/wait-examineer.component.scss b/src/app/plan-audit/wait-examineer/wait-examineer.component.scss index 9357836..5cc4fea 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.scss +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.scss @@ -14,9 +14,12 @@ .headdiv{ margin: 0 0 0 30px; height: 40px; + .radio{ + height: 10px; + } span{ font-size: 16px; - margin-left: 3px; + //margin-left: 3px; } input{ margin-left: 15px; @@ -41,10 +44,17 @@ } } .tablediv{ - width: 95%; - table{ - margin: 20px 20px; + width: 100%; + height: 70%; + .tbodycss{ + overflow-y: auto; + height: 700px; width: 100%; + } + table{ + //margin: 20px 20px; + margin-left: 20px; + width: 97%; //border: 1px solid #2196F3; thead{ @@ -54,6 +64,7 @@ font-size: 16px; } + tr:nth-child(odd){ background: #FAFAFA; } @@ -88,6 +99,7 @@ th,td{ height:48px; font-size: 16px; text-align: center; + //white-space: nowrap; } .green{color: #00C756;} .red{color: #FF4D4D;} @@ -167,4 +179,13 @@ th,td{ width: 60%; opacity: 1; } -} \ No newline at end of file +} + +//滚动条样式 +::-webkit-scrollbar{ + width: 6px; + background-color: white; + } + ::-webkit-scrollbar-thumb{ + background-color: #2196F3; + } 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 cdd8909..a7ac208 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.ts +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.ts @@ -4,10 +4,11 @@ * @Author: sueRimn * @Date: 2020-12-25 16:13:50 * @LastEditors: sueRimn - * @LastEditTime: 2020-12-28 16:14:25 + * @LastEditTime: 2021-01-18 11:07:46 */ import { Component, OnInit } from '@angular/core'; import { FormControl } from '@angular/forms'; +import { HttpClient } from '@angular/common/http' declare var echarts: any; @Component({ @@ -17,29 +18,105 @@ declare var echarts: any; }) export class WaitExamineerComponent implements OnInit { - constructor() { } + constructor(private http:HttpClient) { } 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=1 + } + if(level == "1"){//如果是支队 + this.preparelevels = [ + {name:"支队",value:"2"}, + {name:"大队",value:"4"}, + {name:"中队",value:"8"} + ] + this.PlanLevel=2 + } + if(level == "2"){//如果是大队 + this.preparelevels = [ + {name:"大队",value:"4"}, + {name:"中队",value:"8"} + ] + this.PlanLevel=4 + } + if(level == "3"){//如果是中队 + this.preparelevels = [ + {name:"中队",value:"8"} + ] + this.PlanLevel=8 + } + var scrollflaga = true; + var win=document.getElementById('tbodydiv') + /* window.setTimeout(()=>{ + var a = document.getElementById("table").offsetTop; + window.onscroll=function(){ + if(scrollflaga){ + if(a>=win.scrollTop&&a<(win.scrollTop+win.offsetHeight)){ + scrollflaga=false + this.getAlltabledate() + } + } + } + }) */ + + this.getAlltabledate() } ngOnDestroy () { /* this.indexbar.clear() this.indexbar.dispose() */ } + preparelevels:any selected = new FormControl(0); //选项卡 实例 level//类型 js//组织机构 addtime//时间 + projectlevel//编制级别 previewshow=false//预览得分是否显示 - 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"} - ] + tableDate isallDate=true//是否显示完成数据，默认显示 companyBuiltInGrouping=["基本信息","四周毗邻","消防设施"] indexbar //饼状图实例 indexzhu + PlanLevel//编制级别 + + //获取表格数据 + getAlltabledate(){ + + let paramsdata:any = { + VerifyType:3, + ContentType:Number(this.level)||'', + Level:this.PlanLevel||'' + + } + this.http.get("/api/ContentVerifies",{params:paramsdata}).subscribe((data:any)=>{ + console.log(data) + this.tableDate=data.items + }) + } + //提交查询 + onSubmit(value){ + console.log(value) + this.getAlltabledate() + } + //刷新 + record(){ + this.level='' + this.PlanLevel='' + this.getAlltabledate() + } + //表格点击事件 + tableClick(e,key){ + //e.target.parentElement.bgColor='#2196F3' + console.log(e) + } //变更数据和全部数据切换按钮 buttonChange(){ this.isallDate=!this.isallDate diff --git a/src/app/plan-management/entry-plan-look/AddPlanone.html b/src/app/plan-management/entry-plan-look/AddPlanone.html index beaf0d1..805108f 100644 --- a/src/app/plan-management/entry-plan-look/AddPlanone.html +++ b/src/app/plan-management/entry-plan-look/AddPlanone.html @@ -1,3 +1,11 @@ +
新建预案 @@ -24,6 +32,15 @@
+
+ + + Ⅲ级预案 + Ⅳ级预案 + Ⅴ级预案 + + +
@@ -32,7 +49,7 @@ - 上传预案完成创建 + 上传预案完成创建
预案形式： @@ -48,6 +65,12 @@ 导入word文档
+
+ + 是否为全景图 +
在线编辑
diff --git a/src/app/plan-management/entry-plan-look/Photo-Sphere-Viewer.html b/src/app/plan-management/entry-plan-look/Photo-Sphere-Viewer.html new file mode 100644 index 0000000..623b3ea --- /dev/null +++ b/src/app/plan-management/entry-plan-look/Photo-Sphere-Viewer.html @@ -0,0 +1,9 @@ + +
\ No newline at end of file diff --git a/src/app/plan-management/entry-plan-look/entry-plan-look.component.scss b/src/app/plan-management/entry-plan-look/entry-plan-look.component.scss index cadd2d5..9324d93 100644 --- a/src/app/plan-management/entry-plan-look/entry-plan-look.component.scss +++ b/src/app/plan-management/entry-plan-look/entry-plan-look.component.scss @@ -114,4 +114,12 @@ button{ margin: 0 3px; } -} \ No newline at end of file +} + +#viewer { + width: 100%; + height: 100%; + } + .mat-dialog-container{ + padding: 0; + } \ No newline at end of file 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 15f9db0..45342f6 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 @@ -11,6 +11,8 @@ import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; import { TreeService } from '../../http-interceptors/tree.service' import {FormBuilder, FormGroup, Validators} from '@angular/forms'; import { async } from '@angular/core/testing'; +import { Viewer } from 'photo-sphere-viewer'; +import {STEPPER_GLOBAL_OPTIONS} from '@angular/cdk/stepper'; @Component({ selector: 'app-entry-plan-look', templateUrl: './entry-plan-look.component.html', @@ -99,10 +101,14 @@ export class EntryPlanLookComponent implements OnInit { //查看预案 lookPlan(e){ if(e.planMode == 0){ - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('本地文件，请下载查看','确定',config); + console.log() + if(e.attachmentUrls[0].substr(0,3)=='psw'){ + const dialogRef = this.dialog.open(PsViewer, { + width: '1500px', + height:'800px', + data: e.attachmentUrls[0] + }); + } } if(e.planMode == 1){ const config = new MatSnackBarConfig(); @@ -141,6 +147,7 @@ export class EntryPlanLookComponent implements OnInit { allPlanComponents:any //所有预案组件 companyId : any //新建预案需要使用的id planId : any //统一预案id + lookUrl //查看文件路径 //改名 changeName(element){ // console.log(element) @@ -385,7 +392,7 @@ export class EntryPlanLookComponent implements OnInit { addplan () { const dialogRef = this.dialog.open(AddPlanone, { width:"585px", - height:"410px", + height:"430px", data: {companyId:this.companyId}, disableClose:true }); @@ -414,7 +421,8 @@ export class EntryPlanLookComponent implements OnInit { @Component({ selector: 'AddPlanone', templateUrl: './AddPlanone.html', - styleUrls: ['./entry-plan-look.component.scss'] + styleUrls: ['./entry-plan-look.component.scss'], + }) export class AddPlanone { isLinear = true; //是否为线性步进器 @@ -428,7 +436,8 @@ export class AddPlanone { this.firstFormGroup = this._formBuilder.group({ firstCtrlone: ['', Validators.required], - firstCtrltwo: ['', Validators.required] + firstCtrltwo: ['', Validators.required], + firstCtrlthree: ['', Validators.required], }); this.secondFormGroup = this._formBuilder.group({ secondCtrl: ['', Validators.required] @@ -442,6 +451,8 @@ export class AddPlanone { isweb:boolean = false //web输入框是否显示 isinput:boolean = false //导入是否显示 defaultisshow = '0' //默认显示上传input框 + pswShow=false //是否为全景图选项默认不显示 + psw//是否为全景图 //选择radio selectradio(e){ if(e.value == "0"){ //如果点击本地上传 @@ -481,7 +492,14 @@ export class AddPlanone { uploadId:any; //上传分块上传事件编号 //上传文件input filechange(e){ + this.psw=false this.file = e.target.files[0] || null //上传的文件 + if(this.selectedPLanType=='4'&&this.file.type!=null&&this.file.type!=undefined){ + if(this.file.type=='image/png'||this.file.type=='image/jpeg'){ + this.pswShow=true + }else{this.pswShow=false} + }else{this.pswShow=false} + // this.startUploading() } @@ -491,11 +509,12 @@ export class AddPlanone { let file = this.file || null //获取上传的文件 let fileSize = file.size || null //上传文件的总大小 let shardSize = 5 * 1024 * 1024 //5MB一个分片 + console.log(this.psw) if (file && fileSize<=shardSize) { //上传文件<=5MB时 let formData = new FormData() formData.append("file",file) - this.http.post(`/api/Objects/PlanPlatform/${this.data.companyId}/2D`,formData).subscribe((data:any)=>{ + this.http.post(this.psw?'/api/Objects/PlanPlatform/psw': `/api/Objects/PlanPlatform/${this.data.companyId}/2D`,formData).subscribe((data:any)=>{ this.objectName = data.objectName const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; @@ -531,6 +550,7 @@ export class AddPlanone { planType:Number(this.selectedPLanType), planMode: Number(this.defaultisshow), planLevel: PlanLevel, + planCategory: Number(this.selectedPLanLevel), url: "", attachmentUrls: [`${this.objectName}`] },{params:{ @@ -546,7 +566,7 @@ export class AddPlanone { } else if (file && fileSize>shardSize) { //上传文件>5MB时,分块上传 let data = {filename: file.name} this.uploadisLoading = true - this.http.post(`/api/NewMultipartUpload/PlanPlatform/${this.data.companyId}/2D`,{},{params:data}).subscribe((data:any)=>{ //初始化分段上传 + this.http.post(this.psw?'/api/NewMultipartUpload/PlanPlatform/psw':`/api/NewMultipartUpload/PlanPlatform/${this.data.companyId}/2D`,{},{params:data}).subscribe((data:any)=>{ //初始化分段上传 this.objectName = data.objectName this.uploadId = data.uploadId this.subsectionUploading(planType) @@ -630,6 +650,7 @@ export class AddPlanone { planType:Number(this.selectedPLanType), planMode: Number(this.defaultisshow), planLevel: PlanLevel, + planCategory: Number(this.selectedPLanLevel), url: "", attachmentUrls: [`${this.objectName}`] },{params:{ @@ -671,14 +692,18 @@ export class AddPlanone { //点击下一步 selectedPLanType:any//所选预案类型 selectedPLanName:any//所选预案名称 + selectedPLanLevel:any//所选预案级别 localup:boolean = false //本地上传 inputword:boolean = false //导入文档 onlineedit:boolean = false //在线编辑 website:boolean = false //网页地址 next(formdata){ // console.log(formdata.value.firstCtrltwo) + //console.log(this.file) + this.psw=false this.selectedPLanName = formdata.value.firstCtrlone this.selectedPLanType = formdata.value.firstCtrltwo + this.selectedPLanLevel= formdata.value.firstCtrlthree if(formdata.value.firstCtrltwo=='8'){ //如果是卡片预案 this.localup = true this.inputword = true @@ -696,10 +721,25 @@ export class AddPlanone { this.inputword = false this.onlineedit = false this.website = true + this.pswShow=true } + if(this.selectedPLanType=='4'&&this.file!=undefined&&this.file.type!=null){ + if(this.file.type=='image/png'||this.file.type=='image/jpeg'){ + this.pswShow=true + }else{this.pswShow=false} + }else{this.pswShow=false} + + } + setttt(){ + this.pswShow=false + this.psw=false } closediv(){ - this.cancel(); + console.log(this.file) + if(this.file!=undefined){ + this.cancel(); + } + this.dialogRef.close(); } @@ -985,4 +1025,22 @@ export class ChangeName { }) } } +} + +//全景图弹出框 +@Component({ + selector: 'PsViewer', + templateUrl: './Photo-Sphere-Viewer.html', + styleUrls: ['./entry-plan-look.component.scss'] +}) +export class PsViewer{ + constructor(private router:Router,private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public dialogRef: MatDialogRef,@Inject(MAT_DIALOG_DATA) public data: any) {} + ngOnInit(): void { + console.log(this.data) + const viewer = new Viewer({ + container: document.querySelector('#viewer'), + panorama:'/api/Objects/PlanPlatform/'+ this.data, + + }); + } } \ No newline at end of file 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 6cd5933..fcc41f3 100644 --- a/src/app/plan-management/entry-plan/entry-plan.component.html +++ b/src/app/plan-management/entry-plan/entry-plan.component.html @@ -228,7 +228,7 @@ 预案级别 - Ⅲ(0)Ⅳ(0)Ⅴ(0) + {{element.planCategory}} 消防救援站 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 74af56b..feb6b5d 100644 --- a/src/app/plan-management/entry-plan/entry-plan.component.ts +++ b/src/app/plan-management/entry-plan/entry-plan.component.ts @@ -311,7 +311,6 @@ export class EntryPlanComponent implements OnInit { this.allPlanInfo = data this.tabledataSource = data.items - console.log(this.tabledataSource) }) } 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 97682f5..f648b51 100644 --- a/src/app/plan-management/meet-plan/meet-plan.component.html +++ b/src/app/plan-management/meet-plan/meet-plan.component.html @@ -81,7 +81,17 @@
+
+
+ +
+ + + {{downloadFileName}} + 下载中... + +
@@ -123,6 +133,8 @@ 操作 查看预案 + 提交审核 + 撤销审核 下载 删除 diff --git a/src/app/plan-management/meet-plan/meet-plan.component.scss b/src/app/plan-management/meet-plan/meet-plan.component.scss index d963db0..6b4385f 100644 --- a/src/app/plan-management/meet-plan/meet-plan.component.scss +++ b/src/app/plan-management/meet-plan/meet-plan.component.scss @@ -74,6 +74,7 @@ .newadd{ margin-top: 10px; margin-left: 70px; + display: flex; button{ font-size: 16px; width: 100px; @@ -118,4 +119,34 @@ text-decoration:underline } } - } \ No newline at end of file + } + + //进度条 +.progressBox{ + line-height: 49px; + height: 30px; + position: relative; + display: inline-block; + width: 100%; + top:10%; + button{ + float: right; + } + .progress{ + display: inline-block; + position: absolute; + width: 500px; + top: 22px; + left: 62px; + } + + .filename{ + display: inline-block; + max-width: 180px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + // margin-left: 160px; + } + +} \ No newline at end of file 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 12cc226..875e4e8 100644 --- a/src/app/plan-management/meet-plan/meet-plan.component.ts +++ b/src/app/plan-management/meet-plan/meet-plan.component.ts @@ -132,6 +132,28 @@ export class MeetPlanComponent implements OnInit { } + //提交审核 + submitAudit(element){ + // console.log(element) + if(element.auditStatus == 4){ + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('审核退回的预案需要修改后方可再次提交审核!','确定',config); + }else{ + this.http.put(`/api/PlanComponentsMajor/${element.id}/Commit`,"").subscribe(data=>{ + this.getAlltabledate() + }) + } + + } + //撤销审核 + cancelAudit(element){ + this.http.put(`/api/PlanComponentsMajor/${element.id}/Cancel`,"").subscribe(data=>{ + this.getAlltabledate() + }) + } + //下载↓ selectDownloadFile:any; //选择下载的文件 download:any; //下载文件元数据 @@ -247,7 +269,8 @@ export class MeetPlanComponent implements OnInit { addunit(){ const dialogRef = this.dialog.open(newunitMeet, { width: '340px', - height:'505px' + height:'490px', + disableClose:true //data: paperDataInfo }); dialogRef.afterClosed().subscribe(result => { @@ -307,6 +330,21 @@ export class newunitMeet{ const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 + let level = sessionStorage.getItem("level") + // console.log(level) + let PlanLevel + if(level == '0'){ + PlanLevel = 1 + } + if(level == '1'){ + PlanLevel = 2 + } + if(level == '2'){ + PlanLevel = 4 + } + if(level == '3'){ + PlanLevel = 8 + } this.http.post('/api/Objects/PlanPlatform/meetClass',formData).subscribe((data:any)=>{ this.objectName = data.objectName //this.snackBar.open('上传成功!','确定',config); @@ -315,7 +353,7 @@ export class newunitMeet{ Name:this.unitname||'', PlanCategory:Number(this.level)||'', PlanType: Number(this.reservePlanType), - PlanLevel:1, + PlanLevel:PlanLevel, PlanMode:1, attachmentUrls:[`${this.objectName}`] } @@ -387,12 +425,27 @@ export class newunitMeet{ this.uploadisLoading = false this.PartNumberETag =[] //清空保存返回的信息 this.uploadover = true + let level = sessionStorage.getItem("level") + // console.log(level) + let PlanLevel + if(level == '0'){ + PlanLevel = 1 + } + if(level == '1'){ + PlanLevel = 2 + } + if(level == '2'){ + PlanLevel = 4 + } + if(level == '3'){ + PlanLevel = 8 + } let body:any = { Name:this.unitname||'', PlanCategory:Number(this.level)||'', PlanType: Number(this.reservePlanType), - PlanLevel:1, + PlanLevel:PlanLevel, PlanMode:1, attachmentUrls:[`${this.objectName}`] } diff --git a/src/app/plan-management/meet-plan/newunit.html b/src/app/plan-management/meet-plan/newunit.html index 65e54f7..96e7e79 100644 --- a/src/app/plan-management/meet-plan/newunit.html +++ b/src/app/plan-management/meet-plan/newunit.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-24 16:26:16 * @LastEditors: sueRimn - * @LastEditTime: 2021-01-11 13:56:29 + * @LastEditTime: 2021-01-13 15:43:05 -->
@@ -41,10 +41,15 @@
-
- 上传中... - - +
+
+ 上传中... +
+
+ +
+
+
diff --git a/src/app/plan-management/meet-plan/newunit.scss b/src/app/plan-management/meet-plan/newunit.scss index b99389b..c97e256 100644 --- a/src/app/plan-management/meet-plan/newunit.scss +++ b/src/app/plan-management/meet-plan/newunit.scss @@ -32,4 +32,27 @@ height: 36px; font-size: 16px; } - } \ No newline at end of file + } + + .uping{ + display:flex; + .upclass{ + margin-left: 3px; + height: 30px; + } + .progress{ + position: relative; + top:3% + } + button{ + width: 80px; + height: 30px; + font-size: 10px; + margin-top: 5px; + } + span{ + font-size: 10px; + position: relative; + top: 8px; + } +} \ No newline at end of file diff --git a/src/app/plan-management/onetwo-entry-plan/newunit.html b/src/app/plan-management/onetwo-entry-plan/newunit.html index 47919d3..dd60ef4 100644 --- a/src/app/plan-management/onetwo-entry-plan/newunit.html +++ b/src/app/plan-management/onetwo-entry-plan/newunit.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-24 16:26:16 * @LastEditors: sueRimn - * @LastEditTime: 2021-01-11 13:55:40 + * @LastEditTime: 2021-01-13 15:17:47 -->
@@ -33,10 +33,15 @@
-
- 上传中... - - +
+
+ 上传中... +
+
+ +
+
+
diff --git a/src/app/plan-management/onetwo-entry-plan/newunit.scss b/src/app/plan-management/onetwo-entry-plan/newunit.scss index b99389b..3551e22 100644 --- a/src/app/plan-management/onetwo-entry-plan/newunit.scss +++ b/src/app/plan-management/onetwo-entry-plan/newunit.scss @@ -32,4 +32,26 @@ height: 36px; font-size: 16px; } + } + .uping{ + display:flex; + .upclass{ + margin-left: 3px; + height: 30px; + } + .progress{ + position: relative; + top:3% + } + button{ + width: 80px; + height: 30px; + font-size: 10px; + margin-top: 5px; + } + span{ + font-size: 10px; + position: relative; + top: 8px; + } } \ No newline at end of file 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 0c01d45..99ae087 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-09 10:37:36 + * @LastEditTime: 2021-01-15 14:11:36 -->
@@ -81,7 +81,16 @@
+
+
+
+ + + {{downloadFileName}} + 下载中... + +
@@ -124,6 +133,8 @@ 操作 查看预案 + 提交审核 + 撤销审核 下载 删除 diff --git a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss index d963db0..06f4edd 100644 --- a/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss +++ b/src/app/plan-management/onetwo-entry-plan/onetwo-entry-plan.component.scss @@ -74,6 +74,7 @@ .newadd{ margin-top: 10px; margin-left: 70px; + display: flex; button{ font-size: 16px; width: 100px; @@ -118,4 +119,34 @@ text-decoration:underline } } - } \ No newline at end of file + } + + //进度条 +.progressBox{ + line-height: 49px; + height: 29px; + position: relative; + display: inline-block; + width: 100%; + top:10%; + button{ + float: right; + } + .progress{ + display: inline-block; + position: absolute; + width: 500px; + top: 22px; + left: 62px; + } + + .filename{ + display: inline-block; + max-width: 180px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + // margin-left: 160px; + } + +} \ No newline at end of file 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 7a0debf..1031949 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-11 14:04:49 + * @LastEditTime: 2021-01-15 15:05:18 */ import { Component, OnInit, ViewChild, Inject } from '@angular/core'; import { HttpClient } from '@angular/common/http' @@ -157,11 +157,34 @@ export class OnetwoEntryPlanComponent implements OnInit { } + //提交审核 + submitAudit(element){ + // console.log(element) + if(element.auditStatus == 4){ + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('审核退回的预案需要修改后方可再次提交审核!','确定',config); + }else{ + this.http.put(`/api/PlanComponentsMajor/${element.id}/Commit`,"").subscribe(data=>{ + this.getAlltabledate() + }) + } + + } + //撤销审核 + cancelAudit(element){ + this.http.put(`/api/PlanComponentsMajor/${element.id}/Cancel`,"").subscribe(data=>{ + this.getAlltabledate() + }) + } + //新增预案弹窗 addunit(){ const dialogRef = this.dialog.open(newunitComponent, { width: '340px', - height:'440px' + height:'400px', + disableClose:true //data: paperDataInfo }); dialogRef.afterClosed().subscribe(result => { @@ -333,12 +356,27 @@ export class newunitComponent{ this.http.post(this.url=='2'?`/api/Objects/PlanPlatform/twoClass`:'/api/Objects/PlanPlatform/oneClass',formData).subscribe((data:any)=>{ this.objectName = data.objectName //this.snackBar.open('上传成功!','确定',config); + let level = sessionStorage.getItem("level") + // console.log(level) + let PlanLevel + if(level == '0'){ + PlanLevel = 1 + } + if(level == '1'){ + PlanLevel = 2 + } + if(level == '2'){ + PlanLevel = 4 + } + if(level == '3'){ + PlanLevel = 8 + } let body:any = { Name:this.unitname||'', PlanCategory:this.url=='2'?2:1, PlanType: Number(this.reservePlanType), - PlanLevel:1, + PlanLevel:PlanLevel, PlanMode:1, attachmentUrls:[`${this.objectName}`] } @@ -409,12 +447,27 @@ export class newunitComponent{ this.uploadisLoading = false this.PartNumberETag =[] //清空保存返回的信息 this.uploadover = true + let level = sessionStorage.getItem("level") + // console.log(level) + let PlanLevel + if(level == '0'){ + PlanLevel = 1 + } + if(level == '1'){ + PlanLevel = 2 + } + if(level == '2'){ + PlanLevel = 4 + } + if(level == '3'){ + PlanLevel = 8 + } let body:any = { Name:this.unitname||'', PlanCategory:this.url=='2'?2:1, PlanType: Number(this.reservePlanType), - PlanLevel:1, + PlanLevel:PlanLevel, PlanMode:1, attachmentUrls:[`${this.objectName}`] } diff --git a/src/app/plan-management/plan-management.module.ts b/src/app/plan-management/plan-management.module.ts index 2b5d724..3c10cd0 100644 --- a/src/app/plan-management/plan-management.module.ts +++ b/src/app/plan-management/plan-management.module.ts @@ -55,12 +55,14 @@ import { newunitComponent} from './onetwo-entry-plan/onetwo-entry-plan.component import { MeetPlanComponent } from './meet-plan/meet-plan.component'; import { newunitMeet }from './meet-plan/meet-plan.component'; import { TypePlanComponent } from './type-plan/type-plan.component'; -import { newunitType }from './type-plan/type-plan.component' +import { newunitType }from './type-plan/type-plan.component'; +import { PsViewer } from './entry-plan-look/entry-plan-look.component' @NgModule({ - declarations: [EntryPlanComponent, PassPlanComponent, OpenPlanComponent, EntryPlanLookComponent,AddPlanone,PlanType,AuditSatus,PlanLevel,DownloadFile,AuditResult,ChangeName, WebLookComponent, OnetwoEntryPlanComponent,newunitComponent, MeetPlanComponent,newunitMeet, TypePlanComponent,newunitType], + declarations: [EntryPlanComponent, PassPlanComponent, OpenPlanComponent, EntryPlanLookComponent,AddPlanone,PlanType,AuditSatus,PlanLevel,DownloadFile,AuditResult,ChangeName, + WebLookComponent, OnetwoEntryPlanComponent,newunitComponent, MeetPlanComponent,newunitMeet, TypePlanComponent,newunitType,PsViewer], imports: [ CommonModule, PlanManagementRoutingModule, diff --git a/src/app/plan-management/type-plan/newunit.html b/src/app/plan-management/type-plan/newunit.html index 519b63d..cd2b0a7 100644 --- a/src/app/plan-management/type-plan/newunit.html +++ b/src/app/plan-management/type-plan/newunit.html @@ -4,7 +4,7 @@ * @Author: sueRimn * @Date: 2020-12-24 16:26:16 * @LastEditors: sueRimn - * @LastEditTime: 2021-01-11 13:57:06 + * @LastEditTime: 2021-01-13 15:26:19 -->
@@ -22,11 +22,16 @@ -
-
- 上传中... - - +
+
+
+ 上传中... +
+
+ +
+
+
diff --git a/src/app/plan-management/type-plan/newunit.scss b/src/app/plan-management/type-plan/newunit.scss index 42ff2b4..9270aa9 100644 --- a/src/app/plan-management/type-plan/newunit.scss +++ b/src/app/plan-management/type-plan/newunit.scss @@ -52,3 +52,26 @@ opacity: 0; -ms-filter: 'alpha(opacity=0)'; } + +.uping{ + display:flex; + .upclass{ + margin-left: 3px; + height: 30px; + } + .progress{ + position: relative; + top:3% + } + button{ + width: 80px; + height: 30px; + font-size: 10px; + margin-top: 5px; + } + span{ + font-size: 10px; + position: relative; + top: 8px; + } +} 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 5982abd..4dfa58b 100644 --- a/src/app/plan-management/type-plan/type-plan.component.html +++ b/src/app/plan-management/type-plan/type-plan.component.html @@ -61,7 +61,17 @@
+
+
+ +
+ + + {{downloadFileName}} + 下载中... + +
@@ -101,6 +111,8 @@ 操作 查看预案 + 提交审核 + 撤销审核 下载 删除 diff --git a/src/app/plan-management/type-plan/type-plan.component.scss b/src/app/plan-management/type-plan/type-plan.component.scss index d963db0..71cadc2 100644 --- a/src/app/plan-management/type-plan/type-plan.component.scss +++ b/src/app/plan-management/type-plan/type-plan.component.scss @@ -74,6 +74,7 @@ .newadd{ margin-top: 10px; margin-left: 70px; + display: flex; button{ font-size: 16px; width: 100px; @@ -118,4 +119,34 @@ text-decoration:underline } } - } \ No newline at end of file + } + + //进度条 +.progressBox{ + line-height: 49px; + height: 29px; + position: relative; + display: inline-block; + width: 100%; + top:5%; + button{ + float: right; + } + .progress{ + display: inline-block; + position: absolute; + width: 500px; + top: 22px; + left: 62px; + } + + .filename{ + display: inline-block; + max-width: 180px; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + // margin-left: 160px; + } + +} \ No newline at end of file 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 9e104cc..623917f 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-11 14:01:30 + * @LastEditTime: 2021-01-15 15:15:49 */ import { Component, OnInit, ViewChild, Inject } from '@angular/core'; import { HttpClient } from '@angular/common/http' @@ -145,11 +145,33 @@ export class TypePlanComponent implements OnInit { } + //提交审核 + submitAudit(element){ + // console.log(element) + if(element.auditStatus == 4){ + const config = new MatSnackBarConfig(); + config.verticalPosition = 'top'; + config.duration = 3000 + this.snackBar.open('审核退回的预案需要修改后方可再次提交审核!','确定',config); + }else{ + this.http.put(`/api/PlanComponentsMajor/${element.id}/Commit`,"").subscribe(data=>{ + this.getAlltabledate() + }) + } + + } + //撤销审核 + cancelAudit(element){ + this.http.put(`/api/PlanComponentsMajor/${element.id}/Cancel`,"").subscribe(data=>{ + this.getAlltabledate() + }) + } //新增预案弹窗 addunit(){ const dialogRef = this.dialog.open(newunitType, { width: '340px', - height:'370px' + height:'330px', + disableClose:true //data: paperDataInfo }); dialogRef.afterClosed().subscribe(result => { @@ -309,6 +331,21 @@ export class newunitType{ const config = new MatSnackBarConfig(); config.verticalPosition = 'top'; config.duration = 3000 + let level = sessionStorage.getItem("level") + // console.log(level) + let PlanLevel + if(level == '0'){ + PlanLevel = 1 + } + if(level == '1'){ + PlanLevel = 2 + } + if(level == '2'){ + PlanLevel = 4 + } + if(level == '3'){ + PlanLevel = 8 + } this.http.post(`/api/Objects/PlanPlatform/typeClass`,formData).subscribe((data:any)=>{ this.objectName = data.objectName //console.log('上传成功') @@ -316,7 +353,7 @@ export class newunitType{ let body:any = { Name:this.unitname||'', PlanCategory:8, - PlanLevel:1, + PlanLevel:PlanLevel, PlanMode:1, attachmentUrls:[`${this.objectName}`] } @@ -387,11 +424,26 @@ export class newunitType{ this.uploadisLoading = false this.PartNumberETag =[] //清空保存返回的信息 this.uploadover = true + let level = sessionStorage.getItem("level") + // console.log(level) + let PlanLevel + if(level == '0'){ + PlanLevel = 1 + } + if(level == '1'){ + PlanLevel = 2 + } + if(level == '2'){ + PlanLevel = 4 + } + if(level == '3'){ + PlanLevel = 8 + } let body:any = { Name:this.unitname||'', PlanCategory:8, - PlanLevel:1, + PlanLevel:PlanLevel, PlanMode:1, attachmentUrls:[`${this.objectName}`] } diff --git a/src/index.html b/src/index.html index 3a0931f..a52c1b2 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: 2020-11-28 13:54:40 + * @LastEditTime: 2021-01-12 13:42:33 --> @@ -15,6 +15,7 @@ +