diff --git a/proxy.config.json b/proxy.config.json index dd2d252..35b864a 100644 --- a/proxy.config.json +++ b/proxy.config.json @@ -1,11 +1,11 @@ { "/api": { - "target": "http://121.36.37.70:8906", + "target": "https://znaq.sinochemoilmarketing.com", "secure": false, "changeOrigin": true }, "/signalr": { - "target": "http://121.36.37.70:8906", + "target": "https://znaq.sinochemoilmarketing.com", "secure": false, "ws": true, "logLevel": "debug" diff --git a/src/app/pages/plan-admin/file-license-list/file-license-list.component.ts b/src/app/pages/plan-admin/file-license-list/file-license-list.component.ts index 398f033..430a1d3 100644 --- a/src/app/pages/plan-admin/file-license-list/file-license-list.component.ts +++ b/src/app/pages/plan-admin/file-license-list/file-license-list.component.ts @@ -229,10 +229,16 @@ export class FileLicenseListComponent implements OnInit { returnLastMenus() { let userMenu = JSON.parse(sessionStorage.getItem('userdata')).menus + console.log(userMenu,80808); for (let index = 0; index < userMenu.length; index++) { - if (userMenu[index].parentId==10) { - this.button=true + for (let k = 0; k < userMenu.length; k++) { + if (userMenu[index].name=="资产类证照") { + if(userMenu[index].id==userMenu[k].parentId){ + this.button = true + } + } + } } return 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 bff3349..8972800 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 @@ -225,10 +225,16 @@ export class UpdateLicenseListComponent implements OnInit { returnLastMenus() { let userMenu = JSON.parse(sessionStorage.getItem('userdata')).menus - + console.log(userMenu,5555555); + for (let index = 0; index < userMenu.length; index++) { - if (userMenu[index].parentId == 9) { - this.button = true + for (let k = 0; k < userMenu.length; k++) { + if (userMenu[index].name=="经营类证照") { + if(userMenu[index].id==userMenu[k].parentId){ + this.button = true + } + } + } } return diff --git a/src/app/pages/records/criminal-records-admin/criminal-records-admin.component.ts b/src/app/pages/records/criminal-records-admin/criminal-records-admin.component.ts index 5d60e95..b7def54 100644 --- a/src/app/pages/records/criminal-records-admin/criminal-records-admin.component.ts +++ b/src/app/pages/records/criminal-records-admin/criminal-records-admin.component.ts @@ -894,21 +894,31 @@ export class CriminalRecordsAdminComponent implements OnInit { if(e){ let userMenu = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).menus - for (let index = 0; index < userMenu.length; index++) { - if (userMenu[index].parentId == 5) { - this.button = true + 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){ + this.button = true + } + } + + } } - } }else{ let userMenu = JSON.parse(sessionStorage.getItem('userdata')).menus console.log(userMenu,900); - for (let index = 0; index < userMenu.length; index++) { - if (userMenu[index].parentId == 5) { - this.button = true + 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){ + this.button = true + } + } + + } } } - } return } exportExcel() { diff --git a/src/app/pages/records/criminal-records/criminal-records.component.ts b/src/app/pages/records/criminal-records/criminal-records.component.ts index 6b951f3..e367a80 100644 --- a/src/app/pages/records/criminal-records/criminal-records.component.ts +++ b/src/app/pages/records/criminal-records/criminal-records.component.ts @@ -312,7 +312,8 @@ export class CriminalRecordsComponent implements OnInit { // this.isShowEcharts.getMessage().subscribe((message: any) => { // this.isEchartsShow() // }); - + console.log(1243); + this.tableScrollHeight = '100px' // 页面监听 this.resizeListener = fromEvent(window, 'resize').pipe(debounceTime(100)).subscribe((event) => { @@ -375,22 +376,32 @@ export class CriminalRecordsComponent implements OnInit { returnLastMenus(e) { if(e){ let userMenu = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).menus - - for (let index = 0; index < userMenu.length; index++) { - if (userMenu[index].parentId == 5) { - this.button = true + console.log(userMenu,900112); + 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){ + this.button = true + } + } + + } } - } }else{ let userMenu = JSON.parse(sessionStorage.getItem('userdata')).menus - console.log(userMenu,900); + // console.log(userMenu,90011); - for (let index = 0; index < userMenu.length; index++) { - if (userMenu[index].parentId == 5) { - this.button = true + 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){ + this.button = true + } + } + + } } } - } return } //刷新饼图图表数据 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 7310806..e7a6976 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 @@ -138,22 +138,28 @@ export class OilUnloadingProcessListComponent implements OnInit { if(e){ let userMenu = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).menus for (let index = 0; index < userMenu.length; index++) { - if (userMenu[index].parentId==6) { - this.button=true + for (let k = 0; k < userMenu.length; k++) { + if (userMenu[index].name=="卸油统计") { + if(userMenu[index].id==userMenu[k].parentId){ + this.button = true + } + } + } } }else{ let userMenu = JSON.parse(sessionStorage.getItem('userdata')).menus - console.log(userMenu); - + console.log(userMenu,5555); for (let index = 0; index < userMenu.length; index++) { - if (userMenu[index].parentId==6) { - this.button=true + for (let k = 0; k < userMenu.length; k++) { + if (userMenu[index].name=="卸油统计") { + if(userMenu[index].id==userMenu[k].parentId){ + this.button = true + } + } } } - - } } diff --git a/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.ts b/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.ts index 878f38f..0df0837 100644 --- a/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.ts +++ b/src/app/pages/records/warning-statistics-list/warning-statistics-list.component.ts @@ -105,20 +105,30 @@ export class WarningStatisticsListComponent implements OnInit { if(e){ let userMenu = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).menus - for (let index = 0; index < userMenu.length; index++) { - if (userMenu[index].parentId == 7) { - this.button = true + 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){ + this.button = true + } + } + + } } - } }else{ let userMenu = JSON.parse(sessionStorage.getItem('userdata')).menus - - for (let index = 0; index < userMenu.length; index++) { - if (userMenu[index].parentId == 7) { - this.button = true + console.log(userMenu); + 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){ + this.button = true + } + } + + } } } - } return } listOfData//证照列表