From 6f5e40a4180d04a159f576f231d2a9acb413a51f Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Wed, 13 Jul 2022 15:44:17 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[=E6=96=B0=E5=A2=9E]=E7=BB=8F=E8=90=A5?=
=?UTF-8?q?=E7=B1=BB=E8=AF=81=E7=85=A7=E5=B9=B4=E6=A3=80=E6=9B=B4=E6=96=B0?=
=?UTF-8?q?=E9=99=84=E4=BB=B6=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../audit-dispose.component.html | 36 ++++----
.../details-update-category.component.html | 32 +++++--
.../edit-update-category.component.html | 92 +++++++++++++++----
.../edit-update-category.component.ts | 59 +++++++-----
.../update-category.component.html | 28 ++++--
.../update-category.component.ts | 11 ++-
.../get-out-of-line-details.component.ts | 1 -
src/theme.less | 6 +-
8 files changed, 187 insertions(+), 78 deletions(-)
diff --git a/src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.html b/src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.html
index 441e321..2ebdedd 100644
--- a/src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.html
+++ b/src/app/pages/audit/audit-ing/audit-dispose/audit-dispose.component.html
@@ -71,30 +71,30 @@
所属机构: {{data.getData.organizationName}}
- 角色: {{item}}
+ 角色: {{item}}
- 预警接收级别: {{item}}
+ 预警接收级别: {{item}}
手机号: {{data.getData.phoneNumber}}
- 附件:
- ![]()
- 
- 
+ 附件:
+ ![]()
+
+
+
- 附件副本:
- ![]()
-
-
+ 附件副本:
+ ![]()
+
+
+
审批意见:
+
+
+
-
+
diff --git a/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.ts b/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.ts
index ccf274f..0a947d9 100644
--- a/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.ts
+++ b/src/app/pages/license/update-category/edit-update-category/edit-update-category.component.ts
@@ -16,7 +16,7 @@ export class EditUpdateCategoryComponent implements OnInit {
@Input() data?: any;
validateForm!: FormGroup;
- constructor(private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient, private objectsSrv: ObjectsSimpleService,private message: NzMessageService,) { }
+ constructor(private modal: NzModalRef, private fb: FormBuilder, private http: HttpClient, private objectsSrv: ObjectsSimpleService, private message: NzMessageService,) { }
handleTypeList: handleTypeList[] = new handleType().list;
data2: any; //深拷贝data
@@ -27,8 +27,10 @@ export class EditUpdateCategoryComponent implements OnInit {
this.validateForm = this.fb.group({
number: [null, [Validators.required]],
isLongTerm: [null, [Validators.required]],
- isLongTermTime: [null,],
- isNoLongTermTime: [null,],
+ isLongTermTime: [null],
+ isNoLongTermTime: [null],
+ radioTypeForm: [null],
+ explain: [null]
});
// 日期
this.data2 = JSON.parse(JSON.stringify(this.data))
@@ -41,15 +43,22 @@ export class EditUpdateCategoryComponent implements OnInit {
this.isNoLongTermTime = []
this.isNoLongTermTime.push(new Date(this.data2.validityStartTime))
this.isNoLongTermTime.push(new Date(this.data2.validityEndTime))
- if (this.isNoLongTermTime.length && this.isNoLongTermTime.find(item=>{ return item.getFullYear() < 1000 })) {
+ if (this.isNoLongTermTime.length && this.isNoLongTermTime.find(item => { return item.getFullYear() < 1000 })) {
this.isNoLongTermTime[0] = new Date()
this.isNoLongTermTime[1] = new Date()
}
}
console.log(this.data2)
+ console.log(typeof(this.data2.lastLicenseAuditType))
}
+ radioChange($event) {
+ this.data2.LastLicenseAuditType = $event
+ }
+
+
+
imageUrl = '/api/Objects/sinochemweb/stationPhotos/175/timg.jpg'
destroyModal() {
@@ -63,7 +72,7 @@ export class EditUpdateCategoryComponent implements OnInit {
}
//提交审核
- submitReview(){
+ submitReview() {
this.isSubmit = true;
this.modal.triggerOk();
}
@@ -79,7 +88,7 @@ export class EditUpdateCategoryComponent implements OnInit {
if (time <= 0) {
this.data2.validityDays = 0
} else {
- this.data2.validityDays = Math.floor(time / (1000*3600*24));
+ this.data2.validityDays = Math.floor(time / (1000 * 3600 * 24));
}
}
}
@@ -96,7 +105,7 @@ export class EditUpdateCategoryComponent implements OnInit {
if (time <= 0) {
this.data2.validityDays = 0
} else {
- this.data2.validityDays = Math.floor(time / (1000*3600*24));
+ this.data2.validityDays = Math.floor(time / (1000 * 3600 * 24));
}
} else {
this.data2.validityDays = 999
@@ -104,29 +113,29 @@ export class EditUpdateCategoryComponent implements OnInit {
}
//获取办理类型
- getHandleTypes(handleTypes: any[]):string {
+ getHandleTypes(handleTypes: any[]): string {
if (!handleTypes || !handleTypes.length) {
return
}
let names: string[] = []
let handleTypeList = JSON.parse(JSON.stringify(handleTypes));
let list: handleTypeList[] = new handleType().list;
- handleTypeList.forEach(item=>{
- list.find(element=>{
- item == element.value? names.push(element.name) : null
+ handleTypeList.forEach(item => {
+ list.find(element => {
+ item == element.value ? names.push(element.name) : null
})
})
return names.join(',')
}
//获取文件格式
- getFileType(name: string):string {
+ 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')) {
+ 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')) {
+ } 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')) {
+ } else if (name.substring(name.length - 4).includes('pdf')) {
suffix = 'pdf'
}
return suffix
@@ -141,7 +150,7 @@ export class EditUpdateCategoryComponent implements OnInit {
let arr = item.split('.')
arr[arr.length - 1] = 'pdf'
window.open(arr.join('.'))
- } else if (this.getFileType(item) == 'pdf') {
+ } else if (this.getFileType(item) == 'pdf') {
window.open(item)
} else {
this.message.create('warning', '暂不支持查看！');
@@ -149,10 +158,10 @@ export class EditUpdateCategoryComponent implements OnInit {
}
- uploadType: boolean; //是否是上传副本
+ uploadType: number; //是否是上传副本
isLoadingSave: boolean = false
uploadIndex: string
- filechange(e, type: boolean) {
+ filechange(e, type: number) {
this.uploadType = type
this.isLoadingSave = true
let oilStationId = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).organization.id
@@ -180,10 +189,12 @@ export class EditUpdateCategoryComponent implements OnInit {
this.objectsSrv.postFile(this.postFilePath, file).subscribe(data => {
let dataObj = data as any;
let filePath: string = ObjectsSimpleService.baseUrl + dataObj.objectName;
- if (this.uploadType){
+ if (this.uploadType === 0) {
this.data2.imageUrl = filePath
- } else {
+ } else if (this.uploadType === 1) {
this.data2.attachment = filePath
+ } else if (this.uploadType === 2) {
+ this.data2.yearlyCheckAttachment = filePath
}
this.isLoadingSave = false
resolve('success')
@@ -199,10 +210,12 @@ export class EditUpdateCategoryComponent implements OnInit {
this.objectsSrv.postFile_MultipartUpload(this.postFilePath, file).then((value) => {
let dataObj = value as any;
let filePath = dataObj.filePath
- if (this.uploadType){
+ if (this.uploadType === 0) {
this.data2.imageUrl = filePath
- } else {
+ } else if (this.uploadType === 1) {
this.data2.attachment = filePath
+ } else if (this.uploadType === 2) {
+ this.data2.yearlyCheckAttachment = filePath
}
this.isLoadingSave = false
});
@@ -233,7 +246,7 @@ export class EditUpdateCategoryComponent implements OnInit {
//办理类型
export class handleType {
- list: handleTypeList[] =[
+ list: handleTypeList[] = [
{ value: 0, name: "无" },
{ value: 1, name: "年度公示" },
{ value: 2, name: "年检" },
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 4c29519..773167b 100644
--- a/src/app/pages/license/update-category/update-category.component.html
+++ b/src/app/pages/license/update-category/update-category.component.html
@@ -48,13 +48,29 @@
逾期报警
- ![]()
-
-
+ ![]()
+
+
+
|
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 d4a4910..c03eb64 100644
--- a/src/app/pages/license/update-category/update-category.component.ts
+++ b/src/app/pages/license/update-category/update-category.component.ts
@@ -162,6 +162,12 @@ export class UpdateCategoryComponent implements OnInit {
let newUrl = window.location.protocol + '//' + window.location.host + body.attachment
body.attachment = newUrl
}
+
+ if (body.lastLicenseAuditType == 0) {
+ body.yearlyCheckAttachment = null
+ body.yearlyCheckDescription = null
+ }
+
if (!instance.isSubmit) {
this.http.post('/api/services/app/StationValidityLicense/Create', body).subscribe((data: any) => {
this.getStationList();
@@ -221,7 +227,10 @@ export class UpdateCategoryComponent implements OnInit {
return
}
return new Promise((resolve, reject) => {
- let params = { id: item.id }
+ let params: any = {
+ id: item.id,
+ type: item.lastLicenseAuditType
+ }
this.http.post('/api/services/app/StationValidityLicense/Commit', {}, { params }).subscribe(data => {
this.message.create('success', '提交审核成功！');
this.getStationList();
diff --git a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts
index dee04e6..0b6f416 100644
--- a/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts
+++ b/src/app/pages/today-warning/get-out-of-line-details/get-out-of-line-details.component.ts
@@ -2,7 +2,6 @@ import { HttpClient } from '@angular/common/http';
import { Component, OnInit, Input } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { DomSanitizer } from '@angular/platform-browser';
-import { Console } from 'console';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
@Component({
diff --git a/src/theme.less b/src/theme.less
index 09630bf..5822154 100644
--- a/src/theme.less
+++ b/src/theme.less
@@ -288,7 +288,6 @@
#detailsfilecategory {
nz-form-item {
margin-bottom: 0;
-
input,
select {
color: rgba(145, 204, 255, 0.95) !important;
@@ -297,11 +296,12 @@
nz-date-picker,
nz-range-picker,
- nz-select {
+ nz-select,
+ textarea {
background-color: #143c61;
}
- nz-select {
+ nz-select,textarea {
color: rgba(145, 204, 255, 0.95) !important;
}
From 58cd8fb05f692a3162c8b2152f6498b4ecc57e7a Mon Sep 17 00:00:00 2001
From: SHAOJIAHAO <55341701@qq.com>
Date: Wed, 13 Jul 2022 15:54:24 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E5=AE=8C=E5=96=84]init3DGuard=E5=AE=88?=
=?UTF-8?q?=E5=8D=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/pages/init3D.guard.ts | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/app/pages/init3D.guard.ts b/src/app/pages/init3D.guard.ts
index 8f46e71..8662653 100644
--- a/src/app/pages/init3D.guard.ts
+++ b/src/app/pages/init3D.guard.ts
@@ -26,7 +26,9 @@ export class init3DGuard implements CanActivate {
if (userdata.userName == 'superadmin' || res.hasBuildingInfo) {
return true
} else {
- // this.message.info("当前油站未开通!");
+ if(this.router.url != '/plan'){
+ this.message.info("当前油站未开通!");
+ }
return false
}
});
|