From 74db54e2de6d85e722467474a5988b550d93aecf Mon Sep 17 00:00:00 2001 From: fan Date: Mon, 16 Jan 2023 10:08:07 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E4=B8=80=E5=8F=B7?= =?UTF-8?q?=E7=BA=BF=E6=8A=98=E8=BF=94=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 910e0c5712eceb558c927fe57f4f3fd340794298) --- .../menus/dialog/standBackStrategy.vue | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue b/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue index 57a895825..d3d4d1eff 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue @@ -118,12 +118,12 @@ export default { loadInitData(selected, opts) { this.tempData = []; const station = this.stationList.find(n => n.code == selected.stationCode); - this.tempData.push({ name: station.name, station: selected.name, strategy: opts.reentryStrategy }); + this.tempData.push({ name: station.name, station: selected.name, strategy: opts ? opts.reentryStrategy : '' }); this.$nextTick(() => { this.$refs.table.setCurrentRow(null); }); }, - doShow(operate, selected, opts) { + doShow(operate, selected) { this.selected = selected; if (!this.dialogShow) { this.stationName = ''; @@ -132,14 +132,18 @@ export default { const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode); if (station) { this.stationName = station.name; - this.strategyList.forEach(item => { - if (item.value == opts.reentryStrategy) { - this.stationStrategy = item.label; - } - }); + if (selected.typeStrategy === 'DEFAULT') { + this.stationStrategy = '关闭'; + } else if (selected.typeStrategy === 'NONE') { + this.stationStrategy = '无折返'; + } else if (selected.typeStrategy === 'UNMANNED') { + this.stationStrategy = '无人折返'; + } else if (selected.typeStrategy === 'AUTO') { + this.stationStrategy = '自动换端'; + } } } - this.loadInitData(selected, opts); + this.loadInitData(selected); } this.dialogShow = true; @@ -177,7 +181,7 @@ export default { doClose() { this.loading = false; this.dialogShow = false; - this.$root.$emit('dialogClose', this.selected); + this.$root.$emit('dialogClose', this.selected); this.$store.dispatch('training/emitTipFresh'); mouseCancelState(this.selected); }, From 35fce14a319ee16765574a24c929bdb5f4a0cfa4 Mon Sep 17 00:00:00 2001 From: fan Date: Mon, 16 Jan 2023 10:08:07 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E4=B8=80=E5=8F=B7?= =?UTF-8?q?=E7=BA=BF=E6=8A=98=E8=BF=94=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 910e0c5712eceb558c927fe57f4f3fd340794298) --- .../menus/dialog/standBackStrategy.vue | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue b/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue index 57a895825..d3d4d1eff 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue @@ -118,12 +118,12 @@ export default { loadInitData(selected, opts) { this.tempData = []; const station = this.stationList.find(n => n.code == selected.stationCode); - this.tempData.push({ name: station.name, station: selected.name, strategy: opts.reentryStrategy }); + this.tempData.push({ name: station.name, station: selected.name, strategy: opts ? opts.reentryStrategy : '' }); this.$nextTick(() => { this.$refs.table.setCurrentRow(null); }); }, - doShow(operate, selected, opts) { + doShow(operate, selected) { this.selected = selected; if (!this.dialogShow) { this.stationName = ''; @@ -132,14 +132,18 @@ export default { const station = this.$store.getters['map/getDeviceByCode'](selected.stationCode); if (station) { this.stationName = station.name; - this.strategyList.forEach(item => { - if (item.value == opts.reentryStrategy) { - this.stationStrategy = item.label; - } - }); + if (selected.typeStrategy === 'DEFAULT') { + this.stationStrategy = '关闭'; + } else if (selected.typeStrategy === 'NONE') { + this.stationStrategy = '无折返'; + } else if (selected.typeStrategy === 'UNMANNED') { + this.stationStrategy = '无人折返'; + } else if (selected.typeStrategy === 'AUTO') { + this.stationStrategy = '自动换端'; + } } } - this.loadInitData(selected, opts); + this.loadInitData(selected); } this.dialogShow = true; @@ -177,7 +181,7 @@ export default { doClose() { this.loading = false; this.dialogShow = false; - this.$root.$emit('dialogClose', this.selected); + this.$root.$emit('dialogClose', this.selected); this.$store.dispatch('training/emitTipFresh'); mouseCancelState(this.selected); }, From a67d2abf6586dba31937ef4c22133013958d39ba Mon Sep 17 00:00:00 2001 From: fan Date: Mon, 16 Jan 2023 10:30:46 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E4=B8=80=E5=8F=B7?= =?UTF-8?q?=E7=BA=BF=E6=9F=A5=E7=9C=8B=E7=AB=99=E5=8F=B0=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=BB=93=E6=9D=9F=E5=90=8E=E6=B8=85=E9=99=A4=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/beijing_01/menus/dialog/standDetail.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/standDetail.vue b/src/jmapNew/theme/beijing_01/menus/dialog/standDetail.vue index 607bf2370..db64d14bf 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/standDetail.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/standDetail.vue @@ -235,7 +235,8 @@ export default { commit() { const operate = { type: MapDeviceType.StationStand.type, - operation: OperationEvent.Command.close.confirm.operation + operation: OperationEvent.Command.close.confirm.operation, + over: true }; this.loading = true; @@ -252,7 +253,8 @@ export default { cancel() { const operate = { type: MapDeviceType.StationStand.type, - operation: OperationEvent.Command.cancel.menu.operation + operation: OperationEvent.Command.cancel.menu.operation, + cancel: true }; this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => { From 807220e7b5f0b81ba0ff620badfb7e4fd4d47571 Mon Sep 17 00:00:00 2001 From: fan Date: Mon, 16 Jan 2023 10:45:20 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BB=BF=E7=9C=9F=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E8=AE=A2=E9=98=85=E6=94=BE=E5=9C=A8mounted?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/newMap/display/terminals/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/newMap/display/terminals/index.vue b/src/views/newMap/display/terminals/index.vue index a1bef3254..c8ae59129 100644 --- a/src/views/newMap/display/terminals/index.vue +++ b/src/views/newMap/display/terminals/index.vue @@ -145,7 +145,6 @@ export default { }, watch: { '$store.state.map.mapViewLoadedCount': function (val) { // 地图视图加载完成标识 开始加载默认状态 - this.subscribe('STATE'); this.subscribe('ATS_STATUS'); if (this.isFirst) { this.$store.dispatch('training/setMapDefaultState'); @@ -183,6 +182,7 @@ export default { this.group = this.$route.query.group; this.isFirst = true; this.subscribe('COMMON'); + this.subscribe('STATE'); }, beforeDestroy() { this.clearSubscribe(); From 7fae6574689fb80969810445588ad14fb008e821 Mon Sep 17 00:00:00 2001 From: fan Date: Mon, 16 Jan 2023 10:50:23 +0800 Subject: [PATCH 5/7] =?UTF-8?q?BUG=EF=BC=9A=E3=80=90=E5=8D=97=E4=BA=AC?= =?UTF-8?q?=E4=BA=8C=E5=8F=B7=E7=BA=BF=E3=80=91=E8=BD=A8=E9=81=93=E6=80=BB?= =?UTF-8?q?=E8=A7=88=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../newMap/display/terminals/troWork.vue | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/src/views/newMap/display/terminals/troWork.vue b/src/views/newMap/display/terminals/troWork.vue index 5cd72c5dc..4bdbe10bb 100644 --- a/src/views/newMap/display/terminals/troWork.vue +++ b/src/views/newMap/display/terminals/troWork.vue @@ -46,25 +46,17 @@ export default { const repaint = this.$store.state.map.initJlmapLoadedCount === 1; this.$jlmap.setMap(this.mapData, this.mapDevice, logicData, repaint); if (this.mapData && this.mapData.pictureList) { - const picture = this.mapData.pictureList.find(picture => picture.type === 'dispatchWork'); + const picture = this.$store.state.map.map.pictureList.find(picture => picture.type === 'bigScreen'); if (picture) { - this.handlerPictureShow(picture); - - } else { - this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]); - const list = []; - for (const key in this.mapDevice) { - list.push(this.mapDevice[key]); + this.$store.dispatch('map/setPictureDeviceMap', picture.deviceMap); + const deviceList = []; + const mapDevice = this.$store.state.map.mapDevice; + for (const deviceCode in mapDevice) { + deviceList.push(deviceCode); } - this.$jlmap.updateShowStation(list); + this.$jlmap.updatePicture(deviceList); + this.$jlmap.updateTransform(picture.scaling, picture.origin); } - } else { - this.$jlmap.amendDevice([...this.sectionList, ...this.signalList, ...this.trainWindowList]); - const list = []; - for (const key in this.mapDevice) { - list.push(this.mapDevice[key]); - } - this.$jlmap.updateShowStation(list); } this.updateJlmapMode('05'); }, From 88c85f4e49845f28630beb9b802bd3ca24c36285 Mon Sep 17 00:00:00 2001 From: fan Date: Mon, 16 Jan 2023 13:24:51 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E6=8A=98=E8=BF=94?= =?UTF-8?q?=E7=AD=96=E7=95=A5=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../theme/beijing_01/menus/dialog/standBackStrategy.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue b/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue index d3d4d1eff..b37df3619 100644 --- a/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue +++ b/src/jmapNew/theme/beijing_01/menus/dialog/standBackStrategy.vue @@ -68,19 +68,19 @@ export default { tempData: [], strategyList: [ { - value: '01', + value: 'NONE', label: '无折返' }, { - value: '02', + value: 'UNMANNED', label: '无人折返' }, { - value: '03', + value: 'AUTO', label: '自动换端' }, { - value: '04', + value: 'DEFAULT', label: '关闭' } ], From 126b37c205308998703e81bec5b4a443328937cd Mon Sep 17 00:00:00 2001 From: dong <58670809@qq.com> Date: Mon, 16 Jan 2023 14:15:10 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=A4=84=E7=90=86=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E6=AE=B5=E8=B0=83=E5=BA=A6=E6=97=A0=E6=B3=95=E6=8E=92=E5=88=97?= =?UTF-8?q?=E8=BF=9B=E8=B7=AF=EF=BC=8C=E6=8C=89=E9=92=AE=E9=92=AE=E5=B0=81?= =?UTF-8?q?=E6=97=A0=E5=8F=8D=E5=BA=94=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue b/src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue index 072440d95..5bbb68c86 100644 --- a/src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue +++ b/src/jmapNew/theme/fuzhou_01/menus/menuSignal.vue @@ -193,6 +193,9 @@ export default { ...mapGetters('map', ['routeList']), group() { return this.$route.query.group; + }, + roles() { + return this.$store.state.training.roles; } }, watch: { @@ -203,8 +206,9 @@ export default { this.doClose(); } }, - '$store.state.menuOperation.selectedCount': function (val) { - if (this.$store.state.menuOperation.selected._type == 'Signal' && this.$store.state.training.prdType == '09') { + // '$store.state.menuOperation.selectedCount': function (val) { + '$store.state.menuOperation.leftClickCount': function (val) { + if (this.$store.state.menuOperation.selected._type == 'Signal' && this.work == 'localWork' && this.roles == 'DEPOT_DISPATCHER') { // 车辆段调度角色 if (this.buttonOperation) { this.operationHandler(this.buttonOperation, this.$store.state.menuOperation.selected); this.$parent.$refs.menuDeplotButton.clearCountDown(); @@ -278,7 +282,7 @@ export default { initMenu() { this.menu = []; this.menuNormal.forEach(menuItem => { - menuItem.disabled = !judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work) || menuItem.isDisabled(this.selected, this.work); + menuItem.disabled = (!judgeStationControl(this.selected.belongStationCode, this.selected.stationCode, this.work) && this.roles !== 'DEPOT_DISPATCHER') || menuItem.isDisabled(this.selected, this.work); menuItem.show = menuItem.isShow(this.selected, this.work); this.menu.push(menuItem); });