This commit is contained in:
lVAL 2021-02-02 19:00:15 +08:00
commit b7b90fe707
171 changed files with 690 additions and 1369 deletions

View File

@ -157,7 +157,13 @@ export default class StationTurnBack extends Group {
}); });
} }
} }
getShapeTipPoint() {
const rect = this.control.getBoundingRect();
return {
x: rect.x + rect.width,
y: rect.y
};
}
setShowMode() { setShowMode() {
const showMode = this.model.showMode; const showMode = this.model.showMode;
const showConditions = (this.style.StationTurnBack || {}).displayCondition; const showConditions = (this.style.StationTurnBack || {}).displayCondition;

View File

@ -17,12 +17,14 @@
<span v-else-if="scope.row.controlMode == 'Local'">站控</span> <span v-else-if="scope.row.controlMode == 'Local'">站控</span>
<!-- <span v-else-if="scope.row.controlMode == 'Local' && $route.query.prdType == '02'">中心请求站控</span> <!-- <span v-else-if="scope.row.controlMode == 'Local' && $route.query.prdType == '02'">中心请求站控</span>
<span v-else-if="scope.row.controlMode == 'Center' && $route.query.prdType == '01'">现地请求遥控</span> --> <span v-else-if="scope.row.controlMode == 'Center' && $route.query.prdType == '01'">现地请求遥控</span> -->
<span v-else-if="scope.row.controlMode == 'Emergency'">紧急站控</span>
<span v-else>获取状态中...</span> <span v-else>获取状态中...</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-col> </el-col>
<el-col :span="6" :offset="1"> <el-col :span="6" :offset="1">
<el-radio v-model="controlMode" label="emergency" :disabled="disabledAll" style="margin-bottom: 8px">紧急站控</el-radio>
<el-radio v-model="controlMode" label="center" :disabled="disabledAll" style="margin-bottom: 8px;">请求站控</el-radio> <el-radio v-model="controlMode" label="center" :disabled="disabledAll" style="margin-bottom: 8px;">请求站控</el-radio>
<el-radio v-model="controlMode" label="local" :disabled="disabledAll">请求遥控</el-radio> <el-radio v-model="controlMode" label="local" :disabled="disabledAll">请求遥控</el-radio>
</el-col> </el-col>
@ -84,6 +86,8 @@ export default {
return OperationEvent.StationControl.requestCentralControl.choose.domId; return OperationEvent.StationControl.requestCentralControl.choose.domId;
} else if (this.operation == OperationEvent.StationControl.requestStationControl.menu.operation) { } else if (this.operation == OperationEvent.StationControl.requestStationControl.menu.operation) {
return OperationEvent.StationControl.requestStationControl.choose.domId; return OperationEvent.StationControl.requestStationControl.choose.domId;
} else if (this.operation == OperationEvent.StationControl.emergencyStationControl.menu.operation) {
return OperationEvent.StationControl.emergencyStationControl.choose.domId;
} }
return ''; return '';
}, },
@ -92,6 +96,8 @@ export default {
return OperationEvent.StationControl.requestCentralControl.confirm.domId; return OperationEvent.StationControl.requestCentralControl.confirm.domId;
} else if (this.operation == OperationEvent.StationControl.requestStationControl.menu.operation) { } else if (this.operation == OperationEvent.StationControl.requestStationControl.menu.operation) {
return OperationEvent.StationControl.requestStationControl.confirm.domId; return OperationEvent.StationControl.requestStationControl.confirm.domId;
} else if (this.operation == OperationEvent.StationControl.emergencyStationControl.menu.operation) {
return OperationEvent.StationControl.emergencyStationControl.confirm.domId;
} }
return ''; return '';
}, },
@ -202,6 +208,8 @@ export default {
this.controlMode = 'local'; this.controlMode = 'local';
} else if (this.operation == OperationEvent.StationControl.requestStationControl.menu.operation) { } else if (this.operation == OperationEvent.StationControl.requestStationControl.menu.operation) {
this.controlMode = 'center'; this.controlMode = 'center';
} else if (this.operation == OperationEvent.StationControl.emergencyStationControl.menu.operation) {
this.controlMode = 'emergency';
} }
} }
this.dialogShow = true; this.dialogShow = true;
@ -275,6 +283,9 @@ export default {
} else if (this.controlMode == 'local') { } else if (this.controlMode == 'local') {
operate.cmdType = CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL; operate.cmdType = CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL;
operate.operation = OperationEvent.StationControl.requestCentralControl.confirm.operation; operate.operation = OperationEvent.StationControl.requestCentralControl.confirm.operation;
} else if (this.controlMode == 'emergency') {
operate.cmdType = CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL;
operate.operation = OperationEvent.StationControl.emergencyStationControl.confirm.operation;
} }
this.loading = true; this.loading = true;

View File

@ -33,6 +33,11 @@ export default {
menu: [], menu: [],
menuNormal: { menuNormal: {
Local: [ Local: [
{
label: '紧急站控',
handler: this.setEmergencyControl,
cmdType: CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL
},
{ {
label: '请求站控', label: '请求站控',
handler: this.setStationControl, handler: this.setStationControl,
@ -45,6 +50,11 @@ export default {
} }
], ],
Center: [ Center: [
{
label: '紧急站控',
handler: this.setEmergencyControl,
cmdType: CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL
},
{ {
label: '请求站控', label: '请求站控',
handler: this.setStationControl, handler: this.setStationControl,
@ -112,7 +122,7 @@ export default {
}, },
setCenterControl() { setCenterControl() {
// //
commitOperate(menuOperate.StationControl.requestCentralControl, {standCode:this.selected.code}, 0).then(({valid, operate})=>{ commitOperate(menuOperate.StationControl.requestCentralControl, {stationCode:this.selected.code}, 0).then(({valid, operate})=>{
if (valid) { if (valid) {
this.$refs.stationControl.doShow(operate, this.selected); this.$refs.stationControl.doShow(operate, this.selected);
} }
@ -120,7 +130,15 @@ export default {
}, },
setStationControl() { setStationControl() {
// //
commitOperate(menuOperate.StationControl.requestStationControl, {standCode:this.selected.code}, 0).then(({valid, operate})=>{ commitOperate(menuOperate.StationControl.requestStationControl, {stationCode:this.selected.code}, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.stationControl.doShow(operate, this.selected);
}
});
},
setEmergencyControl() {
//
commitOperate(menuOperate.StationControl.emergencyStationControl, {stationCode: this.selected.code}, 0).then(({valid, operate})=>{
if (valid) { if (valid) {
this.$refs.stationControl.doShow(operate, this.selected); this.$refs.stationControl.doShow(operate, this.selected);
} }

View File

@ -902,14 +902,14 @@ export default {
minDuration: 8, minDuration: 8,
operateType: 'Station_Set_Turn_Back_Strategy', operateType: 'Station_Set_Turn_Back_Strategy',
skinCode: '06', skinCode: '06',
trainingName: '设置折返策略({1})({30})', trainingName: '设置折返策略({32})({31})',
trainingRemark: '设置折返策略', trainingRemark: '设置折返策略',
trainingType: 'Station', trainingType: 'Station',
productTypes: ['02'], productTypes: ['02'],
stepVOList: [ stepVOList: [
{ deviceType: '05', orderNum: 1, operateCode: '511', tip: '鼠标右键菜单选择【设置折返策略】'}, { deviceType: '05', orderNum: 1, operateCode: '610', tip: '鼠标右键菜单选择【设置折返策略】', codeType: 'BUTTON'},
{ deviceType: '05', orderNum: 2, operateCode: '5111', tip: '选择折返策略【{30}】', val: '2' }, { deviceType: '05', orderNum: 2, operateCode: '6101', tip: '选择折返策略【{31}】', val: '2' },
{ deviceType: '05', orderNum: 3, operateCode: '5112', tip: '鼠标左键点击【确定】' } { deviceType: '05', orderNum: 3, operateCode: '6102', tip: '鼠标左键点击【确定】' }
], ],
config:{tbStrategyBT:true} config:{tbStrategyBT:true}
}, },
@ -918,7 +918,7 @@ export default {
minDuration: 8, minDuration: 8,
operateType: 'Station_Key_Operation_Test', operateType: 'Station_Key_Operation_Test',
skinCode: '06', skinCode: '06',
trainingName: '执行关键性操作测试({1})', trainingName: '执行关键性操作测试({26})',
trainingRemark: '执行关键性操作测试', trainingRemark: '执行关键性操作测试',
trainingType: 'Station', trainingType: 'Station',
productTypes: ['01', '02'], productTypes: ['01', '02'],

View File

@ -195,11 +195,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
stopTask() { stopTask() {
if (this.task) { if (this.task) {

View File

@ -73,11 +73,6 @@ export default {
return ''; return '';
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
if (!this.dialogShow) { if (!this.dialogShow) {

View File

@ -53,11 +53,6 @@ export default {
return this.dialogShow ? OperationEvent.Signal.unlock.confirm.domId : ''; return this.dialogShow ? OperationEvent.Signal.unlock.confirm.domId : '';
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate, selected) { doShow(operate, selected) {
this.stationName = ''; this.stationName = '';

View File

@ -97,11 +97,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
expandPath() { expandPath() {
console.log('展开进路预览'); console.log('展开进路预览');

View File

@ -77,11 +77,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate, selected, message) { doShow(operate, selected, message) {
this.selected = selected; this.selected = selected;

View File

@ -90,11 +90,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
if (!this.dialogShow) { if (!this.dialogShow) {

View File

@ -100,11 +100,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate, selected) { doShow(operate, selected) {
this.selected = selected; this.selected = selected;

View File

@ -99,11 +99,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate, selected) { doShow(operate, selected) {
this.selected = selected; this.selected = selected;

View File

@ -111,11 +111,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
getStationList(disable) { getStationList(disable) {
this.stationLists = []; this.stationLists = [];

View File

@ -87,11 +87,6 @@ export default {
return '设置车体号'; return '设置车体号';
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate, selected) { doShow(operate, selected) {
this.selected = selected; this.selected = selected;

View File

@ -81,11 +81,6 @@ export default {
return '删除车组号'; return '删除车组号';
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
loadInitData(map) { loadInitData(map) {
if (map) { if (map) {

View File

@ -87,11 +87,6 @@ export default {
return '移动车组号'; return '移动车组号';
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate, selected) { doShow(operate, selected) {
this.selected = selected; this.selected = selected;

View File

@ -99,11 +99,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate, selected) { doShow(operate, selected) {
this.selected = selected; this.selected = selected;

View File

@ -101,11 +101,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate, selected) { doShow(operate, selected) {
this.selected = selected; this.selected = selected;

View File

@ -75,11 +75,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate, selected) { doShow(operate, selected) {
this.selected = selected; this.selected = selected;

View File

@ -82,11 +82,6 @@ export default {
return 'ATP切除功能'; return 'ATP切除功能';
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate, selected) { doShow(operate, selected) {
this.selected = selected; this.selected = selected;

View File

@ -98,11 +98,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate, selected) { doShow(operate, selected) {
this.selected = selected; this.selected = selected;

View File

@ -87,10 +87,10 @@ export default {
]), ]),
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
}, },
@ -111,26 +111,21 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
this.operate = operate; this.operate = operate;
// //
this.dialogShow = true; this.dialogShow = true;
this.$nextTick(function () { this.$nextTick(function () {
this.$refs.table.setCurrentRow(); this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
}); });
}, },
doClose() { doClose() {
this.loading = false; this.loading = false;
this.dialogShow = false; this.dialogShow = false;
this.$refs.table.setCurrentRow(); this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
}, },
commit() { commit() {
}, },

View File

@ -81,10 +81,10 @@ export default {
]), ]),
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
}, },
@ -105,25 +105,20 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
this.operate = operate; this.operate = operate;
// //
this.dialogShow = true; this.dialogShow = true;
this.$nextTick(function () { this.$nextTick(function () {
this.$refs.table.setCurrentRow(); this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
}); });
}, },
doClose() { doClose() {
this.loading = false; this.loading = false;
this.dialogShow = false; this.dialogShow = false;
this.$refs.table.setCurrentRow(); this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
}, },
commit() { commit() {

View File

@ -157,20 +157,15 @@ export default {
if (this.show) { if (this.show) {
this.commit(); this.commit();
} }
}, },
'selected': function(val) { 'selected': function(val) {
if (val) { if (val) {
const stand = this.$store.getters['map/getDeviceByCode'](val.code); const stand = this.$store.getters['map/getDeviceByCode'](val.code);
if (stand) { if (stand) {
this.currentTime = stand.parkingTime this.currentTime = stand.parkingTime;
} }
} }
} }
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
}, },
methods: { methods: {
doShow(operate) { doShow(operate) {

View File

@ -99,10 +99,10 @@ export default {
]), ]),
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
}, },
@ -123,15 +123,10 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
selectStand(stationStand) { selectStand(stationStand) {
this.selectStandCode = stationStand.code; this.selectStandCode = stationStand.code;
}, },
expandPath() { expandPath() {
console.log('展开进路预览'); console.log('展开进路预览');
}, },

View File

@ -55,10 +55,10 @@ export default {
]), ]),
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
}, },
@ -79,25 +79,20 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
this.operate = operate; this.operate = operate;
// //
this.dialogShow = true; this.dialogShow = true;
this.$nextTick(function () { this.$nextTick(function () {
this.$refs.table.setCurrentRow(); this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
}); });
}, },
doClose() { doClose() {
this.loading = false; this.loading = false;
this.dialogShow = false; this.dialogShow = false;
this.$refs.table.setCurrentRow() this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
}, },
commit() { commit() {

View File

@ -80,11 +80,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate, message) { doShow(operate, message) {
this.operate = operate || {}; this.operate = operate || {};

View File

@ -93,11 +93,6 @@ export default {
return '增加用户'; return '增加用户';
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
// //

View File

@ -67,11 +67,6 @@ export default {
return '删除用户'; return '删除用户';
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate, selected) { doShow(operate, selected) {
// //

View File

@ -101,11 +101,6 @@ export default {
return '用户编辑页面'; return '用户编辑页面';
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate, selected) { doShow(operate, selected) {
// //

View File

@ -3,7 +3,7 @@
<el-dialog v-dialogDrag class="ningbo-01__systerm route-setting" :title="title" :visible.sync="show" width="1000px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false"> <el-dialog v-dialogDrag class="ningbo-01__systerm route-setting" :title="title" :visible.sync="show" width="1000px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
<el-row> <el-row>
<el-col :span="20"> <el-col :span="20">
<el-table ref="table1" :data="tempData" highlight-current-row height="300px" :id="domIdChoose" @current-change="handleChangeLine"> <el-table :id="domIdChoose" ref="table1" :data="tempData" highlight-current-row height="300px" @current-change="handleChangeLine">
<el-table-column prop="name" width="100" label="轨道" /> <el-table-column prop="name" width="100" label="轨道" />
<el-table-column prop="blockStatus" width="120" label="MAU"> <el-table-column prop="blockStatus" width="120" label="MAU">
<template slot-scope="scope"> <template slot-scope="scope">
@ -30,7 +30,7 @@
</el-table> </el-table>
</el-col> </el-col>
<el-col :span="4"> <el-col :span="4">
<el-table ref="table2" :data="limitList" highlight-current-row height="300px" :id="domIdChoose1" @current-change="handleChangeLine2"> <el-table :id="domIdChoose1" ref="table2" :data="limitList" highlight-current-row height="300px" @current-change="handleChangeLine2">
<el-table-column prop="name" label="速度" /> <el-table-column prop="name" label="速度" />
</el-table> </el-table>
</el-col> </el-col>
@ -96,7 +96,7 @@ export default {
{ name: '75', value: 75 }, { name: '75', value: 75 },
{ name: '80', value: 80 } { name: '80', value: 80 }
], ],
initEle: null, initEle: null,
commandEleCode:null, commandEleCode:null,
speedLimitValue: 0 speedLimitValue: 0
}; };
@ -107,23 +107,23 @@ export default {
]), ]),
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
domIdChoose() { domIdChoose() {
return this.dialogShow ? OperationEvent.Command.common.choose.domId : '' return this.dialogShow ? OperationEvent.Command.common.choose.domId : '';
}, },
domIdChoose1() { domIdChoose1() {
return this.dialogShow ? OperationEvent.Command.common.choose1.domId : '' return this.dialogShow ? OperationEvent.Command.common.choose1.domId : '';
}, },
domIdConfirm() { domIdConfirm() {
return this.dialogShow ? OperationEvent.Command.common.confirm.domId : ''; return this.dialogShow ? OperationEvent.Command.common.confirm.domId : '';
}, },
domIdApply() { domIdApply() {
return this.dialogShow ? OperationEvent.Command.common.apply.domId : ''; return this.dialogShow ? OperationEvent.Command.common.apply.domId : '';
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close.domId : ''; return this.dialogShow ? OperationEvent.Command.common.close.domId : '';
}, },
title() { title() {
@ -137,15 +137,10 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
this.tempData = []; this.tempData = [];
this.operate = operate; this.operate = operate;
this.sectionList.forEach(item => { this.sectionList.forEach(item => {
if (item.type === '01' || item.type === '04') { if (item.type === '01' || item.type === '04') {
this.tempData.push(item); this.tempData.push(item);
@ -156,8 +151,8 @@ export default {
this.speedLimitValue = 0; this.speedLimitValue = 0;
this.dialogShow = true; this.dialogShow = true;
this.$nextTick(function () { this.$nextTick(function () {
this.$refs.table1.setCurrentRow(null); this.$refs.table1.setCurrentRow(null);
this.$refs.table2.setCurrentRow(null); this.$refs.table2.setCurrentRow(null);
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
}); });
}, },
@ -180,9 +175,9 @@ export default {
this.$store.dispatch('training/nextNew', step).then(({ valid }) => { this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$store.dispatch('menuOperation/setSelected', {device: val}); this.$store.dispatch('menuOperation/setSelected', {device: val});
const sectionEle = this.$store.getters['map/getDeviceByCode'](val.code); const sectionEle = this.$store.getters['map/getDeviceByCode'](val.code);
this.speedLimitValue = sectionEle.speedUpLimit; this.speedLimitValue = sectionEle.speedUpLimit;
if (this.speedLimitValue > 0) { if (this.speedLimitValue > 0) {
this.$refs.table2.setCurrentRow(this.limitList[this.speedLimitValue / 5 - 1]); this.$refs.table2.setCurrentRow(this.limitList[this.speedLimitValue / 5 - 1]);
} else { } else {
@ -198,8 +193,8 @@ export default {
this.initEle = null; this.initEle = null;
this.commandEleCode = null; this.commandEleCode = null;
const step = { const step = {
operation: OperationEvent.Command.common.choose1.operation, operation: OperationEvent.Command.common.choose1.operation,
val: val.value, val: val.value,
param: {speedLimitValue: val.value} param: {speedLimitValue: val.value}
}; };
this.$store.dispatch('training/nextNew', step).then(({ valid }) => { this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
@ -240,8 +235,8 @@ export default {
}, },
commit(isClose = true) { commit(isClose = true) {
const step = { const step = {
operation: isClose ? OperationEvent.Command.common.confirm.operation: OperationEvent.Command.common.apply.operation, operation: isClose ? OperationEvent.Command.common.confirm.operation : OperationEvent.Command.common.apply.operation,
param: { sectionCode: this.selected.code } param: { sectionCode: this.selected.code }
}; };
this.$store.dispatch('training/nextNew', step).then(({ valid }) => { this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) { if (valid) {

View File

@ -2,7 +2,7 @@
<div> <div>
<el-dialog v-dialogDrag class="ningbo-01__systerm route-setting" :title="title" :visible.sync="show" width="700px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false"> <el-dialog v-dialogDrag class="ningbo-01__systerm route-setting" :title="title" :visible.sync="show" width="700px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
<el-row> <el-row>
<el-table ref="table" :data="tempData" highlight-current-row height="300px" :id="domIdChoose" @current-change="handleChangeLine"> <el-table :id="domIdChoose" ref="table" :data="tempData" highlight-current-row height="300px" @current-change="handleChangeLine">
<el-table-column prop="name" label="轨道" /> <el-table-column prop="name" label="轨道" />
<el-table-column prop="blockStatus" label="MAU"> <el-table-column prop="blockStatus" label="MAU">
<template slot-scope="scope"> <template slot-scope="scope">
@ -79,20 +79,20 @@ export default {
}, },
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
domIdChoose() { domIdChoose() {
return this.dialogShow ? OperationEvent.Command.common.choose.domId : '' return this.dialogShow ? OperationEvent.Command.common.choose.domId : '';
}, },
domIdConfirm() { domIdConfirm() {
return this.dialogShow ? OperationEvent.Command.common.confirm.domId : ''; return this.dialogShow ? OperationEvent.Command.common.confirm.domId : '';
}, },
domIdApply() { domIdApply() {
return this.dialogShow ? OperationEvent.Command.common.apply.domId : ''; return this.dialogShow ? OperationEvent.Command.common.apply.domId : '';
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close.domId : ''; return this.dialogShow ? OperationEvent.Command.common.close.domId : '';
}, },
title() { title() {
@ -106,14 +106,9 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
this.tempData = []; this.tempData = [];
this.sectionList.forEach(item => { this.sectionList.forEach(item => {
if (item.type === '01' || item.type === '04') { if (item.type === '01' || item.type === '04') {
this.tempData.push(item); this.tempData.push(item);
@ -125,7 +120,7 @@ export default {
// //
this.dialogShow = true; this.dialogShow = true;
this.$nextTick(function () { this.$nextTick(function () {
this.$refs.table.setCurrentRow(); this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
}); });
}, },
@ -143,7 +138,7 @@ export default {
this.initEle = null; this.initEle = null;
this.commandEleCode = null; this.commandEleCode = null;
const step = { const step = {
code: val.code, code: val.code,
operation: OperationEvent.Command.common.choose.operation, operation: OperationEvent.Command.common.choose.operation,
val: val.code val: val.code
}; };
@ -180,9 +175,9 @@ export default {
}, },
commit(isClose = true) { commit(isClose = true) {
const step = { const step = {
isBlock: this.isBlock, isBlock: this.isBlock,
operation: isClose ? OperationEvent.Command.common.confirm.operation: OperationEvent.Command.common.apply.operation, operation: isClose ? OperationEvent.Command.common.confirm.operation : OperationEvent.Command.common.apply.operation,
param: { sectionCode: this.selected.code } param: { sectionCode: this.selected.code }
}; };
this.$store.dispatch('training/nextNew', step).then(({ valid }) => { this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) { if (valid) {

View File

@ -113,11 +113,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
this.initEle = null; this.initEle = null;

View File

@ -1,7 +1,7 @@
<template> <template>
<el-dialog v-dialogDrag class="ningbo-01__systerm route-setting" :title="title" :visible.sync="show" width="600px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false"> <el-dialog v-dialogDrag class="ningbo-01__systerm route-setting" :title="title" :visible.sync="show" width="600px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
<el-row> <el-row>
<el-table ref="table" :data="signalList" height="300px" > <el-table ref="table" :data="signalList" height="300px">
<el-table-column prop="code" label="ID" /> <el-table-column prop="code" label="ID" />
<el-table-column prop="mode" label="信号模式" /> <el-table-column prop="mode" label="信号模式" />
<el-table-column v-if="isCbtc" prop="status" label="CBTC可命令" /> <el-table-column v-if="isCbtc" prop="status" label="CBTC可命令" />
@ -55,10 +55,10 @@ export default {
]), ]),
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
isCbtc() { isCbtc() {
return this.operate.operation === OperationEvent.Command.mBar.cbtcMode.operation; return this.operate.operation === OperationEvent.Command.mBar.cbtcMode.operation;
}, },
@ -82,25 +82,20 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
this.operate = operate; this.operate = operate;
// //
this.dialogShow = true; this.dialogShow = true;
this.$nextTick(function () { this.$nextTick(function () {
this.$refs.table.setCurrentRow(); this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
}); });
}, },
doClose() { doClose() {
this.loading = false; this.loading = false;
this.dialogShow = false; this.dialogShow = false;
this.$refs.table.setCurrentRow(); this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
}, },
commit(isClose = false) { commit(isClose = false) {

View File

@ -1,46 +1,46 @@
<template> <template>
<div> <div>
<el-dialog v-dialogDrag class="ningbo-01__systerm route-setting" :title="title" :visible.sync="show" width="700px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false"> <el-dialog v-dialogDrag class="ningbo-01__systerm route-setting" :title="title" :visible.sync="show" width="700px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
<el-row> <el-row>
<el-table <el-table
ref="table" ref="table"
:data="signalList" :data="signalList"
highlight-current-row highlight-current-row
height="300px" height="300px"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
> >
<el-table-column prop="name" label="信号机" /> <el-table-column prop="name" label="信号机" />
<el-table-column prop="blockStatus" label="允许锁闭"> <el-table-column prop="blockStatus" label="允许锁闭">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ getSignalBlock(scope.row.code) }}</span> <span>{{ getSignalBlock(scope.row.code) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="blockProcess" label="同意取消"></el-table-column> <el-table-column prop="blockProcess" label="同意取消"></el-table-column>
<el-table-column prop="unblockProcess" label="取消进程"> <el-table-column prop="unblockProcess" label="取消进程">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ getProcess(scope.row.code) }}</span> <span>{{ getProcess(scope.row.code) }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-row> </el-row>
<el-row justify="center" class="button-group"> <el-row justify="center" class="button-group">
<el-col :span="4" :offset="1"> <el-col :span="4" :offset="1">
<el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!selected" @click="commit(true)">确定(O)</el-button> <el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!selected" @click="commit(true)">确定(O)</el-button>
</el-col> </el-col>
<el-col :span="4" :offset="2"> <el-col :span="4" :offset="2">
<el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!selected" @click="commit(false)">应用(A)</el-button> <el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!selected" @click="commit(false)">应用(A)</el-button>
</el-col> </el-col>
<el-col :span="4" :offset="2"> <el-col :span="4" :offset="2">
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button> <el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col> </el-col>
<el-col :span="4" :offset="2"> <el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button> <el-button>帮助(H)</el-button>
</el-col> </el-col>
</el-row> </el-row>
<notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" /> <notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
</el-dialog> </el-dialog>
<signal-can-block ref="signalCanBlock" @commandSuccess="commandSuccess" @cancelCommand="cancelCommand" /> <signal-can-block ref="signalCanBlock" @commandSuccess="commandSuccess" @cancelCommand="cancelCommand" />
</div> </div>
</template> </template>
<script> <script>
@ -74,12 +74,12 @@ export default {
]), ]),
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
isBlock() { isBlock() {
console.log(this.selected && this.selected.blockade, 2222222) console.log(this.selected && this.selected.blockade, 2222222);
return this.selected && this.selected.blockade; return this.selected && this.selected.blockade;
}, },
domIdClose() { domIdClose() {
@ -102,11 +102,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
this.initEle = null; this.initEle = null;
@ -115,7 +110,7 @@ export default {
// //
this.dialogShow = true; this.dialogShow = true;
this.$nextTick(function () { this.$nextTick(function () {
this.$refs.table.setCurrentRow(); this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
}); });
}, },
@ -127,7 +122,7 @@ export default {
}, },
commit(isClose = false) { commit(isClose = false) {
const step = { const step = {
needBlock: this.isBlock, needBlock: this.isBlock,
code: `${this.selected.code}`, code: `${this.selected.code}`,
operation: OperationEvent.Signal.lock.confirm.operation, operation: OperationEvent.Signal.lock.confirm.operation,
param: {} param: {}
@ -175,12 +170,12 @@ export default {
code: `${val.code}`, code: `${val.code}`,
operation: OperationEvent.Signal.lock.choose.operation, operation: OperationEvent.Signal.lock.choose.operation,
param: {} param: {}
}; };
this.$store.dispatch('training/nextNew', step).then(({ valid }) => { this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$store.dispatch('menuOperation/setSelected', {device: val}); this.$store.dispatch('menuOperation/setSelected', {device: val});
} }
}).catch(() => { }).catch(() => {
this.$refs.noticeInfo.doShow(); this.$refs.noticeInfo.doShow();

View File

@ -79,10 +79,10 @@ export default {
]), ]),
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
}, },
@ -103,11 +103,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
this.initEle = null; this.initEle = null;
@ -116,7 +111,7 @@ export default {
// //
this.dialogShow = true; this.dialogShow = true;
this.$nextTick(function () { this.$nextTick(function () {
this.$refs.table.setCurrentRow(); this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
}); });
}, },
@ -187,7 +182,7 @@ export default {
this.$store.dispatch('training/nextNew', step).then(({ valid }) => { this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$store.dispatch('menuOperation/setSelected', {device: val}); this.$store.dispatch('menuOperation/setSelected', {device: val});
} }
}).catch(() => { }).catch(() => {
this.$refs.noticeInfo.doShow(); this.$refs.noticeInfo.doShow();

View File

@ -1,49 +1,49 @@
<template> <template>
<div> <div>
<el-dialog v-dialogDrag class="ningbo-01__systerm route-setting" :title="title" :visible.sync="show" width="700px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false"> <el-dialog v-dialogDrag class="ningbo-01__systerm route-setting" :title="title" :visible.sync="show" width="700px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
<el-row> <el-row>
<el-table <el-table
ref="table" ref="table"
:data="switchList" :data="switchList"
highlight-current-row highlight-current-row
height="350px" height="350px"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
> >
<el-table-column prop="name" label="道岔" /> <el-table-column prop="name" label="道岔" />
<el-table-column prop="blockStatus" label="道岔封锁状态"> <el-table-column prop="blockStatus" label="道岔封锁状态">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ getSwitchStatus(scope.row.code) }}</span> <span>{{ getSwitchStatus(scope.row.code) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="blockProcess" label="设置封锁进程"> <el-table-column prop="blockProcess" label="设置封锁进程">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ getProcess(scope.row.code, 'block') }}</span> <span>{{ getProcess(scope.row.code, 'block') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="unblockProcess" label="解除封锁进程"> <el-table-column prop="unblockProcess" label="解除封锁进程">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ getProcess(scope.row.code, 'unblock') }}</span> <span>{{ getProcess(scope.row.code, 'unblock') }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</el-row> </el-row>
<el-row justify="center" class="button-group"> <el-row justify="center" class="button-group">
<el-col :span="4" :offset="1"> <el-col :span="4" :offset="1">
<el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!selected || !!initEle" @click="commit(true)">确定(O)</el-button> <el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!selected || !!initEle" @click="commit(true)">确定(O)</el-button>
</el-col> </el-col>
<el-col :span="4" :offset="2"> <el-col :span="4" :offset="2">
<el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!selected || !!initEle" @click="commit(false)">应用(A)</el-button> <el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!selected || !!initEle" @click="commit(false)">应用(A)</el-button>
</el-col> </el-col>
<el-col :span="4" :offset="2"> <el-col :span="4" :offset="2">
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button> <el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col> </el-col>
<el-col :span="4" :offset="2"> <el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button> <el-button>帮助(H)</el-button>
</el-col> </el-col>
</el-row> </el-row>
<notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" /> <notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
</el-dialog> </el-dialog>
<switch-block ref="switchBlock" @commandSuccess="commandSuccess" @cancelCommand="cancelCommand" /> <switch-block ref="switchBlock" @commandSuccess="commandSuccess" @cancelCommand="cancelCommand" />
</div> </div>
</template> </template>
@ -83,10 +83,10 @@ export default {
}, },
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
}, },
@ -105,12 +105,7 @@ export default {
if (this.show) { if (this.show) {
this.commit(); this.commit();
} }
} }
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
}, },
methods: { methods: {
doShow(operate) { doShow(operate) {
@ -120,7 +115,7 @@ export default {
// //
this.dialogShow = true; this.dialogShow = true;
this.$nextTick(function () { this.$nextTick(function () {
this.$refs.table.setCurrentRow(); this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
}); });
}, },
@ -130,7 +125,7 @@ export default {
this.$refs.table.setCurrentRow(); this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
}, },
commit(isClose=false) { commit(isClose = false) {
const step = { const step = {
code: `${this.selected.code}`, code: `${this.selected.code}`,
operation: this.isBlock ? OperationEvent.Switch.block.confirm.operation : OperationEvent.Switch.unblock.confirm.operation, operation: this.isBlock ? OperationEvent.Switch.block.confirm.operation : OperationEvent.Switch.unblock.confirm.operation,
@ -140,11 +135,11 @@ export default {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$refs.switchBlock.doShow(step, this.selected); this.$refs.switchBlock.doShow(step, this.selected);
this.initEle = this.selected; this.initEle = this.selected;
isClose && this.doClose(); isClose && this.doClose();
} }
}).catch(() => { }).catch(() => {
isClose && this.doClose(); isClose && this.doClose();
this.$refs.noticeInfo.doShow(); this.$refs.noticeInfo.doShow();
}); });
}, },

View File

@ -95,11 +95,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
// //

View File

@ -70,10 +70,10 @@ export default {
]), ]),
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
}, },
@ -94,11 +94,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
this.operate = operate; this.operate = operate;

View File

@ -79,10 +79,10 @@ export default {
]), ]),
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
}, },
@ -103,11 +103,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
this.operate = operate; this.operate = operate;

View File

@ -215,10 +215,10 @@ export default {
]), ]),
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
filterRouteList() { filterRouteList() {
return this.routeList.filter(el => { return el.flt == {'auto': true, 'artificial': false}[this.unlockType]; }); return this.routeList.filter(el => { return el.flt == {'auto': true, 'artificial': false}[this.unlockType]; });
}, },
@ -242,11 +242,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
// //
@ -355,8 +350,8 @@ export default {
}; };
this.$store.dispatch('training/nextNew', step).then(({ valid }) => { this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$store.dispatch('menuOperation/setSelected', {device: row}); this.$store.dispatch('menuOperation/setSelected', {device: row});
} }
}).catch(() => { }).catch(() => {
this.$refs.noticeInfo.doShow(); this.$refs.noticeInfo.doShow();
@ -412,7 +407,7 @@ export default {
this.$store.dispatch('training/nextNew', step).then(({ valid }) => { this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$store.dispatch('menuOperation/setSelected', {device: val}); this.$store.dispatch('menuOperation/setSelected', {device: val});
} }
}).catch(() => { }).catch(() => {
this.$refs.noticeInfo.doShow(); this.$refs.noticeInfo.doShow();

View File

@ -60,10 +60,10 @@ export default {
]), ]),
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
}, },
@ -84,11 +84,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
this.operate = operate; this.operate = operate;

View File

@ -115,10 +115,10 @@ export default {
]), ]),
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
}, },
@ -139,11 +139,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
this.operate = operate; this.operate = operate;

View File

@ -79,8 +79,8 @@ export default {
allChecked: false, allChecked: false,
dialogShow: false, dialogShow: false,
loading: false, loading: false,
active: false, active: false,
command: false, command: false,
activeName: 'first', activeName: 'first',
tempData: [], tempData: [],
operate: null, operate: null,
@ -111,17 +111,17 @@ export default {
]), ]),
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
domIdConfirm() { domIdConfirm() {
return this.dialogShow ? OperationEvent.Command.common.confirm1.domId : ''; return this.dialogShow ? OperationEvent.Command.common.confirm1.domId : '';
}, },
domIdApply() { domIdApply() {
return this.dialogShow ? OperationEvent.Command.common.apply1.domId : ''; return this.dialogShow ? OperationEvent.Command.common.apply1.domId : '';
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close1.domId : ''; return this.dialogShow ? OperationEvent.Command.common.close1.domId : '';
}, },
title() { title() {
@ -135,11 +135,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate, selected, value) { doShow(operate, selected, value) {
this.tempData = []; this.tempData = [];
@ -147,11 +142,11 @@ export default {
if (item.type === '01' || item.type === '04') { if (item.type === '01' || item.type === '04') {
this.tempData.push(item); this.tempData.push(item);
} }
}); });
this.command = true; this.command = true;
this.$store.dispatch('menuOperation/setSelected', {device: selected}); this.$store.dispatch('menuOperation/setSelected', {device: selected});
// //
this.operate = operate; this.operate = operate;
this.speedLimitValue = value; this.speedLimitValue = value;
this.dialogShow = true; this.dialogShow = true;
this.$nextTick(function () { this.$nextTick(function () {
@ -192,9 +187,9 @@ export default {
}, },
commit(isClose = true) { commit(isClose = true) {
const operate = { const operate = {
// cmdType: this.command ? CMD.Section.CMD_SECTION_SET_LIMIT_SPEED : CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED, // cmdType: this.command ? CMD.Section.CMD_SECTION_SET_LIMIT_SPEED : CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED,
cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED , cmdType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED,
operation: isClose ? OperationEvent.Command.common.confirm1.operation: OperationEvent.Command.common.apply1.operation, operation: isClose ? OperationEvent.Command.common.confirm1.operation : OperationEvent.Command.common.apply1.operation,
over: true, over: true,
param: {sectionCode: this.selected.code, speedLimitValue:this.speedLimitValue} param: {sectionCode: this.selected.code, speedLimitValue:this.speedLimitValue}
}; };

View File

@ -75,10 +75,10 @@ export default {
]), ]),
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
}, },
@ -99,11 +99,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
// //

View File

@ -2,7 +2,7 @@
<el-dialog v-dialogDrag class="ningbo-01__systerm route-setting" :title="title" :visible.sync="show" width="700px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false"> <el-dialog v-dialogDrag class="ningbo-01__systerm route-setting" :title="title" :visible.sync="show" width="700px" :before-close="doClose" :z-index="2000" :modal="false" :close-on-click-modal="false">
<el-row> <el-row>
<el-col :span="18"> <el-col :span="18">
<el-table ref="sectionable" :data="tempData" highlight-current-row height="300px" :id="domIdChoose" @current-change="handleChangeLine"> <el-table :id="domIdChoose" ref="sectionable" :data="tempData" highlight-current-row height="300px" @current-change="handleChangeLine">
<el-table-column prop="name" label="轨道" /> <el-table-column prop="name" label="轨道" />
<el-table-column prop="blockStatus" label="MAU"> <el-table-column prop="blockStatus" label="MAU">
<template slot-scope="scope"> <template slot-scope="scope">
@ -84,20 +84,20 @@ export default {
}, },
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
domIdChoose() { domIdChoose() {
return this.dialogShow ? OperationEvent.Command.common.choose1.domId : '' return this.dialogShow ? OperationEvent.Command.common.choose1.domId : '';
}, },
domIdConfirm() { domIdConfirm() {
return this.dialogShow ? OperationEvent.Command.common.confirm1.domId : ''; return this.dialogShow ? OperationEvent.Command.common.confirm1.domId : '';
}, },
domIdApply() { domIdApply() {
return this.dialogShow ? OperationEvent.Command.common.apply1.domId : ''; return this.dialogShow ? OperationEvent.Command.common.apply1.domId : '';
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close1.domId : ''; return this.dialogShow ? OperationEvent.Command.common.close1.domId : '';
}, },
title() { title() {
@ -111,11 +111,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
this.tempData = []; this.tempData = [];
@ -137,21 +132,21 @@ export default {
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
}, },
handleChangeLine(val) { handleChangeLine(val) {
if (!val) { return; } if (!val) { return; }
const step = { const step = {
code: val.code, code: val.code,
operation: OperationEvent.Command.common.choose1.operation, operation: OperationEvent.Command.common.choose1.operation,
val: val.code val: val.code
}; };
this.$store.dispatch('training/nextNew', step).then(({ valid }) => { this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$store.dispatch('menuOperation/setSelected', {device: val}); this.$store.dispatch('menuOperation/setSelected', {device: val});
this.$refs.sectionable.setCurrentRow(this.selected); this.$refs.sectionable.setCurrentRow(this.selected);
} }
}).catch(() => { }).catch(() => {
this.$refs.noticeInfo.doShow(); this.$refs.noticeInfo.doShow();
}); });
}, },
getProcess(code) { getProcess(code) {
if (this.selected && this.selected.code === code) { if (this.selected && this.selected.code === code) {
@ -168,21 +163,21 @@ export default {
const sectionElm = this.$store.getters['map/getDeviceByCode'](code); const sectionElm = this.$store.getters['map/getDeviceByCode'](code);
return sectionElm.blockade ? '关闭双向:所有列车' : '打开'; return sectionElm.blockade ? '关闭双向:所有列车' : '打开';
}, },
commit(isClose=true) { commit(isClose = true) {
if (this.command) { if (this.command) {
const operate = { const operate = {
cmdType: this.isBlock ? CMD.Section.CMD_SECTION_BLOCK : CMD.Section.CMD_SECTION_UNBLOCK, cmdType: this.isBlock ? CMD.Section.CMD_SECTION_BLOCK : CMD.Section.CMD_SECTION_UNBLOCK,
operation: isClose ? OperationEvent.Command.common.confirm1.operation: OperationEvent.Command.common.apply1.operation, operation: isClose ? OperationEvent.Command.common.confirm1.operation : OperationEvent.Command.common.apply1.operation,
over: true, over: true,
param: {sectionCode: this.selected.code} param: {sectionCode: this.selected.code}
}; };
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) { if (valid) {
isClose && this.doClose(); isClose && this.doClose();
this.$emit('commandSuccess', this.selected.code); this.$emit('commandSuccess', this.selected.code);
} }
}).catch(() => { }).catch(() => {
isClose && this.isClose(); isClose && this.isClose();
this.$refs.noticeInfo.doShow(); this.$refs.noticeInfo.doShow();
}); });
} else { } else {

View File

@ -81,10 +81,10 @@ export default {
]), ]),
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
}, },
@ -105,11 +105,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
this.tempData = []; this.tempData = [];

View File

@ -85,17 +85,17 @@ export default {
}, },
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
domIdConfirm() { domIdConfirm() {
return this.dialogShow ? OperationEvent.Command.common.confirm1.domId : ''; return this.dialogShow ? OperationEvent.Command.common.confirm1.domId : '';
}, },
domIdApply() { domIdApply() {
return this.dialogShow ? OperationEvent.Command.common.apply1.domId : ''; return this.dialogShow ? OperationEvent.Command.common.apply1.domId : '';
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close1.domId : ''; return this.dialogShow ? OperationEvent.Command.common.close1.domId : '';
} }
}, },
@ -106,11 +106,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
this.operate = operate; this.operate = operate;
@ -131,14 +126,14 @@ export default {
if (this.command) { if (this.command) {
const operate = { const operate = {
cmdType: this.needBlock ? CMD.Signal.CMD_SIGNAL_BLOCK : CMD.Signal.CMD_SIGNAL_UNBLOCK, cmdType: this.needBlock ? CMD.Signal.CMD_SIGNAL_BLOCK : CMD.Signal.CMD_SIGNAL_UNBLOCK,
operation: isClose ? OperationEvent.Command.common.confirm1.operation: OperationEvent.Command.common.apply1.operation, operation: isClose ? OperationEvent.Command.common.confirm1.operation : OperationEvent.Command.common.apply1.operation,
over: true, over: true,
param: {signalCode: this.selected.code} param: {signalCode: this.selected.code}
}; };
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) { if (valid) {
isClose && this.doClose(); isClose && this.doClose();
this.$emit('commandSuccess', this.selected.code); this.$emit('commandSuccess', this.selected.code);
} }
}).catch(() => { }).catch(() => {
isClose && this.doClose(); isClose && this.doClose();

View File

@ -78,10 +78,10 @@ export default {
]), ]),
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
}, },
@ -102,11 +102,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
this.operate = operate; this.operate = operate;
@ -132,7 +127,7 @@ export default {
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) { if (valid) {
isClose && this.doClose(); isClose && this.doClose();
this.$emit('commandSuccess', this.selected.code); this.$emit('commandSuccess', this.selected.code);
} }
}).catch(() => { }).catch(() => {
isClose && this.doClose(); isClose && this.doClose();

View File

@ -68,10 +68,10 @@ export default {
]), ]),
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close.domId : ''; return this.dialogShow ? OperationEvent.Command.common.close.domId : '';
}, },
@ -89,11 +89,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
this.operate = operate; this.operate = operate;
@ -142,8 +137,8 @@ export default {
}, },
cancel() { cancel() {
const operate = { const operate = {
over: true, over: true,
cmdType: CMD.Signal.CMD_SIGNAL_DETAIL, cmdType: CMD.Signal.CMD_SIGNAL_DETAIL,
operation: OperationEvent.Command.common.close.operation operation: OperationEvent.Command.common.close.operation
}; };
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {

View File

@ -83,10 +83,10 @@ export default {
]), ]),
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
}, },
@ -107,11 +107,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
this.operate = operate; this.operate = operate;
@ -124,8 +119,8 @@ export default {
}, },
doClose() { doClose() {
this.loading = false; this.loading = false;
this.dialogShow = false; this.dialogShow = false;
this.$refs.table.setCurrentRow(); this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
}, },
commit(isClose = false) { commit(isClose = false) {
@ -139,7 +134,7 @@ export default {
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) { if (valid) {
isClose && this.doClose(); isClose && this.doClose();
this.$emit('commandSuccess', this.selected.code); this.$emit('commandSuccess', this.selected.code);
} }
}).catch(() => { }).catch(() => {
isClose && this.doClose(); isClose && this.doClose();

View File

@ -3,11 +3,11 @@
<el-row> <el-row>
<el-col :span="18"> <el-col :span="18">
<el-table <el-table
ref="table"
:data="signalList" :data="signalList"
ref="table"
height="300px" height="300px"
highlight-current-row highlight-current-row
:domIdChoose="domIdChoose" :dom-id-choose="domIdChoose"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
> >
<el-table-column prop="name" label="ID" /> <el-table-column prop="name" label="ID" />
@ -73,25 +73,25 @@ export default {
]), ]),
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
isCbtc() { isCbtc() {
return this.operate.operation === OperationEvent.Command.mBar.cbtcMode.operation; return this.operate.operation === OperationEvent.Command.mBar.cbtcMode.operation;
}, },
domIdChoose() { domIdChoose() {
return this.dialogShow ? OperationEvent.Command.common.choose.domId : '' return this.dialogShow ? OperationEvent.Command.common.choose.domId : '';
}, },
domIdConfirm() { domIdConfirm() {
return this.dialogShow ? OperationEvent.Command.common.confirm.domId : ''; return this.dialogShow ? OperationEvent.Command.common.confirm.domId : '';
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close.domId : ''; return this.dialogShow ? OperationEvent.Command.common.close.domId : '';
}, },
domIdApply() { domIdApply() {
return this.dialogShow ? OperationEvent.Command.common.apply.domId : ''; return this.dialogShow ? OperationEvent.Command.common.apply.domId : '';
}, },
title() { title() {
return this.isCbtc ? '确认/取消CBTC模式' : '确认/取消后备模式'; return this.isCbtc ? '确认/取消CBTC模式' : '确认/取消后备模式';
} }
@ -103,55 +103,50 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
handleCurrentChange(val) { handleCurrentChange(val) {
if (!val) { return; } if (!val) { return; }
const step = { const step = {
code: val.code, code: val.code,
operation: OperationEvent.Command.common.choose.operation, operation: OperationEvent.Command.common.choose.operation,
val: val.code val: val.code
}; };
this.$store.dispatch('training/nextNew', step).then(({ valid }) => { this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$store.dispatch('menuOperation/setSelected', {device: val}); this.$store.dispatch('menuOperation/setSelected', {device: val});
this.$refs.table.setCurrentRow(this.selected); this.$refs.table.setCurrentRow(this.selected);
} }
}).catch(() => { }).catch(() => {
this.$refs.noticeInfo.doShow(); this.$refs.noticeInfo.doShow();
}); });
}, },
doShow(operate) { doShow(operate) {
this.operate = operate; this.operate = operate;
// //
this.dialogShow = true; this.dialogShow = true;
this.$nextTick(function () { this.$nextTick(function () {
this.$refs.table.setCurrentRow(); this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
}); });
}, },
doClose() { doClose() {
this.loading = false; this.loading = false;
this.dialogShow = false; this.dialogShow = false;
this.$refs.table.setCurrentRow(); this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
}, },
commit(isClose = false) { commit(isClose = false) {
const step = { const step = {
cmdType: this.isCbtc ? CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING : CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING, cmdType: this.isCbtc ? CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING : CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING,
operation: isClose ? OperationEvent.Command.common.confirm.operation: OperationEvent.Command.common.apply.operation, operation: isClose ? OperationEvent.Command.common.confirm.operation : OperationEvent.Command.common.apply.operation,
over: true, over: true,
param: { signalCode: this.selected.code } param: { signalCode: this.selected.code }
}; };
this.$store.dispatch('training/nextNew', step).then(({ valid }) => { this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
isClose && this.doClose(); isClose && this.doClose();
} }
}).catch(() => { }).catch(() => {

View File

@ -115,11 +115,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
handleCurrentChange(val) { handleCurrentChange(val) {
if (!val) { return; } if (!val) { return; }

View File

@ -108,11 +108,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
// //

View File

@ -64,17 +64,17 @@ export default {
]), ]),
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
domIdChoose() { domIdChoose() {
return this.dialogShow ? OperationEvent.Command.common.choose.domId : '' return this.dialogShow ? OperationEvent.Command.common.choose.domId : '';
}, },
domIdConfirm() { domIdConfirm() {
return this.dialogShow ? OperationEvent.Command.common.confirm.domId : ''; return this.dialogShow ? OperationEvent.Command.common.confirm.domId : '';
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close.domId : ''; return this.dialogShow ? OperationEvent.Command.common.close.domId : '';
}, },
title() { title() {
@ -88,11 +88,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
// //
@ -125,8 +120,8 @@ export default {
}, },
cancel() { cancel() {
const operate = { const operate = {
over: true, over: true,
cmdType: CMD.Stand.CMD_STAND_VIEW_STATUS, cmdType: CMD.Stand.CMD_STAND_VIEW_STATUS,
operation: OperationEvent.Command.common.close.operation operation: OperationEvent.Command.common.close.operation
}; };
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => { this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {

View File

@ -5,11 +5,11 @@
<el-tabs v-model="activeName" type="border-card"> <el-tabs v-model="activeName" type="border-card">
<el-tab-pane label="站台" name="first"> <el-tab-pane label="站台" name="first">
<el-table <el-table
:id="domIdChoose"
ref="table" ref="table"
:data="stationStandList" :data="stationStandList"
highlight-current-row highlight-current-row
height="280px" height="280px"
:id="domIdChoose"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
> >
<el-table-column prop="name" label="站台" /> <el-table-column prop="name" label="站台" />
@ -85,25 +85,25 @@ export default {
computed: { computed: {
...mapGetters('map', [ ...mapGetters('map', [
'stationStandList' 'stationStandList'
]), ]),
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
domIdChoose() { domIdChoose() {
return this.dialogShow ? OperationEvent.Command.common.choose.domId : '' return this.dialogShow ? OperationEvent.Command.common.choose.domId : '';
}, },
domIdConfirm() { domIdConfirm() {
return this.dialogShow ? OperationEvent.Command.common.confirm.domId : ''; return this.dialogShow ? OperationEvent.Command.common.confirm.domId : '';
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close.domId : ''; return this.dialogShow ? OperationEvent.Command.common.close.domId : '';
}, },
domIdApply() { domIdApply() {
return this.dialogShow ? OperationEvent.Command.common.apply.domId : ''; return this.dialogShow ? OperationEvent.Command.common.apply.domId : '';
}, },
title() { title() {
return '扣车'; return '扣车';
} }
@ -125,11 +125,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
expandPath() { expandPath() {
console.log('展开进路预览'); console.log('展开进路预览');
@ -142,7 +137,7 @@ export default {
// //
this.dialogShow = true; this.dialogShow = true;
this.$nextTick(function () { this.$nextTick(function () {
this.$refs.table.setCurrentRow(); this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
}); });
}, },
@ -153,40 +148,40 @@ export default {
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
}, },
commit(isClose = false) { commit(isClose = false) {
const step = { const step = {
over: true, over: true,
cmdType:this.status ? CMD.Stand.CMD_STAND_SET_HOLD_TRAIN : CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN, cmdType:this.status ? CMD.Stand.CMD_STAND_SET_HOLD_TRAIN : CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN,
operation: isClose? OperationEvent.Command.common.confirm.operation: OperationEvent.Command.common.apply.operation, operation: isClose ? OperationEvent.Command.common.confirm.operation : OperationEvent.Command.common.apply.operation,
param: {standCode: this.selected.code} param: {standCode: this.selected.code}
}; };
this.$store.dispatch('training/nextNew', step).then(({ valid }) => { this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
isClose && this.doClose(); isClose && this.doClose();
} }
}).catch((error) => { }).catch((error) => {
console.log(error); console.log(error);
isClose && this.doClose(); isClose && this.doClose();
this.$refs.noticeInfo.doShow(); this.$refs.noticeInfo.doShow();
}); });
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
if (!val) { return; } if (!val) { return; }
const step = { const step = {
code: val.code, code: val.code,
operation: OperationEvent.Command.common.choose.operation, operation: OperationEvent.Command.common.choose.operation,
val: val.code val: val.code
}; };
this.$store.dispatch('menuOperation/setSelected', {device: val}); this.$store.dispatch('menuOperation/setSelected', {device: val});
this.$store.dispatch('training/nextNew', step).then(({ valid }) => { this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
} }
}).catch(() => { }).catch(() => {
this.$refs.noticeInfo.doShow(); this.$refs.noticeInfo.doShow();
}); });
}, },
getDetainStatus(code) { getDetainStatus(code) {
const stand = this.$store.getters['map/getDeviceByCode'](code); const stand = this.$store.getters['map/getDeviceByCode'](code);

View File

@ -13,7 +13,7 @@
> >
<el-row style="margin-bottom: 20px"> <el-row style="margin-bottom: 20px">
<el-col :span="18"> <el-col :span="18">
<el-table ref="table" :id="domIdChoose" :data="centralizedStaionList" style="width: 100%;" height="350px" highlight-current-row @current-change="handleCurrentChange"> <el-table :id="domIdChoose" ref="table" :data="centralizedStaionList" style="width: 100%;" height="350px" highlight-current-row @current-change="handleCurrentChange">
<el-table-column prop="name" label="控制区域" /> <el-table-column prop="name" label="控制区域" />
<el-table-column label="控制模式"> <el-table-column label="控制模式">
<template slot-scope="scope"> <template slot-scope="scope">
@ -96,47 +96,42 @@ export default {
}, },
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
domIdChoose() { domIdChoose() {
return this.dialogShow ? OperationEvent.Command.common.choose.domId : '' return this.dialogShow ? OperationEvent.Command.common.choose.domId : '';
}, },
domIdConfirm() { domIdConfirm() {
return this.dialogShow ? OperationEvent.Command.common.confirm.domId : ''; return this.dialogShow ? OperationEvent.Command.common.confirm.domId : '';
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close.domId : ''; return this.dialogShow ? OperationEvent.Command.common.close.domId : '';
}, },
domIdApply() { domIdApply() {
return this.dialogShow ? OperationEvent.Command.common.apply.domId : ''; return this.dialogShow ? OperationEvent.Command.common.apply.domId : '';
}, },
prdType() { prdType() {
return this.$store.state.training.prdType; return this.$store.state.training.prdType;
}, },
concertrateStationList() { concertrateStationList() {
return this.stationList.filter(station=>{ return this.stationList.filter(station=>{
return station.centralized; return station.centralized;
}); });
} }
}, },
watch: { watch: {
'selected': function(val) { 'selected': function(val) {
if (val) { if (val) {
const sationEle = this.$store.getters['map/getDeviceByCode'](val.code); const sationEle = this.$store.getters['map/getDeviceByCode'](val.code);
if (this.prdType == '02'){ if (this.prdType == '02') {
this.status = sationEle && sationEle.controlMode != 'Center' this.status = sationEle && sationEle.controlMode != 'Center';
} else { } else {
this.status = sationEle && sationEle.controlMode == 'Center' this.status = sationEle && sationEle.controlMode == 'Center';
} }
} }
} }
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
}, },
methods: { methods: {
doShow() { doShow() {
@ -164,43 +159,43 @@ export default {
handleCurrentChange(val) { handleCurrentChange(val) {
if (!val) { return; } if (!val) { return; }
const step = { const step = {
code: val.code, code: val.code,
operation: OperationEvent.Command.common.choose.operation, operation: OperationEvent.Command.common.choose.operation,
val: val.code val: val.code
}; };
this.$store.dispatch('training/nextNew', step).then(({ valid }) => { this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) { if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true }); this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$store.dispatch('menuOperation/setSelected', {device: val}); this.$store.dispatch('menuOperation/setSelected', {device: val});
} }
}).catch(() => { }).catch(() => {
this.$refs.noticeInfo.doShow(); this.$refs.noticeInfo.doShow();
}); });
}, },
commit(isClose=true) { commit(isClose = true) {
const val = this.selected||{}; const val = this.selected || {};
const steps = { const steps = {
operation: isClose ? OperationEvent.Command.common.confirm.operation: OperationEvent.Command.common.apply.operation, operation: isClose ? OperationEvent.Command.common.confirm.operation : OperationEvent.Command.common.apply.operation,
over: true, over: true,
param: {stationCodes:[val.code]} param: {stationCodes:[val.code]}
}; };
if (this.prdType == '02'){ if (this.prdType == '02') {
steps.cmdType = this.status ? CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL : CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL; steps.cmdType = this.status ? CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL : CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL;
} else { } else {
steps.cmdType = this.status ? CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL : CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL; steps.cmdType = this.status ? CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL : CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL;
} }
this.$store.dispatch('training/nextNew', steps).then(({ valid }) => { this.$store.dispatch('training/nextNew', steps).then(({ valid }) => {
if (valid) { if (valid) {
isClose && this.doClose(); isClose && this.doClose();
this.$emit('commandSuccess', val.code); this.$emit('commandSuccess', val.code);
} }
}).catch(() => { }).catch(() => {
isClose && this.doClose(); isClose && this.doClose();
this.$refs.noticeInfo.doShow(); this.$refs.noticeInfo.doShow();
}); });
} }
} }
}; };

View File

@ -71,22 +71,22 @@ export default {
]), ]),
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
domIdChoose() { domIdChoose() {
return this.dialogShow ? OperationEvent.Command.common.choose.domId : '' return this.dialogShow ? OperationEvent.Command.common.choose.domId : '';
}, },
domIdConfirm() { domIdConfirm() {
return this.dialogShow ? OperationEvent.Command.common.confirm.domId : ''; return this.dialogShow ? OperationEvent.Command.common.confirm.domId : '';
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close.domId : ''; return this.dialogShow ? OperationEvent.Command.common.close.domId : '';
}, },
domIdApply() { domIdApply() {
return this.dialogShow ? OperationEvent.Command.common.apply.domId : ''; return this.dialogShow ? OperationEvent.Command.common.apply.domId : '';
}, },
title() { title() {
return '请求或允许动岔激活/取消激活'; return '请求或允许动岔激活/取消激活';
} }
@ -108,17 +108,12 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
// //
this.dialogShow = true; this.dialogShow = true;
this.$nextTick(function () { this.$nextTick(function () {
this.$refs.table.setCurrentRow(); this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
}); });
}, },
@ -128,13 +123,13 @@ export default {
this.$refs.table.setCurrentRow(); this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
}, },
commit(isClose=false) { commit(isClose = false) {
const step = { const step = {
over: true, over: true,
cmdType: this.status ? CMD.Switch.CMD_SWITCH_ACTIVE : CMD.Switch.CMD_SWITCH_CUT_OFF, cmdType: this.status ? CMD.Switch.CMD_SWITCH_ACTIVE : CMD.Switch.CMD_SWITCH_CUT_OFF,
operation: isClose ? OperationEvent.Command.common.confirm.operation: OperationEvent.Command.common.apply.operation, operation: isClose ? OperationEvent.Command.common.confirm.operation: OperationEvent.Command.common.apply.operation,
param: { switchCode: this.selected.code} param: { switchCode: this.selected.code}
}; };
this.$store.dispatch('training/nextNew', step).then(({ valid }) => { this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) { if (valid) {
@ -142,7 +137,7 @@ export default {
isClose && this.doClose(); isClose && this.doClose();
} }
}).catch(() => { }).catch(() => {
isClose && this.doClose(); isClose && this.doClose();
this.$refs.noticeInfo.doShow(); this.$refs.noticeInfo.doShow();
}); });
}, },

View File

@ -3,11 +3,11 @@
<el-row> <el-row>
<el-col :span="18"> <el-col :span="18">
<el-table <el-table
:id="domIdChoose"
ref="table" ref="table"
:data="switchList" :data="switchList"
highlight-current-row highlight-current-row
height="350px" height="350px"
:id="domIdChoose"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
> >
<el-table-column prop="name" width="80" label="道岔" /> <el-table-column prop="name" width="80" label="道岔" />
@ -82,25 +82,25 @@ export default {
]), ]),
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
isBlock() { isBlock() {
return this.operate && this.operate.operation === OperationEvent.Command.commandNingBo3.line_switch_block.operation; return this.operate && this.operate.operation === OperationEvent.Command.commandNingBo3.line_switch_block.operation;
}, },
domIdChoose() { domIdChoose() {
return this.dialogShow ? OperationEvent.Command.common.choose.domId : '' return this.dialogShow ? OperationEvent.Command.common.choose.domId : '';
}, },
domIdConfirm() { domIdConfirm() {
return this.dialogShow ? OperationEvent.Command.common.confirm.domId : ''; return this.dialogShow ? OperationEvent.Command.common.confirm.domId : '';
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close.domId : ''; return this.dialogShow ? OperationEvent.Command.common.close.domId : '';
}, },
domIdApply() { domIdApply() {
return this.dialogShow ? OperationEvent.Command.common.apply.domId : ''; return this.dialogShow ? OperationEvent.Command.common.apply.domId : '';
} }
}, },
watch: { watch: {
'$store.state.map.keyboardEnterCount': function (val) { '$store.state.map.keyboardEnterCount': function (val) {
@ -109,11 +109,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
// //
@ -121,14 +116,14 @@ export default {
this.title = this.isBlock ? '确认/取消道岔封锁' : '确认/取消道岔解除封锁'; this.title = this.isBlock ? '确认/取消道岔封锁' : '确认/取消道岔解除封锁';
this.dialogShow = true; this.dialogShow = true;
this.$nextTick(function () { this.$nextTick(function () {
this.$refs.table.setCurrentRow(); this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
}); });
}, },
doClose() { doClose() {
this.loading = false; this.loading = false;
this.dialogShow = false; this.dialogShow = false;
this.$refs.table.setCurrentRow(); this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
}, },
getSwitchStatus(code) { getSwitchStatus(code) {
@ -139,11 +134,11 @@ export default {
return '未锁闭的'; return '未锁闭的';
} }
}, },
commit(isClose=false) { commit(isClose = false) {
if (this.command) { if (this.command) {
const operate = { const operate = {
cmdType: this.isBlock ? CMD.Switch.CMD_SWITCH_BLOCK : CMD.Switch.CMD_SWITCH_UNBLOCK, cmdType: this.isBlock ? CMD.Switch.CMD_SWITCH_BLOCK : CMD.Switch.CMD_SWITCH_UNBLOCK,
operation: isClose ? OperationEvent.Command.common.confirm.operation: OperationEvent.Command.common.apply.operation, operation: isClose ? OperationEvent.Command.common.confirm.operation : OperationEvent.Command.common.apply.operation,
over: true, over: true,
param: { switchCode: this.selected.code } param: { switchCode: this.selected.code }
}; };
@ -153,7 +148,7 @@ export default {
this.$emit('commandSuccess', this.selected.code); this.$emit('commandSuccess', this.selected.code);
} }
}).catch(() => { }).catch(() => {
isClose && this.doClose(); isClose && this.doClose();
this.$refs.noticeInfo.doShow(); this.$refs.noticeInfo.doShow();
}); });
} else { } else {
@ -161,9 +156,9 @@ export default {
} }
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
if (!val) { return; } if (!val) { return; }
const step = { const step = {
code: val.code, code: val.code,
operation: OperationEvent.Command.common.choose.operation, operation: OperationEvent.Command.common.choose.operation,
val: val.code val: val.code
}; };
@ -174,7 +169,7 @@ export default {
} }
}).catch(() => { }).catch(() => {
this.$refs.noticeInfo.doShow(); this.$refs.noticeInfo.doShow();
}); });
}, },
getProcess(code, type) { getProcess(code, type) {
if (this.selected && this.selected.code === code && ((type === 'block' && this.isBlock) || (type === 'unblock' && !this.isBlock))) { if (this.selected && this.selected.code === code && ((type === 'block' && this.isBlock) || (type === 'unblock' && !this.isBlock))) {

View File

@ -92,10 +92,10 @@ export default {
]), ]),
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
}, },
@ -116,17 +116,12 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
// //
this.dialogShow = true; this.dialogShow = true;
this.$nextTick(function () { this.$nextTick(function () {
this.$refs.table.setCurrentRow(); this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh'); this.$store.dispatch('training/emitTipFresh');
}); });
}, },
@ -165,8 +160,8 @@ export default {
this.position = 'reverse'; this.position = 'reverse';
} else if (switchEle.reversePosition) { } else if (switchEle.reversePosition) {
this.position = 'normal'; this.position = 'normal';
} }
this.$store.dispatch('menuOperation/setSelected', {device: val}); this.$store.dispatch('menuOperation/setSelected', {device: val});
} }
}); });
}, },

View File

@ -64,14 +64,14 @@ export default {
]), ]),
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
domIdConfirm() { domIdConfirm() {
return this.dialogShow ? OperationEvent.Command.common.confirm.domId : ''; return this.dialogShow ? OperationEvent.Command.common.confirm.domId : '';
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close.domId : ''; return this.dialogShow ? OperationEvent.Command.common.close.domId : '';
}, },
title() { title() {
@ -85,11 +85,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
this.operate = operate; this.operate = operate;

View File

@ -123,10 +123,10 @@ export default {
]), ]),
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
}, },
@ -147,11 +147,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
this.operate = operate; this.operate = operate;

View File

@ -55,10 +55,10 @@ export default {
]), ]),
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
isDepart() { isDepart() {
return this.operate.operation === OperationEvent.Train.setTrainDeparture.menu.operation; return this.operate.operation === OperationEvent.Train.setTrainDeparture.menu.operation;
}, },
@ -73,8 +73,8 @@ export default {
}, },
domIdConfirm() { domIdConfirm() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : ''; return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
}, },
title() { title() {
@ -96,11 +96,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
this.operate = operate; this.operate = operate;

View File

@ -217,10 +217,10 @@ export default {
]), ]),
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
}, },
@ -241,11 +241,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
this.operate = operate; this.operate = operate;

View File

@ -102,10 +102,10 @@ export default {
]), ]),
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
}, },
@ -126,11 +126,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
expandPath() { expandPath() {
console.log('展开进路预览'); console.log('展开进路预览');

View File

@ -70,10 +70,10 @@ export default {
]), ]),
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
}, },
@ -94,11 +94,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
this.operate = operate; this.operate = operate;

View File

@ -84,10 +84,10 @@ export default {
]), ]),
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
}, },
@ -108,11 +108,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
this.operate = operate; this.operate = operate;

View File

@ -75,10 +75,10 @@ export default {
]), ]),
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
}, },
@ -99,11 +99,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
// //

View File

@ -85,10 +85,10 @@ export default {
]), ]),
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
}, },
@ -99,11 +99,6 @@ export default {
return '平移计划车'; return '平移计划车';
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
this.operate = operate || {}; this.operate = operate || {};

View File

@ -66,10 +66,10 @@ export default {
]), ]),
show() { show() {
return this.dialogShow && !this.$store.state.menuOperation.break; return this.dialogShow && !this.$store.state.menuOperation.break;
}, },
selected() { selected() {
return this.$store.state.menuOperation.selected; return this.$store.state.menuOperation.selected;
}, },
domIdClose() { domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : ''; return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
}, },
@ -90,11 +90,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
this.operate = operate; this.operate = operate;

View File

@ -140,11 +140,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
this.operate = operate || {}; this.operate = operate || {};

View File

@ -59,11 +59,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
this.operate = operate || {}; this.operate = operate || {};

View File

@ -195,11 +195,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
stopTask() { stopTask() {
if (this.task) { if (this.task) {

View File

@ -73,11 +73,6 @@ export default {
return ''; return '';
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
if (!this.dialogShow) { if (!this.dialogShow) {

View File

@ -53,11 +53,6 @@ export default {
return this.dialogShow ? OperationEvent.Signal.unlock.confirm.domId : ''; return this.dialogShow ? OperationEvent.Signal.unlock.confirm.domId : '';
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate, selected) { doShow(operate, selected) {
this.stationName = ''; this.stationName = '';

View File

@ -97,11 +97,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
expandPath() { expandPath() {
console.log('展开进路预览'); console.log('展开进路预览');

View File

@ -77,11 +77,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate, selected, message) { doShow(operate, selected, message) {
this.selected = selected; this.selected = selected;

View File

@ -90,11 +90,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
if (!this.dialogShow) { if (!this.dialogShow) {

View File

@ -99,11 +99,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate, selected) { doShow(operate, selected) {
this.selected = selected; this.selected = selected;

View File

@ -111,11 +111,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
getStationList(disable) { getStationList(disable) {
this.stationLists = []; this.stationLists = [];

View File

@ -87,11 +87,6 @@ export default {
return '设置车体号'; return '设置车体号';
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate, selected) { doShow(operate, selected) {
this.selected = selected; this.selected = selected;

View File

@ -81,11 +81,6 @@ export default {
return '删除车组号'; return '删除车组号';
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
loadInitData(map) { loadInitData(map) {
if (map) { if (map) {

View File

@ -87,11 +87,6 @@ export default {
return '移动车组号'; return '移动车组号';
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate, selected) { doShow(operate, selected) {
this.selected = selected; this.selected = selected;

View File

@ -99,11 +99,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate, selected) { doShow(operate, selected) {
this.selected = selected; this.selected = selected;

View File

@ -109,11 +109,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate, selected) { doShow(operate, selected) {
this.selected = selected; this.selected = selected;

View File

@ -75,11 +75,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate, selected) { doShow(operate, selected) {
this.selected = selected; this.selected = selected;

View File

@ -82,11 +82,6 @@ export default {
return 'ATP切除功能'; return 'ATP切除功能';
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate, selected) { doShow(operate, selected) {
this.selected = selected; this.selected = selected;

View File

@ -98,11 +98,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate, selected) { doShow(operate, selected) {
this.selected = selected; this.selected = selected;

View File

@ -80,11 +80,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate, message) { doShow(operate, message) {
this.operate = operate || {}; this.operate = operate || {};

View File

@ -93,11 +93,6 @@ export default {
return '增加用户'; return '增加用户';
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
// //

View File

@ -67,11 +67,6 @@ export default {
return '删除用户'; return '删除用户';
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate, selected) { doShow(operate, selected) {
// //

View File

@ -101,11 +101,6 @@ export default {
return '用户编辑页面'; return '用户编辑页面';
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate, selected) { doShow(operate, selected) {
// //

View File

@ -99,11 +99,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
if (!this.dialogShow) { if (!this.dialogShow) {

View File

@ -95,11 +95,6 @@ export default {
} }
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
if (!this.dialogShow) { if (!this.dialogShow) {

View File

@ -73,11 +73,6 @@ export default {
return '关于ControlMonitor'; return '关于ControlMonitor';
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
// //

View File

@ -121,11 +121,6 @@ export default {
return '用户管理'; return '用户管理';
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
// //

View File

@ -126,11 +126,6 @@ export default {
}); });
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
this.message = ''; this.message = '';

View File

@ -96,11 +96,6 @@ export default {
return '添加计划车'; return '添加计划车';
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
this.operate = operate || {}; this.operate = operate || {};

View File

@ -79,11 +79,6 @@ export default {
return '删除计划车'; return '删除计划车';
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
this.operate = operate || {}; this.operate = operate || {};

View File

@ -96,11 +96,6 @@ export default {
return '平移计划车'; return '平移计划车';
} }
}, },
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: { methods: {
doShow(operate) { doShow(operate) {
this.operate = operate || {}; this.operate = operate || {};

Some files were not shown because too many files have changed in this diff Show More