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/records/criminal-records-admin/criminal-records-admin.component.ts b/src/app/pages/records/criminal-records-admin/criminal-records-admin.component.ts index 92b867c..ecbe298 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 @@ -350,12 +350,15 @@ export class CriminalRecordsAdminComponent implements OnInit { misinformation: ['true'], }); - //饼图 - this.myChart = echarts.init(document.getElementById('piechart')); - this.myChart.setOption(this.option); - //柱状折线图 - this.mybarChart = echarts.init(document.getElementById('barchart')); - this.mybarChart.setOption(this.baroption); + setTimeout(() => { + //饼图 + this.myChart = echarts.init(document.getElementById('piechart')); + this.myChart.setOption(this.option); + //柱状折线图 + this.mybarChart = echarts.init(document.getElementById('barchart')); + this.mybarChart.setOption(this.baroption); + }, 0); + this.warningType() this.tableSpin = true 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 330452e..3cbb90e 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,6 @@ export class CriminalRecordsComponent implements OnInit { // this.isShowEcharts.getMessage().subscribe((message: any) => { // this.isEchartsShow() // }); - console.log(1243); this.tableScrollHeight = '100px' // 页面监听 @@ -358,12 +357,17 @@ export class CriminalRecordsComponent implements OnInit { datePicker: [[this.startdate, this.enddate]], misinformation: ['true'], }); - // 饼图 - this.myChart = echarts.init(document.getElementById('piechart')); - this.myChart.setOption(this.option); - //柱状折线图 - this.mybarChart = echarts.init(document.getElementById('barchart')); - this.mybarChart.setOption(this.baroption); + + setTimeout(() => { + // 饼图 + this.myChart = echarts.init(document.getElementById('piechart')); + this.myChart.setOption(this.option); + //柱状折线图 + this.mybarChart = echarts.init(document.getElementById('barchart')); + this.mybarChart.setOption(this.baroption); + + }, 0); + this.warningType() this.getViolateRecordList() 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 6aaa5e8..800be37 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 @@ -118,10 +118,16 @@ export class OilUnloadingProcessListComponent implements OnInit { organization: [null], datePicker: [[this.startdate, this.enddate]] }); - // 饼图 - this.myChart = echarts.init(document.getElementById('piechart')); - //柱状折线图 - this.mybarChart = echarts.init(document.getElementById('barchart')); + + setTimeout(() => { + // 饼图 + this.myChart = echarts.init(document.getElementById('piechart')); + //柱状折线图 + this.mybarChart = echarts.init(document.getElementById('barchart')); + }, 0); + + + this.tableSpin = true this.getAllOrganization() this.getAggregations() @@ -753,7 +759,7 @@ export class OilUnloadingProcessListComponent implements OnInit { 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 == '卸油中无人监卸' || 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 == '车辆出厂' || item.nodeName == '油罐车离场' }); 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 5250014..a73d853 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 @@ -85,10 +85,13 @@ export class WarningStatisticsListComponent implements OnInit { datePicker: [[this.startdate, this.enddate]] }); - // 饼图 - this.myChart = echarts.init(document.getElementById('piechart')); - //柱状折线图 - this.mybarChart = echarts.init(document.getElementById('barchart')); + setTimeout(() => { + // 饼图 + this.myChart = echarts.init(document.getElementById('piechart')); + //柱状折线图 + this.mybarChart = echarts.init(document.getElementById('barchart')); + }, 0); + this.tableSpin = true this.getAllOrganization() this.getAggregations() @@ -103,15 +106,15 @@ export class WarningStatisticsListComponent implements OnInit { } returnLastMenus(e) { let userMenu - if(e){ + if (e) { userMenu = JSON.parse(sessionStorage.getItem('userdataOfgasstation')).menus - }else{ - userMenu = JSON.parse(sessionStorage.getItem('userdata')).menus + } 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 } }