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 1f1bfb3..f62ccf7 100644 --- a/src/app/pages/audit/audit-record/audit-record.component.html +++ b/src/app/pages/audit/audit-record/audit-record.component.html @@ -5,10 +5,10 @@ - + - - + + 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 4224da9..13a16a2 100644 --- a/src/app/pages/audit/audit-record/audit-record.component.ts +++ b/src/app/pages/audit/audit-record/audit-record.component.ts @@ -20,14 +20,14 @@ export class AuditRecordComponent implements OnInit { constructor(private element: ElementRef, private modal: NzModalService, private viewContainerRef: ViewContainerRef, private toTree: TreeService, private http: HttpClient, private fb: FormBuilder) { } list = [] - level=false + level = false tableScrollHeight resizeListener startdate enddate async ngOnInit(): Promise { - if(JSON.parse(sessionStorage.getItem('userdata')).organization.level==1){ - this.level=true + if (JSON.parse(sessionStorage.getItem('userdata')).organization.level == 1) { + this.level = true } this.tableScrollHeight = '100px' // 页面监听 diff --git a/src/app/pages/plan-admin/update-license-list/update-license-list.component.ts b/src/app/pages/plan-admin/update-license-list/update-license-list.component.ts index 229d678..bff3349 100644 --- a/src/app/pages/plan-admin/update-license-list/update-license-list.component.ts +++ b/src/app/pages/plan-admin/update-license-list/update-license-list.component.ts @@ -21,7 +21,7 @@ export class UpdateLicenseListComponent implements OnInit { validateForm!: FormGroup; constructor(private modal: NzModalService, private viewContainerRef: ViewContainerRef, private element: ElementRef, private navChangeService: NavChangeService, private http: HttpClient, private toTree: TreeService, private fb: FormBuilder, private nzContextMenuService: NzContextMenuService, private router: Router, private message: NzMessageService) { } - button=false + button = false tableScrollHeight tableScrollWeight resizeListener @@ -149,19 +149,20 @@ export class UpdateLicenseListComponent implements OnInit { let newArr = [] for (let index = 0; index < newElement.length; index++) { const item = newElement[index]; - if (item.name == '公司名称') { - newArr[0] = item - newElement.splice(index--, 1) - } - if (item.name == '区域名称') { - newArr[1] = item - newElement.splice(index--, 1) - } - if (item.name == '油站名称') { - newArr[2] = item - newElement.splice(index--, 1) + let arr = [ + '公司名称', '区域名称', '油站名称', '营业执照', '成品油零售经营批准证书', '危险化学品经营许可证', '食品经营许可证', '烟草经营许可证', '安全生产标准化认证证书', '排污许可证', '防雷检测报告', '计量检测报告', '职业危害因素检测报告', '安全现状评价报告', '安全应急预案备案回执', '环境应急预案备案回执', '油气回收系统年检报告', '大气污染物合规性监测报告', '主要负责人证书', '安全管理人员资格证书1', '安全管理人员资格证书2' + ] + for (let i = 0; i < arr.length; i++) { + const element = arr[i]; + if (item.name == element) { + newArr[i] = item + newElement.splice(index--, 1) + } } } + newArr = newArr.filter((item) => { + return item + }) let atLastArr = newArr.concat(newElement); arr.push(atLastArr) }); @@ -224,10 +225,10 @@ export class UpdateLicenseListComponent implements OnInit { returnLastMenus() { let userMenu = JSON.parse(sessionStorage.getItem('userdata')).menus - + for (let index = 0; index < userMenu.length; index++) { - if (userMenu[index].parentId==9) { - this.button=true + if (userMenu[index].parentId == 9) { + this.button = true } } return