邵佳豪 3 years ago
parent
commit
ff6e3f46d8
  1. 4
      src/app/babylon/controller/scene-manager.ts
  2. 4
      src/app/pages/audit/audit-ing/audit-ing.component.ts
  3. 5
      src/app/pages/audit/audit-record/audit-record.component.html
  4. 4
      src/app/pages/audit/audit-record/audit-record.component.ts
  5. 2
      src/app/pages/audit/gas-base-info/gas-base-info.component.html
  6. 11
      src/app/pages/audit/gas-base-info/gas-base-info.component.ts
  7. 13
      src/app/pages/license/file-category/details-file-category/details-file-category.component.html
  8. 43
      src/app/pages/license/file-category/details-file-category/details-file-category.component.ts
  9. 5
      src/app/pages/license/file-category/edit-file-category/edit-file-category.component.html
  10. 33
      src/app/pages/license/file-category/edit-file-category/edit-file-category.component.ts
  11. 8
      src/app/pages/license/file-category/file-category.component.html
  12. 29
      src/app/pages/license/file-category/file-category.component.ts
  13. 7
      src/app/pages/license/update-category/details-update-category/details-update-category.component.html
  14. 11
      src/app/pages/license/update-category/details-update-category/details-update-category.component.ts
  15. 11
      src/app/pages/license/update-category/update-category.component.html
  16. 1
      src/app/pages/license/update-category/update-category.component.ts

4
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);

4
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)
})
})

5
src/app/pages/audit/audit-record/audit-record.component.html

@ -71,14 +71,13 @@
<nz-form-item class="btn">
<nz-form-control>
<button nz-button type="submit" class="submit"><i nz-icon [nzType]="'search'"></i>查询</button>
<button nz-button type="submit" class="submit" [nzLoading]="tableSpin"><i nz-icon [nzType]="'search'"></i>查询</button>
</nz-form-control>
</nz-form-item>
<nz-form-item class="btn">
<nz-form-control>
<button nz-button type="button" class="reset" (click)="resetForm($event)"><i nz-icon
[nzType]="'sync'"></i>重置</button>
<button nz-button type="button" class="reset" (click)="resetForm($event)" [nzLoading]="tableSpin"><i nz-icon [nzType]="'sync'"></i>重置</button>
</nz-form-control>
</nz-form-item>
</form>

4
src/app/pages/audit/audit-record/audit-record.component.ts

@ -244,6 +244,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)
})
})

2
src/app/pages/audit/gas-base-info/gas-base-info.component.html

@ -79,7 +79,7 @@
<span>审核记录</span>
<span>
<span style="margin-right: 6px;">
审核次数:{{auditList.length}}
审核次数:{{getVerifyNum()}}
</span>
<span>
驳回次数:{{getRejectNum()}}

11
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

13
src/app/pages/license/file-category/details-file-category/details-file-category.component.html

@ -13,13 +13,17 @@
<div class="cutoffrule"></div>
<!-- <p>是否年检: &nbsp;&nbsp;是</p>
<div class="cutoffrule"></div> -->
<p>证件图片: &nbsp;&nbsp;<img *ngIf="data.imageUrl" [src]="data.imageUrl" (click)="viewImg(data.imageUrl)"></p>
<p>证件图片: &nbsp;&nbsp;
<img *ngIf="data.imageUrl && getFileType(data.imageUrl) == 'img'" [src]="data.imageUrl" (click)="viewImg(data.imageUrl)">
<img *ngIf="data.imageUrl && getFileType(data.imageUrl) == 'word'" src="../../../../assets/images/license/word.png" (click)="lookFile(data)">
<img *ngIf="data.imageUrl && getFileType(data.imageUrl) == 'pdf'" src="../../../../assets/images/license/pdf.png" (click)="lookFile(data)">
</p>
<div class="cutoffrule"></div>
<p class="recordP" style="margin-bottom: 32px">
<span>审核记录</span>
<span>
<span style="margin-right: 6px;">
审核次数:{{auditList.length}}
审核次数:{{getVerifyNum()}}
</span>
<span>
驳回次数:{{getRejectNum()}}
@ -28,8 +32,9 @@
</p>
<nz-timeline>
<nz-timeline-item *ngFor="let item of auditList">
<span style="margin-right: 12px;">{{item.creationTime | date:"yyyy/MM/dd"}}</span>
<span>{{item.auditStatus | auditStatus}}</span>
<span>{{item.creationTime | date:"yyyy/MM/dd"}}</span>
<span style="margin: 0 10px;">{{item.auditStatus | auditStatus}}</span>
<span *ngIf="item.auditStatus == 3">驳回说明:{{item.auditLog? item.auditLog.rejectReason : ''}}</span>
</nz-timeline-item>
</nz-timeline>
<ng-template #soccerTemplate>

43
src/app/pages/license/file-category/details-file-category/details-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-details-file-category',
@ -13,7 +14,7 @@ import Viewer from 'viewerjs';
export class DetailsFileCategoryComponent implements OnInit {
@Input() data?: any;
constructor(private modal: NzModalRef, private http: HttpClient) { }
constructor(private modal: NzModalRef, private http: HttpClient,private message: NzMessageService) { }
ngOnInit(): void {
this.getAuditLogging()
@ -32,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
@ -47,6 +59,19 @@ export class DetailsFileCategoryComponent implements OnInit {
this.modal.destroy({ data: 'this the result data' });
}
//获取文件格式
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`)
@ -67,4 +92,20 @@ export class DetailsFileCategoryComponent 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', '暂不支持查看!');
}
}
}

5
src/app/pages/license/file-category/edit-file-category/edit-file-category.component.html

@ -26,7 +26,10 @@
<div class="uploadDivbox">
<div class="uploadDiv" style="margin-right: 12px;">
<img *ngIf="data2 && data2.imageUrl" style="width: 100%;height: 100%;cursor: pointer;" [src]="data2.imageUrl" (click)="viewImg(data2.imageUrl)">
<img *ngIf="data2.imageUrl && getFileType(data2.imageUrl) == 'img'" style="width: 100%;height: 100%;cursor: pointer;" [src]="data2.imageUrl" (click)="viewImg(data2.imageUrl)">
<img *ngIf="data2.imageUrl && getFileType(data2.imageUrl) == 'word'" src="../../../../assets/images/license/word.png" (click)="lookFile(data2)">
<img *ngIf="data2.imageUrl && getFileType(data2.imageUrl) == 'pdf'" src="../../../../assets/images/license/pdf.png" (click)="lookFile(data2)">
<input *ngIf="!data2.imageUrl" (change)="filechange($event)" class="fileinput" type="file" name="" id="">
<button *ngIf="!data2.imageUrl" nz-button [nzLoading]=""><i nz-icon nzType="upload"
nzTheme="outline"></i>上传附件</button>

33
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', '暂不支持查看!');
}
}
}

8
src/app/pages/license/file-category/file-category.component.html

@ -8,7 +8,7 @@
<span style="margin-left: 25%;">证件名称</span>
</th>
<th>有效期类型</th>
<th>图片</th>
<th>附件</th>
<th>提交时间</th>
<th>审核状态</th>
<th>操作</th>
@ -25,11 +25,13 @@
<span *ngIf="item.validatyType == 2"></span>
</td>
<td>
<img *ngIf="item.imageUrl" [src]="item.imageUrl" (click)="viewImg(item.imageUrl)">
<img *ngIf="item.imageUrl && getFileType(item.imageUrl) == 'img'" [src]="item.imageUrl" (click)="viewImg(item.imageUrl)">
<img *ngIf="item.imageUrl && getFileType(item.imageUrl) == 'word'" src="../../../../assets/images/license/word.png" (click)="lookFile(item)">
<img *ngIf="item.imageUrl && getFileType(item.imageUrl) == 'pdf'" src="../../../../assets/images/license/pdf.png" (click)="lookFile(item)">
</td>
<td>{{item.committedTime | date:"yyyy/MM/dd"}}<span *ngIf="!item.committedTime">未提交审核</span></td>
<td>
<span>{{item.auditStatus | auditStatus}}</span>
<span *ngIf="item.auditLog">{{item.auditLog.auditStatusDesc || ''}}</span>
</td>
<td class="operation">
<span class="blueColor" (click)="edit(item)">编辑</span>

29
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() {
}

7
src/app/pages/license/update-category/details-update-category/details-update-category.component.html

@ -29,7 +29,7 @@
<span>审核记录</span>
<span>
<span style="margin-right: 6px;">
审核次数:{{auditList.length}}
审核次数:{{getVerifyNum()}}
</span>
<span>
驳回次数:{{getRejectNum()}}
@ -38,8 +38,9 @@
</p>
<nz-timeline>
<nz-timeline-item *ngFor="let item of auditList">
<span style="margin-right: 12px;">{{item.creationTime | date:"yyyy/MM/dd"}}</span>
<span>{{item.auditStatus | auditStatus}}</span>
<span>{{item.creationTime | date:"yyyy/MM/dd"}}</span>
<span style="margin: 0 10px;">{{item.auditStatus | auditStatus}}</span>
<span *ngIf="item.auditStatus == 3">驳回说明:{{item.auditLog? item.auditLog.rejectReason : ''}}</span>
</nz-timeline-item>
</nz-timeline>
<ng-template #soccerTemplate>

11
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

11
src/app/pages/license/update-category/update-category.component.html

@ -27,12 +27,9 @@
<td>{{item.licenseCode || ''}}</td>
<td>{{item.isLongTerm ? '长期证照' : (item.validityEndTime | date:"yyyy/MM/dd")}}</td>
<td>
<img *ngIf="item.imageUrl && getFileType(item.imageUrl) == 'img'" [src]="item.imageUrl"
(click)="viewImg(item.imageUrl)">
<img *ngIf="item.imageUrl && getFileType(item.imageUrl) == 'word'"
src="../../../../assets/images/license/word.png" (click)="lookFile(item)">
<img *ngIf="item.imageUrl && getFileType(item.imageUrl) == 'pdf'"
src="../../../../assets/images/license/pdf.png" (click)="lookFile(item)">
<img *ngIf="item.imageUrl && getFileType(item.imageUrl) == 'img'" [src]="item.imageUrl" (click)="viewImg(item.imageUrl)">
<img *ngIf="item.imageUrl && getFileType(item.imageUrl) == 'word'" src="../../../../assets/images/license/word.png" (click)="lookFile(item)">
<img *ngIf="item.imageUrl && getFileType(item.imageUrl) == 'pdf'" src="../../../../assets/images/license/pdf.png" (click)="lookFile(item)">
</td>
<td>
<ng-container *ngIf="item.isLongTerm; else elseTemplate">
@ -47,7 +44,7 @@
<!-- <td><span *ngIf="item.isYearlyCheck">是</span><span *ngIf="!item.isYearlyCheck">否</span></td> -->
<td>{{item.committedTime | date:"yyyy/MM/dd"}}<span *ngIf="!item.committedTime">未提交审核</span></td>
<td>
<span>{{item.auditStatus | auditStatus}}</span>
<span *ngIf="item.auditLog">{{item.auditLog.auditStatusDesc || ''}}</span>
</td>
<td>
<span *ngIf="item.licenseViolationType == 0"></span>

1
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)

Loading…
Cancel
Save