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 2021-02-01 11:24:14 +08:00
commit c4619c0784
50 changed files with 352 additions and 269 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/jmapNew/map.js
View File

@ -434,6 +434,8 @@ class Jlmap {
this.setUpdateMapDevice(list || []); // 增加一个 前数据 处理 为了在区段中 获取全部的 道岔信息
const controlTransferList = [];
const signalDeviceList = [];
const selected = store.state.menuOperation.selected;
(list || []).forEach((elem, index) => {
const code = elem.code;
const type = elem._type;
@ -517,6 +519,10 @@ class Jlmap {
this.$painter.update(oDevice);
}
}
if (selected && selected.code == elem.code) {
store.dispatch('menuOperation/setSelected', {device: selected});
}
});
if (controlTransferList.length > 0) {

3
src/jmapNew/theme/ningbo_01/menus/menuDialog/childDialog/twoConfirmation.vue
View File

@ -120,10 +120,13 @@ export default {
};
if (this.operation == OperationEvent.StationControl.requestCentralControl.menu.operation) {
operate.cmdType = CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL;
operate.operation = OperationEvent.StationControl.requestCentralControl.confirm.operation;
} else if (this.operation == OperationEvent.StationControl.requestStationControl.menu.operation) {
operate.cmdType = CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL;
operate.operation = OperationEvent.StationControl.requestStationControl.confirm.operation;
} else if (this.operation == OperationEvent.StationControl.emergencyStationControl.menu.operation) {
operate.cmdType = CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL;
operate.operation = OperationEvent.StationControl.emergencyStationControl.confirm.operation;
}
this.doClose();
this.$store.dispatch('training/nextNew', operate).then(({ valid, response }) => {

27
src/jmapNew/theme/ningbo_01/menus/menuDialog/stationControl.vue
View File

@ -85,23 +85,22 @@ export default {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdChooseControl() {
return this.dialogShow ? OperationEvent.MixinCommand.remoteControl.select.domId : '';
return this.dialogShow ? OperationEvent.Command.order.choose.domId : '';
},
domIdChooseStation() {
return this.dialogShow ? OperationEvent.Command.order.choose1.domId : '';
},
domIdCommit() {
if (this.dialogShow) {
// if (this.stationType == '01') {
// return OperationEvent.StationControl.requestCentralControl.menu.domId;
// } else if (this.stationType == '02') {
// return OperationEvent.StationControl.requestStationControl.menu.domId;
// } else if (this.stationType == '03') {
// return OperationEvent.StationControl.emergencyStationControl.menu.domId;
// } else {
// return '';
// }
return OperationEvent.MixinCommand.remoteControl.confirm.domId;
if (this.stationType == '01') {
return OperationEvent.StationControl.requestCentralControl.menu.domId;
} else if (this.stationType == '02') {
return OperationEvent.StationControl.requestStationControl.menu.domId;
} else if (this.stationType == '03') {
return OperationEvent.StationControl.emergencyStationControl.menu.domId;
} else {
return '';
}
} else {
return '';
}
@ -241,21 +240,21 @@ export default {
},
// 请求遥控
conterCommit() {
commitOperate(menuOperate.StationControl.requestCentralControl, {stationCodes:[this.stationCode]}, 0).then((data)=>{
commitOperate(menuOperate.StationControl.requestCentralControl, {stationCodes:[this.stationCode]}, 1).then((data)=>{
this.doClose();
this.$refs.twoConfirmation.doShow(data.operate, '确认将如下操作区域的控制模式由站控转为遥控:\n' + this.stationName);
});
},
// 请求站控
requestCommit() {
commitOperate(menuOperate.StationControl.requestStationControl, {stationCodes:[this.stationCode]}, 0).then((data)=>{
commitOperate(menuOperate.StationControl.requestStationControl, {stationCodes:[this.stationCode]}, 1).then((data)=>{
this.doClose();
this.$refs.twoConfirmation.doShow(data.operate, '确认将如下操作区域的控制模式由中控转为站控:\n' + this.stationName);
});
},
// 紧急站控
emergencyCommit() {
commitOperate(menuOperate.StationControl.emergencyStationControl, {stationCodes:[this.stationCode]}, 0).then((data)=>{
commitOperate(menuOperate.StationControl.emergencyStationControl, {stationCodes:[this.stationCode]}, 1).then((data)=>{
this.doClose();
this.$refs.twoConfirmation.doShow(data.operate, '确认将如下操作区域的控制模式由中控转为站控:\n' + this.stationName);
});

8
src/jmapNew/theme/ningbo_01/operationConfig.js
View File

@ -789,10 +789,12 @@ export default {
trainingType: 'ControlConvertMenu',
productTypes: ['01'],
stepVOList: [
{ deviceType: 'mBar', orderNum: 1, operateCode: '002', tip: '鼠标左键点击【系统】' },
{ deviceType: 'bar', orderNum: 1, operateCode: '002', tip: '鼠标左键点击【系统】' },
{ deviceType: '05', orderNum: 2, operateCode: '0024', tip: '鼠标左键点击【站遥控】' },
{ deviceType: '05', orderNum: 3, operateCode: '299b', tip: '选择【紧急站控】' },
{ deviceType: '05', orderNum: 4, operateCode: '299c', tip: '鼠标左键点击【设置】' }
{ deviceType: '05', orderNum: 3, operateCode: '0071', tip: '选择车站-【{1}】', val: '{2}'},
{ deviceType: '05', orderNum: 4, operateCode: '007', tip: '选择【紧急站控】', val: '{2}' },
{ deviceType: '05', orderNum: 5, operateCode: '201', tip: '鼠标左键点击【设置】' },
{ deviceType: '05', orderNum: 6, operateCode: '2013', tip: '鼠标左键点击【确认】' }
]
},
{

10
src/jmapNew/theme/ningbo_03/menus/menuDialog/adjustStrategy.vue
View File

@ -59,9 +59,8 @@
<script>
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
// import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import { mapGetters } from 'vuex';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
export default {
name: 'SignalBlock',
@ -75,7 +74,6 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
activeName: 'first',
operate: {},
startTime: new Date(),
@ -90,6 +88,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
@ -116,8 +117,7 @@ export default {
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;
doShow(operate) {
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;

8
src/jmapNew/theme/ningbo_03/menus/menuDialog/allTrainDetail.vue
View File

@ -66,7 +66,6 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
activeName: 'first',
operate: {},
allCheck: false,
@ -83,6 +82,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
@ -109,8 +111,7 @@ export default {
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;
doShow(operate) {
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;
@ -126,7 +127,6 @@ export default {
commit() {
},
handleClick() {
},
cancel() {
const operate = {

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

@ -112,7 +112,6 @@ export default {
return {
dialogShow: false,
loading: false,
selected: null,
display: true,
checkAll: false,
minTime: 0,
@ -131,6 +130,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Command.common.choose.domId : ''
},
@ -155,6 +157,12 @@ export default {
if (this.show) {
this.commit();
}
},
'$store.state.menuOperation.selectedCount': function(val) {
if (this.selected) {
const stand = this.$store.getters['map/getDeviceByCode'](this.selected.code);
this.currentTime = stand.parkingTime
}
}
},
mounted() {
@ -163,8 +171,7 @@ export default {
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;
doShow(operate) {
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;
this.$nextTick(function () {
@ -206,11 +213,11 @@ export default {
operation: OperationEvent.Command.common.choose.operation,
val: val.code
};
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
const stand = this.$store.getters['map/getDeviceByCode'](val.code);
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.selected = val;
this.$store.dispatch('menuOperation/setSelected', {device: val});
}
}).catch(() => {
this.$refs.noticeInfo.doShow();

7
src/jmapNew/theme/ningbo_03/menus/menuDialog/arrangeRoute.vue
View File

@ -88,7 +88,6 @@ export default {
beforeSectionList: [],
dialogShow: false,
loading: false,
selected: null,
displayCopyPath: false,
selectStandCode: ''
};
@ -101,6 +100,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
@ -133,8 +135,7 @@ export default {
expandPath() {
console.log('展开进路预览');
},
doShow(operate, selected, tempData) {
this.selected = selected;
doShow(operate) {
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;
this.$nextTick(function () {

7
src/jmapNew/theme/ningbo_03/menus/menuDialog/cancelRoute.vue
View File

@ -43,7 +43,6 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
activeName: 'first',
operate: {},
allCheck: false,
@ -57,6 +56,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
@ -83,8 +85,7 @@ export default {
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;
doShow(operate) {
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;

12
src/jmapNew/theme/ningbo_03/menus/menuDialog/initSectionLimitSpeed.vue
View File

@ -57,9 +57,8 @@
<script>
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
// import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import { mapGetters } from 'vuex';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import SectionLimitSpeed from './sectionLimitSpeed';
export default {
@ -75,7 +74,6 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
active: false,
activeName: 'first',
tempData: [],
@ -110,6 +108,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Command.common.choose.domId : ''
},
@ -142,7 +143,7 @@ export default {
});
},
methods: {
doShow(operate, selected) {
doShow(operate) {
this.tempData = [];
this.operate = operate;
this.sectionList.forEach(item => {
@ -150,7 +151,6 @@ export default {
this.tempData.push(item);
}
});
// this.selected = selected;
this.initEle = null;
this.commandEleCode = null;
this.speedLimitValue = 0;
@ -178,7 +178,7 @@ export default {
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.selected = val;
this.$store.dispatch('menuOperation/setSelected', {device: val});
const sectionEle = this.$store.getters['map/getDeviceByCode'](val.code);
this.speedLimitValue = sectionEle.speedUpLimit;
if (this.speedLimitValue > 0) {

9
src/jmapNew/theme/ningbo_03/menus/menuDialog/initSectionOpen.vue
View File

@ -61,7 +61,6 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
active: false,
selectShow: false,
activeName: 'first',
@ -81,6 +80,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Command.common.choose.domId : ''
},
@ -110,7 +112,7 @@ export default {
});
},
methods: {
doShow(operate, selected) {
doShow(operate) {
this.tempData = [];
this.sectionList.forEach(item => {
if (item.type === '01' || item.type === '04') {
@ -119,7 +121,6 @@ export default {
});
this.initEle = null;
this.commandEleCode = null;
this.selected = selected;
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;
@ -148,7 +149,7 @@ export default {
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.selected = val;
this.$store.dispatch('menuOperation/setSelected', {device: val});
}
}).catch(() => {
this.$refs.noticeInfo.doShow();

9
src/jmapNew/theme/ningbo_03/menus/menuDialog/initSignalBlock.vue
View File

@ -68,7 +68,6 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
isBlock: true,
initEle: null,
commandEleCode: null
@ -86,6 +85,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Command.common.choose.domId : ''
},
@ -115,10 +117,9 @@ export default {
});
},
methods: {
doShow(operate, selected) {
doShow(operate) {
this.initEle = null;
this.commandEleCode = null;
this.selected = selected;
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;
@ -161,7 +162,7 @@ export default {
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.selected = val;
this.$store.dispatch('menuOperation/setSelected', {device: val});
}
}).catch(() => {
this.$refs.noticeInfo.doShow();

7
src/jmapNew/theme/ningbo_03/menus/menuDialog/initSignalMode.vue
View File

@ -46,7 +46,6 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
operate: {}
};
},
@ -57,6 +56,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
isCbtc() {
return this.operate.operation === OperationEvent.Command.mBar.cbtcMode.operation;
},
@ -86,8 +88,7 @@ export default {
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;
doShow(operate) {
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;

10
src/jmapNew/theme/ningbo_03/menus/menuDialog/initializeSignalCanBlock.vue
View File

@ -63,7 +63,6 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
operate: '',
initEle: null,
commandEleCode: null
@ -76,6 +75,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
@ -102,10 +104,9 @@ export default {
});
},
methods: {
doShow(operate, selected) {
doShow(operate) {
this.initEle = null;
this.commandEleCode = null;
this.selected = selected;
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;
@ -169,10 +170,11 @@ export default {
operation: OperationEvent.Signal.lock.choose.operation,
param: {}
};
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.selected = val;
this.$store.dispatch('menuOperation/setSelected', {device: val});
}
}).catch(() => {
this.$refs.noticeInfo.doShow();

9
src/jmapNew/theme/ningbo_03/menus/menuDialog/initializeSignalGuide.vue
View File

@ -68,7 +68,6 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
operate: '',
initEle: null,
commandEleCode: null
@ -81,6 +80,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
@ -107,10 +109,9 @@ export default {
});
},
methods: {
doShow(operate, selected) {
doShow(operate) {
this.initEle = null;
this.commandEleCode = null;
this.selected = selected;
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;
@ -185,7 +186,7 @@ export default {
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.selected = val;
this.$store.dispatch('menuOperation/setSelected', {device: val});
}
}).catch(() => {
this.$refs.noticeInfo.doShow();

11
src/jmapNew/theme/ningbo_03/menus/menuDialog/initializeSwitchBlock.vue
View File

@ -66,7 +66,6 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
mode: '',
position: '',
reserved: '',
@ -85,6 +84,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
@ -111,10 +113,9 @@ export default {
});
},
methods: {
doShow(operate, selected) {
doShow(operate) {
this.initEle = null;
this.commandEleCode = null;
this.selected = selected;
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;
@ -151,14 +152,14 @@ export default {
this.initEle = null;
this.commandEleCode = null;
const step = {
code: `${val.code}`,
code: val.code,
operation: this.isBlock ? OperationEvent.Switch.block.choose.operation : OperationEvent.Switch.unblock.choose.operation,
param: {}
};
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.selected = val;
this.$store.dispatch('menuOperation/setSelected', {device: val});
}
}).catch(() => {
this.$refs.noticeInfo.doShow();

7
src/jmapNew/theme/ningbo_03/menus/menuDialog/intervalStopNumber.vue
View File

@ -63,7 +63,6 @@ export default {
value: '',
dialogShow: false,
loading: false,
selected: null,
checkedDirection: '',
isIndeterminate: true,
checkAll: false
@ -73,6 +72,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
@ -99,8 +101,7 @@ export default {
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;
doShow(operate) {
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;
this.$nextTick(function () {

7
src/jmapNew/theme/ningbo_03/menus/menuDialog/modifyTrainNumber.vue
View File

@ -55,7 +55,6 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
activeName: 'first',
operate: {},
allCheck: false,
@ -72,6 +71,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
@ -98,8 +100,7 @@ export default {
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;
doShow(operate) {
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;

8
src/jmapNew/theme/ningbo_03/menus/menuDialog/occupancyTrainCorrelation.vue
View File

@ -51,7 +51,6 @@
<script>
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
// import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import { mapGetters } from 'vuex';
export default {
@ -66,7 +65,6 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
activeName: 'first',
operate: {},
allCheck: false,
@ -82,6 +80,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
@ -108,8 +109,7 @@ export default {
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;
doShow(operate) {
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;

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

@ -197,7 +197,6 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
active: false,
activeName: 'first',
tempData: [],
@ -217,6 +216,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
filterRouteList() {
return this.routeList.filter(el => { return el.flt == {'auto': true, 'artificial': false}[this.unlockType]; });
},
@ -246,8 +248,7 @@ export default {
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;
doShow(operate) {
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;
this.$nextTick(function () {
@ -355,7 +356,7 @@ export default {
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.selected = row;
this.$store.dispatch('menuOperation/setSelected', {device: row});
}
}).catch(() => {
this.$refs.noticeInfo.doShow();
@ -411,7 +412,7 @@ export default {
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.selected = val;
this.$store.dispatch('menuOperation/setSelected', {device: val});
}
}).catch(() => {
this.$refs.noticeInfo.doShow();
@ -431,7 +432,7 @@ export default {
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.selected = val;
this.$store.dispatch('menuOperation/setSelected', {device: val});
}
}).catch(() => {
this.$refs.noticeInfo.doShow();
@ -453,7 +454,7 @@ export default {
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.selected = val;
this.$store.dispatch('menuOperation/setSelected', {device: val});
}
}).catch(() => {
this.$refs.noticeInfo.doShow();

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

@ -45,7 +45,6 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
activeName: 'first',
operate: {},
allCheck: false,
@ -62,6 +61,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
@ -88,8 +90,7 @@ export default {
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;
doShow(operate) {
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;

7
src/jmapNew/theme/ningbo_03/menus/menuDialog/runningInterval.vue
View File

@ -99,7 +99,6 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
activeName: 'first',
operate: {},
intervalValue: 180,
@ -117,6 +116,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
@ -143,8 +145,7 @@ export default {
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;
doShow(operate) {
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;

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

@ -79,7 +79,6 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
active: false,
command: false,
activeName: 'first',
@ -113,6 +112,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Command.common.confirm1.domId : '';
},
@ -147,7 +149,7 @@ export default {
}
});
this.command = true;
this.selected = selected;
this.$store.dispatch('menuOperation/setSelected', {device: selected});
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.operate = operate;
this.speedLimitValue = value;

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

@ -45,7 +45,6 @@
<script>
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
// import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import { mapGetters } from 'vuex';
export default {
@ -60,7 +59,6 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
active: false,
selectShow: false,
activeName: 'first',
@ -78,6 +76,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
@ -104,8 +105,7 @@ export default {
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;
doShow(operate) {
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;
this.$nextTick(function () {

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

@ -67,7 +67,6 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
active: false,
activeName: 'first',
tempData: [],
@ -86,6 +85,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Command.common.choose1.domId : ''
},
@ -115,14 +117,13 @@ export default {
});
},
methods: {
doShow(operate, selected) {
doShow(operate) {
this.tempData = [];
this.sectionList.forEach(item => {
if (item.type === '01' || item.type === '04') {
this.tempData.push(item);
}
});
this.selected = selected;
this.operate = operate;
this.dialogShow = true;
this.$nextTick(function () {
@ -145,7 +146,7 @@ export default {
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.selected = val;
this.$store.dispatch('menuOperation/setSelected', {device: val});
this.$refs.sectionable.setCurrentRow(this.selected);
}
}).catch(() => {

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

@ -68,7 +68,6 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
active: false,
selectShow: false,
activeName: 'first',
@ -83,6 +82,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
@ -109,14 +111,13 @@ export default {
});
},
methods: {
doShow(operate, selected) {
doShow(operate) {
this.tempData = [];
this.sectionList.forEach(item => {
if (item.type === '01' || item.type === '04') {
this.tempData.push(item);
}
});
this.selected = selected;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;
this.$nextTick(function () {

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

@ -72,7 +72,6 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
operate: {},
title: ''
};
@ -87,6 +86,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Command.common.confirm1.domId : '';
},
@ -110,8 +112,7 @@ export default {
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;
doShow(operate) {
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.title = this.isBlock ? '确认/取消信号机封锁' : '确认/取消信号机解除封锁';

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

@ -68,7 +68,6 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
operate: '',
command: true
};
@ -80,6 +79,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
@ -106,8 +108,7 @@ export default {
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;
doShow(operate) {
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;

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

@ -58,7 +58,6 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
operate: {}
};
},
@ -69,6 +68,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
@ -95,8 +97,7 @@ export default {
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;
doShow(operate) {
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;

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

@ -73,7 +73,6 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
command: true,
operate: ''
};
@ -85,6 +84,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
@ -111,8 +113,7 @@ export default {
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;
doShow(operate) {
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;

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

@ -64,7 +64,6 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
operate: {}
};
},
@ -75,6 +74,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
isCbtc() {
return this.operate.operation === OperationEvent.Command.mBar.cbtcMode.operation;
},
@ -117,15 +119,14 @@ export default {
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.selected = val;
this.$store.dispatch('menuOperation/setSelected', {device: val});
this.$refs.singleTable.setCurrentRow(this.selected);
}
}).catch(() => {
this.$refs.noticeInfo.doShow();
});
},
doShow(operate, selected) {
this.selected = selected;
doShow(operate) {
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;

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

@ -13,8 +13,8 @@
<el-table-column prop="name" label="ID" />
<el-table-column prop="signalModel" label="信号指示模式">
<template slot-scope="scope">
<span v-if="scope.row.greenOpen">开灯模式</span>
<span v-if="scope.row.redOpen">灭灯模式</span>
<span v-else>开灯模式</span>
</template>
</el-table-column>
</el-table>
@ -22,9 +22,9 @@
<el-col :span="5" :offset="1">
<div class="set-status-title">命令</div>
<div class="set-status-box">
<el-radio v-model="signalModel" :disabled="true" :label="false">灭灯</el-radio>
<el-radio v-model="signalModel" :disabled="!signalDisabled" :label="false">灭灯</el-radio>
<br>
<el-radio v-model="signalModel" :disabled="true" :label="true">点灯</el-radio>
<el-radio v-model="signalModel" :disabled="signalDisabled" :label="true">点灯</el-radio>
</div>
</el-col>
</el-row>
@ -62,10 +62,10 @@ export default {
status: false,
operate: null,
signalModel: true,
signalDisabled: true,
allChecked: false,
dialogShow: false,
loading: false,
selected: null
loading: false
};
},
computed: {
@ -75,6 +75,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
filterSignalList() {
return this.signalList.map(el => {
return this.$store.getters['map/getDeviceByCode'](el.code);
@ -101,6 +104,14 @@ export default {
if (this.show) {
this.commit();
}
},
'$store.state.menuOperation.selectedCount': function(val) {
console.log(this.selected)
if (this.selected) {
const signal = this.$store.getters['map/getDeviceByCode'](this.selected.code);
this.signalModel = !!signal.redOpen
this.signalDisabled = !this.signalModel;
}
}
},
mounted() {
@ -120,8 +131,7 @@ export default {
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.selected = val;
this.signalModel = this.selected.redOpen;
this.$store.dispatch('menuOperation/setSelected', {device: val});
this.$refs.singleTable.setCurrentRow(this.selected);
}
}).catch(() => {
@ -129,8 +139,7 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
doShow(operate, selected) {
this.selected = selected;
doShow(operate) {
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;

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

@ -63,8 +63,7 @@ export default {
standStatus: true,
allChecked: false,
dialogShow: false,
loading: false,
selected: null
loading: false
};
},
computed: {
@ -74,6 +73,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Command.common.choose.domId : ''
},
@ -95,6 +97,13 @@ export default {
if (this.show) {
this.commit();
}
},
'$store.state.menuOperation.selectedCount': function(val) {
if (this.selected) {
const stand = this.$store.getters['map/getDeviceByCode'](this.selected.code);
this.status = !!stand.allSkip
this.standStatus = !this.status;
}
}
},
mounted() {
@ -103,8 +112,7 @@ export default {
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;
doShow(operate) {
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;
this.$nextTick(function () {
@ -155,9 +163,7 @@ export default {
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.selected = val;
this.standStatus = !standEle.allSkip;
this.status = !!standEle.allSkip;
this.$store.dispatch('menuOperation/setSelected', {device: val});
}
}).catch(() => {
this.$refs.noticeInfo.doShow();

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

@ -54,8 +54,7 @@ export default {
standStatus: true,
allChecked: false,
dialogShow: false,
loading: false,
selected: null
loading: false
};
},
computed: {
@ -65,6 +64,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Command.common.choose.domId : ''
},
@ -91,8 +93,7 @@ export default {
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;
doShow(operate) {
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;
this.$nextTick(function () {

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

@ -37,9 +37,9 @@
<el-col :span="7" :offset="1">
<div class="set-status-box">
<div class="set-status-title">扣车</div>
<el-radio v-model="status" :disabled="standStatus" :label="true" style="margin-top:17px">设置</el-radio>
<el-radio v-model="status" :disabled="!standStatus" :label="true" style="margin-top:17px">设置</el-radio>
<br>
<el-radio v-model="status" :disabled="!standStatus" :label="false">取消</el-radio>
<el-radio v-model="status" :disabled="standStatus" :label="false">取消</el-radio>
</div>
</el-col>
</el-row>
@ -79,7 +79,6 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
activeName: 'first',
active: '未激活'
};
@ -91,6 +90,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Command.common.choose.domId : ''
},
@ -113,15 +115,15 @@ export default {
this.commit();
}
},
selected(val) {
if (val) {
const stand = this.$store.getters['map/getDeviceByCode'](val.code);
'$store.state.menuOperation.selectedCount': function(val) {
if (this.selected) {
const stand = this.$store.getters['map/getDeviceByCode'](this.selected.code);
if (stand && !stand.stationHoldTrain && !stand.centerHoldTrain) {
this.status = true;
this.standStatus = false;
this.standStatus = true;
} else {
this.status = false;
this.standStatus = true;
this.standStatus = false;
}
}
}
@ -178,10 +180,11 @@ export default {
operation: OperationEvent.Command.common.choose.operation,
val: val.code
};
this.$store.dispatch('menuOperation/setSelected', {device: val});
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.selected = val;
}
}).catch(() => {
this.$refs.noticeInfo.doShow();

7
src/jmapNew/theme/ningbo_03/menus/menuDialog/stationControl.vue
View File

@ -97,6 +97,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdChooseControl() {
return this.dialogShow ? OperationEvent.Command.order.choose.domId : '';
},
@ -130,8 +133,6 @@ export default {
});
}
},
watch: {
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
@ -171,7 +172,7 @@ export default {
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.selected = val;
this.$store.dispatch('menuOperation/setSelected', {device: val});
}
}).catch(() => {
this.$refs.noticeInfo.doShow();

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

@ -61,7 +61,6 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
active: false
};
},
@ -72,6 +71,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Command.common.choose.domId : ''
},
@ -93,6 +95,14 @@ export default {
if (this.show) {
this.commit();
}
},
'$store.state.menuOperation.selectedCount': function(val) {
if (this.selected) {
const swch = this.$store.getters['map/getDeviceByCode'](this.selected.code);
if (swch) {
this.active = !!swch.cutOff;
}
}
}
},
mounted() {
@ -101,8 +111,7 @@ export default {
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;
doShow(operate) {
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;
this.$nextTick(function () {
@ -126,6 +135,7 @@ export default {
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$store.dispatch('menuOperation/setSelected', {device: selected});
isClose && this.doClose();
}
}).catch(() => {
@ -143,9 +153,7 @@ export default {
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.selected = val;
const signalEle = this.$store.getters['map/getDeviceByCode'](val.code);
this.active = !!signalEle.singleLock;
this.$store.dispatch('menuOperation/setSelected', {device: val});
}
}).catch(() => {
this.$refs.noticeInfo.doShow();
@ -153,7 +161,7 @@ export default {
},
getSignalLock(code) {
const signalEle = this.$store.getters['map/getDeviceByCode'](code);
if (signalEle.singleLock) {
if (signalEle.cutOff) {
return '未激活';
} else {
return '激活';

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

@ -72,7 +72,6 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
command: true,
title: ''
};
@ -84,6 +83,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
isBlock() {
return this.operate && this.operate.operation === OperationEvent.Command.commandNingBo3.line_switch_block.operation;
},
@ -166,7 +168,7 @@ export default {
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.selected = val;
this.$store.dispatch('menuOperation/setSelected', {device: val});
this.$refs.singleTable.setCurrentRow(this.selected);
}
}).catch(() => {

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

@ -80,7 +80,6 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
mode: '',
position: '',
reserved: 'reversed'
@ -94,6 +93,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
@ -120,8 +122,7 @@ export default {
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;
doShow(operate) {
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;
this.$nextTick(function () {
@ -164,7 +165,7 @@ export default {
} else if (switchEle.reversePosition) {
this.position = 'normal';
}
this.selected = val;
this.$store.dispatch('menuOperation/setSelected', {device: val});
}
});
},

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

@ -52,7 +52,6 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
mode: '',
position: '',
reserved: '',
@ -66,6 +65,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Command.common.confirm.domId : '';
},
@ -89,8 +91,7 @@ export default {
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;
doShow(operate) {
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;

7
src/jmapNew/theme/ningbo_03/menus/menuDialog/trainCancelDeviation.vue
View File

@ -111,7 +111,6 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
activeName: 'first',
operate: {},
allCheck: false
@ -125,6 +124,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
@ -151,8 +153,7 @@ export default {
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;
doShow(operate) {
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;

11
src/jmapNew/theme/ningbo_03/menus/menuDialog/trainDepart.vue
View File

@ -45,7 +45,6 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
activeName: 'first',
operate: {}
};
@ -57,8 +56,8 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
selected() {
return this.$store.state.menuOperation.selected;
},
isDepart() {
return this.operate.operation === OperationEvent.Train.setTrainDeparture.menu.operation;
@ -75,6 +74,9 @@ export default {
domIdConfirm() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
title() {
if (this.isDepart) {
return '列车发车';
@ -100,8 +102,7 @@ export default {
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;
doShow(operate) {
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;

7
src/jmapNew/theme/ningbo_03/menus/menuDialog/trainDetail.vue
View File

@ -201,7 +201,6 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
activeName: 'first',
operate: {},
allCheck: false,
@ -219,6 +218,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
@ -245,8 +247,7 @@ export default {
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;
doShow(operate) {
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;

6
src/jmapNew/theme/ningbo_03/menus/menuDialog/trainDistribution.vue
View File

@ -91,7 +91,6 @@ export default {
activeName: 'first',
dialogShow: false,
loading: false,
selected: null,
selectStandCode: '',
showPath: false
};
@ -104,6 +103,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
@ -134,7 +136,7 @@ export default {
console.log('展开进路预览');
},
doShow(operate, activeName) {
// this.selected = selected;
this.$store.dispatch('menuOperation/setSelected', {device: selected});
this.activeName = activeName;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;

7
src/jmapNew/theme/ningbo_03/menus/menuDialog/trainIdAssociated.vue
View File

@ -56,7 +56,6 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
activeName: 'first',
operate: {},
allCheck: false,
@ -72,6 +71,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
@ -98,8 +100,7 @@ export default {
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;
doShow(operate) {
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;

7
src/jmapNew/theme/ningbo_03/menus/menuDialog/trainJumpStop.vue
View File

@ -72,7 +72,6 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
activeName: 'first',
operate: {},
allCheck: false
@ -86,6 +85,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
@ -112,8 +114,7 @@ export default {
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;
doShow(operate) {
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;

8
src/jmapNew/theme/ningbo_03/menus/menuDialog/trainRunType.vue
View File

@ -53,7 +53,6 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
activeName: 'first',
operate: {},
allCheck: false,
@ -77,6 +76,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
@ -103,9 +105,7 @@ export default {
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;
this.operate = operate;
doShow(operate) {
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;
this.$nextTick(function () {

3
src/jmapNew/theme/ningbo_03/menus/menuDialog/trainTranstalet.vue
View File

@ -86,6 +86,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},

7
src/jmapNew/theme/ningbo_03/menus/menuDialog/trainUpdateDeviation.vue
View File

@ -53,7 +53,6 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
selected: null,
activeName: 'first',
operate: {},
allCheck: false,
@ -68,6 +67,9 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
@ -94,8 +96,7 @@ export default {
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;
doShow(operate) {
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;

12
src/store/modules/menuoperation.js
View File

@ -87,14 +87,14 @@ const menuOperation = {
setButtonOperation: (state, operation) => {
state.buttonOperation = operation;
},
setSelected: (state, selected) => {
state.selected = selected.device;
state.subType = selected.subType;
setSelected: (state, obj) => {
if (obj.subType) state.subType = obj.subType;
state.selected = obj.device;
state.selectedCount += 1;
},
setMenuChange: (state, selected) => {
state.selected = selected.device;
state.subType = selected.subType;
setMenuChange: (state, obj) => {
state.selected = obj.device;
state.subType = obj.subType;
state.setMenuChangeCount += 1;
},
mbmpCountIncrement: (state) => {