-
![]()
+
![]()
+
+
+
diff --git a/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.ts b/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.ts
index 825b327..8d590bb 100644
--- a/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.ts
+++ b/src/app/pages/license/file-category/edit-file-category/edit-file-category.component.ts
@@ -4,6 +4,7 @@ import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { HttpClient } from '@angular/common/http';
import { ObjectsSimpleService } from 'src/app/service/objectsSimple.service';
import Viewer from 'viewerjs';
+import { NzMessageService } from 'ng-zorro-antd/message';
@Component({
selector: 'app-edit-file-category',
templateUrl: './edit-file-category.component.html',
@@ -14,7 +15,7 @@ export class EditFileCategoryComponent implements OnInit {
@Input() data?: any;
validateForm!: FormGroup;
- constructor(private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient, private objectsSrv: ObjectsSimpleService) { }
+ constructor(private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient, private objectsSrv: ObjectsSimpleService,private message: NzMessageService) { }
data2
@@ -94,9 +95,21 @@ export class EditFileCategoryComponent implements OnInit {
}
+ //获取文件格式
+ getFileType(name: string):string {
+ let suffix
+ if (name.substring(name.length-4).includes('png') || name.substring(name.length-4).includes('jpg') || name.substring(name.length-4).includes('jpeg') || name.substring(name.length-4).includes('webp')) {
+ suffix = 'img'
+ } else if (name.substring(name.length-4).includes('doc') || name.substring(name.length-4).includes('docx')) {
+ suffix = 'word'
+ } else if (name.substring(name.length-4).includes('pdf')) {
+ suffix = 'pdf'
+ }
+ return suffix
+ }
+
//查看图片
viewImg(url) {
- // url.split('?')[0]
let dom = document.getElementById(`viewerjs`)
let pObjs = dom.childNodes;
let node = document.createElement("img")
@@ -115,4 +128,20 @@ export class EditFileCategoryComponent implements OnInit {
}, 0);
}
+ //查看文件
+ lookFile(item) {
+ if (!item.imageUrl) {
+ return
+ }
+ if (this.getFileType(item.imageUrl) == 'word') {
+ let arr = item.imageUrl.split('.')
+ arr[arr.length - 1] = 'pdf'
+ window.open(arr.join('.'))
+ } else if (this.getFileType(item.imageUrl) == 'pdf') {
+ window.open(item.imageUrl)
+ } else {
+ this.message.create('warning', '暂不支持查看！');
+ }
+ }
+
}
diff --git a/src/app/pages/license/file-category/file-category.component.html b/src/app/pages/license/file-category/file-category.component.html
index 7edc66d..a279810 100644
--- a/src/app/pages/license/file-category/file-category.component.html
+++ b/src/app/pages/license/file-category/file-category.component.html
@@ -8,7 +8,7 @@
证件名称
有效期类型 |
-
图片 |
+
附件 |
提交时间 |
审核状态 |
操作 |
@@ -25,7 +25,9 @@
有
- ![]()
+ ![]()
+
+
|
{{item.committedTime | date:"yyyy/MM/dd"}}未提交审核 |
diff --git a/src/app/pages/license/file-category/file-category.component.ts b/src/app/pages/license/file-category/file-category.component.ts
index e841d20..e8a7828 100644
--- a/src/app/pages/license/file-category/file-category.component.ts
+++ b/src/app/pages/license/file-category/file-category.component.ts
@@ -41,6 +41,19 @@ export class FileCategoryComponent implements OnInit {
})
}
+ //获取文件格式
+ getFileType(name: string):string {
+ let suffix
+ if (name.substring(name.length-4).includes('png') || name.substring(name.length-4).includes('jpg') || name.substring(name.length-4).includes('jpeg') || name.substring(name.length-4).includes('webp')) {
+ suffix = 'img'
+ } else if (name.substring(name.length-4).includes('doc') || name.substring(name.length-4).includes('docx')) {
+ suffix = 'word'
+ } else if (name.substring(name.length-4).includes('pdf')) {
+ suffix = 'pdf'
+ }
+ return suffix
+ }
+
//查看图片
viewImg(url) {
let dom = document.getElementById(`viewerjs`)
@@ -61,6 +74,22 @@ export class FileCategoryComponent implements OnInit {
}, 0);
}
+ //查看文件
+ lookFile(item) {
+ if (!item.imageUrl) {
+ return
+ }
+ if (this.getFileType(item.imageUrl) == 'word') {
+ let arr = item.imageUrl.split('.')
+ arr[arr.length - 1] = 'pdf'
+ window.open(arr.join('.'))
+ } else if (this.getFileType(item.imageUrl) == 'pdf') {
+ window.open(item.imageUrl)
+ } else {
+ this.message.create('warning', '暂不支持查看！');
+ }
+ }
+
dispose() {
}
diff --git a/src/app/pages/license/update-category/update-category.component.html b/src/app/pages/license/update-category/update-category.component.html
index f4018d9..b205c16 100644
--- a/src/app/pages/license/update-category/update-category.component.html
+++ b/src/app/pages/license/update-category/update-category.component.html
@@ -27,12 +27,9 @@
| {{item.licenseCode || ''}} |
{{item.isLongTerm ? '长期证照' : (item.validityEndTime | date:"yyyy/MM/dd")}} |
- ![]()
-
-
+ ![]()
+
+
|
From ceeb2e8623cb0fdf6719522a0a173ab9b63bb1b5 Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Wed, 18 May 2022 13:52:06 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=AC=A1=E6=95=B0?=
=?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../audit/gas-base-info/gas-base-info.component.html | 2 +-
.../audit/gas-base-info/gas-base-info.component.ts | 11 +++++++++++
.../details-file-category.component.html | 2 +-
.../details-file-category.component.ts | 11 +++++++++++
.../details-update-category.component.html | 2 +-
.../details-update-category.component.ts | 11 +++++++++++
6 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/src/app/pages/audit/gas-base-info/gas-base-info.component.html b/src/app/pages/audit/gas-base-info/gas-base-info.component.html
index 462e684..bd804c6 100644
--- a/src/app/pages/audit/gas-base-info/gas-base-info.component.html
+++ b/src/app/pages/audit/gas-base-info/gas-base-info.component.html
@@ -79,7 +79,7 @@
审核记录
- 审核次数：{{auditList.length}}
+ 审核次数：{{getVerifyNum()}}
驳回次数：{{getRejectNum()}}
diff --git a/src/app/pages/audit/gas-base-info/gas-base-info.component.ts b/src/app/pages/audit/gas-base-info/gas-base-info.component.ts
index 187e5e6..b419c66 100644
--- a/src/app/pages/audit/gas-base-info/gas-base-info.component.ts
+++ b/src/app/pages/audit/gas-base-info/gas-base-info.component.ts
@@ -50,6 +50,17 @@ export class GasBaseInfoComponent implements OnInit {
})
}
+ //获取审核次数
+ getVerifyNum(): number {
+ let num = 0
+ this.auditList.forEach(item=>{
+ if (item.auditStatus == 2 || item.auditStatus == 3) {
+ num = num + 1
+ }
+ })
+ return num
+ }
+
//获取驳回次数
getRejectNum(): number {
let num = 0
diff --git a/src/app/pages/license/file-category/details-file-category/details-file-category.component.html b/src/app/pages/license/file-category/details-file-category/details-file-category.component.html
index a5167e3..c44bbdd 100644
--- a/src/app/pages/license/file-category/details-file-category/details-file-category.component.html
+++ b/src/app/pages/license/file-category/details-file-category/details-file-category.component.html
@@ -23,7 +23,7 @@
审核记录
- 审核次数：{{auditList.length}}
+ 审核次数：{{getVerifyNum()}}
驳回次数：{{getRejectNum()}}
diff --git a/src/app/pages/license/file-category/details-file-category/details-file-category.component.ts b/src/app/pages/license/file-category/details-file-category/details-file-category.component.ts
index e9d05b6..2161bd7 100644
--- a/src/app/pages/license/file-category/details-file-category/details-file-category.component.ts
+++ b/src/app/pages/license/file-category/details-file-category/details-file-category.component.ts
@@ -33,6 +33,17 @@ export class DetailsFileCategoryComponent implements OnInit {
})
}
+ //获取审核次数
+ getVerifyNum(): number {
+ let num = 0
+ this.auditList.forEach(item=>{
+ if (item.auditStatus == 2 || item.auditStatus == 3) {
+ num = num + 1
+ }
+ })
+ return num
+ }
+
//获取驳回次数
getRejectNum(): number {
let num = 0
diff --git a/src/app/pages/license/update-category/details-update-category/details-update-category.component.html b/src/app/pages/license/update-category/details-update-category/details-update-category.component.html
index 4b970b7..7ac2a22 100644
--- a/src/app/pages/license/update-category/details-update-category/details-update-category.component.html
+++ b/src/app/pages/license/update-category/details-update-category/details-update-category.component.html
@@ -29,7 +29,7 @@
审核记录
- 审核次数：{{auditList.length}}
+ 审核次数：{{getVerifyNum()}}
驳回次数：{{getRejectNum()}}
diff --git a/src/app/pages/license/update-category/details-update-category/details-update-category.component.ts b/src/app/pages/license/update-category/details-update-category/details-update-category.component.ts
index 399308e..18de9d9 100644
--- a/src/app/pages/license/update-category/details-update-category/details-update-category.component.ts
+++ b/src/app/pages/license/update-category/details-update-category/details-update-category.component.ts
@@ -34,6 +34,17 @@ export class DetailsUpdateCategoryComponent implements OnInit {
})
}
+ //获取审核次数
+ getVerifyNum(): number {
+ let num = 0
+ this.auditList.forEach(item=>{
+ if (item.auditStatus == 2 || item.auditStatus == 3) {
+ num = num + 1
+ }
+ })
+ return num
+ }
+
//获取驳回次数
getRejectNum(): number {
let num = 0
From 458cc3da739e77557670283f4eee53390631db8a Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Wed, 18 May 2022 14:17:04 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=9F=A5=E8=AF=A2loading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/pages/audit/audit-record/audit-record.component.html | 5 ++---
.../license/update-category/update-category.component.ts | 1 -
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/app/pages/audit/audit-record/audit-record.component.html b/src/app/pages/audit/audit-record/audit-record.component.html
index a2c5cad..c0ae045 100644
--- a/src/app/pages/audit/audit-record/audit-record.component.html
+++ b/src/app/pages/audit/audit-record/audit-record.component.html
@@ -71,14 +71,13 @@
-
+
-
+
diff --git a/src/app/pages/license/update-category/update-category.component.ts b/src/app/pages/license/update-category/update-category.component.ts
index 5753622..4e36b4f 100644
--- a/src/app/pages/license/update-category/update-category.component.ts
+++ b/src/app/pages/license/update-category/update-category.component.ts
@@ -36,7 +36,6 @@ export class UpdateCategoryComponent implements OnInit {
let data = JSON.parse(sessionStorage.getItem('userdataOfgasstation'));
let params = { orgId: data.organization.id || "" }
this.http.get(`/api/services/app/StationValidityLicense/GetCurStationLicense`,{params}).subscribe((info: any)=>{
- this.tableSpin = false
this.list = info.result
this.tableSpin = false
console.log(info.result)
From 1e9112223a730c976e751b69824864323a829f84 Mon Sep 17 00:00:00 2001
From: liuxianghui <519646741@qq.com>
Date: Wed, 18 May 2022 14:55:06 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E5=A4=B1=E8=B4=A5?=
=?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/babylon/controller/scene-manager.ts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/app/babylon/controller/scene-manager.ts b/src/app/babylon/controller/scene-manager.ts
index 4f1d9fc..ee940df 100644
--- a/src/app/babylon/controller/scene-manager.ts
+++ b/src/app/babylon/controller/scene-manager.ts
@@ -605,7 +605,7 @@ export class SceneManager {
},
function (scene: Scene, message: string, exception?: any) {
-
+ LoadTool.remove(modelData.resPath + modelData.resName);
if (index < 5) {
let l_index = index + 1;
modelInfo.dispose();
@@ -618,7 +618,7 @@ export class SceneManager {
}
else {
modelInfo.dispose();
- LoadTool.remove(modelData.resPath + modelData.resName);
+ // LoadTool.onEnd();
console.log(message, exception);
alert("模型加载失败,请刷新页面重试: " + message + "==" + exception);
// alert(exception);
From 380933769a105b5dc98cdf5ab6c24bf53b0c0d21 Mon Sep 17 00:00:00 2001
From: cpf <1105965053@qq.com>
Date: Wed, 18 May 2022 16:10:56 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E9=A9=B3=E5=9B=9E=E8=AF=B4=E6=98=8E,=20?=
=?UTF-8?q?=E5=AE=A1=E6=89=B9=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/pages/audit/audit-ing/audit-ing.component.ts | 4 ++++
src/app/pages/audit/audit-record/audit-record.component.ts | 4 ++++
.../details-file-category.component.html | 5 +++--
.../pages/license/file-category/file-category.component.html | 2 +-
.../details-update-category.component.html | 5 +++--
.../license/update-category/update-category.component.html | 2 +-
6 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/app/pages/audit/audit-ing/audit-ing.component.ts b/src/app/pages/audit/audit-ing/audit-ing.component.ts
index 1a29b58..3d57d8d 100644
--- a/src/app/pages/audit/audit-ing/audit-ing.component.ts
+++ b/src/app/pages/audit/audit-ing/audit-ing.component.ts
@@ -188,6 +188,10 @@ export class AuditIngComponent implements OnInit {
return new Promise((resolve, reject) => {
let params = { id: item.itemId }
this.http.get(url, { params }).subscribe((data: any) => {
+ let auditLog = { rejectReason: item.rejectReason }
+ if (item.auditType == 1 && item.rejectReason) {
+ data.result.auditLog = auditLog
+ }
resolve(data.result)
})
})
diff --git a/src/app/pages/audit/audit-record/audit-record.component.ts b/src/app/pages/audit/audit-record/audit-record.component.ts
index 74a9f46..9826955 100644
--- a/src/app/pages/audit/audit-record/audit-record.component.ts
+++ b/src/app/pages/audit/audit-record/audit-record.component.ts
@@ -241,6 +241,10 @@ export class AuditRecordComponent implements OnInit {
return new Promise((resolve, reject) => {
let params = { id: item.itemId }
this.http.get(url, { params }).subscribe((data: any) => {
+ let auditLog = { rejectReason: item.rejectReason }
+ if (item.auditType == 1 && item.rejectReason) {
+ data.result.auditLog = auditLog
+ }
resolve(data.result)
})
})
diff --git a/src/app/pages/license/file-category/details-file-category/details-file-category.component.html b/src/app/pages/license/file-category/details-file-category/details-file-category.component.html
index c44bbdd..08f809e 100644
--- a/src/app/pages/license/file-category/details-file-category/details-file-category.component.html
+++ b/src/app/pages/license/file-category/details-file-category/details-file-category.component.html
@@ -32,8 +32,9 @@
- {{item.creationTime | date:"yyyy/MM/dd"}}
- {{item.auditStatus | auditStatus}}
+ {{item.creationTime | date:"yyyy/MM/dd"}}
+ {{item.auditStatus | auditStatus}}
+ 驳回说明：{{item.auditLog? item.auditLog.rejectReason : ''}}
diff --git a/src/app/pages/license/file-category/file-category.component.html b/src/app/pages/license/file-category/file-category.component.html
index a279810..376fd49 100644
--- a/src/app/pages/license/file-category/file-category.component.html
+++ b/src/app/pages/license/file-category/file-category.component.html
@@ -31,7 +31,7 @@
|
{{item.committedTime | date:"yyyy/MM/dd"}}未提交审核 |
- {{item.auditStatus | auditStatus}}
+ {{item.auditLog.auditStatusDesc || ''}}
|
编辑
diff --git a/src/app/pages/license/update-category/details-update-category/details-update-category.component.html b/src/app/pages/license/update-category/details-update-category/details-update-category.component.html
index 7ac2a22..a1bd1a5 100644
--- a/src/app/pages/license/update-category/details-update-category/details-update-category.component.html
+++ b/src/app/pages/license/update-category/details-update-category/details-update-category.component.html
@@ -38,8 +38,9 @@
- {{item.creationTime | date:"yyyy/MM/dd"}}
- {{item.auditStatus | auditStatus}}
+ {{item.creationTime | date:"yyyy/MM/dd"}}
+ {{item.auditStatus | auditStatus}}
+ 驳回说明：{{item.auditLog? item.auditLog.rejectReason : ''}}
diff --git a/src/app/pages/license/update-category/update-category.component.html b/src/app/pages/license/update-category/update-category.component.html
index b205c16..e3c3c23 100644
--- a/src/app/pages/license/update-category/update-category.component.html
+++ b/src/app/pages/license/update-category/update-category.component.html
@@ -44,7 +44,7 @@
| {{item.committedTime | date:"yyyy/MM/dd"}}未提交审核 |
- {{item.auditStatus | auditStatus}}
+ {{item.auditLog.auditStatusDesc || ''}}
|
无
| |