From b1638adeece90d6c534d39a0323589ab0901908d Mon Sep 17 00:00:00 2001 From: fan Date: Thu, 18 Aug 2022 09:36:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=94=BB=E9=9D=A2=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/newMap/displayNew/selectStation.vue | 3 +-- src/views/newMap/jointTrainingNew/index.vue | 3 +-- src/views/newMap/newMapdraft/mapoperate/signalButton.vue | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/views/newMap/displayNew/selectStation.vue b/src/views/newMap/displayNew/selectStation.vue index 051072f03..f5e70a5c9 100644 --- a/src/views/newMap/displayNew/selectStation.vue +++ b/src/views/newMap/displayNew/selectStation.vue @@ -69,8 +69,7 @@ export default { const member = this.$store.state.training.memberData[val]; const station = this.$store.getters['map/getDeviceByCode'](member.deviceCode); if (station) { - const pictureLineCodeList = ['16']; - if (pictureLineCodeList.includes(this.$route.query.lineCode) && this.$store.state.map.map && this.$store.state.map.map.pictureList) { + if (this.$store.state.map.map && this.$store.state.map.map.pictureList) { const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCode === station.code && picture.type === 'chainStation'); if (picture) { const mapDevice = this.$store.state.map.mapDevice; diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue index 419229508..7c69c0f20 100644 --- a/src/views/newMap/jointTrainingNew/index.vue +++ b/src/views/newMap/jointTrainingNew/index.vue @@ -440,7 +440,6 @@ export default { this.$refs[type].doShow(); }, stationRoleShow(deviceCode) { - const pictureLineCodeList = ['16']; if (this.lineCode === '14') { const list = []; const mapDevice = this.$store.state.map.mapDevice; @@ -450,7 +449,7 @@ export default { } this.$jlmap.updateShowMode(list, '02'); } - if (pictureLineCodeList.includes(this.lineCode) && this.$store.state.map.map && this.$store.state.map.map.pictureList) { + if (this.$store.state.map.map && this.$store.state.map.map.pictureList) { const picture = this.$store.state.map.map.pictureList.find(picture => picture.stationCode === deviceCode && picture.type === 'chainStation'); if (picture) { const mapDevice = this.$store.state.map.mapDevice; diff --git a/src/views/newMap/newMapdraft/mapoperate/signalButton.vue b/src/views/newMap/newMapdraft/mapoperate/signalButton.vue index 49ac3ef01..278f0c8ee 100644 --- a/src/views/newMap/newMapdraft/mapoperate/signalButton.vue +++ b/src/views/newMap/newMapdraft/mapoperate/signalButton.vue @@ -442,7 +442,6 @@ export default { text-align: right; font-size: 14px; color: #606266; - line-height: 40px; padding: 0 12px 0 0; -webkit-box-sizing: border-box; box-sizing: border-box;