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

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

Browse Source
This commit is contained in:
lVAL 2021-02-02 19:00:15 +08:00
commit b7b90fe707
171 changed files with 690 additions and 1369 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/jmapNew/shape/StationTurnBack/index.js
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() {
const showMode = this.model.showMode;
const showConditions = (this.style.StationTurnBack || {}).displayCondition;

11
src/jmapNew/theme/ningbo_01/menus/dialog/stationControl.vue
View File

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

22
src/jmapNew/theme/ningbo_01/menus/menuStationControl.vue
View File

@ -33,6 +33,11 @@ export default {
menu: [],
menuNormal: {
Local: [
{
label: '紧急站控',
handler: this.setEmergencyControl,
cmdType: CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL
},
{
label: '请求站控',
handler: this.setStationControl,
@ -45,6 +50,11 @@ export default {
}
],
Center: [
{
label: '紧急站控',
handler: this.setEmergencyControl,
cmdType: CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL
},
{
label: '请求站控',
handler: this.setStationControl,
@ -112,7 +122,7 @@ export default {
},
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) {
this.$refs.stationControl.doShow(operate, this.selected);
}
@ -120,7 +130,15 @@ export default {
},
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) {
this.$refs.stationControl.doShow(operate, this.selected);
}

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

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

5
src/jmapNew/theme/ningbo_03/menus/dialog/alxeEffective.vue
View File

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

5
src/jmapNew/theme/ningbo_03/menus/dialog/childDialog/confirmControl.vue
View File

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

5
src/jmapNew/theme/ningbo_03/menus/dialog/childDialog/confirmSignalUnlock.vue
View File

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

5
src/jmapNew/theme/ningbo_03/menus/dialog/routeSelection.vue
View File

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

5
src/jmapNew/theme/ningbo_03/menus/dialog/routerCommand.vue
View File

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

5
src/jmapNew/theme/ningbo_03/menus/dialog/sectionAlxeReset.vue
View File

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

5
src/jmapNew/theme/ningbo_03/menus/dialog/standBulkBuckleTrain.vue
View File

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

5
src/jmapNew/theme/ningbo_03/menus/dialog/stationBackStrategy.vue
View File

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

5
src/jmapNew/theme/ningbo_03/menus/dialog/stationControl.vue
View File

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

5
src/jmapNew/theme/ningbo_03/menus/dialog/trainDefine.vue
View File

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

5
src/jmapNew/theme/ningbo_03/menus/dialog/trainDelete.vue
View File

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

5
src/jmapNew/theme/ningbo_03/menus/dialog/trainMove.vue
View File

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

5
src/jmapNew/theme/ningbo_03/menus/dialog/trainSetHead.vue
View File

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

5
src/jmapNew/theme/ningbo_03/menus/dialog/trainSetPlan.vue
View File

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

5
src/jmapNew/theme/ningbo_03/menus/dialog/trainSetWork.vue
View File

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

5
src/jmapNew/theme/ningbo_03/menus/dialog/trainSetWorkATP.vue
View File

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

5
src/jmapNew/theme/ningbo_03/menus/dialog/turnBackControl.vue
View File

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

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

@ -87,10 +87,10 @@ export default {
]),
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
@ -111,26 +111,21 @@ export default {
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;
this.$nextTick(function () {
this.$refs.table.setCurrentRow();
this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh');
});
},
doClose() {
this.loading = false;
this.dialogShow = false;
this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh');
this.dialogShow = false;
this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh');
},
commit() {
},

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

@ -81,10 +81,10 @@ export default {
]),
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
@ -105,25 +105,20 @@ export default {
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;
this.$nextTick(function () {
this.$refs.table.setCurrentRow();
this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh');
});
},
doClose() {
this.loading = false;
this.dialogShow = false;
this.$refs.table.setCurrentRow();
this.dialogShow = false;
this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh');
},
commit() {

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

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

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

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

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

@ -55,10 +55,10 @@ export default {
]),
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
@ -79,25 +79,20 @@ export default {
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;
this.$nextTick(function () {
this.$refs.table.setCurrentRow();
this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh');
});
},
doClose() {
this.loading = false;
this.dialogShow = false;
this.$refs.table.setCurrentRow()
this.dialogShow = false;
this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh');
},
commit() {

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

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

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

@ -93,11 +93,6 @@ export default {
return '增加用户';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
// 非断电激活时设置初始值

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

@ -67,11 +67,6 @@ export default {
return '删除用户';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate, selected) {
// 非断电激活时设置初始值

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

@ -101,11 +101,6 @@ export default {
return '用户编辑页面';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate, selected) {
// 非断电激活时设置初始值

57
src/jmapNew/theme/ningbo_03/menus/menuDialog/initSectionLimitSpeed.vue
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-row>
<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="blockStatus" width="120" label="MAU">
<template slot-scope="scope">
@ -30,7 +30,7 @@
</el-table>
</el-col>
<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>
</el-col>
@ -96,7 +96,7 @@ export default {
{ name: '75', value: 75 },
{ name: '80', value: 80 }
],
initEle: null,
initEle: null,
commandEleCode:null,
speedLimitValue: 0
};
@ -107,23 +107,23 @@ export default {
]),
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Command.common.choose.domId : ''
},
domIdChoose1() {
return this.dialogShow ? OperationEvent.Command.common.choose1.domId : ''
},
return this.dialogShow ? OperationEvent.Command.common.choose.domId : '';
},
domIdChoose1() {
return this.dialogShow ? OperationEvent.Command.common.choose1.domId : '';
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Command.common.confirm.domId : '';
},
domIdApply() {
},
domIdApply() {
return this.dialogShow ? OperationEvent.Command.common.apply.domId : '';
},
domIdClose() {
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close.domId : '';
},
title() {
@ -137,15 +137,10 @@ export default {
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
this.tempData = [];
this.operate = operate;
this.tempData = [];
this.operate = operate;
this.sectionList.forEach(item => {
if (item.type === '01' || item.type === '04') {
this.tempData.push(item);
@ -156,8 +151,8 @@ export default {
this.speedLimitValue = 0;
this.dialogShow = true;
this.$nextTick(function () {
this.$refs.table1.setCurrentRow(null);
this.$refs.table2.setCurrentRow(null);
this.$refs.table1.setCurrentRow(null);
this.$refs.table2.setCurrentRow(null);
this.$store.dispatch('training/emitTipFresh');
});
},
@ -180,9 +175,9 @@ export default {
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$store.dispatch('menuOperation/setSelected', {device: val});
this.$store.dispatch('menuOperation/setSelected', {device: val});
const sectionEle = this.$store.getters['map/getDeviceByCode'](val.code);
this.speedLimitValue = sectionEle.speedUpLimit;
this.speedLimitValue = sectionEle.speedUpLimit;
if (this.speedLimitValue > 0) {
this.$refs.table2.setCurrentRow(this.limitList[this.speedLimitValue / 5 - 1]);
} else {
@ -198,8 +193,8 @@ export default {
this.initEle = null;
this.commandEleCode = null;
const step = {
operation: OperationEvent.Command.common.choose1.operation,
val: val.value,
operation: OperationEvent.Command.common.choose1.operation,
val: val.value,
param: {speedLimitValue: val.value}
};
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
@ -240,8 +235,8 @@ export default {
},
commit(isClose = true) {
const step = {
operation: isClose ? OperationEvent.Command.common.confirm.operation: OperationEvent.Command.common.apply.operation,
param: { sectionCode: this.selected.code }
operation: isClose ? OperationEvent.Command.common.confirm.operation : OperationEvent.Command.common.apply.operation,
param: { sectionCode: this.selected.code }
};
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {

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

@ -2,7 +2,7 @@
<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-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="blockStatus" label="MAU">
<template slot-scope="scope">
@ -79,20 +79,20 @@ export default {
},
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Command.common.choose.domId : ''
return this.dialogShow ? OperationEvent.Command.common.choose.domId : '';
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Command.common.confirm.domId : '';
},
domIdApply() {
},
domIdApply() {
return this.dialogShow ? OperationEvent.Command.common.apply.domId : '';
},
domIdClose() {
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close.domId : '';
},
title() {
@ -106,14 +106,9 @@ export default {
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
this.tempData = [];
this.tempData = [];
this.sectionList.forEach(item => {
if (item.type === '01' || item.type === '04') {
this.tempData.push(item);
@ -125,7 +120,7 @@ export default {
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;
this.$nextTick(function () {
this.$refs.table.setCurrentRow();
this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh');
});
},
@ -143,7 +138,7 @@ export default {
this.initEle = null;
this.commandEleCode = null;
const step = {
code: val.code,
code: val.code,
operation: OperationEvent.Command.common.choose.operation,
val: val.code
};
@ -180,9 +175,9 @@ export default {
},
commit(isClose = true) {
const step = {
isBlock: this.isBlock,
operation: isClose ? OperationEvent.Command.common.confirm.operation: OperationEvent.Command.common.apply.operation,
param: { sectionCode: this.selected.code }
isBlock: this.isBlock,
operation: isClose ? OperationEvent.Command.common.confirm.operation : OperationEvent.Command.common.apply.operation,
param: { sectionCode: this.selected.code }
};
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {

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

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

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

@ -1,7 +1,7 @@
<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-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="mode" label="信号模式" />
<el-table-column v-if="isCbtc" prop="status" label="CBTC可命令" />
@ -55,10 +55,10 @@ export default {
]),
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
},
selected() {
return this.$store.state.menuOperation.selected;
},
isCbtc() {
return this.operate.operation === OperationEvent.Command.mBar.cbtcMode.operation;
},
@ -82,25 +82,20 @@ export default {
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;
this.dialogShow = true;
this.$nextTick(function () {
this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh');
this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh');
});
},
doClose() {
this.loading = false;
this.dialogShow = false;
this.$refs.table.setCurrentRow();
this.dialogShow = false;
this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh');
},
commit(isClose = false) {

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

@ -1,46 +1,46 @@
<template>
<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-row>
<el-table
ref="table"
:data="signalList"
highlight-current-row
height="300px"
@current-change="handleCurrentChange"
>
<el-table-column prop="name" label="信号机" />
<el-table-column prop="blockStatus" label="允许锁闭">
<template slot-scope="scope">
<span>{{ getSignalBlock(scope.row.code) }}</span>
</template>
</el-table-column>
<el-table-column prop="blockProcess" label="同意取消">否</el-table-column>
<el-table-column prop="unblockProcess" label="取消进程">
<template slot-scope="scope">
<span>{{ getProcess(scope.row.code) }}</span>
</template>
</el-table-column>
</el-table>
</el-row>
<el-row justify="center" class="button-group">
<el-col :span="4" :offset="1">
<el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!selected" @click="commit(true)">确定(O)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!selected" @click="commit(false)">应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
</el-col>
</el-row>
<notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
</el-dialog>
<signal-can-block ref="signalCanBlock" @commandSuccess="commandSuccess" @cancelCommand="cancelCommand" />
</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-row>
<el-table
ref="table"
:data="signalList"
highlight-current-row
height="300px"
@current-change="handleCurrentChange"
>
<el-table-column prop="name" label="信号机" />
<el-table-column prop="blockStatus" label="允许锁闭">
<template slot-scope="scope">
<span>{{ getSignalBlock(scope.row.code) }}</span>
</template>
</el-table-column>
<el-table-column prop="blockProcess" label="同意取消">否</el-table-column>
<el-table-column prop="unblockProcess" label="取消进程">
<template slot-scope="scope">
<span>{{ getProcess(scope.row.code) }}</span>
</template>
</el-table-column>
</el-table>
</el-row>
<el-row justify="center" class="button-group">
<el-col :span="4" :offset="1">
<el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!selected" @click="commit(true)">确定(O)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!selected" @click="commit(false)">应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
</el-col>
</el-row>
<notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
</el-dialog>
<signal-can-block ref="signalCanBlock" @commandSuccess="commandSuccess" @cancelCommand="cancelCommand" />
</div>
</template>
<script>
@ -74,12 +74,12 @@ export default {
]),
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
isBlock() {
console.log(this.selected && this.selected.blockade, 2222222)
},
selected() {
return this.$store.state.menuOperation.selected;
},
isBlock() {
console.log(this.selected && this.selected.blockade, 2222222);
return this.selected && this.selected.blockade;
},
domIdClose() {
@ -102,11 +102,6 @@ export default {
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
this.initEle = null;
@ -115,7 +110,7 @@ export default {
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;
this.$nextTick(function () {
this.$refs.table.setCurrentRow();
this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh');
});
},
@ -127,7 +122,7 @@ export default {
},
commit(isClose = false) {
const step = {
needBlock: this.isBlock,
needBlock: this.isBlock,
code: `${this.selected.code}`,
operation: OperationEvent.Signal.lock.confirm.operation,
param: {}
@ -175,12 +170,12 @@ export default {
code: `${val.code}`,
operation: OperationEvent.Signal.lock.choose.operation,
param: {}
};
};
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$store.dispatch('menuOperation/setSelected', {device: val});
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$store.dispatch('menuOperation/setSelected', {device: val});
}
}).catch(() => {
this.$refs.noticeInfo.doShow();

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

@ -79,10 +79,10 @@ export default {
]),
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
@ -103,11 +103,6 @@ export default {
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
this.initEle = null;
@ -116,7 +111,7 @@ export default {
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;
this.$nextTick(function () {
this.$refs.table.setCurrentRow();
this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh');
});
},
@ -187,7 +182,7 @@ export default {
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$store.dispatch('menuOperation/setSelected', {device: val});
this.$store.dispatch('menuOperation/setSelected', {device: val});
}
}).catch(() => {
this.$refs.noticeInfo.doShow();

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

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

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

@ -95,11 +95,6 @@ export default {
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
// 如果不是断点激活，而是第一次显示，则需要设置初始值

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

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

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

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

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

@ -215,10 +215,10 @@ export default {
]),
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
},
selected() {
return this.$store.state.menuOperation.selected;
},
filterRouteList() {
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: {
doShow(operate) {
// 如果不是断点激活，而是第一次显示，则需要设置初始值
@ -355,8 +350,8 @@ export default {
};
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$store.dispatch('menuOperation/setSelected', {device: row});
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$store.dispatch('menuOperation/setSelected', {device: row});
}
}).catch(() => {
this.$refs.noticeInfo.doShow();
@ -412,7 +407,7 @@ export default {
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$store.dispatch('menuOperation/setSelected', {device: val});
this.$store.dispatch('menuOperation/setSelected', {device: val});
}
}).catch(() => {
this.$refs.noticeInfo.doShow();

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

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

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

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

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

@ -79,8 +79,8 @@ export default {
allChecked: false,
dialogShow: false,
loading: false,
active: false,
command: false,
active: false,
command: false,
activeName: 'first',
tempData: [],
operate: null,
@ -111,17 +111,17 @@ export default {
]),
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Command.common.confirm1.domId : '';
},
domIdApply() {
},
domIdApply() {
return this.dialogShow ? OperationEvent.Command.common.apply1.domId : '';
},
domIdClose() {
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close1.domId : '';
},
title() {
@ -135,11 +135,6 @@ export default {
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate, selected, value) {
this.tempData = [];
@ -147,11 +142,11 @@ export default {
if (item.type === '01' || item.type === '04') {
this.tempData.push(item);
}
});
this.command = true;
});
this.command = true;
this.$store.dispatch('menuOperation/setSelected', {device: selected});
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.operate = operate;
this.operate = operate;
this.speedLimitValue = value;
this.dialogShow = true;
this.$nextTick(function () {
@ -192,9 +187,9 @@ export default {
},
commit(isClose = true) {
const operate = {
// 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 ,
operation: isClose ? OperationEvent.Command.common.confirm1.operation: OperationEvent.Command.common.apply1.operation,
// 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,
operation: isClose ? OperationEvent.Command.common.confirm1.operation : OperationEvent.Command.common.apply1.operation,
over: true,
param: {sectionCode: this.selected.code, speedLimitValue:this.speedLimitValue}
};

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

@ -75,10 +75,10 @@ export default {
]),
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
@ -99,11 +99,6 @@ export default {
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
// 如果不是断点激活，而是第一次显示，则需要设置初始值

47
src/jmapNew/theme/ningbo_03/menus/menuDialog/sectionOpen.vue
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-row>
<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="blockStatus" label="MAU">
<template slot-scope="scope">
@ -84,20 +84,20 @@ export default {
},
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Command.common.choose1.domId : ''
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Command.common.choose1.domId : '';
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Command.common.confirm1.domId : '';
},
domIdApply() {
},
domIdApply() {
return this.dialogShow ? OperationEvent.Command.common.apply1.domId : '';
},
domIdClose() {
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close1.domId : '';
},
title() {
@ -111,11 +111,6 @@ export default {
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
this.tempData = [];
@ -137,21 +132,21 @@ export default {
this.$store.dispatch('training/emitTipFresh');
},
handleChangeLine(val) {
if (!val) { return; }
if (!val) { return; }
const step = {
code: val.code,
code: val.code,
operation: OperationEvent.Command.common.choose1.operation,
val: val.code
};
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$store.dispatch('menuOperation/setSelected', {device: val});
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$store.dispatch('menuOperation/setSelected', {device: val});
this.$refs.sectionable.setCurrentRow(this.selected);
}
}).catch(() => {
this.$refs.noticeInfo.doShow();
});
});
},
getProcess(code) {
if (this.selected && this.selected.code === code) {
@ -168,21 +163,21 @@ export default {
const sectionElm = this.$store.getters['map/getDeviceByCode'](code);
return sectionElm.blockade ? '关闭双向：所有列车' : '打开';
},
commit(isClose=true) {
commit(isClose = true) {
if (this.command) {
const operate = {
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,
over: true,
operation: isClose ? OperationEvent.Command.common.confirm1.operation : OperationEvent.Command.common.apply1.operation,
over: true,
param: {sectionCode: this.selected.code}
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
isClose && this.doClose();
this.$emit('commandSuccess', this.selected.code);
this.$emit('commandSuccess', this.selected.code);
}
}).catch(() => {
isClose && this.isClose();
isClose && this.isClose();
this.$refs.noticeInfo.doShow();
});
} else {

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

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

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

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

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

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

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

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

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

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

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

@ -3,11 +3,11 @@
<el-row>
<el-col :span="18">
<el-table
ref="table"
:data="signalList"
ref="table"
height="300px"
highlight-current-row
:domIdChoose="domIdChoose"
:dom-id-choose="domIdChoose"
@current-change="handleCurrentChange"
>
<el-table-column prop="name" label="ID" />
@ -73,25 +73,25 @@ export default {
]),
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
},
selected() {
return this.$store.state.menuOperation.selected;
},
isCbtc() {
return this.operate.operation === OperationEvent.Command.mBar.cbtcMode.operation;
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Command.common.choose.domId : ''
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Command.common.choose.domId : '';
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Command.common.confirm.domId : '';
},
domIdClose() {
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close.domId : '';
},
domIdApply() {
return this.dialogShow ? OperationEvent.Command.common.apply.domId : '';
},
},
title() {
return this.isCbtc ? '确认/取消CBTC模式' : '确认/取消后备模式';
}
@ -103,55 +103,50 @@ export default {
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
handleCurrentChange(val) {
if (!val) { return; }
if (!val) { return; }
const step = {
code: val.code,
code: val.code,
operation: OperationEvent.Command.common.choose.operation,
val: val.code
};
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$store.dispatch('menuOperation/setSelected', {device: val});
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$store.dispatch('menuOperation/setSelected', {device: val});
this.$refs.table.setCurrentRow(this.selected);
}
}).catch(() => {
this.$refs.noticeInfo.doShow();
});
});
},
doShow(operate) {
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;
this.$nextTick(function () {
this.$refs.table.setCurrentRow();
this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh');
});
},
doClose() {
this.loading = false;
this.dialogShow = false;
this.$refs.table.setCurrentRow();
this.dialogShow = false;
this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh');
},
commit(isClose = false) {
const step = {
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,
over: true,
param: { signalCode: this.selected.code }
};
const step = {
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,
over: true,
param: { signalCode: this.selected.code }
};
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
isClose && this.doClose();
}
}).catch(() => {

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

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

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

@ -108,11 +108,6 @@ export default {
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
// 如果不是断点激活，而是第一次显示，则需要设置初始值

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

@ -64,17 +64,17 @@ export default {
]),
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Command.common.choose.domId : ''
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Command.common.choose.domId : '';
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Command.common.confirm.domId : '';
},
domIdClose() {
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close.domId : '';
},
title() {
@ -88,11 +88,6 @@ export default {
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
// 如果不是断点激活，而是第一次显示，则需要设置初始值
@ -125,8 +120,8 @@ export default {
},
cancel() {
const operate = {
over: true,
cmdType: CMD.Stand.CMD_STAND_VIEW_STATUS,
over: true,
cmdType: CMD.Stand.CMD_STAND_VIEW_STATUS,
operation: OperationEvent.Command.common.close.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {

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

@ -5,11 +5,11 @@
<el-tabs v-model="activeName" type="border-card">
<el-tab-pane label="站台" name="first">
<el-table
:id="domIdChoose"
ref="table"
:data="stationStandList"
highlight-current-row
height="280px"
:id="domIdChoose"
@current-change="handleCurrentChange"
>
<el-table-column prop="name" label="站台" />
@ -85,25 +85,25 @@ export default {
computed: {
...mapGetters('map', [
'stationStandList'
]),
]),
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Command.common.choose.domId : ''
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Command.common.choose.domId : '';
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Command.common.confirm.domId : '';
},
domIdClose() {
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close.domId : '';
},
domIdApply() {
return this.dialogShow ? OperationEvent.Command.common.apply.domId : '';
},
},
title() {
return '扣车';
}
@ -125,11 +125,6 @@ export default {
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
expandPath() {
console.log('展开进路预览');
@ -142,7 +137,7 @@ export default {
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;
this.$nextTick(function () {
this.$refs.table.setCurrentRow();
this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh');
});
},
@ -153,40 +148,40 @@ export default {
this.$store.dispatch('training/emitTipFresh');
},
commit(isClose = false) {
const step = {
const step = {
over: true,
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}
};
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
isClose && this.doClose();
}
}).catch((error) => {
console.log(error);
isClose && this.doClose();
this.$refs.noticeInfo.doShow();
});
});
},
handleCurrentChange(val) {
if (!val) { return; }
if (!val) { return; }
const step = {
code: val.code,
code: val.code,
operation: OperationEvent.Command.common.choose.operation,
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 }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
}
}).catch(() => {
this.$refs.noticeInfo.doShow();
});
});
},
getDetainStatus(code) {
const stand = this.$store.getters['map/getDeviceByCode'](code);

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

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

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

@ -71,22 +71,22 @@ export default {
]),
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Command.common.choose.domId : ''
return this.dialogShow ? OperationEvent.Command.common.choose.domId : '';
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Command.common.confirm.domId : '';
},
domIdClose() {
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close.domId : '';
},
domIdApply() {
return this.dialogShow ? OperationEvent.Command.common.apply.domId : '';
},
},
title() {
return '请求或允许动岔激活/取消激活';
}
@ -108,17 +108,12 @@ export default {
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;
this.$nextTick(function () {
this.$refs.table.setCurrentRow();
this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh');
});
},
@ -128,13 +123,13 @@ export default {
this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh');
},
commit(isClose=false) {
commit(isClose = false) {
const step = {
over: true,
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,
param: { switchCode: this.selected.code}
};
};
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
@ -142,7 +137,7 @@ export default {
isClose && this.doClose();
}
}).catch(() => {
isClose && this.doClose();
isClose && this.doClose();
this.$refs.noticeInfo.doShow();
});
},

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

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

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

@ -92,10 +92,10 @@ export default {
]),
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
@ -116,17 +116,12 @@ export default {
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;
this.$nextTick(function () {
this.$refs.table.setCurrentRow();
this.$refs.table.setCurrentRow();
this.$store.dispatch('training/emitTipFresh');
});
},
@ -165,8 +160,8 @@ export default {
this.position = 'reverse';
} else if (switchEle.reversePosition) {
this.position = 'normal';
}
this.$store.dispatch('menuOperation/setSelected', {device: val});
}
this.$store.dispatch('menuOperation/setSelected', {device: val});
}
});
},

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -75,10 +75,10 @@ export default {
]),
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
selected() {
return this.$store.state.menuOperation.selected;
},
},
selected() {
return this.$store.state.menuOperation.selected;
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
@ -99,11 +99,6 @@ export default {
}
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
// 如果不是断点激活，而是第一次显示，则需要设置初始值

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

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

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

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

5
src/jmapNew/theme/ningbo_03/menus/passiveDialog/alarm.vue
View File

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

5
src/jmapNew/theme/ningbo_03/menus/passiveDialog/timeout.vue
View File

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

5
src/jmapNew/theme/race_01/menus/dialog/alxeEffective.vue
View File

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

5
src/jmapNew/theme/race_01/menus/dialog/childDialog/confirmControl.vue
View File

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

5
src/jmapNew/theme/race_01/menus/dialog/childDialog/confirmSignalUnlock.vue
View File

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

5
src/jmapNew/theme/race_01/menus/dialog/routeSelection.vue
View File

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

5
src/jmapNew/theme/race_01/menus/dialog/routerCommand.vue
View File

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

5
src/jmapNew/theme/race_01/menus/dialog/sectionAlxeReset.vue
View File

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

5
src/jmapNew/theme/race_01/menus/dialog/stationBackStrategy.vue
View File

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

5
src/jmapNew/theme/race_01/menus/dialog/stationControl.vue
View File

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

5
src/jmapNew/theme/race_01/menus/dialog/trainDefine.vue
View File

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

5
src/jmapNew/theme/race_01/menus/dialog/trainDelete.vue
View File

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

5
src/jmapNew/theme/race_01/menus/dialog/trainMove.vue
View File

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

5
src/jmapNew/theme/race_01/menus/dialog/trainSetHead.vue
View File

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

5
src/jmapNew/theme/race_01/menus/dialog/trainSetPlan.vue
View File

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

5
src/jmapNew/theme/race_01/menus/dialog/trainSetWork.vue
View File

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

5
src/jmapNew/theme/race_01/menus/dialog/trainSetWorkATP.vue
View File

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

5
src/jmapNew/theme/race_01/menus/dialog/turnBackControl.vue
View File

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

5
src/jmapNew/theme/race_01/menus/menuDialog/childDialog/twoConfirmation.vue
View File

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

5
src/jmapNew/theme/race_01/menus/menuDialog/childDialog/userAdd.vue
View File

@ -93,11 +93,6 @@ export default {
return '增加用户';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
// 非断电激活时设置初始值

5
src/jmapNew/theme/race_01/menus/menuDialog/childDialog/userDelete.vue
View File

@ -67,11 +67,6 @@ export default {
return '删除用户';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate, selected) {
// 非断电激活时设置初始值

5
src/jmapNew/theme/race_01/menus/menuDialog/childDialog/userEdit.vue
View File

@ -101,11 +101,6 @@ export default {
return '用户编辑页面';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate, selected) {
// 非断电激活时设置初始值

5
src/jmapNew/theme/race_01/menus/menuDialog/detainTrainContorl.vue
View File

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

5
src/jmapNew/theme/race_01/menus/menuDialog/detainTrainContorlUpDown.vue
View File

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

5
src/jmapNew/theme/race_01/menus/menuDialog/helpAbout.vue
View File

@ -73,11 +73,6 @@ export default {
return '关于ControlMonitor';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
// 非断电激活时设置初始值

5
src/jmapNew/theme/race_01/menus/menuDialog/manageUser.vue
View File

@ -121,11 +121,6 @@ export default {
return '用户管理';
}
},
mounted() {
this.$nextTick(() => {
this.$store.dispatch('training/tipReload');
});
},
methods: {
doShow(operate) {
// 非断电激活时设置初始值

5
src/jmapNew/theme/race_01/menus/menuDialog/stationControl.vue
View File

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

5
src/jmapNew/theme/race_01/menus/menuDialog/trainAdd.vue
View File

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

5
src/jmapNew/theme/race_01/menus/menuDialog/trainDelete.vue
View File

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

5
src/jmapNew/theme/race_01/menus/menuDialog/trainTranstalet.vue
View File

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

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