joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

Browse Source
This commit is contained in:
joylink_cuiweidong 2022-07-08 17:39:06 +08:00
commit 548e737cfd
3 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/directive/dialogDrag/dialogDrag.js
View File

@ -33,6 +33,7 @@ export default {
} }
document.onmousemove = function (e) { document.onmousemove = function (e) {
e.preventDefault();
e.stopPropagation(); e.stopPropagation();
let cY = e.clientY; let cY = e.clientY;
if (cY < oY) { if (cY < oY) {

9
src/jmapNew/theme/datie_02/menus/bottomTable.vue
View File

@ -157,6 +157,10 @@ export default {
const offset = val ? 162 : 0; const offset = val ? 162 : 0;
EventBus.$emit('setMenuButtonPosition', offset); EventBus.$emit('setMenuButtonPosition', offset);
}, },
'$store.state.socket.simulationReset': function (val) {
this.sequenceMap = {};
this.sequenceList = [];
},
'$store.state.socket.railCtcStatusMsg': function (val) { '$store.state.socket.railCtcStatusMsg': function (val) {
if (val && val.length) { if (val && val.length) {
val.forEach(item => { 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 = []; this.sequenceList = [];
for (const key in this.sequenceMap) { for (const key in this.sequenceMap) {

18
src/views/newMap/displayCity/lineBoard.vue
View File

@ -331,7 +331,6 @@ export default {
{label: '发车报点', value: 'DEPARTURE'}, {label: '发车报点', value: 'DEPARTURE'},
{label: '流程终止', value: 'FINISH'} {label: '流程终止', value: 'FINISH'}
], ],
stationDataMap: {},
sequenceMap: {}, sequenceMap: {},
sequenceList: [], sequenceList: [],
readOnlyMap: {}, readOnlyMap: {},
@ -346,6 +345,13 @@ export default {
]) ])
}, },
watch: { watch: {
'$store.state.socket.simulationReset': function (val) {
this.sequenceMap = {};
this.sequenceList = [];
this.readOnlyMap = {};
this.standTrackSectionMap = {};
this.trackList = [];
},
'$store.state.socket.railCtcStatusMsg': function (val) { '$store.state.socket.railCtcStatusMsg': function (val) {
if (val && val.length) { if (val && val.length) {
val.forEach(item => { 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) { if (item && item.trackView && item.trackView.sectionOccupiedMap) {
for (const key in item.trackView.sectionOccupiedMap) { for (const key in item.trackView.sectionOccupiedMap) {
if (this.standTrackSectionMap[key]) { if (this.standTrackSectionMap[key]) {