From c897c182447a0452fc8d4613fc97b7e5d9fd84ee Mon Sep 17 00:00:00 2001 From: Sjh <55341701@qq.com> Date: Fri, 22 Dec 2023 10:25:54 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=E5=BE=85=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E6=98=BE=E7=A4=BAbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/app.component.ts | 1 + .../wait-examineer.component.html | 2 + .../meet-plan/meet-plan.component.html | 363 ++++---- .../onetwo-entry-plan.component.html | 335 +++---- .../type-plan/type-plan.component.html | 322 +++---- .../type-plan/type-plan.component.ts | 861 ++++++++++-------- 6 files changed, 1007 insertions(+), 877 deletions(-) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 76ba4c8..dce8026 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -25,6 +25,7 @@ export class AppComponent { isMaskLayerShow: boolean = false; ngOnInit(): void { + console.log("更新日期2023.12.21"); //监听遮罩层 this.maskLayerService.getMessage().subscribe((message: any) => { this.isMaskLayerShow = message; 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 b9d66e8..8789cac 100644 --- a/src/app/plan-audit/wait-examineer/wait-examineer.component.html +++ b/src/app/plan-audit/wait-examineer/wait-examineer.component.html @@ -108,6 +108,8 @@ 待初审 + 待初审 待终审 初审通过 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 6592eef..40aa7c2 100644 --- a/src/app/plan-management/meet-plan/meet-plan.component.html +++ b/src/app/plan-management/meet-plan/meet-plan.component.html @@ -1,190 +1,199 @@
-
-
-
- -
- - - - -
-
- - - - - {{item.name}} - - - 包含下级 - 更多筛选条件 - 收起 -
- - -
- - -
-
- - - - 国家级 - 市级 - - - -
-
- - - - - 更多筛选条件 - 收起 -
-
- - + {{item.name}} + + + 包含下级 + 更多筛选条件 + 收起
-
- - - - - - arrow forward - 🠊 - - - - -
- -
- - - - -
-
- - - - 未提交审核 - 审核中 - 审核通过 - 审核退回 - - -
-
- - - - -
- -
- + arrow forward + 🠊 + + + + +
+ + +
+ + + + +
+
+ + + + 未提交审核 + 审核中 + 审核通过 + 审核退回 + + +
+
+ + + + +
+ +
+ - + + + +
+
+ +
- -
-
- - -
- -
- - - {{downloadFileName}} - 下载中... - -
+ +
+ + + {{downloadFileName}} + 下载中... +
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
预案状态 - 新增 - 维护更新 - 预案名称{{element.name}}预案级别{{element.planCategory=='6'?'国家级':'市级'}}添加人{{element.creatorName}}添加时间{{element.creationTime|date:'yyyy-MM-dd'}}预案类型{{element.disasterType}}新增审核 - {{element.newVerifyState}} - - 是否公开{{element.openRange}}编制级别{{element.planLevel=='1'?'总队':element.planLevel=='2'?'支队':element.planLevel=='4'?'大队':'中队'}}维护审核{{element.maintenanceVerifyState}}操作 - 查看预案 - 提交审核 - 撤销审核 - 审批结果 - 下载 - 删除 -
- - - - -
+ + + + 是否公开 + {{element.openRange}} + + + 编制级别 + + {{element.planLevel=='1'?'总队':element.planLevel=='2'?'支队':element.planLevel=='4'?'大队':'中队'}} + + + 维护审核 + {{element.maintenanceVerifyState}} + + + 操作 + + 查看预案 + 提交审核 + 撤销审核 + 审批结果 + 下载 + 删除 + + + + + + + + +
-
+
+ \ 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 b7c44e5..e120f7c 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 @@ -7,172 +7,181 @@ * @LastEditTime: 2021-07-24 16:59:38 -->
-
-
-
-
- - - - -
-
- - - - - {{item.name}} - - - 包含下级 - 更多筛选条件 - 收起 -
-
- - -
-
- - - - - -
-
- - - - - 更多筛选条件 - 收起 -
- -
- - -
-
- - - - - - arrow forward - 🠊 - - - -
- -
- - - - 未提交审核 - 审核中 - 审核通过 - 审核退回 - - -
-
- - - - -
- -
- -
-
- -
-
- -
-
- - - {{downloadFileName}} - 下载中... - + {{item.name}} + + + 包含下级 + 更多筛选条件 + 收起 +
+
+ + +
+
+ + + + + +
+
+ + + + + 更多筛选条件 + 收起 +
+ +
+ + +
+
+ + + + + + arrow forward + 🠊 + + + +
+ +
+ + + + 未提交审核 + 审核中 + 审核通过 + 审核退回 + + +
+
+ + + + +
+
+ + +
+ +
+
+
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
预案状态 - 新增 - 维护更新 - 预案名称{{element.name}}预案级别{{url=='2'?'Ⅱ级':'Ⅰ级'}}添加人{{element.creatorName}}添加时间{{element.creationTime|date:'yyyy-MM-dd'}}预案类型{{element.disasterType}}新增审核{{element.newVerifyState}}维护审核{{element.maintenanceVerifyState}}是否公开{{element.openRange}}编制级别{{element.planLevel=='1'?'总队':element.planLevel=='2'?'支队':element.planLevel=='4'?'大队':'中队'}}操作 - 查看预案 - 提交审核 - 撤销审核 - 审批结果 - - 下载 - 删除 -
- - - - -
+
+ + + {{downloadFileName}} + 下载中... + +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
预案状态 + 新增 + 维护更新 + 预案名称{{element.name}}预案级别{{url=='2'?'Ⅱ级':'Ⅰ级'}}添加人{{element.creatorName}}添加时间{{element.creationTime|date:'yyyy-MM-dd'}}预案类型{{element.disasterType}}新增审核{{element.newVerifyState}}维护审核{{element.maintenanceVerifyState}}是否公开{{element.openRange}}编制级别 + {{element.planLevel=='1'?'总队':element.planLevel=='2'?'支队':element.planLevel=='4'?'大队':'中队'}}操作 + 查看预案 + 提交审核 + 撤销审核 + 审批结果 + + 下载 + 删除 +
+ + + +
-
+
+ \ No newline at end of file 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 d9d5c81..5c300fe 100644 --- a/src/app/plan-management/type-plan/type-plan.component.html +++ b/src/app/plan-management/type-plan/type-plan.component.html @@ -1,164 +1,174 @@
-
-
-
- -
- - - - -
-
- - - - - {{item.name}} - - - 包含下级 - 更多筛选条件 - 收起 -
- -
- - -
-
- - - - - -
- -
- - - - 未提交审核 - 审核中 - 审核通过 - 审核退回 - - - 更多筛选条件 - 收起 -
-
- - -
-
- - - - - - arrow forward - 🠊 - - - -
-
- - - - -
- -
-
-
- -
-
- -
- -
- - - {{downloadFileName}} - 下载中... - + {{item.name}} + + + 包含下级 + 更多筛选条件 + 收起 +
+ +
+ + +
+
+ + + + + +
+ +
+ + + + 未提交审核 + 审核中 + 审核通过 + 审核退回 + + + 更多筛选条件 + 收起 +
+
+ + +
+
+ + + + + + arrow forward + 🠊 + + + +
+
+ + + + +
+
+ +
+ +
+
+
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
预案状态 - 新增 - 维护更新 - 预案名称{{element.name}}添加人{{element.creatorName}}添加时间{{element.creationTime|date:'yyyy-MM-dd'}}预案类型类型预案新增审核 - {{element.newVerifyState}} - 是否公开{{element.openRange}}编制级别{{element.planLevel=='1'?'总队':element.planLevel=='2'?'支队':element.planLevel=='4'?'大队':'中队'}}维护审核{{element.maintenanceVerifyState}}操作 - 查看预案 - 提交审核 - 撤销审核 - 审批结果 - 下载 - 删除 -
- - - - -
+ +
+ + + {{downloadFileName}} + 下载中... + +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
预案状态 + 新增 + 维护更新 + 预案名称{{element.name}}添加人{{element.creatorName}}添加时间{{element.creationTime|date:'yyyy-MM-dd'}}预案类型类型预案新增审核 + {{element.newVerifyState}} + 是否公开{{element.openRange}}编制级别 + {{element.planLevel=='1'?'总队':element.planLevel=='2'?'支队':element.planLevel=='4'?'大队':'中队'}}维护审核{{element.maintenanceVerifyState}}操作 + 查看预案 + 提交审核 + 撤销审核 + 审批结果 + 下载 + + 删除 +
+ + + +
+
-

type-plan works!

+

type-plan works!

\ 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 147a395..012c2b3 100644 --- a/src/app/plan-management/type-plan/type-plan.component.ts +++ b/src/app/plan-management/type-plan/type-plan.component.ts @@ -1,234 +1,275 @@ /* - * @Descripttion: - * @version: + * @Descripttion: + * @version: * @Author: sueRimn * @Date: 2021-01-06 09:47:43 * @LastEditors: sueRimn * @LastEditTime: 2021-03-31 14:14:03 */ -import { Component, OnInit, ViewChild, Inject } from '@angular/core'; -import { HttpClient } from '@angular/common/http' -import { MatTreeFlatDataSource, MatTreeFlattener } from '@angular/material/tree'; -import { MatPaginator } from '@angular/material/paginator'; -import { FlatTreeControl } from '@angular/cdk/tree'; -import { FormControl } from '@angular/forms'; -import { Router, ActivatedRoute } from '@angular/router' -import { PageEvent } from '@angular/material/paginator'; -import { MatDialogRef, MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog'; -import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; -import { TreeService } from '../../http-interceptors/tree.service' -declare var CryptoJS +import { Component, OnInit, ViewChild, Inject } from "@angular/core"; +import { HttpClient } from "@angular/common/http"; +import { + MatTreeFlatDataSource, + MatTreeFlattener, +} from "@angular/material/tree"; +import { MatPaginator } from "@angular/material/paginator"; +import { FlatTreeControl } from "@angular/cdk/tree"; +import { FormControl } from "@angular/forms"; +import { Router, ActivatedRoute } from "@angular/router"; +import { PageEvent } from "@angular/material/paginator"; +import { + MatDialogRef, + MatDialog, + MAT_DIALOG_DATA, +} from "@angular/material/dialog"; +import { MatSnackBar, MatSnackBarConfig } from "@angular/material/snack-bar"; +import { TreeService } from "../../http-interceptors/tree.service"; +declare var CryptoJS; @Component({ - selector: 'app-type-plan', - templateUrl: './type-plan.component.html', - styleUrls: ['./type-plan.component.scss'] + selector: "app-type-plan", + templateUrl: "./type-plan.component.html", + styleUrls: ["./type-plan.component.scss"], }) export class TypePlanComponent implements OnInit { - - constructor(private http: HttpClient, private router: Router, private route: ActivatedRoute, private tree: TreeService, public dialog: MatDialog, public snackBar: MatSnackBar) { } + constructor( + private http: HttpClient, + private router: Router, + private route: ActivatedRoute, + private tree: TreeService, + public dialog: MatDialog, + public snackBar: MatSnackBar + ) {} ngOnInit(): void { if (window.matchMedia("(max-width: 1400px)").matches) { - this.pcMore = false - this.padMore = true - this.pcfind = false - this.padjt = true + this.pcMore = false; + this.padMore = true; + this.pcfind = false; + this.padjt = true; } else { - this.pcfind = true - this.pcMore = true - this.padMore = false - this.padjt = false + this.pcfind = true; + this.pcMore = true; + this.padMore = false; + this.padjt = false; } this.levels = sessionStorage.getItem("level"); - if (this.levels == "0") {//如果是总队 + if (this.levels == "0") { + //如果是总队 this.preparelevels = [ { name: "总队", value: "1" }, { name: "支队", value: "2" }, { name: "大队", value: "4" }, - { name: "中队", value: "8" } - ] + { name: "中队", value: "8" }, + ]; } - if (this.levels == "1") {//如果是支队 + if (this.levels == "1") { + //如果是支队 this.preparelevels = [ { name: "支队", value: "2" }, { name: "大队", value: "4" }, - { name: "中队", value: "8" } - ] + { name: "中队", value: "8" }, + ]; } - if (this.levels == "2") {//如果是大队 + if (this.levels == "2") { + //如果是大队 this.preparelevels = [ { name: "大队", value: "4" }, - { name: "中队", value: "8" } - ] + { name: "中队", value: "8" }, + ]; } - if (this.levels == "3") {//如果是中队 - this.preparelevels = [ - { name: "中队", value: "8" } - ] + if (this.levels == "3") { + //如果是中队 + this.preparelevels = [{ name: "中队", value: "8" }]; } - this.getAlltabledate() + this.getAlltabledate(); } - pcMore//pc更多 - pcput = false//pc收起 - pcfind//pc查询 - padjt = false - padMore = true//pad收缩控制 - padput = false//pad收起按钮 - imgsrcopen = "../../../assets/images/routdown2.png" - imgsrcdown = "../../../assets/images/routup2.png" + pcMore; //pc更多 + pcput = false; //pc收起 + pcfind; //pc查询 + padjt = false; + padMore = true; //pad收缩控制 + padput = false; //pad收起按钮 + imgsrcopen = "../../../assets/images/routdown2.png"; + imgsrcdown = "../../../assets/images/routup2.png"; pcInfo() { - this.pcMore = !this.pcMore - this.pcput = !this.pcput + this.pcMore = !this.pcMore; + this.pcput = !this.pcput; } padInfo() { - this.padMore = !this.padMore - this.padput = !this.padput + this.padMore = !this.padMore; + this.padput = !this.padput; } - levels - preparelevels: any - plcheck: boolean //编制级别勾选框 - IsNewData = '' //维护更新活新增 - displayedColumns: string[] = ['state', 'unitname', 'addname', 'addtime', 'plantype', 'isopen', 'projectlevel', 'passstate', 'weihustate', 'operation']; - tabledataSource - unitname//预案名称 - level//预案级别 - addname//添加人 - addtime//添加时间 - endtime - unittype//预案类型 - unitstate//审核状态 - projectlevel//编制级别 + levels; + preparelevels: any; + plcheck: boolean; //编制级别勾选框 + IsNewData = ""; //维护更新活新增 + displayedColumns: string[] = [ + "state", + "unitname", + "addname", + "addtime", + "plantype", + "isopen", + "projectlevel", + "passstate", + "weihustate", + "operation", + ]; + tabledataSource; + unitname; //预案名称 + level; //预案级别 + addname; //添加人 + addtime; //添加时间 + endtime; + unittype; //预案类型 + unitstate; //审核状态 + projectlevel; //编制级别 //分页 @ViewChild(MatPaginator, { static: true }) pageEvent: PageEvent; paginator: MatPaginator; length: any; //共多少条数据 pageSize: any; //每页条数 - pageSizeOptions: number[] = [10] //设置每页条数 + pageSizeOptions: number[] = [10]; //设置每页条数 PageNumber: any; //第几页 //获取表格数据 getAlltabledate() { let paramsdata: any = { - Name: this.unitname || '', + Name: this.unitname || "", planCategories: 8, - CreatorName: this.addname || '', - AuditStatus: this.unitstate || '', - CreationTimeRangeStart: this.addtime || '', - CreationTimeRangeEnd: this.endtime || '', - PlanLevel: this.projectlevel || '', - HasChildrenPlanLevel: this.plcheck || '', - PageNumber: this.PageNumber || '1', + CreatorName: this.addname || "", + AuditStatus: this.unitstate || "", + CreationTimeRangeStart: this.addtime || "", + CreationTimeRangeEnd: this.endtime || "", + PlanLevel: this.projectlevel || "", + HasChildrenPlanLevel: this.plcheck || "", + PageNumber: this.PageNumber || "1", PageSize: this.pageSizeOptions[0], IsNewData: this.IsNewData, - } - this.http.get("/api/PlanComponentsMajor", { params: paramsdata }).subscribe((data: any) => { - this.length = data.totalCount - this.tabledataSource = data.items - }) + }; + this.http + .get("/api/PlanComponentsMajor", { params: paramsdata }) + .subscribe((data: any) => { + this.length = data.totalCount; + this.tabledataSource = data.items; + }); } //分页事件 changePage(e) { - this.PageNumber = e.pageIndex + 1 - this.getAlltabledate() + this.PageNumber = e.pageIndex + 1; + this.getAlltabledate(); } //重置 reset() { - this.IsNewData = '' - this.unitname = '' - this.level = '' - this.addname = '' - this.addtime = '' - this.endtime = '' - this.unitstate = '' - this.projectlevel = '' - this.plcheck = false - this.getAlltabledate() + this.IsNewData = ""; + this.unitname = ""; + this.level = ""; + this.addname = ""; + this.addtime = ""; + this.endtime = ""; + this.unitstate = ""; + this.projectlevel = ""; + this.plcheck = false; + this.getAlltabledate(); } //查询 onSubmit(value) { - this.getAlltabledate() - + this.getAlltabledate(); } //删除预案 deletePlan(id) { - let isTrue = confirm('您确定要删除吗') + let isTrue = confirm("您确定要删除吗"); if (isTrue) { const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.http.delete(`/api/PlanComponentsMajor/${id}`).subscribe(data => { - this.snackBar.open('删除成功!', '确定', config); - this.getAlltabledate() - }, err => { - this.snackBar.open(err, '确定', config); - }) + config.verticalPosition = "top"; + config.duration = 3000; + this.http.delete(`/api/PlanComponentsMajor/${id}`).subscribe( + (data) => { + this.snackBar.open("删除成功!", "确定", config); + this.getAlltabledate(); + }, + (err) => { + this.snackBar.open(err, "确定", config); + } + ); } - } //提交审核 submitAudit(element) { const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 + config.verticalPosition = "top"; + config.duration = 3000; if (element.auditStatus == 4 || element.auditStatus == 32) { - this.snackBar.open('审核退回的预案需要修改后方可再次提交审核!', '确定', config); + this.snackBar.open( + "审核退回的预案需要修改后方可再次提交审核!", + "确定", + config + ); } - this.http.put(`/api/PlanComponentsMajor/${element.id}/Commit`, "").subscribe(data => { - this.getAlltabledate() - }, err => { - this.snackBar.open(err, '确定', config); - }) - - + this.http + .put(`/api/PlanComponentsMajor/${element.id}/Commit`, "") + .subscribe( + (data) => { + this.getAlltabledate(); + }, + (err) => { + this.snackBar.open(err, "确定", config); + } + ); } //撤销审核 cancelAudit(element) { const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.http.put(`/api/PlanComponentsMajor/${element.id}/Cancel`, "").subscribe(data => { - this.getAlltabledate() - }, err => { - this.snackBar.open(err, '确定', config); - }) + config.verticalPosition = "top"; + config.duration = 3000; + this.http + .put(`/api/PlanComponentsMajor/${element.id}/Cancel`, "") + .subscribe( + (data) => { + this.getAlltabledate(); + }, + (err) => { + this.snackBar.open(err, "确定", config); + } + ); } //查看预案 openPlan(element) { - let fetchUrl = element.attachmentUrls[0] - let suffix = fetchUrl.split('.')[fetchUrl.split('.').length - 1].toLowerCase() - if (suffix == 'docx' || suffix == 'doc') { - let arr = fetchUrl.split('.') - arr[arr.length - 1] = 'pdf' - window.open(`/api/Objects/PlanPlatform/` + arr.join('.')) - } else if (suffix == 'pdf') { - window.open(`/api/Objects/PlanPlatform/` + fetchUrl) + let fetchUrl = element.attachmentUrls[0]; + let suffix = fetchUrl + .split(".") + [fetchUrl.split(".").length - 1].toLowerCase(); + if (suffix == "docx" || suffix == "doc") { + let arr = fetchUrl.split("."); + arr[arr.length - 1] = "pdf"; + window.open(`/api/Objects/PlanPlatform/` + arr.join(".")); + } else if (suffix == "pdf") { + window.open(`/api/Objects/PlanPlatform/` + fetchUrl); } else { let config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('该文件类型暂不支持在线查看', '确定', config); + config.verticalPosition = "top"; + config.duration = 3000; + this.snackBar.open("该文件类型暂不支持在线查看", "确定", config); } } //新增预案弹窗 addunit() { const dialogRef = this.dialog.open(newunitType, { - width: '340px', - height: '330px', - disableClose: true + width: "340px", + height: "330px", + disableClose: true, //data: paperDataInfo }); - dialogRef.afterClosed().subscribe(result => { - this.getAlltabledate() - } - ); - + dialogRef.afterClosed().subscribe((result) => { + this.getAlltabledate(); + }); } //审核结果 auditResult(element) { @@ -236,332 +277,386 @@ export class TypePlanComponent implements OnInit { const dialogRef = this.dialog.open(typeAuditResult, { width: "400px", //height:"300px", - data: { element: element } + data: { element: element }, }); - } //下载↓ selectDownloadFile: any; //选择下载的文件 download: any; //下载文件元数据 downloadisLoading: boolean = false; //进度条loading加载 - downloadProgress: number = 0; //进度条进度 - downloadFileName: any - fileUrls: any //当前预案附件地址 - fileDatas: any = [] - selectedFileIndex: any = 0 - selectedFileData: any - - uploadFileLonging: any + downloadProgress: number = 0; //进度条进度 + downloadFileName: any; + fileUrls: any; //当前预案附件地址 + fileDatas: any = []; + selectedFileIndex: any = 0; + selectedFileData: any; + + uploadFileLonging: any; //读取下载文件信息 readFile(element) { - this.uploadFileLonging = element - element.attachmentUrls.forEach(item => { - this.http.get('/api/ObjectMetadata/PlanPlatform/' + item).subscribe((data: any) => { - data.filePige = (data.fileLength / (1024 * 1024)).toFixed(2) - //console.log(data) - this.download = data - this.downloadFile() - }) - }) - + this.uploadFileLonging = element; + element.attachmentUrls.forEach((item) => { + this.http + .get("/api/ObjectMetadata/PlanPlatform/" + item) + .subscribe((data: any) => { + data.filePige = (data.fileLength / (1024 * 1024)).toFixed(2); + //console.log(data) + this.download = data; + this.downloadFile(); + }); + }); } //初始化下载 downloadFile() { - this.downloadProgress = 0 - let file = this.download - let fileSize = file.fileLength//下载文件的总大小 - let shardSize = 10 * 1024 * 1024 //文件大小是否大于10MB - - if (file && fileSize <= shardSize) { //<=10MB时直接下载 - this.downloadisLoading = true + this.downloadProgress = 0; + let file = this.download; + let fileSize = file.fileLength; //下载文件的总大小 + let shardSize = 10 * 1024 * 1024; //文件大小是否大于10MB + + if (file && fileSize <= shardSize) { + //<=10MB时直接下载 + this.downloadisLoading = true; // this.setFileLoading() - this.http.get(`/api/Objects/PlanPlatform/${file.objectName}`, { responseType: 'blob' },).subscribe(data => { - - let url = window.URL.createObjectURL(new Blob([data])); //createObjectURL创建一个下载Blob的url地址 - let link = document.createElement("a"); - link.style.display = "none"; - link.href = url; - - let suffix = file.objectName.substring(file.objectName.lastIndexOf(".") + 1, file.objectName.length); - link.setAttribute("download", file.fileName + "-" + this.uploadFileLonging.name + "." + suffix); - document.body.appendChild(link); - link.click(); - this.downloadisLoading = false - // this.setFileLoading() - }) - } else if (file && fileSize > shardSize) { //>10MB时分块下载 - this.blockingDownload() //分段下载 - this.downloadisLoading = true + this.http + .get(`/api/Objects/PlanPlatform/${file.objectName}`, { + responseType: "blob", + }) + .subscribe((data) => { + let url = window.URL.createObjectURL(new Blob([data])); //createObjectURL创建一个下载Blob的url地址 + let link = document.createElement("a"); + link.style.display = "none"; + link.href = url; + + let suffix = file.objectName.substring( + file.objectName.lastIndexOf(".") + 1, + file.objectName.length + ); + link.setAttribute( + "download", + file.fileName + "-" + this.uploadFileLonging.name + "." + suffix + ); + document.body.appendChild(link); + link.click(); + this.downloadisLoading = false; + // this.setFileLoading() + }); + } else if (file && fileSize > shardSize) { + //>10MB时分块下载 + this.blockingDownload(); //分段下载 + this.downloadisLoading = true; // this.setFileLoading() } - } //分段下载并合并 async blockingDownload() { - let file = this.download - let fileSize = file.fileLength //下载文件的总大小 - let shardSize = 3 * 1024 * 1024 //3MB一个分片 - let allSlice = Math.ceil(fileSize / shardSize) //总文件/3MB===共分多少段 - let allFile: any = [] //所有的file分段 + let file = this.download; + let fileSize = file.fileLength; //下载文件的总大小 + let shardSize = 3 * 1024 * 1024; //3MB一个分片 + let allSlice = Math.ceil(fileSize / shardSize); //总文件/3MB===共分多少段 + let allFile: any = []; //所有的file分段 for (let i = 0; i < allSlice; i++) { - let start = i * shardSize //每次下载文件开始位置 + let start = i * shardSize; //每次下载文件开始位置 let end = Math.min(fileSize, start + shardSize - 1); //每次下载文件结束为止 let result = await new Promise((result, reject) => { - this.http.get(`/api/Objects/PlanPlatform/${file.objectName}`, { headers: { 'range': `bytes= ${start}-${end}` }, responseType: 'blob' }).subscribe(data => { - result(data) - }) - }) - allFile.push(result) - this.downloadProgress = Number((i / allSlice).toFixed(2)) * 100 + this.http + .get(`/api/Objects/PlanPlatform/${file.objectName}`, { + headers: { range: `bytes= ${start}-${end}` }, + responseType: "blob", + }) + .subscribe((data) => { + result(data); + }); + }); + allFile.push(result); + this.downloadProgress = Number((i / allSlice).toFixed(2)) * 100; - if (allFile.length === allSlice) { //合并文件输出给浏览器 + if (allFile.length === allSlice) { + //合并文件输出给浏览器 let url = window.URL.createObjectURL(new Blob(allFile)); //createObjectURL创建一个下载Blob的url地址 let link = document.createElement("a"); link.style.display = "none"; link.href = url; - let suffix = file.objectName.substring(file.objectName.lastIndexOf(".") + 1, file.objectName.length); - link.setAttribute("download", file.fileName + "-" + this.uploadFileLonging.name + "." + suffix); + let suffix = file.objectName.substring( + file.objectName.lastIndexOf(".") + 1, + file.objectName.length + ); + link.setAttribute( + "download", + file.fileName + "-" + this.uploadFileLonging.name + "." + suffix + ); document.body.appendChild(link); link.click(); // this.downloadProgress = 0 - this.downloadisLoading = false + this.downloadisLoading = false; // this.setFileLoading() } - } //for循环 - } //取消分块下载 - cancelDowload() { - } - + cancelDowload() {} } //新建 @Component({ - selector: 'new-unit', - templateUrl: './newunit.html', - styleUrls: ['./newunit.scss'] + selector: "new-unit", + templateUrl: "./newunit.html", + styleUrls: ["./newunit.scss"], }) export class newunitType { - constructor(private router: Router, private http: HttpClient, public dialog: MatDialog, public snackBar: MatSnackBar, public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data: any) { } - unitname//预案名称 - level//预案级别 - addname//添加人 - addtime//添加时间 - unittype//预案类型 - unitstate//审核状态 - projectlevel//编制级别 - reservePlanType//预案类型 + constructor( + private router: Router, + private http: HttpClient, + public dialog: MatDialog, + public snackBar: MatSnackBar, + public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: any + ) {} + unitname; //预案名称 + level; //预案级别 + addname; //添加人 + addtime; //添加时间 + unittype; //预案类型 + unitstate; //审核状态 + projectlevel; //编制级别 + reservePlanType; //预案类型 //上传 upload() { - document.getElementById('up').click() + document.getElementById("up").click(); } //上传文件↓ file: any; //上传的文件 fileName: any; //上传文件name uploadisLoading: boolean = false; //进度条loading加载 - uploadProgress: number = 0; //进度条进度 + uploadProgress: number = 0; //进度条进度 objectName: any; //上传对象名 uploadId: any; //上传分块上传事件编号 - uploadover: any = false //上传完成之后提示 - selectedPLanType: any//所选预案类型 - selectedPLanName: any//所选预案名称 - localup: boolean = false //本地上传 - defaultisshow = '0' //默认显示上传input框 + uploadover: any = false; //上传完成之后提示 + selectedPLanType: any; //所选预案类型 + selectedPLanName: any; //所选预案名称 + localup: boolean = false; //本地上传 + defaultisshow = "0"; //默认显示上传input框 //上传文件input filechange(e) { - this.file = e.target.files[0] || null //上传的文件 + this.file = e.target.files[0] || null; //上传的文件 } //上传文件 startUploading(planType) { - let file = this.file || null //获取上传的文件 - let fileSize = file.size || null //上传文件的总大小 - let shardSize = 5 * 1024 * 1024 //5MB一个分片 - - if (file && fileSize <= shardSize) { //上传文件<=5MB时 - let formData = new FormData() - formData.append("file", file) + let file = this.file || null; //获取上传的文件 + let fileSize = file.size || null; //上传文件的总大小 + let shardSize = 5 * 1024 * 1024; //5MB一个分片 + + if (file && fileSize <= shardSize) { + //上传文件<=5MB时 + let formData = new FormData(); + formData.append("file", file); const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - let level = sessionStorage.getItem("level") + config.verticalPosition = "top"; + config.duration = 3000; + let level = sessionStorage.getItem("level"); // console.log(level) - let PlanLevel - if (level == '0') { - PlanLevel = 1 + let PlanLevel; + if (level == "0") { + PlanLevel = 1; } - if (level == '1') { - PlanLevel = 2 + if (level == "1") { + PlanLevel = 2; } - if (level == '2') { - PlanLevel = 4 + if (level == "2") { + PlanLevel = 4; } - if (level == '3') { - PlanLevel = 8 + if (level == "3") { + PlanLevel = 8; } - this.http.post(`/api/Objects/PlanPlatform/typeClass`, formData).subscribe((data: any) => { - this.objectName = data.objectName - //console.log('上传成功') - - let body: any = { - Name: this.unitname || '', - PlanCategory: 8, - PlanLevel: PlanLevel, - PlanMode: 1, - PlanType: 8, - planType: 16, - attachmentUrls: [`${this.objectName}`] + this.http.post(`/api/Objects/PlanPlatform/typeClass`, formData).subscribe( + (data: any) => { + this.objectName = data.objectName; + //console.log('上传成功') + + let body: any = { + Name: this.unitname || "", + PlanCategory: 8, + PlanLevel: PlanLevel, + PlanMode: 1, + PlanType: 8, + planType: 16, + attachmentUrls: [`${this.objectName}`], + }; + this.http.post("/api/PlanComponentsMajor", body).subscribe( + (data: any) => { + this.snackBar.open("创建成功!", "确定", config); + this.dialogRef.close(); + }, + (err) => { + this.snackBar.open("创建失败!", "确定", config); + } + ); + }, + (err) => { + this.snackBar.open("上传失败!", "确定", config); } - this.http.post("/api/PlanComponentsMajor", body).subscribe((data: any) => { - this.snackBar.open('创建成功!', '确定', config); - this.dialogRef.close(); - }, err => { - this.snackBar.open('创建失败!', '确定', config); - }) - }, err => { - this.snackBar.open('上传失败!', '确定', config); - }) - } else if (file && fileSize > shardSize) { //上传文件>5MB时,分块上传 - let data = { filename: file.name } - this.uploadisLoading = true - this.http.post(`/api/NewMultipartUpload/PlanPlatform/typeClass`, {}, { params: data }).subscribe((data: any) => { //初始化分段上传 - this.objectName = data.objectName - this.uploadId = data.uploadId - this.subsectionUploading(planType) - }) + ); + } else if (file && fileSize > shardSize) { + //上传文件>5MB时,分块上传 + let data = { filename: file.name }; + this.uploadisLoading = true; + this.http + .post( + `/api/NewMultipartUpload/PlanPlatform/typeClass`, + {}, + { params: data } + ) + .subscribe((data: any) => { + //初始化分段上传 + this.objectName = data.objectName; + this.uploadId = data.uploadId; + this.subsectionUploading(planType); + }); } - } PartNumberETag: any = []; //每次返回需要保存的信息 //开始分段上传 async subsectionUploading(planType) { - let file = this.file || null //获取上传的文件 - let fileSize = file.size || null //上传文件的总大小 - let shardSize = 5 * 1024 * 1024 //5MB一个分片 - let allSlice = Math.ceil(fileSize / shardSize) //总文件/5MB===共分多少段 向上取整 + let file = this.file || null; //获取上传的文件 + let fileSize = file.size || null; //上传文件的总大小 + let shardSize = 5 * 1024 * 1024; //5MB一个分片 + let allSlice = Math.ceil(fileSize / shardSize); //总文件/5MB===共分多少段 向上取整 - for (let i = 0; i < allSlice; i++) { //循环分段上传 - let start = i * shardSize //切割文件开始位置 + for (let i = 0; i < allSlice; i++) { + //循环分段上传 + let start = i * shardSize; //切割文件开始位置 let end = Math.min(fileSize, start + shardSize); //切割文件结束位置 （对比取小数） - let formData = new FormData() - formData.append("file", file.slice(start, end)) + let formData = new FormData(); + formData.append("file", file.slice(start, end)); //同步写法实现异步调用 let result = await new Promise((resolve, reject) => { // await 需要后面返回一个 promise 对象 - this.http.post(`/api/MultipartUpload/PlanPlatform/${this.objectName}?uploadId=${this.uploadId}&partNumber=${i + 1}`, formData).subscribe((data: any) => { - let msg = { - "partNumber": data.partNumber || null, - "eTag": data.eTag || null - } - resolve(msg) // 调用 promise 内置方法处理成功 - }) + this.http + .post( + `/api/MultipartUpload/PlanPlatform/${this.objectName}?uploadId=${ + this.uploadId + }&partNumber=${i + 1}`, + formData + ) + .subscribe((data: any) => { + let msg = { + partNumber: data.partNumber || null, + eTag: data.eTag || null, + }; + resolve(msg); // 调用 promise 内置方法处理成功 + }); }); - this.PartNumberETag.push(result) - this.uploadProgress = Number((i / allSlice).toFixed(2)) * 100 + this.PartNumberETag.push(result); + this.uploadProgress = Number((i / allSlice).toFixed(2)) * 100; if (this.PartNumberETag.length === allSlice) { - this.uploadProgress = 100 - this.endUploading(planType) + this.uploadProgress = 100; + this.endUploading(planType); } - }//for循环 - + } //for循环 } //完成分块上传 endUploading(planType) { - let data = this.PartNumberETag - let paramsData = { uploadId: this.uploadId } - this.http.post(`/api/CompleteMultipartUpload/PlanPlatform/${this.objectName}`, data, { params: paramsData }).subscribe(data => { - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - //console.log('创建成功') - this.uploadProgress = 0; - 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: PlanLevel, - PlanMode: 1, - PlanType: 8, - planType: 16, - attachmentUrls: [`${this.objectName}`] - } + let data = this.PartNumberETag; + let paramsData = { uploadId: this.uploadId }; + this.http + .post( + `/api/CompleteMultipartUpload/PlanPlatform/${this.objectName}`, + data, + { params: paramsData } + ) + .subscribe((data) => { + const config = new MatSnackBarConfig(); + config.verticalPosition = "top"; + config.duration = 3000; + //console.log('创建成功') + this.uploadProgress = 0; + 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; + } - this.http.post("/api/PlanComponentsMajor", body).subscribe((data: any) => { - this.snackBar.open('创建成功!', '确定', config); - this.dialogRef.close(); - }, err => { - this.snackBar.open('创建失败!', '确定', config); - }) - }) + let body: any = { + Name: this.unitname || "", + PlanCategory: 8, + PlanLevel: PlanLevel, + PlanMode: 1, + PlanType: 8, + planType: 16, + attachmentUrls: [`${this.objectName}`], + }; + + this.http.post("/api/PlanComponentsMajor", body).subscribe( + (data: any) => { + this.snackBar.open("创建成功!", "确定", config); + this.dialogRef.close(); + }, + (err) => { + this.snackBar.open("创建失败!", "确定", config); + } + ); + }); } //取消分块上传 cancel() { - this.http.delete(`/api/MultipartUpload/PlanPlatform/${this.objectName}?uploadId=${this.uploadId}`).subscribe(data => { - this.uploadProgress = 0; - this.uploadisLoading = false; - (document.getElementById('up')).value = null - this.PartNumberETag = [] //清空保存返回的信息 - const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - this.snackBar.open('取消上传成功!', '确定', config); - this.uploadover = false - this.file = null - }) + this.http + .delete( + `/api/MultipartUpload/PlanPlatform/${this.objectName}?uploadId=${this.uploadId}` + ) + .subscribe((data) => { + this.uploadProgress = 0; + this.uploadisLoading = false; + (document.getElementById("up")).value = null; + this.PartNumberETag = []; //清空保存返回的信息 + const config = new MatSnackBarConfig(); + config.verticalPosition = "top"; + config.duration = 3000; + this.snackBar.open("取消上传成功!", "确定", config); + this.uploadover = false; + this.file = null; + }); } //创建预案 newplan() { const config = new MatSnackBarConfig(); - config.verticalPosition = 'top'; - config.duration = 3000 - if (this.unitname == undefined || this.unitname == '') { - this.snackBar.open('请输入预案名称!', '确定', config); - } - else if (this.file == undefined) { - this.snackBar.open('请先上传文件!', '确定', config); - } - else { - if (this.reservePlanType != '1') { - this.startUploading("非二维") + config.verticalPosition = "top"; + config.duration = 3000; + if (this.unitname == undefined || this.unitname == "") { + this.snackBar.open("请输入预案名称!", "确定", config); + } else if (this.file == undefined) { + this.snackBar.open("请先上传文件!", "确定", config); + } else { + if (this.reservePlanType != "1") { + this.startUploading("非二维"); + } else { + this.startUploading("二维"); } - else { this.startUploading("二维") } - - } - - } //取消按钮 close() { @@ -571,21 +666,25 @@ export class newunitType { //查看审核结果 @Component({ - selector: 'resultmeet', - templateUrl: './resulttypePlan.html', - styleUrls: ['./type-plan.component.scss'] + selector: "resultmeet", + templateUrl: "./resulttypePlan.html", + styleUrls: ["./type-plan.component.scss"], }) export class typeAuditResult { - constructor(private http: HttpClient, public dialogRef: MatDialogRef, @Inject(MAT_DIALOG_DATA) public data, public snackBar: MatSnackBar) { } - planName: any = this.data.element.name - commitTime: any = this.data.element.committedTime - commitOrganizationName: any = this.data.element.committerOrganizationName - - auditOrganizationName: any = this.data.element.auditorOrganizationName - auditResult: any = this.data.element.auditStatus - auditOpinion: any = this.data.element.auditOpinion - ngOnInit(): void { - } + constructor( + private http: HttpClient, + public dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data, + public snackBar: MatSnackBar + ) {} + planName: any = this.data.element.name; + commitTime: any = this.data.element.committedTime; + commitOrganizationName: any = this.data.element.committerOrganizationName; + + auditOrganizationName: any = this.data.element.auditorOrganizationName; + auditResult: any = this.data.element.auditStatus; + auditOpinion: any = this.data.element.auditOpinion; + ngOnInit(): void {} onNoClick(): void { this.dialogRef.close(); }