From b53f8576ec89e5026b64e85632ad0e0d345d1f0d Mon Sep 17 00:00:00 2001 From: walker-sheng Date: Tue, 25 May 2021 18:09:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=93=88=E5=B0=94=E6=BB=A8=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0=E6=89=93=E5=8C=85=E9=85=8D=E7=BD=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.heb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.env.heb b/.env.heb index f812f3b43..3dacc354d 100644 --- a/.env.heb +++ b/.env.heb @@ -3,7 +3,7 @@ NODE_ENV = 'production' VUE_APP_PRO = 'local' # base api -VUE_APP_BASE_API = 'https://joylink.club/jlcloud' -VUE_APP_VOICE_API = 'https://joylink.club/oss/joylink' -VUE_APP_UPLOAD_API = 'https://upload.joylink.club' -VUE_APP_BASE_SITE='https://joylink.club/cbtc' +VUE_APP_BASE_API = 'http://160.20.60.15:9000' +VUE_APP_VOICE_API = 'http://160.20.60.15/oss/joylink' +VUE_APP_UPLOAD_API = 'http://160.20.60.15' +VUE_APP_BASE_SITE='http://160.20.60.15' From cc4eaf034cb641c8bc92f07c664860fdf949d404 Mon Sep 17 00:00:00 2001 From: joylink_cuiweidong <364937672@qq.com> Date: Wed, 26 May 2021 10:16:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A5=BF=E5=AE=89=E4=B8=89=E5=8F=B7?= =?UTF-8?q?=E7=BA=BF=20=E5=8F=B3=E9=94=AE=E7=9A=84=E8=BD=A6=E7=AB=99?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=92=E5=88=86=E9=97=AE=E9=A2=98=EF=BC=88?= =?UTF-8?q?bug281=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/xian_01/menus/index.vue | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/jmapNew/theme/xian_01/menus/index.vue b/src/jmapNew/theme/xian_01/menus/index.vue index 879ed4a67..2b7676df2 100644 --- a/src/jmapNew/theme/xian_01/menus/index.vue +++ b/src/jmapNew/theme/xian_01/menus/index.vue @@ -119,16 +119,19 @@ export default { initMenu() { this.menuNormal = []; this.$store.state.map.map.stationList.forEach(station => { - if (station.chargeStationCodeList && station.chargeStationCodeList.length) { + if (station.relStationCodeList && station.relStationCodeList.length) { const node = { label: station.name, - children: [{ - code: station.code, - label: station.name, - handler: this.mapLocation - }] + children: [] }; - station.chargeStationCodeList.forEach(item => { + const relStationCodeList = [...station.relStationCodeList]; + relStationCodeList.push(station.code); + relStationCodeList.sort((a, b) => { + const stationA = this.$store.getters['map/getDeviceByCode'](a); + const stationB = this.$store.getters['map/getDeviceByCode'](b); + return stationA.kmRange - stationB.kmRange; + }); + relStationCodeList.forEach(item => { const next = this.$store.getters['map/getDeviceByCode'](item); node.children.push({ code: next.code,