diff --git a/src/directive/dialogDrag/dialogDrag.js b/src/directive/dialogDrag/dialogDrag.js index 473b2e953..5443adb03 100644 --- a/src/directive/dialogDrag/dialogDrag.js +++ b/src/directive/dialogDrag/dialogDrag.js @@ -33,6 +33,7 @@ export default { } document.onmousemove = function (e) { + e.preventDefault(); e.stopPropagation(); let cY = e.clientY; if (cY < oY) { diff --git a/src/jmapNew/theme/datie_02/menus/bottomTable.vue b/src/jmapNew/theme/datie_02/menus/bottomTable.vue index e5687c866..951aa37af 100644 --- a/src/jmapNew/theme/datie_02/menus/bottomTable.vue +++ b/src/jmapNew/theme/datie_02/menus/bottomTable.vue @@ -157,6 +157,10 @@ export default { const offset = val ? 162 : 0; EventBus.$emit('setMenuButtonPosition', offset); }, + '$store.state.socket.simulationReset': function (val) { + this.sequenceMap = {}; + this.sequenceList = []; + }, '$store.state.socket.railCtcStatusMsg': function (val) { if (val && val.length) { val.forEach(item => { @@ -169,6 +173,11 @@ export default { } }); } + if (item && item.routeSequence && item.routeSequence.deletedLineIds && item.routeSequence.deletedLineIds.length) { + item.routeSequence.deletedLineIds.forEach(elem => { + delete this.sequenceMap[elem]; + }); + } }); this.sequenceList = []; for (const key in this.sequenceMap) { diff --git a/src/views/newMap/displayCity/lineBoard.vue b/src/views/newMap/displayCity/lineBoard.vue index 3bec22354..3ffa1a879 100644 --- a/src/views/newMap/displayCity/lineBoard.vue +++ b/src/views/newMap/displayCity/lineBoard.vue @@ -331,7 +331,6 @@ export default { {label: '发车报点', value: 'DEPARTURE'}, {label: '流程终止', value: 'FINISH'} ], - stationDataMap: {}, sequenceMap: {}, sequenceList: [], readOnlyMap: {}, @@ -346,6 +345,13 @@ export default { ]) }, watch: { + '$store.state.socket.simulationReset': function (val) { + this.sequenceMap = {}; + this.sequenceList = []; + this.readOnlyMap = {}; + this.standTrackSectionMap = {}; + this.trackList = []; + }, '$store.state.socket.railCtcStatusMsg': function (val) { if (val && val.length) { val.forEach(item => { @@ -375,6 +381,16 @@ export default { } } } + if (item && item.trackView && item.trackView.deletedMap) { + for (const key in item.trackView.deletedMap) { + if (this.standTrackSectionMap[key] && item.trackView.deletedMap[key] && item.trackView.deletedMap[key].length) { + const sectionMap = this.standTrackSectionMap[key].lineMap; + item.trackView.deletedMap[key].forEach(trainCode => { + delete sectionMap[trainCode]; + }); + } + } + } if (item && item.trackView && item.trackView.sectionOccupiedMap) { for (const key in item.trackView.sectionOccupiedMap) { if (this.standTrackSectionMap[key]) {