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

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

Browse Source
This commit is contained in:
joylink_cuiweidong 2023-01-09 11:20:48 +08:00
commit f9fa1c2dbe
35 changed files with 589 additions and 193 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/jmapNew/theme/components/menus/passiveDialog/control.vue
View File

@ -222,16 +222,16 @@ export default {
this.requestInfo = info;
this.disabledAgree = true;
this.updateTableData(controlTransferList);
const operate = {
start: true,
operation: OperationEvent.StationControl.controlResponse.menu.operation
};
this.$store.dispatch('training/emitTipFresh');
this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
}
});
// const operate = {
// start: true,
// operation: OperationEvent.StationControl.controlResponse.menu.operation
// };
// this.$store.dispatch('training/emitTipFresh');
// this.$store.dispatch('trainingNew/next', operate).then(({ valid }) => {
// if (valid) {
// this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
// }
// });
}
} else {
// 后端倒计时

2
src/jmapNew/theme/ningbo_03/menus/dispatchWorkMenu.vue
View File

@ -427,7 +427,7 @@ export default {
.__socpe {
.el-dialog,
.el-dialog__wrapper {
pointer-events: none !important;
// pointer-events: none !important;
}
.el-dialog__header,

2
src/jmapNew/theme/ningbo_03/menus/localWorkMenu.vue
View File

@ -424,7 +424,7 @@ export default {
.__socpe {
.el-dialog,
.el-dialog__wrapper {
pointer-events: none !important;
// pointer-events: none !important;
}
.el-dialog__header,

24
src/jmapNew/theme/ningbo_03/menus/menuDialog/allocateTime.vue
View File

@ -120,7 +120,8 @@ export default {
ratedValue: 0,
maxTimeValue: '',
currentTime: 0,
ratedValue11: ''
ratedValue11: '',
changeIgnore: false
};
},
computed: {
@ -165,6 +166,11 @@ export default {
this.currentTime = stand.parkingTime;
}
}
},
'$store.state.trainingNew.trainingSwitch': function(val) {
if (!val && this.dialogShow) {
this.doClose();
}
}
},
methods: {
@ -181,6 +187,7 @@ export default {
this.$nextTick(function () {
let index = 0;
const stand = this.stationStandList.find((el, i) => { index = i; return el.code == selected.code; });
this.changeIgnore = !!stand;
this.$refs.table.setCurrentRow(stand);
setTimeout(() => {
this.$refs.table.bodyWrapper.scrollTop = index * 20;
@ -191,6 +198,7 @@ export default {
doClose() {
this.loading = false;
this.dialogShow = false;
this.changeIgnore = false;
this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh');
},
@ -218,16 +226,22 @@ export default {
},
handleCurrentChange(val) {
if (!val) { return; }
this.$store.dispatch('menuOperation/setSelected', {device: val});
if (this.changeIgnore) {
this.changeIgnore = false;
return;
}
const step = {
// code: val.code,
operation: OperationEvent.Command.common.choose.operation,
val: val.code
param: {
val: val.code
}
};
this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$store.dispatch('menuOperation/setSelected', {device: val});
}
}).catch(() => {
this.$refs.noticeInfo.doShow();
@ -237,7 +251,9 @@ export default {
if (!val) { return; }
const step = {
operation: OperationEvent.Command.common.choose1.operation,
val: val
param: {
val: val
}
};
this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
if (valid) {

21
src/jmapNew/theme/ningbo_03/menus/menuDialog/cancleSignalGuide.vue
View File

@ -61,6 +61,7 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
changeIgnore: false,
operate: '',
selectSignalCode: ''
};
@ -99,6 +100,11 @@ export default {
},
'selected': function(val) {
this.status = !val || val.callOn;
},
'$store.state.trainingNew.trainingSwitch': function(val) {
if (!val && this.dialogShow) {
this.doClose();
}
}
},
methods: {
@ -115,9 +121,11 @@ export default {
this.operate = operate;
this.dialogShow = true;
this.$nextTick(function () {
this.selectSignalCode = selected.code;
let index = 0;
this.$refs.table.setCurrentRow(this.signalList.find((el, i) => { index = i; return el.code == selected.code; }));
const signal = this.signalList.find((el, i) => { index = i; return el.code == selected.code; });
this.changeIgnore = !!signal;
this.selectSignalCode = selected.code;
this.$refs.table.setCurrentRow(signal);
setTimeout(()=> {
this.$refs.table.bodyWrapper.scrollTop = index * 20;
}, 200);
@ -127,6 +135,7 @@ export default {
doClose() {
this.loading = false;
this.dialogShow = false;
this.changeIgnore = false;
this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh');
},
@ -170,10 +179,14 @@ export default {
},
handleCurrentChange(val) {
if (!val) { return; }
if (this.changeIgnore) {
this.changeIgnore = false;
return;
}
const step = {
// code: `${val.code}`,
operation: OperationEvent.Command.common.choose.operation,
val: val.code,
// val: val.code,
param: {
signalCode: val.code
}
@ -182,8 +195,8 @@ export default {
this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$store.dispatch('menuOperation/setSelected', {device: val});
}
this.$store.dispatch('menuOperation/setSelected', {device: val});
}).catch(() => {
this.$refs.noticeInfo.doShow();
});

26
src/jmapNew/theme/ningbo_03/menus/menuDialog/routeCommand.vue
View File

@ -31,7 +31,7 @@
<el-checkbox v-model="checked">显示复制路径</el-checkbox>
</el-col>
<el-col :span="14" style="padding-left: 8px;">
<el-tabs v-model="activeName" type="card">
<el-tabs :id="domIdRouteTabs" v-model="activeName" type="card" @tab-click="handleClick">
<el-tab-pane label="设置进路" name="first">
<el-row>
<el-col :span="18">
@ -208,6 +208,7 @@ export default {
checked: false,
unlockType: 'auto',
forbidRoute: false,
changeIgnore: false,
route: null
};
},
@ -259,6 +260,9 @@ export default {
domIdUnlockType() {
return this.dialogShow ? OperationEvent.Command.commandNingBo3.Signal_command_unlockType.domId : '';
},
domIdRouteTabs() {
return this.dialogShow ? OperationEvent.Command.commandNingBo3.Signal_command_routeTabs.domId : '';
},
title() {
return '进路命令';
}
@ -268,9 +272,23 @@ export default {
if (this.show) {
this.commit();
}
},
'$store.state.trainingNew.trainingSwitch': function(val) {
if (!val && this.dialogShow) {
this.doClose();
}
}
},
methods: {
handleClick() {
const step = {
operation: OperationEvent.Command.commandNingBo3.Signal_command_routeTabs.operation,
param: {
activeName: this.activeName
}
};
this.$store.dispatch('trainingNew/next', step);
},
changeUnlockType() {
const step = {
operation: OperationEvent.Command.commandNingBo3.Signal_command_unlockType.operation,
@ -293,6 +311,7 @@ export default {
this.$nextTick(function () {
let index = 0;
const signal = this.signalList.find((el, i) => { index = i; return el.code == selected.code; });
this.changeIgnore = !!signal;
this.$refs.table.setCurrentRow(signal);
setTimeout(()=> {
this.$refs.table.bodyWrapper.scrollTop = index * 20;
@ -314,6 +333,7 @@ export default {
this.$refs.singleTable4.setCurrentRow();
this.activeName = 'first';
this.unlockType = 'auto';
this.changeIgnore = false;
this.$refs.table.bodyWrapper.scrollTop = 0;
},
// 始端信号机点击
@ -326,6 +346,10 @@ export default {
this.tempData.push(item);
}
});
if (this.changeIgnore) {
this.changeIgnore = false;
return;
}
const step = {
operation: OperationEvent.Command.commandNingBo3.Signal_command_startSignal.operation,
param: {

5
src/jmapNew/theme/ningbo_03/menus/menuDialog/routeDetail.vue
View File

@ -82,6 +82,11 @@ export default {
if (this.show) {
this.commit();
}
},
'$store.state.trainingNew.trainingSwitch': function(val) {
if (!val && this.dialogShow) {
this.doClose();
}
}
},
methods: {

39
src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionLimitSpeed.vue
View File

@ -177,6 +177,11 @@ export default {
if (this.currentSelect) {
this.noInit = this.sure && (this.getCacheMap()[this.currentSelect.code] || {}).done != 'one';
}
},
'$store.state.trainingNew.trainingSwitch': function(val) {
if (!val && this.dialogShow) {
this.doClose();
}
}
},
methods: {
@ -196,9 +201,12 @@ export default {
this.dialogShow = true;
this.$nextTick(function () {
this.changeIgnore = sure;
this.changeIgnore = true;
this.$refs.singleTable1.setCurrentRow(sure ? this.tempList.find(el => el.code == this.initSelect.code) : null);
this.isSetSpeed && this.$refs.singleTable2.setCurrentRow(sure ? this.limitList[this.initParams.value / 5 - 1] : 0);
setTimeout(()=> {
this.changeIgnore = false;
}, 200);
this.$store.dispatch('training/emitTipFresh');
});
},
@ -214,13 +222,15 @@ export default {
this.currentSelect = this.$store.getters['map/getDeviceByCode'](selected.code);
this.dialogShow = true;
this.$nextTick(function () {
this.changeIgnore = sure;
this.changeIgnore = true;
let index = 0;
const section = this.tempList.find((el, i) => { index = i; return el.code == selected.code; });
this.$refs.singleTable1.setCurrentRow(section);
this.speedLimitValue = this.initParams.value || 0;
// this.speedLimitValue = this.initParams.value || 0;
this.speedLimitValue = section ? this.getLimitSpeed(section.code) : 0;
setTimeout(()=> {
this.$refs.singleTable1.bodyWrapper.scrollTop = index * 20;
this.changeIgnore = false;
}, 200);
this.$emit('updateDone');
this.$store.dispatch('training/emitTipFresh');
@ -230,18 +240,19 @@ export default {
this.loading = false;
this.dialogShow = false;
this.speedLimitValue = 0;
this.sure && (this.currentSelect = null);
this.sure && this.$refs.singleTable1.setCurrentRow();
this.sure && this.isSetSpeed && this.$refs.singleTable2.setCurrentRow();
this.currentSelect = null;
this.$refs.singleTable1.setCurrentRow();
this.isSetSpeed && this.$refs.singleTable2.setCurrentRow();
this.sure && this.$root.$emit('iniCacheMap', this.cmdType.value,
Object.fromEntries(Object.entries(this.getCacheMap()).filter(el => el[1].done == 'done'))
);
this.$store.dispatch('training/emitTipFresh');
},
commit(isClose = true) {
const hasSpeed = this.isSetSpeed ? this.speedLimitValue == this.initParams.value : true;
if (this.currentSelect &&
this.currentSelect.code == this.initSelect.code &&
this.speedLimitValue == this.initParams.value) {
hasSpeed) {
const cacheMap = this.getCacheMap();
const isOK = this.command && (!this.sure || this.sure && cacheMap[this.currentSelect.code]);
const operate = {
@ -274,20 +285,21 @@ export default {
selectLine1(val) {
if (!val) { return; }
this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
this.sure || this.$emit('initSelect', this.currentSelect, {value: this.isSetSpeed ? this.speedLimitValue : this.getLimitSpeed(val.code)});
this.$emit('updateDone');
if (this.changeIgnore) { return; }
const step = {
// code: val.code,
operation: OperationEvent.Command.common.choose.operation,
val: val.code
param: {
val: val.code
}
};
this.changeIgnore = false;
this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.sure || this.$emit('initSelect', this.currentSelect, {value: this.speedLimitValue});
}
}).catch(() => {
this.$refs.noticeInfo.doShow();
@ -296,19 +308,20 @@ export default {
selectLine2(val) {
if (!val) { return; }
this.speedLimitValue = val.value;
this.sure || this.$emit('initSelect', this.currentSelect, {value: this.isSetSpeed ? this.speedLimitValue : 0});
this.$emit('updateDone');
if (this.changeIgnore) { return; }
const step = {
operation: OperationEvent.Command.common.select.operation,
val: val.value
param: {
val: val.value
}
};
this.changeIgnore = false;
this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.sure || this.$emit('initSelect', this.currentSelect, {value: this.isSetSpeed ? this.speedLimitValue : 0});
}
}).catch(() => {
this.$refs.noticeInfo.doShow();

5
src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionLock.vue
View File

@ -97,6 +97,11 @@ export default {
if (this.show) {
this.commit();
}
},
'$store.state.trainingNew.trainingSwitch': function(val) {
if (!val && this.dialogShow) {
this.doClose();
}
}
},
methods: {

28
src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionOpen.vue
View File

@ -141,6 +141,11 @@ export default {
if (this.currentSelect) {
this.noInit = this.sure && (this.getCacheMap()[this.currentSelect.code] || {}).done != 'one';
}
},
'$store.state.trainingNew.trainingSwitch': function(val) {
if (!val && this.dialogShow) {
this.doClose();
}
}
},
methods: {
@ -161,8 +166,9 @@ export default {
this.currentSelect = this.$store.getters['map/getDeviceByCode'](this.initSelect.code);
this.dialogShow = true;
this.$nextTick(function () {
this.changeIgnore = sure;
this.$refs.table.setCurrentRow(sure ? this.tempList.find(el => el.code == this.initSelect.code) : null);
const section = sure ? this.tempList.find(el => el.code == this.initSelect.code) : null;
this.changeIgnore = !!section;
this.$refs.table.setCurrentRow(section);
this.$store.dispatch('training/emitTipFresh');
});
},
@ -180,6 +186,7 @@ export default {
this.$nextTick(function () {
let index = 0;
const section = this.tempList.find((el, i) => { index = i; return el.code == selected.code; });
this.changeIgnore = !!section;
this.$refs.table.setCurrentRow(section);
setTimeout(()=> {
this.$refs.table.bodyWrapper.scrollTop = index * 20;
@ -191,8 +198,9 @@ export default {
doClose() {
this.loading = false;
this.dialogShow = false;
this.sure && (this.currentSelect = null);
this.sure && this.$refs.table.setCurrentRow();
this.currentSelect = null;
this.changeIgnore = false;
this.$refs.table.setCurrentRow();
this.sure && this.$root.$emit('iniCacheMap', this.cmdType.value,
Object.fromEntries(Object.entries(this.getCacheMap()).filter(el => el[1].done == 'done'))
);
@ -234,21 +242,25 @@ export default {
handleChangeLine(val) {
if (!val) { return; }
this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
this.sure || this.$emit('initSelect', this.currentSelect);
this.$emit('updateDone');
if (this.changeIgnore) { return; }
if (this.changeIgnore) {
this.changeIgnore = false;
return;
}
const step = {
// code: val.code,
operation: OperationEvent.Command.common.choose.operation,
val: val.code
param: {
val: val.code
}
};
this.changeIgnore = false;
this.$emit('updateDone');
this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.sure || this.$emit('initSelect', this.currentSelect);
}
}).catch(() => {
this.$refs.noticeInfo.doShow();

5
src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionShow.vue
View File

@ -102,6 +102,11 @@ export default {
if (this.show) {
this.commit();
}
},
'$store.state.trainingNew.trainingSwitch': function(val) {
if (!val && this.dialogShow) {
this.doClose();
}
}
},
methods: {

32
src/jmapNew/theme/ningbo_03/menus/menuDialog/signalBlock.vue
View File

@ -143,6 +143,11 @@ export default {
if (this.currentSelect) {
this.noInit = this.sure && (this.getCacheMap()[this.currentSelect.code] || {}).done != 'one';
}
},
'$store.state.trainingNew.trainingSwitch': function(val) {
if (!val && this.dialogShow) {
this.doClose();
}
}
},
methods: {
@ -161,8 +166,9 @@ export default {
this.currentSelect = this.$store.getters['map/getDeviceByCode'](this.initSelect.code);
this.dialogShow = true;
this.$nextTick(function () {
this.changeIgnore = sure;
this.$refs.table.setCurrentRow(sure ? this.tempList.find(el => el.code == this.initSelect.code) : null);
const cRow = sure ? this.tempList.find(el => el.code == this.initSelect.code) : null;
this.changeIgnore = !!cRow;
this.$refs.table.setCurrentRow(cRow);
this.$store.dispatch('training/emitTipFresh');
});
},
@ -178,9 +184,10 @@ export default {
this.currentSelect = this.$store.getters['map/getDeviceByCode'](selected.code);
this.dialogShow = true;
this.$nextTick(function () {
this.changeIgnore = sure;
let index = 0;
this.$refs.table.setCurrentRow(this.tempList.find((el, i) => { index = i; return el.code == selected.code; }));
const cRow = this.tempList.find((el, i) => { index = i; return el.code == selected.code; });
this.changeIgnore = !!cRow;
this.$refs.table.setCurrentRow(cRow);
setTimeout(()=> {
this.$refs.table.bodyWrapper.scrollTop = index * 20;
}, 200);
@ -191,8 +198,9 @@ export default {
doClose() {
this.loading = false;
this.dialogShow = false;
this.sure && (this.currentSelect = null);
this.sure && this.$refs.table.setCurrentRow();
this.changeIgnore = false;
this.currentSelect = null;
this.$refs.table.setCurrentRow();
this.sure && this.$root.$emit('iniCacheMap', this.cmdType.value,
Object.fromEntries(Object.entries(this.getCacheMap()).filter(el => el[1].done == 'done'))
);
@ -233,21 +241,25 @@ export default {
handleCurrentChange(val) {
if (!val) { return; }
this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
this.sure || this.$emit('initSelect', this.currentSelect);
this.$emit('updateDone');
if (this.changeIgnore) { return; }
if (this.changeIgnore) {
this.changeIgnore = false;
return;
}
const step = {
// code: val.code,
operation: OperationEvent.Command.common.choose.operation,
val: val.code
param: {
val: val.code
}
};
this.changeIgnore = false;
this.$emit('updateDone');
this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.sure || this.$emit('initSelect', this.currentSelect);
}
}).catch(() => {
this.$refs.noticeInfo.doShow();

34
src/jmapNew/theme/ningbo_03/menus/menuDialog/signalCanBlock.vue
View File

@ -136,6 +136,11 @@ export default {
if (this.currentSelect) {
this.noInit = this.sure && (this.getCacheMap()[this.currentSelect.code] || {}).done != 'one';
}
},
'$store.state.trainingNew.trainingSwitch': function(val) {
if (!val && this.dialogShow) {
this.doClose();
}
}
},
methods: {
@ -151,8 +156,9 @@ export default {
this.currentSelect = this.$store.getters['map/getDeviceByCode'](this.initSelect.code);
this.dialogShow = true;
this.$nextTick(function () {
this.changeIgnore = sure;
this.$refs.table.setCurrentRow(sure ? this.tempList.find(el => el.code == this.initSelect.code) : null);
const cRow = sure ? this.tempList.find(el => el.code == this.initSelect.code) : null;
this.changeIgnore = !!cRow;
this.$refs.table.setCurrentRow(cRow);
this.$store.dispatch('training/emitTipFresh');
});
},
@ -163,9 +169,10 @@ export default {
this.currentSelect = this.$store.getters['map/getDeviceByCode'](selected.code);
this.dialogShow = true;
this.$nextTick(function () {
this.changeIgnore = sure;
let index = 0;
this.$refs.table.setCurrentRow(this.tempList.find((el, i) => { index = i; return el.code == selected.code; }));
const cRow = this.tempList.find((el, i) => { index = i; return el.code == selected.code; });
this.changeIgnore = !!cRow;
this.$refs.table.setCurrentRow(cRow);
setTimeout(()=> {
this.$refs.table.bodyWrapper.scrollTop = index * 20;
}, 200);
@ -176,8 +183,9 @@ export default {
doClose() {
this.loading = false;
this.dialogShow = false;
this.sure && (this.currentSelect = null);
this.sure && this.$refs.table.setCurrentRow();
this.currentSelect = null;
this.changeIgnore = false;
this.$refs.table.setCurrentRow();
this.sure && this.$root.$emit('iniCacheMap', this.cmdType.value,
Object.fromEntries(Object.entries(this.getCacheMap()).filter(el => el[1].done == 'done'))
);
@ -190,7 +198,7 @@ export default {
const isOK = this.command && (!this.sure || this.sure && cacheMap[this.currentSelect.code]);
const operate = {
cmdType: this.sure && isOK ? this.cmdType : null,
operation: isClose ? OperationEvent.Signal.lock.confirm.operation : OperationEvent.Signal.unlock.confirm.operation,
operation: isClose ? OperationEvent.Command.common.confirm.operation : OperationEvent.Command.common.apply.operation,
over: this.sure,
param: {signalCode: this.currentSelect.code}
};
@ -218,21 +226,25 @@ export default {
handleCurrentChange(val) {
if (!val) { return; }
this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
this.sure || this.$emit('initSelect', this.currentSelect);
this.$emit('updateDone');
if (this.changeIgnore) { return; }
if (this.changeIgnore) {
this.changeIgnore = false;
return;
}
const step = {
// code: val.code,
operation: OperationEvent.Command.common.choose.operation,
val: val.code
param: {
val: val.code
}
};
this.changeIgnore = false;
this.$emit('updateDone');
this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.sure || this.$emit('initSelect', this.currentSelect);
}
}).catch(_ => {
this.$refs.noticeInfo.doShow();

5
src/jmapNew/theme/ningbo_03/menus/menuDialog/signalDetail.vue
View File

@ -87,6 +87,11 @@ export default {
if (this.show) {
this.commit();
}
},
'$store.state.trainingNew.trainingSwitch': function(val) {
if (!val && this.dialogShow) {
this.doClose();
}
}
},
methods: {

23
src/jmapNew/theme/ningbo_03/menus/menuDialog/signalGuide.vue
View File

@ -142,6 +142,11 @@ export default {
if (this.currentSelect) {
this.noInit = this.sure && (this.getCacheMap()[this.currentSelect.code] || {}).done != 'one';
}
},
'$store.state.trainingNew.trainingSwitch': function(val) {
if (!val && this.dialogShow) {
this.doClose();
}
}
},
methods: {
@ -156,8 +161,9 @@ export default {
this.currentSelect = this.$store.getters['map/getDeviceByCode'](this.initSelect.code);
this.dialogShow = true;
this.$nextTick(function () {
this.changeIgnore = sure;
this.$refs.table.setCurrentRow(sure ? this.tempList.find(el => el.code == this.initSelect.code) : null);
const cRow = sure ? this.tempList.find(el => el.code == this.initSelect.code) : null;
this.changeIgnore = !!cRow;
this.$refs.table.setCurrentRow(cRow);
this.$store.dispatch('training/emitTipFresh');
});
},
@ -168,9 +174,10 @@ export default {
this.currentSelect = this.$store.getters['map/getDeviceByCode'](selected.code);
this.dialogShow = true;
this.$nextTick(function () {
// this.changeIgnore = sure;
let index = 0;
this.$refs.table.setCurrentRow(this.tempList.find((el, i) => { index = i; return el.code == selected.code; }));
const cRow = this.tempList.find((el, i) => { index = i; return el.code == selected.code; });
this.changeIgnore = !!cRow;
this.$refs.table.setCurrentRow(cRow);
setTimeout(()=> {
this.$refs.table.bodyWrapper.scrollTop = index * 20;
}, 200);
@ -223,8 +230,12 @@ export default {
handleCurrentChange(val) {
if (!val) { return; }
this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
this.sure || this.$emit('initSelect', this.currentSelect);
this.$emit('updateDone');
if (this.changeIgnore) { return; }
if (this.changeIgnore) {
this.changeIgnore = false;
return;
}
const step = {
// code: val.code,
@ -234,12 +245,10 @@ export default {
}
};
this.changeIgnore = false;
this.$emit('updateDone');
this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.sure || this.$emit('initSelect', this.currentSelect);
}
}).catch(_ => {
this.$refs.noticeInfo.doShow();

5
src/jmapNew/theme/ningbo_03/menus/menuDialog/signalMode.vue
View File

@ -133,6 +133,11 @@ export default {
if (this.currentSelect) {
this.noInit = this.sure && (this.getCacheMap()[this.currentSelect.code] || {}).done != 'one';
}
},
'$store.state.trainingNew.trainingSwitch': function(val) {
if (!val && this.dialogShow) {
this.doClose();
}
}
},
methods: {

24
src/jmapNew/theme/ningbo_03/menus/menuDialog/signalModel.vue
View File

@ -64,7 +64,8 @@ export default {
operate: null,
allChecked: false,
dialogShow: false,
loading: false
loading: false,
changeIgnore: false
};
},
computed: {
@ -116,22 +117,33 @@ export default {
this.status = false;
}
}
},
'$store.state.trainingNew.trainingSwitch': function(val) {
if (!val && this.dialogShow) {
this.doClose();
}
}
},
methods: {
handleCurrentChange(val) {
if (!val) { return; }
this.$store.dispatch('menuOperation/setSelected', {device: val});
if (this.changeIgnore) {
this.changeIgnore = false;
return;
}
const step = {
// code: val.code,
operation: OperationEvent.Command.common.choose.operation,
val: val.code
param: {
val: val.code
}
};
this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$store.dispatch('menuOperation/setSelected', {device: val});
this.$refs.table.setCurrentRow(this.selected);
// this.$refs.table.setCurrentRow(this.selected);
}
}).catch(() => {
console.log();
@ -152,17 +164,19 @@ export default {
this.$nextTick(function () {
let index = 0;
const signal = this.filterSignalList.find((el, i) => { index = i; return el.code == selected.code; });
this.changeIgnore = !!signal;
this.$refs.table.setCurrentRow(signal);
setTimeout(()=> {
this.$refs.table.bodyWrapper.scrollTop = index * 20;
}, 200);
this.handleCurrentChange(signal);
// this.handleCurrentChange(signal);
this.$store.dispatch('training/emitTipFresh');
});
},
doClose() {
this.loading = false;
this.dialogShow = false;
this.changeIgnore = false;
this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh');
},

5
src/jmapNew/theme/ningbo_03/menus/menuDialog/standControl.vue
View File

@ -105,6 +105,11 @@ export default {
this.status = false;
}
}
},
'$store.state.trainingNew.trainingSwitch': function(val) {
if (!val && this.dialogShow) {
this.doClose();
}
}
},
methods: {

5
src/jmapNew/theme/ningbo_03/menus/menuDialog/standDetail.vue
View File

@ -86,6 +86,11 @@ export default {
if (this.show) {
this.commit();
}
},
'$store.state.trainingNew.trainingSwitch': function(val) {
if (!val && this.dialogShow) {
this.doClose();
}
}
},
methods: {

20
src/jmapNew/theme/ningbo_03/menus/menuDialog/stationTransfer.vue
View File

@ -93,7 +93,8 @@ export default {
station:{},
stationCode: '',
stationName:'',
message:''
message:'',
changeIgnore: false
};
},
computed: {
@ -151,6 +152,11 @@ export default {
} else {
this.status = true;
}
},
'$store.state.trainingNew.trainingSwitch': function(val) {
if (!val && this.dialogShow) {
this.doClose();
}
}
},
methods: {
@ -167,6 +173,7 @@ export default {
this.dialogShow = true;
this.$nextTick(function () {
const stand = this.centralizedStaionList.find(el => el.code == selected.code);
this.changeIgnore = !!stand;
this.$refs.table.setCurrentRow(stand);
this.$store.dispatch('training/emitTipFresh');
});
@ -195,6 +202,7 @@ export default {
this.dialogShow = false;
this.status = true;
this.$store.dispatch('menuOperation/setSelected', {device: {}});
this.changeIgnore = false;
this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh');
this.$store.dispatch('socket/shiftMsgQueue');
@ -213,16 +221,22 @@ export default {
},
handleCurrentChange(val) {
if (!val) { return; }
this.$store.dispatch('menuOperation/setSelected', {device: val});
if (this.changeIgnore) {
this.changeIgnore = false;
return;
}
const step = {
// code: val.code,
operation: OperationEvent.Command.common.choose.operation,
val: val.code
param: {
val: val.code
}
};
this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$store.dispatch('menuOperation/setSelected', {device: val});
}
}).catch(() => {
this.$refs.noticeInfo.doShow();

16
src/jmapNew/theme/ningbo_03/menus/menuDialog/switchActive.vue
View File

@ -61,7 +61,8 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
isActive: false
isActive: false,
changeIgnore: false
};
},
computed: {
@ -105,6 +106,11 @@ export default {
this.status = false;
}
}
},
'$store.state.trainingNew.trainingSwitch': function(val) {
if (!val && this.dialogShow) {
this.doClose();
}
}
},
methods: {
@ -121,6 +127,7 @@ export default {
this.$nextTick(function () {
let index = 0;
const switchEle = this.switchList.find((el, i) => { index = i; return el.code == selected.code; });
this.changeIgnore = !!switchEle;
this.$refs.table.setCurrentRow(switchEle);
setTimeout(()=> {
this.$refs.table.bodyWrapper.scrollTop = index * 20;
@ -131,6 +138,7 @@ export default {
doClose() {
this.loading = false;
this.dialogShow = false;
this.changeIgnore = false;
this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh');
},
@ -154,13 +162,17 @@ export default {
},
handleCurrentChange(val) {
if (!val) { return; }
this.$store.dispatch('menuOperation/setSelected', {device: val});
if (this.changeIgnore) {
this.changeIgnore = false;
return;
}
const step = {
// code: val.code,
operation: OperationEvent.Command.common.choose.operation,
val: val.code
};
this.$store.dispatch('menuOperation/setSelected', {device: val});
this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });

19
src/jmapNew/theme/ningbo_03/menus/menuDialog/switchBlock.vue
View File

@ -143,6 +143,11 @@ export default {
if (this.currentSelect) {
this.noInit = this.sure && (this.getCacheMap()[this.currentSelect.code] || {}).done != 'one';
}
},
'$store.state.trainingNew.trainingSwitch': function(val) {
if (!val && this.dialogShow) {
this.doClose();
}
}
},
methods: {
@ -163,8 +168,9 @@ export default {
this.currentSelect = sure ? this.$store.getters['map/getDeviceByCode'](this.initSelect.code) : null;
this.dialogShow = true;
this.$nextTick(function () {
this.changeIgnore = sure;
this.$refs.table.setCurrentRow(sure ? this.tempList.find(el => el.code == this.initSelect.code) : null);
const switchEle = sure ? this.tempList.find(el => el.code == this.initSelect.code) : null;
this.changeIgnore = !!switchEle;
this.$refs.table.setCurrentRow(switchEle);
this.$store.dispatch('training/emitTipFresh');
});
},
@ -182,6 +188,7 @@ export default {
this.$nextTick(function () {
let index = 0;
const switchEle = this.tempList.find((el, i) => { index = i; return el.code == selected.code; });
this.changeIgnore = !!switchEle;
this.$refs.table.setCurrentRow(switchEle);
setTimeout(()=> {
this.$refs.table.bodyWrapper.scrollTop = index * 20;
@ -236,8 +243,12 @@ export default {
handleCurrentChange(val) {
if (!val) { return; }
this.currentSelect = this.$store.getters['map/getDeviceByCode'](val.code);
this.sure || this.$emit('initSelect', this.currentSelect);
this.$emit('updateDone');
if (this.changeIgnore) { return; }
if (this.changeIgnore) {
this.changeIgnore = false;
return;
}
const step = {
// code: val.code,
@ -245,11 +256,9 @@ export default {
val: val.code
};
this.changeIgnore = false;
this.$store.dispatch('trainingNew/next', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.sure || this.$emit('initSelect', this.currentSelect);
}
}).catch(() => {
this.$refs.noticeInfo.doShow();

34
src/jmapNew/theme/ningbo_03/menus/menuDialog/switchCommand.vue
View File

@ -89,7 +89,8 @@ export default {
selectedSwitch: {},
mode: '',
position: '',
reserved: ''
reserved: '',
changeIgnore: false
};
},
@ -130,6 +131,11 @@ export default {
if (this.show) {
this.commit();
}
},
'$store.state.trainingNew.trainingSwitch': function(val) {
if (!val && this.dialogShow) {
this.doClose();
}
}
},
methods: {
@ -177,11 +183,12 @@ export default {
this.$nextTick(function () {
let index = 0;
const switchEle = this.switchList.find((el, i) => { index = i; return el.code == selected.code; });
this.changeIgnore = !!switchEle;
this.$refs.table.setCurrentRow(switchEle);
setTimeout(() => {
this.$refs.table.bodyWrapper.scrollTop = index * 20;
}, 200);
this.handleCurrentChange(switchEle);
// this.handleCurrentChange(switchEle);
this.$store.dispatch('training/emitTipFresh');
});
},
@ -190,6 +197,7 @@ export default {
this.dialogShow = false;
this.mode = '';
this.position = '';
this.changeIgnore = false;
this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh');
},
@ -232,19 +240,15 @@ export default {
},
handleCurrentChange(val) {
if (!val) { return; }
commitOperate(menuOperate.Switch.turnout, {code:val.code}).then(({valid, operate})=>{
// if (valid) {
this.position = '';
const switchModel = this.$store.getters['map/getDeviceByCode'](val.code);
this.selectedSwitchCode = val.code;
this.selectedSwitch = switchModel;
// this.mode = elem.auto ? 'artificial' : 'auto';
// if (!elem.auto) {
// if (elem.normalPosition) { this.position = 'reverse'; }
// if (elem.reversePosition) { this.position = 'normal'; }
// }
// }
});
this.position = '';
const switchModel = this.$store.getters['map/getDeviceByCode'](val.code);
this.selectedSwitchCode = val.code;
this.selectedSwitch = switchModel;
if (this.changeIgnore) {
this.changeIgnore = false;
return;
}
commitOperate(menuOperate.Switch.turnout, {code:val.code});
},
getSwitchPosition(code) {
const elem = this.$store.getters['map/getDeviceByCode'](code);

5
src/jmapNew/theme/ningbo_03/menus/menuDialog/switchDetail.vue
View File

@ -83,6 +83,11 @@ export default {
if (this.show) {
this.commit();
}
},
'$store.state.trainingNew.trainingSwitch': function(val) {
if (!val && this.dialogShow) {
this.doClose();
}
}
},
methods: {

90
src/jmapNew/theme/ningbo_03/menus/menuSection.vue
View File

@ -80,10 +80,12 @@ export default {
children: [
{
label: '初始化',
operate: OperationEvent.Command.commandNingBo3.line_section_open_init,
handler: this.handlerInitOpen
},
{
label: '确定/取消',
operate: OperationEvent.Command.commandNingBo3.line_section_open_sure,
handler: this.handlerOpen
}
]
@ -93,10 +95,12 @@ export default {
children: [
{
label: '初始化',
operate: OperationEvent.Command.commandNingBo3.line_section_close_init,
handler: this.handlerInitClose
},
{
label: '确定/取消',
operate: OperationEvent.Command.commandNingBo3.line_section_close_sure,
handler: this.handlerClose
}
]
@ -109,10 +113,12 @@ export default {
children: [
{
label: '初始化',
operate: OperationEvent.Command.commandNingBo3.line_section_setSpeed_init,
handler: this.handlerInitSetLimit
},
{
label: '确定/取消',
operate: OperationEvent.Command.commandNingBo3.line_section_setSpeed_sure,
handler: this.handlerSetLimit
}
]
@ -122,10 +128,12 @@ export default {
children: [
{
label: '初始化',
operate: OperationEvent.Command.commandNingBo3.line_section_clearSpeed_init,
handler: this.handlerInitCancelLimit
},
{
label: '确定/取消',
operate: OperationEvent.Command.commandNingBo3.line_section_clearSpeed_sure,
handler: this.handlerCancelLimit
}
]
@ -134,6 +142,7 @@ export default {
},
{
label: '显示',
operate: OperationEvent.Command.commandNingBo3.line_section_detail,
handler: this.handlerDetail
}
],
@ -313,32 +322,77 @@ export default {
}
});
},
handlerInitOpen() {
this.$refs.sectionOpen.rightClickShow(OperationEvent.Command.commandNingBo3.line_section_open_init, false, this.selected);
handlerInitOpen(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.sectionOpen.rightClickShow(item.operate, false, this.selected);
},
handlerOpen() {
this.$refs.sectionOpen.rightClickShow(OperationEvent.Command.commandNingBo3.line_section_open_sure, true, this.selected);
handlerOpen(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.sectionOpen.rightClickShow(item.operate, true, this.selected);
},
handlerInitClose() {
this.$refs.sectionOpen.rightClickShow(OperationEvent.Command.commandNingBo3.line_section_close_init, false, this.selected);
handlerInitClose(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.sectionOpen.rightClickShow(item.operate, false, this.selected);
},
handlerClose() {
this.$refs.sectionOpen.rightClickShow(OperationEvent.Command.commandNingBo3.line_section_close_sure, true, this.selected);
handlerClose(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.sectionOpen.rightClickShow(item.operate, true, this.selected);
},
handlerInitSetLimit() {
this.$refs.sectionLimitSpeed.rightClickShow(OperationEvent.Command.commandNingBo3.line_section_setSpeed_init, false, this.selected);
handlerInitSetLimit(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.sectionLimitSpeed.rightClickShow(item.operate, false, this.selected);
},
handlerSetLimit() {
this.$refs.sectionLimitSpeed.rightClickShow(OperationEvent.Command.commandNingBo3.line_section_setSpeed_sure, true, this.selected);
handlerSetLimit(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.sectionLimitSpeed.rightClickShow(item.operate, true, this.selected);
},
handlerInitCancelLimit() {
this.$refs.sectionLimitSpeed.rightClickShow(OperationEvent.Command.commandNingBo3.line_section_clearSpeed_init, false, this.selected);
handlerInitCancelLimit(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.sectionLimitSpeed.rightClickShow(item.operate, false, this.selected);
},
handlerCancelLimit() {
this.$refs.sectionLimitSpeed.rightClickShow(OperationEvent.Command.commandNingBo3.line_section_clearSpeed_sure, true, this.selected);
handlerCancelLimit(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.sectionLimitSpeed.rightClickShow(item.operate, true, this.selected);
},
handlerDetail() {
this.$refs.sectionShow.rightClickShow('', this.selected);
handlerDetail(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.sectionShow.rightClickShow(item.operate, this.selected);
}
}
};

126
src/jmapNew/theme/ningbo_03/menus/menuSignal.vue
View File

@ -86,14 +86,17 @@ export default {
children: [
{
label: '初始化',
operate: OperationEvent.Signal.guide.initMenu,
handler: this.handlerInitGuide
},
{
label: '确定/取消',
operate: OperationEvent.Signal.guide.menu,
handler: this.handlerGuide
},
{
label: '清除',
operate: OperationEvent.Signal.cancelGuide.menu,
handler: this.handlerCancelGuide
}
]
@ -104,10 +107,12 @@ export default {
children: [
{
label: '初始化',
operate: OperationEvent.Signal.lock.initMenu,
handler: this.handlerInitAllowLock
},
{
label: '确定/取消',
operate: OperationEvent.Signal.lock.menu,
handler: this.handlerAllowLock
}
]
@ -117,6 +122,7 @@ export default {
children: [
{
label: '命令',
operate: OperationEvent.Signal.arrangementRoute.menu,
handler: this.handlerRouteCommand
},
{
@ -136,6 +142,7 @@ export default {
},
{
label: '信号指示模式',
operate: OperationEvent.Signal.reopenSignal.menu,
handler: this.handlerSignalModel,
cmdType: ''
},
@ -144,10 +151,12 @@ export default {
children: [
{
label: '初始化',
operate: OperationEvent.Command.commandNingBo3.line_signal_block_init,
handler: this.handlerInitBlock
},
{
label: '确认/取消',
operate: OperationEvent.Command.commandNingBo3.line_signal_block_sure,
handler: this.handlerBlock
}
]
@ -157,16 +166,19 @@ export default {
children: [
{
label: '初始化',
operate: OperationEvent.Command.commandNingBo3.line_signal_unblock_init,
handler: this.handlerInitUnblock
},
{
label: '确认/取消',
operate: OperationEvent.Command.commandNingBo3.line_signal_unblock_sure,
handler: this.handlerUnblock
}
]
},
{
label: '显示',
operate: OperationEvent.Command.commandNingBo3.line_signal_detail,
handler: this.handlerDetail
}
],
@ -199,12 +211,6 @@ export default {
watch: {
'$store.state.menuOperation.menuCount': function (val) {
if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Signal) && !this.buttonOperation) {
const operate = {
code: `${this.selected.code}`,
userOperationType: 'rightClick',
operation: OperationEvent.Command.commandRight.right.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.doShow(this.$store.state.menuOperation.menuPosition);
} else {
this.doClose();
@ -266,41 +272,101 @@ export default {
undeveloped() {
},
handlerInitGuide() {
this.$refs.signalGuide.rightClickShow(OperationEvent.Signal.guide.initMenu, false, this.selected);
handlerInitGuide(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.signalGuide.rightClickShow(item.operate, false, this.selected);
},
handlerGuide() {
this.$refs.signalGuide.rightClickShow(OperationEvent.Signal.guide.menu, true, this.selected);
handlerGuide(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.signalGuide.rightClickShow(item.operate, true, this.selected);
},
handlerCancelGuide() {
this.$refs.cancelSignal.rightClickShow(OperationEvent.Signal.cancelGuide.menu, this.selected);
handlerCancelGuide(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.cancelSignal.rightClickShow(item.operate, this.selected);
},
handlerInitAllowLock() {
this.$refs.signalCanBlock.rightClickShow(OperationEvent.Signal.lock.initMenu, false, this.selected);
handlerInitAllowLock(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.signalCanBlock.rightClickShow(item.operate, false, this.selected);
},
handlerAllowLock() {
this.$refs.signalCanBlock.rightClickShow(OperationEvent.Signal.lock.menu, true, this.selected);
handlerAllowLock(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.signalCanBlock.rightClickShow(item.operate, true, this.selected);
},
handlerRouteCommand() {
this.$refs.routeCommand.rightClickShow(OperationEvent.Signal.arrangementRoute.menu, this.selected);
handlerRouteCommand(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.routeCommand.rightClickShow(item.operate, this.selected);
},
handlerSignalModel() {
this.$refs.signalModel.rightClickShow('', this.selected);
handlerSignalModel(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.signalModel.rightClickShow(item.operate, this.selected);
},
handlerInitBlock() {
this.$refs.signalBlock.rightClickShow(OperationEvent.Command.commandNingBo3.line_signal_block_init, false, this.selected);
handlerInitBlock(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.signalBlock.rightClickShow(item.operate, false, this.selected);
},
handlerBlock() {
this.$refs.signalBlock.rightClickShow(OperationEvent.Command.commandNingBo3.line_signal_block_sure, true, this.selected);
handlerBlock(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.signalBlock.rightClickShow(item.operate, true, this.selected);
},
handlerInitUnblock() {
this.$refs.signalBlock.rightClickShow(OperationEvent.Command.commandNingBo3.line_signal_unblock_init, false, this.selected);
handlerInitUnblock(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.signalBlock.rightClickShow(item.operate, false, this.selected);
},
handlerUnblock() {
this.$refs.signalBlock.rightClickShow(OperationEvent.Command.commandNingBo3.line_signal_unblock_sure, true, this.selected);
handlerUnblock(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.signalBlock.rightClickShow(item.operate, true, this.selected);
},
handlerDetail() {
this.$refs.signalDetail.rightClickShow(OperationEvent.Command.commandNingBo3.line_signal_detail, this.selected);
handlerDetail(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.signalDetail.rightClickShow(item.operate, this.selected);
}
}
};

52
src/jmapNew/theme/ningbo_03/menus/menuStationStand.vue
View File

@ -25,6 +25,7 @@ import { mapGetters } from 'vuex';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
export default {
name: 'StationStandMenu',
@ -58,26 +59,32 @@ export default {
menuNormal: [
{
label: '开放/关闭',
operate: OperationEvent.Command.commandNingBo3.line_stand_openOrClose,
handler: this.handlerOpenOrClose
},
{
label: '设置/取消扣车',
operate: OperationEvent.Command.commandNingBo3.line_stand_holdOrNot,
handler: this.handlerDetain
},
{
label: '设置站间列车数量',
operate: OperationEvent.Command.commandNingBo3.line_stand_trainNum,
handler: this.undeveloped
},
{
label: '分配停站时间',
operate: OperationEvent.Command.commandNingBo3.line_stand_stopTime,
handler: this.handlerAllocateTime
},
{
label: '授权转移',
operate: OperationEvent.Command.commandNingBo3.line_stand_transfer,
handler: this.handlerStationTransfer
},
{
label: '显示',
operate: OperationEvent.Command.commandNingBo3.line_stand_detail,
handler: this.handlerDetail
}
],
@ -161,20 +168,45 @@ export default {
}
});
},
handlerOpenOrClose() {
this.$refs.standControl.rightClickShow('', this.selected);
handlerOpenOrClose(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.standControl.rightClickShow(item.operate, this.selected);
},
handlerDetain() {
this.$refs.standDetain.rightClickShow('', this.selected);
handlerDetain(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.standDetain.rightClickShow(item.operate, this.selected);
},
handlerAllocateTime() {
this.$refs.allocateTime.rightClickShow('', this.selected);
handlerAllocateTime(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.allocateTime.rightClickShow(item.operate, this.selected);
},
handlerStationTransfer() {
this.$refs.stationTransfer.rightClickShow('', this.selected);
handlerStationTransfer(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.stationTransfer.rightClickShow(item.operate, this.selected);
},
handlerDetail() {
this.$refs.standDetail.rightClickShow('', this.selected);
handlerDetail(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.standDetail.rightClickShow(item.operate, this.selected);
},
undeveloped() {
this.$alert('实现中......', '提示', {

77
src/jmapNew/theme/ningbo_03/menus/menuSwitch.vue
View File

@ -71,6 +71,7 @@ export default {
menuNormal: [
{
label: '命令',
operate: OperationEvent.Command.commandNingBo3.line_switch_cmd,
handler: this.handlerCommand
},
@ -79,10 +80,12 @@ export default {
children: [
{
label: '初始化',
operate: OperationEvent.Command.commandNingBo3.line_switch_block_init,
handler: this.handlerInitBlock
},
{
label: '确定/取消',
operate: OperationEvent.Command.commandNingBo3.line_switch_block_sure,
handler: this.handlerBlock
}
]
@ -92,10 +95,12 @@ export default {
children: [
{
label: '初始化',
operate: OperationEvent.Command.commandNingBo3.line_switch_unblock_init,
handler: this.handlerInitUnblock
},
{
label: '确定/取消',
operate: OperationEvent.Command.commandNingBo3.line_switch_unblock_sure,
handler: this.handlerUnblock
}
]
@ -105,17 +110,20 @@ export default {
children: [
{
label: '请求或授权/取消',
operate: OperationEvent.Command.commandNingBo3.line_switch_empower_init,
handler: this.handlerActive
},
{
label: '显示',
disabled: true,
operate: OperationEvent.Command.commandNingBo3.line_switch_empower_sure,
handler: this.undeveloped
}
]
},
{
label: '显示',
operate: OperationEvent.Command.commandNingBo3.line_switch_detail,
handler: this.handlerDetail
}
],
@ -145,12 +153,6 @@ export default {
watch: {
'$store.state.menuOperation.menuCount': function (val) {
if (this.$store.getters['menuOperation/checkDialogIsOpen'](DeviceMenu.Switch) && !this.buttonOperation) {
const operate = {
code: `${this.selected.code}`,
userOperationType: 'rightClick',
operation: OperationEvent.Command.commandRight.right.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.doShow(this.$store.state.menuOperation.menuPosition);
} else {
this.doClose();
@ -230,26 +232,61 @@ export default {
hookLock() {
this.$refs.switchHookLock.doShow(this.selected);
},
handlerCommand() {
this.$refs.switchCommand.rightClickShow('', this.selected);
handlerCommand(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.switchCommand.rightClickShow(item.operate, this.selected);
},
handlerInitBlock() {
this.$refs.switchBlock.rightClickShow(OperationEvent.Command.commandNingBo3.line_switch_block_init, false, this.selected);
handlerInitBlock(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.switchBlock.rightClickShow(item.operate, false, this.selected);
},
handlerBlock() {
this.$refs.switchBlock.rightClickShow(OperationEvent.Command.commandNingBo3.line_switch_block_sure, true, this.selected);
handlerBlock(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.switchBlock.rightClickShow(item.operate, true, this.selected);
},
handlerInitUnblock() {
this.$refs.switchBlock.rightClickShow(OperationEvent.Command.commandNingBo3.line_switch_unblock_init, false, this.selected);
handlerInitUnblock(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.switchBlock.rightClickShow(item.operate, false, this.selected);
},
handlerUnblock() {
this.$refs.switchBlock.rightClickShow(OperationEvent.Command.commandNingBo3.line_switch_unblock_sure, true, this.selected);
handlerUnblock(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.switchBlock.rightClickShow(item.operate, true, this.selected);
},
handlerActive() {
this.$refs.switchActive.rightClickShow('', this.selected);
handlerActive(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.switchActive.rightClickShow(item.operate, this.selected);
},
handlerDetail() {
this.$refs.switchDetail.rightClickShow('', this.selected);
handlerDetail(item) {
const operate = {
code: this.selected.code,
operation: item.operate.operation
};
this.$store.dispatch('trainingNew/next', operate);
this.$refs.switchDetail.rightClickShow(item.operate, this.selected);
}
}
};

7
src/jmapNew/theme/ningbo_03/menus/menuTrain.vue
View File

@ -34,7 +34,6 @@ import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
// import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
import { judgeStationControl } from '@/jmapNew/theme/components/utils/menuJudge.js';
export default {
name: 'MenuTrain',
@ -240,11 +239,7 @@ export default {
// this.menu = MenuContextHandler.covert(this.menuNormal);
this.menu = [];
this.menuNormal.forEach(menuItem => {
let status = judgeStationControl(this.selected.belongStation, this.selected.stationCode, this.work);
if (menuItem.roleDisabled) {
status = true;
}
menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) || !status : false;
menuItem.disabled = menuItem.isDisabled ? menuItem.isDisabled(this.selected, this.work) : false;
menuItem.show = menuItem.isShow ? menuItem.isShow(this.selected, this.work) : true;
this.menu.push(menuItem);
});

4
src/scripts/cmdPlugin/OperationHandler.js
View File

@ -723,6 +723,10 @@ export const OperationEvent = {
Signal_command_unlockType: {
operation: '00c058',
domId: '_Tips-ningBo-Signal_command_unlockType{BOTTOM}'
},
Signal_command_routeTabs: {
operation: '00c059',
domId: '_Tips-ningBo-Signal_command_routeTabs{BOTTOM}'
}
},
commandRight: {

8
src/store/modules/trainingNew.js
View File

@ -78,7 +78,9 @@ const training = {
Handler.judgeIsTextSendOperation();
},
clearStepInfo: (state, stepInfo) => {
state.stepInfo = {};
if (state.stepInfo.id == stepInfo.stepId) {
state.stepInfo = {};
}
},
clearTrainingData: (state) => {
state.teachMode = '';
@ -164,8 +166,8 @@ const training = {
setStepInfo: ({ commit }, stepInfo) => {
commit('setStepInfo', stepInfo);
},
clearStepInfo: ({ commit }) => {
commit('clearStepInfo');
clearStepInfo: ({ commit }, stepInfo) => {
commit('clearStepInfo', stepInfo);
},
clearTrainingData: ({ commit }) => {
commit('clearTrainingData');

2
src/utils/subscribeCallback.js
View File

@ -181,7 +181,7 @@ function handle(data) {
store.dispatch('trainingNew/setStepInfo', msg);
break;
case 'Simulation_Training_Step_Finish':
store.dispatch('trainingNew/clearStepInfo');
store.dispatch('trainingNew/clearStepInfo', msg);
break;
case 'Simulation_Training_Audio_MATCH_RESULT':
store.dispatch('trainingNew/handleMatchVoice', msg);

3
src/views/newMap/display/memberManage/membersManage.vue
View File

@ -257,6 +257,9 @@ export default {
this.memberData[item.id].labelName = '车务段段长-' + (item.name ? `-${item.name }` : '');
trainMasterList.push(this.memberData[item.id]);
break;
case 'PARENT_DEPARTMENT':
this.memberData[item.id].labelName = '上级部门' + (item.name ? `-${item.name }` : '');
break;
// DEVICE_MANAGER:'设备管理员' deviceManager
}
});

5
src/views/newMap/display/trainingDesign/designPane.vue
View File

@ -207,10 +207,7 @@ export default {
},
getRoleList() {
const memberData = this.$store.state.training.memberData;
let activeTrainList = [];
if (this.$store.state.training.started) {
activeTrainList = this.$store.state.map.activeTrainList;
}
const activeTrainList = this.$store.state.map.activeTrainList;
// 获取仿真成员列表
const result = covertMemberData(activeTrainList, Object.values(memberData));
let list = [];

4
src/views/newMap/display/trainingList/scenePlayRole.vue
View File

@ -69,7 +69,9 @@ export default {
const memberData = this.$store.state.training.memberData;
const newMemberData = {};
playerList.forEach(playerId => {
newMemberData[playerId] = memberData[playerId];
if (memberData[playerId] && (memberData[playerId].type === 'STATION_SUPERVISOR' || memberData[playerId].type === 'DISPATCHER')) {
newMemberData[playerId] = memberData[playerId];
}
});
const result = covertMemberData([], Object.values(newMemberData));
let list = [];