diff --git a/src/app/pages/records/oil-unloading-process-list/oil-unloading-process-list.component.ts b/src/app/pages/records/oil-unloading-process-list/oil-unloading-process-list.component.ts index 6116556..6aaa5e8 100644 --- a/src/app/pages/records/oil-unloading-process-list/oil-unloading-process-list.component.ts +++ b/src/app/pages/records/oil-unloading-process-list/oil-unloading-process-list.component.ts @@ -75,7 +75,7 @@ export class OilUnloadingProcessListComponent implements OnInit { isMisinformation: boolean = false//误报按钮的显隐 - button=false + button = false tableScrollHeight resizeListener ngOnInit(): void { @@ -136,20 +136,20 @@ export class OilUnloadingProcessListComponent implements OnInit { } returnLastMenus(e) { let userMenu - if(e){ + if (e) { userMenu = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).menus - - }else{ + + } else { userMenu = JSON.parse(sessionStorage.getItem('userdata')).menus } for (let index = 0; index < userMenu.length; index++) { for (let k = 0; k < userMenu.length; k++) { - if (userMenu[index].name=="卸油统计") { - if(userMenu[index].id==userMenu[k].parentId){ + if (userMenu[index].name == "卸油统计") { + if (userMenu[index].id == userMenu[k].parentId) { this.button = true } } - + } } } @@ -746,24 +746,17 @@ export class OilUnloadingProcessListComponent implements OnInit { } look(item) { - // console.log(item) + console.log(item) let arr = [] - let arr1 = item.oilUnloadingNodes.find((item) => { return item.nodeName == '车辆进场' }); - let arr2 = item.oilUnloadingNodes.find((item) => { return item.nodeName == '设置卸油隔离区' }); - let arr3 = item.oilUnloadingNodes.find((item) => { return item.nodeName == '卸油连接静电接地' }); - let arr4 = item.oilUnloadingNodes.find((item) => { return item.nodeName == '卸油设置消防器材' }); + let arr1 = item.oilUnloadingNodes.find((item) => { return item.nodeName == '车辆进场' || item.nodeName == '油罐车进场' }); + let arr2 = item.oilUnloadingNodes.find((item) => { return item.nodeName == '设置卸油隔离区' || item.nodeName == '设置隔离区域' }); + let arr3 = item.oilUnloadingNodes.find((item) => { return item.nodeName == '卸油连接静电接地' || item.nodeName == '连接静电接地' }); + let arr4 = item.oilUnloadingNodes.find((item) => { return item.nodeName == '卸油设置消防器材' || item.nodeName == '放置消防器材' }); let arr5 = item.oilUnloadingNodes.find((item) => { return item.nodeName == '连接卸油管' }); - let arr6 = item.oilUnloadingNodes.find((item) => { return item.nodeName == '卸油中无人监卸' }); + let arr6 = item.oilUnloadingNodes.find((item) => { return item.nodeName == '卸油中无人监卸' || item.nodeName == '全程监卸'}); let arr7 = item.oilUnloadingNodes.find((item) => { return item.nodeName == '拆除卸油管' }); - let arr8 = item.oilUnloadingNodes.find((item) => { return item.nodeName == '车辆离场' || item.nodeName == '车辆离厂' || item.nodeName == '车辆出厂' }); - // console.log(1, arr1) - // console.log(2, arr2) - // console.log(3, arr3) - // console.log(4, arr4) - // console.log(5, arr5) - // console.log(6, arr6) - // console.log(7, arr7) - // console.log(8, arr8) + let arr8 = item.oilUnloadingNodes.find((item) => { return item.nodeName == '车辆离场' || item.nodeName == '车辆离厂' || item.nodeName == '车辆出厂' || item.nodeName == '油罐车离场' }); + arr = [arr1, arr2, arr3, arr4, arr5, arr6, arr7, arr8] console.log('卸油流程', arr) diff --git a/src/app/system-management/navigation/navigation.component.html b/src/app/system-management/navigation/navigation.component.html index 2651095..9a4135c 100644 --- a/src/app/system-management/navigation/navigation.component.html +++ b/src/app/system-management/navigation/navigation.component.html @@ -16,9 +16,9 @@
diff --git a/src/app/system-management/organization/addor/addor.component.ts b/src/app/system-management/organization/addor/addor.component.ts index 9ba7d78..0705909 100644 --- a/src/app/system-management/organization/addor/addor.component.ts +++ b/src/app/system-management/organization/addor/addor.component.ts @@ -21,7 +21,7 @@ export class AddorComponent implements OnInit { }); } - OrgnizationLevel = ['无', '总公司', '省公司', '区域', '油站'] + OrgnizationLevel = ['无', '销售公司', '省公司', '区域', '油站'] destroyModal(): void { this.modal.destroy({ data: 'this the result data' }); diff --git a/src/app/system-management/organization/editor/editor.component.ts b/src/app/system-management/organization/editor/editor.component.ts index 6eae504..ba596c5 100644 --- a/src/app/system-management/organization/editor/editor.component.ts +++ b/src/app/system-management/organization/editor/editor.component.ts @@ -16,7 +16,7 @@ export class EditorComponent implements OnInit { datacopy: any isParticipationAudit - OrgnizationLevel = ['无', '总公司', '省公司', '区域', '油站'] + OrgnizationLevel = ['无', '销售公司', '省公司', '区域', '油站'] ngOnInit(): void { this.validateForm = this.fb.group({ name: [null, [Validators.required]],