From 3d834d7b6aa6833899068e155b547bdd459f4671 Mon Sep 17 00:00:00 2001 From: water_xu Date: Wed, 26 Jun 2024 10:51:03 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=85=B6=E4=BB=96=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E6=B0=94=E8=B1=A1=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E5=9B=BE=E8=A1=A8=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=8E=92=E5=BA=8Fbug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meteorological/components/meteorological-history.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 = [] From 50025690f0d537e5de8987e07653fdc91aad3280 Mon Sep 17 00:00:00 2001 From: water_xu Date: Wed, 26 Jun 2024 10:51:47 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=97=A8=E5=8F=A3=E9=97=A8=E7=A6=81-?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE-=E5=8F=A3=E9=97=A8=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=B0=8F=E7=AA=97=E5=8F=A31?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/map/components/menjin.vue | 34 +++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/src/views/map/components/menjin.vue b/src/views/map/components/menjin.vue index 604b295..80ff49e 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 } ], @@ -295,6 +295,32 @@ export default { } }) }, + + getOnlineGateMachine() { + requestFN( + '/map/getOnlineGateMachine', { + AREA: this.area, + CORPINFO_ID: this.corpInfoId, + GANGKOU: this.gangkou, + } + ).then((data) => { + 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 + } + + }); + + }) + }, getDoorManagement() { requestFN( '/map/getDoorManagement', { From 33312767b7dfba0b08cd93031bf8103316bcf028 Mon Sep 17 00:00:00 2001 From: water_xu Date: Wed, 26 Jun 2024 15:14:24 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=97=A8=E5=8F=A3=E9=97=A8=E7=A6=81-?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=9C=B0=E5=9B=BE=E8=BF=9B=E5=85=A5=E8=BF=9B?= =?UTF-8?q?=E5=87=BA=E7=BB=9F=E8=AE=A1=E5=B0=8F=E7=AA=97=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/map/components/menjin.vue | 40 ++++++++++++++--------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/views/map/components/menjin.vue b/src/views/map/components/menjin.vue index 80ff49e..c4b4e17 100644 --- a/src/views/map/components/menjin.vue +++ b/src/views/map/components/menjin.vue @@ -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,13 @@ export default { this.currentPage += 1 this.loadRecord(this.block3OptionsIndex) }, - getMachineTodayInOutCount() { + getMkmjGateStatistics() { requestFN( - '/map/getMachineTodayInOutCount', { - AREA: this.area, - CORPINFO_ID: this.corpInfoId, - GANGKOU: this.gangkou, - id: '7' + '/mkmjGateStatistics/page?showCount=100¤tPage=1', { + } ).then((data) => { - if (this.gangkou === '00004') { - - } else { - this.block2OptionsList = data.varList - } + this.initEcharts1(data.varList) }) }, From c2ef837d933cd3d0deb816a603beb91a4eb5f636 Mon Sep 17 00:00:00 2001 From: water_xu Date: Wed, 26 Jun 2024 15:16:36 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=97=A8=E5=8F=A3=E9=97=A8=E7=A6=81-?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E5=B0=8F=E7=AA=97=E5=8F=A3=E5=9B=BE=E8=A1=A8?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/map/components/menjin.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/map/components/menjin.vue b/src/views/map/components/menjin.vue index c4b4e17..5cbdd89 100644 --- a/src/views/map/components/menjin.vue +++ b/src/views/map/components/menjin.vue @@ -292,7 +292,7 @@ export default { } ).then((data) => { - this.initEcharts1(data.varList) + this.initEcharts1(data.varList.reverse()) }) }, From 101d0fac70e551f027f9f5f231f4dee9d61c87ba Mon Sep 17 00:00:00 2001 From: water_xu Date: Thu, 27 Jun 2024 09:29:00 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E9=97=A8=E5=8F=A3=E9=97=A8=E7=A6=81-?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=9C=B0=E5=9B=BE=E8=BF=9B=E5=85=A5=E8=BF=9B?= =?UTF-8?q?=E5=87=BA=E7=BB=9F=E8=AE=A1=E5=B0=8F=E7=AA=97=E5=8F=A3=E4=B8=9C?= =?UTF-8?q?=E8=A5=BF=E6=B8=AF=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/map/components/menjin.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/map/components/menjin.vue b/src/views/map/components/menjin.vue index 5cbdd89..e3c046e 100644 --- a/src/views/map/components/menjin.vue +++ b/src/views/map/components/menjin.vue @@ -289,7 +289,7 @@ export default { getMkmjGateStatistics() { requestFN( '/mkmjGateStatistics/page?showCount=100¤tPage=1', { - + AREA: this.area } ).then((data) => { this.initEcharts1(data.varList.reverse())