From a7f550908494ad0eda5a8018bddd1db7d2c6ffe8 Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Mon, 18 Jul 2022 16:56:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8C=89=E9=92=AE=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- proxy.config.json | 4 +-- .../file-license-list.component.ts | 2 -- .../update-license-list.component.ts | 2 -- .../criminal-records-admin.component.ts | 32 ++++++------------- .../criminal-records.component.ts | 32 ++++++------------- .../oil-unloading-process-list.component.ts | 31 +++++++----------- .../warning-statistics-list.component.ts | 30 ++++++----------- 7 files changed, 42 insertions(+), 91 deletions(-) diff --git a/proxy.config.json b/proxy.config.json index 35b864a..dd2d252 100644 --- a/proxy.config.json +++ b/proxy.config.json @@ -1,11 +1,11 @@ { "/api": { - "target": "https://znaq.sinochemoilmarketing.com", + "target": "http://121.36.37.70:8906", "secure": false, "changeOrigin": true }, "/signalr": { - "target": "https://znaq.sinochemoilmarketing.com", + "target": "http://121.36.37.70:8906", "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 430a1d3..9cc9d8a 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,8 +229,6 @@ 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++) { for (let k = 0; k < userMenu.length; k++) { if (userMenu[index].name=="资产类证照") { 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 8972800..a06ff19 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,8 +225,6 @@ 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++) { for (let k = 0; k < userMenu.length; k++) { if (userMenu[index].name=="经营类证照") { 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 b7def54..31b166f 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 @@ -891,32 +891,20 @@ export class CriminalRecordsAdminComponent implements OnInit { const instance = modal.getContentComponent(); } returnLastMenus(e) { + let userMenu if(e){ - let userMenu = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).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){ - this.button = true - } - } - - } - } + userMenu = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).menus }else{ - let userMenu = JSON.parse(sessionStorage.getItem('userdata')).menus - console.log(userMenu,900); - - 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 - } + 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){ + this.button = true } - } + } } return 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 e367a80..2c6b7a8 100644 --- a/src/app/pages/records/criminal-records/criminal-records.component.ts +++ b/src/app/pages/records/criminal-records/criminal-records.component.ts @@ -374,32 +374,20 @@ export class CriminalRecordsComponent implements OnInit { this.resizeListener.unsubscribe() } returnLastMenus(e) { + let userMenu if(e){ - let userMenu = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).menus - 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 - } - } - - } - } + userMenu = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).menus }else{ - let userMenu = JSON.parse(sessionStorage.getItem('userdata')).menus - // console.log(userMenu,90011); - - 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 - } + 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){ + 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 e7a6976..0c6ffda 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 @@ -135,30 +135,21 @@ export class OilUnloadingProcessListComponent implements OnInit { this.resizeListener.unsubscribe() } returnLastMenus(e) { + let userMenu if(e){ - let userMenu = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).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){ - this.button = true - } - } - - } - } + userMenu = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).menus + }else{ - let userMenu = JSON.parse(sessionStorage.getItem('userdata')).menus - console.log(userMenu,5555); - 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 - } + 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){ + 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 0df0837..5250014 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 @@ -102,30 +102,18 @@ export class WarningStatisticsListComponent implements OnInit { this.resizeListener.unsubscribe() } returnLastMenus(e) { + let userMenu if(e){ - let userMenu = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).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){ - this.button = true - } - } - - } - } + userMenu = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).menus }else{ - let userMenu = JSON.parse(sessionStorage.getItem('userdata')).menus - 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 - } + 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){ + this.button = true } - } } }