From 22c0b57624a5dff24b4b3c3562f1d64b81da4963 Mon Sep 17 00:00:00 2001 From: fan Date: Thu, 4 Aug 2022 16:03:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=B0=BF=E5=86=8C=E5=89=A7=E6=9C=AC?= =?UTF-8?q?=E7=BC=96=E5=88=B6=E6=98=BE=E7=A4=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/newMap/displayNew/menuSchema.vue | 6 +++++- .../newMap/displayNew/scriptDisplay/scriptRecord/index.vue | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/views/newMap/displayNew/menuSchema.vue b/src/views/newMap/displayNew/menuSchema.vue index 42a45ff62..873dfc7f7 100644 --- a/src/views/newMap/displayNew/menuSchema.vue +++ b/src/views/newMap/displayNew/menuSchema.vue @@ -14,7 +14,7 @@ 车务终端 路票 - 簿册 + 簿册 调度台 @@ -172,6 +172,10 @@ export default { { value: 4, label: '4倍速' }, { value: 5, label: '5倍速' } ]; + }, + showRegisterBookBtn() { + const roleList = ['STATION_SUPERVISOR', 'STATION_ASSISTANT', 'STATION_SIGNALER', 'STATION_SWITCH_MAN', 'STATION_MASTER', 'STATION_WORKER', 'DEVICE_MANAGER']; + return this.$route.query.lineCode === '16' && roleList.includes(this.$store.state.training.userRole); } }, watch: { diff --git a/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue b/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue index 151fa26de..df5ce36fa 100644 --- a/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue +++ b/src/views/newMap/displayNew/scriptDisplay/scriptRecord/index.vue @@ -239,6 +239,7 @@ export default { if ((item.messageType === 'PLAY_CHANGE' || item.messageType === 'ONLINE' ) && item.userId == this.userId && (stationRoleList.includes(item.type) )) { // this.userRole = item.type || 'AUDIENCE'; this.$store.dispatch('training/setRoleDeviceCode', item.deviceCode); + this.$store.dispatch('training/setUserRole', item.type); this.deviceCode = item.deviceCode; if (item.type == 'STATION_SUPERVISOR' || item.type == 'STATION_SIGNALER') { From 78aeeddee098f505456832e745f030fffbf3d61e Mon Sep 17 00:00:00 2001 From: fan Date: Thu, 4 Aug 2022 16:04:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=B0=BF=E5=86=8C=20=E6=96=BD=E5=B7=A5=20?= =?UTF-8?q?=E4=BA=A4=E6=8E=A5=E7=8F=AD=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/newMap/registerBook/index.vue | 251 +++++++++++++++++++++++- 1 file changed, 244 insertions(+), 7 deletions(-) diff --git a/src/views/newMap/registerBook/index.vue b/src/views/newMap/registerBook/index.vue index f98473b11..a39587237 100644 --- a/src/views/newMap/registerBook/index.vue +++ b/src/views/newMap/registerBook/index.vue @@ -103,7 +103,7 @@ - + @@ -202,7 +436,8 @@ export default { return { registerBookShow: false, tableData: [], - dataIndex: null + dataIndex: null, + value: '' }; }, methods: { @@ -260,5 +495,7 @@ export default { From 0e858fb921233b465f8e755a82711135120e4963 Mon Sep 17 00:00:00 2001 From: fan Date: Thu, 4 Aug 2022 16:17:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=A4=9A=E9=80=89=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/mouseController.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/jmapNew/mouseController.js b/src/jmapNew/mouseController.js index 3334bdf95..7566f75e4 100644 --- a/src/jmapNew/mouseController.js +++ b/src/jmapNew/mouseController.js @@ -306,7 +306,18 @@ class MouseController extends Eventful { if (this.whetherInclude(boundingRect, deviceBoundingRect )) { includeDeviceList.push(item); } // item.instance._type !== deviceType.TrainWindow && - } else if (item.instance && item.instance._type !== deviceType.CheckBox && item.instance._type !== deviceType.Train && (window.location.href.indexOf('pictureDraw') > -1 && item.instance._type === deviceType.TrainWindow) ) { + } else if (window.location.href.indexOf('pictureDraw') > -1 && item.instance && item.instance._type === deviceType.TrainWindow) { + const rect = item.instance.getBoundingRect(); + const deviceBoundingRect = { + x1: rect.x, + y1: rect.y, + x2: rect.x, + y2: rect.y + }; + if (this.whetherInclude(boundingRect, deviceBoundingRect)) { + includeDeviceList.push(item); + } + } else if (item.instance && item.instance._type !== deviceType.CheckBox && item.instance._type !== deviceType.Train && item.instance._type !== deviceType.TrainWindow) { const rect = item.instance.getBoundingRect(); const deviceBoundingRect = { x1: rect.x,