diff --git a/src/views/keyprojects/meteorological/components/meteorological-history.vue b/src/views/keyprojects/meteorological/components/meteorological-history.vue index 253fbb5..5dbc97f 100644 --- a/src/views/keyprojects/meteorological/components/meteorological-history.vue +++ b/src/views/keyprojects/meteorological/components/meteorological-history.vue @@ -290,7 +290,7 @@ export default { } ).then((data) => { this.listLoading = false - this.varList = data.varList + this.varList = data.varList.reverse() this.temperature = [] this.winddirection = [] this.windspeed = [] diff --git a/src/views/map/components/menjin.vue b/src/views/map/components/menjin.vue index 604b295..e3c046e 100644 --- a/src/views/map/components/menjin.vue +++ b/src/views/map/components/menjin.vue @@ -102,18 +102,18 @@ export default { img: require('../../../assets/map/menjin/img3.png'), label1: '口门数', count1: 0, - label2: '车门数', + label2: '车闸机数', count2: 0, - label3: '人门数', + label3: '人闸机数', count3: 0 }, { img: require('../../../assets/map/menjin/img4.png'), label1: '口门数', count1: 0, - label2: '车门数', + label2: '车闸机数', count2: 0, - label3: '人门数', + label3: '人闸机数', count3: 0 } ], @@ -137,7 +137,7 @@ export default { created() { this.getDoorWayRecords(0) this.getOnlineGateMachine() - this.getMachineTodayInOutCount() + this.getMkmjGateStatistics() // this.getDoorManagement() }, @@ -152,9 +152,16 @@ export default { }, methods: { initEcharts1(data) { - const XaxisData = ['1号门', '2号门', '3号门', '4号门'] - const seriesData1 = [10, 20, 30, 40] - const seriesData2 = [10, 20, 30, 40] + const XaxisData = [] + const seriesData1 = [] + const seriesData2 = [] + + data.forEach(e => { + XaxisData.push(e.AREA_NAME) + seriesData1.push(e.CAR_IN + 0 + e.PEOPLE_IN) + seriesData2.push(e.CAR_OUT + 0 + e.PEOPLE_OUT) + }); + Echarts1 = echarts.init(document.querySelector('#main1')) const option = { tooltip: { @@ -196,7 +203,7 @@ export default { }, yAxis: { type: 'value', - max: '150', + // max: '150', axisLine: { show: false, lineStyle: { @@ -217,9 +224,9 @@ export default { }, series: [ { - name: '人员', + name: '进', type: 'bar', - barWidth: '10%', + barWidth: '30%', itemStyle: { normal: { color: new echarts.graphic.LinearGradient( @@ -244,9 +251,9 @@ export default { data: seriesData1 }, { - name: '车辆', + name: '出', type: 'bar', - barWidth: '10%', + barWidth: '30%', itemStyle: { normal: { color: new echarts.graphic.LinearGradient( @@ -279,20 +286,39 @@ export default { this.currentPage += 1 this.loadRecord(this.block3OptionsIndex) }, - getMachineTodayInOutCount() { + getMkmjGateStatistics() { requestFN( - '/map/getMachineTodayInOutCount', { + '/mkmjGateStatistics/page?showCount=100¤tPage=1', { + AREA: this.area + } + ).then((data) => { + this.initEcharts1(data.varList.reverse()) + }) + }, + + getOnlineGateMachine() { + requestFN( + '/map/getOnlineGateMachine', { AREA: this.area, CORPINFO_ID: this.corpInfoId, GANGKOU: this.gangkou, - id: '7' } ).then((data) => { - if (this.gangkou === '00004') { + data.varList.forEach(e => { + if (e.AREA_PARENT_ID == '393705'){ + // 东港区 + this.block1OptionsList[0].count1 = e.AREA_COUNT + this.block1OptionsList[0].count2 = e.CAR + this.block1OptionsList[0].count3 = e.PEOPLE + }else if (e.AREA_PARENT_ID == '371709'){ + // 西港区 + this.block1OptionsList[1].count1 = e.AREA_COUNT + this.block1OptionsList[1].count2 = e.CAR + this.block1OptionsList[1].count3 = e.PEOPLE + } + + }); - } else { - this.block2OptionsList = data.varList - } }) }, getDoorManagement() {