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:
fan 2021-01-28 17:47:56 +08:00
commit 3f70632b84
60 changed files with 656 additions and 429 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/jmapNew/theme/chengdu_03/operationConfig.js
View File

@ -26,6 +26,9 @@
// {id: "12", trainingType: "Stand", name: "站台行驶方向"}
// {id: "13", trainingType: "Stand", name: "站台行驶方向编号(反)"}
// {id: "14", trainingType: "Stand", name: "站台行驶方向(反)"}
// {id: "29", trainingType: "Stand", name: "站台名称"}
// {id: "30", trainingType: "Stand", name: "站台编码"}
// {id: "15", trainingType: "Switch", name: "道岔位置"}
// {id: "16", trainingType: "Switch", name: "道岔位置(反)"}

3
src/jmapNew/theme/foshan_01/operationConfig.js
View File

@ -16,6 +16,9 @@
// {id: "12", trainingType: "Stand", name: "站台行驶方向"}
// {id: "13", trainingType: "Stand", name: "站台行驶方向编号(反)"}
// {id: "14", trainingType: "Stand", name: "站台行驶方向(反)"}
// {id: "29", trainingType: "Stand", name: "站台名称"}
// {id: "30", trainingType: "Stand", name: "站台编码"}
// {id: "15", trainingType: "Switch", name: "道岔位置"}
// {id: "16", trainingType: "Switch", name: "道岔位置(反)"}

3
src/jmapNew/theme/fuzhou_01/operationConfig.js
View File

@ -17,6 +17,9 @@
// {id: "12", trainingType: "Stand", name: "站台行驶方向"}
// {id: "13", trainingType: "Stand", name: "站台行驶方向编号(反)"}
// {id: "14", trainingType: "Stand", name: "站台行驶方向(反)"}
// {id: "29", trainingType: "Stand", name: "站台名称"}
// {id: "30", trainingType: "Stand", name: "站台编码"}
// {id: "15", trainingType: "Switch", name: "道岔位置"}
// {id: "16", trainingType: "Switch", name: "道岔位置(反)"}

4
src/jmapNew/theme/haerbin_01/operationConfig.js
View File

@ -27,6 +27,10 @@
// {id: "12", trainingType: "05", name: "站台行驶方向"}
// {id: "13", trainingType: "05", name: "站台行驶方向编号(反)"}
// {id: "14", trainingType: "05", name: "站台行驶方向(反)"}
// {id: "29", trainingType: "Stand", name: "站台名称"}
// {id: "30", trainingType: "Stand", name: "站台编码"}
export default {
list: [
{

3
src/jmapNew/theme/nanjing_02/operationConfig.js
View File

@ -27,6 +27,9 @@
// {id: "12", trainingType: "05", name: "站台行驶方向"}
// {id: "13", trainingType: "05", name: "站台行驶方向编号(反)"}
// {id: "14", trainingType: "05", name: "站台行驶方向(反)"}
// {id: "29", trainingType: "Stand", name: "站台名称"}
// {id: "30", trainingType: "Stand", name: "站台编码"}
export default {
list: [
{

15
src/jmapNew/theme/ningbo_03/menus/menuBar.vue
View File

@ -98,7 +98,7 @@
<stand-detail ref="standDetail" />
<switch-command ref="switchCommand" />
<initialize-switch-block ref="initializeSwitchBlock" />
<!-- <switch-block ref="switchBlock" /> -->
<switch-block ref="switchBlock" />
<switch-active ref="switchActive" />
<switch-detail ref="switchDetail" />
<initialize-signal-guide ref="initializeSignalGuide" />
@ -152,7 +152,7 @@ import AllocateTime from './menuDialog/allocateTime';
import StationControl from './menuDialog/stationControl';
import SwitchCommand from './menuDialog/switchCommand';
import InitializeSwitchBlock from './menuDialog/initializeSwitchBlock';
// import SwitchBlock from './menuDialog/switchBlock';
import SwitchBlock from './menuDialog/switchBlock';
import SwitchActive from './menuDialog/switchActive';
import SwitchDetail from './menuDialog/switchDetail';
import InitializeSignalGuide from './menuDialog/initializeSignalGuide';
@ -201,7 +201,7 @@ export default {
StandDetail,
SwitchCommand,
InitializeSwitchBlock,
// SwitchBlock,
SwitchBlock,
SwitchActive,
SwitchDetail,
InitializeSignalGuide,
@ -1316,7 +1316,7 @@ export default {
hookClick(item, event) {
this.$store.dispatch('menuOperation/setPopMenu', { position: null, menu: null });
if (item && typeof item.click == 'function') {
item.click(item.operate);
item.click(item.operate||{});
}
},
selectedClassA(item, index) {
@ -1534,8 +1534,8 @@ export default {
if (valid) {
this.closeMenu(true);
this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
this.$refs.initializeSwitchBlock.doShow(operate);
// this.$refs.switchBlock.doShow();
// this.$refs.initializeSwitchBlock.doShow(operate);
this.$refs.switchBlock.doShow(operate);
}
});
},
@ -1549,7 +1549,8 @@ export default {
if (valid) {
this.closeMenu(true);
this.$store.dispatch('menuOperation/handleBreakFlag', {break: true});
this.$refs.initializeSwitchBlock.doShow(operate);
// this.$refs.initializeSwitchBlock.doShow(operate);
this.$refs.switchBlock.doShow(operate);
}
});
},

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

@ -47,7 +47,7 @@
<el-button>应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -90,7 +90,7 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {

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

@ -39,7 +39,7 @@
<el-button>应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -83,7 +83,7 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {

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

@ -6,6 +6,7 @@
:data="stationStandList"
highlight-current-row
height="150px"
:id="domIdChoose"
@current-change="handleCurrentChange"
>
<el-table-column prop="name" label="站台" />
@ -48,8 +49,8 @@
</div>
<el-row style="text-align: center;padding: 10px 0;">
<el-col :span="8">当前值</el-col>
<el-col :span="8">
<el-input-number v-model="currentTime" controls-position="right" size="mini" :min="0" :max="999" style="width: 100px;" />
<el-col :span="8" :id="domIdChoose1">
<el-input-number v-model="currentTime" controls-position="right" size="mini" :min="0" :max="999" style="width: 100px;" @change="handleTimeChange" />
</el-col>
</el-row>
</el-col>
@ -83,10 +84,10 @@
<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 :loading="loading" :disabled="!selected" @click="commit(false)">应用(A)</el-button>
<el-button :id="domIdApply" :loading="loading" :disabled="!selected" @click="commit(false)">应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -98,9 +99,10 @@
<script>
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import { mapGetters } from 'vuex';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
export default {
name: 'AllocateTime',
components: {
@ -129,14 +131,20 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.choose.domId : '';
return this.dialogShow ? OperationEvent.Command.common.choose.domId : ''
},
domIdChoose1() {
return this.dialogShow ? OperationEvent.Command.common.choose1.domId : ''
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
return this.dialogShow ? OperationEvent.Command.common.confirm.domId : '';
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close.domId : '';
},
domIdApply() {
return this.dialogShow ? OperationEvent.Command.common.apply.domId : '';
},
title() {
return '分配停站时间';
@ -170,23 +178,57 @@ export default {
this.$store.dispatch('training/emitTipFresh');
},
commit(isClose = false) {
commitOperate(menuOperate.StationStand.setStopTime, {standCode: this.selected.code, parkingTime: this.currentTime, parkingAlwaysValid: false}, 3).then(({valid})=>{
const step = {
over: true,
cmdType: CMD.Stand.CMD_STAND_SET_PARK_TIME,
operation: isClose? OperationEvent.Command.common.confirm.operation: OperationEvent.Command.common.apply.operation,
param: {
standCode: this.selected.code,
parkingTime: this.currentTime,
parkingAlwaysValid: false
}
};
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
isClose && this.doClose();
}
}).catch(_ => {
}).catch((error) => {
isClose && this.doClose();
this.$refs.noticeInfo.doShow();
});
},
handleCurrentChange(val) {
if (!val) { return; }
commitOperate(menuOperate.StationStand.setStopTime, {code:val.code}).then(({valid, operate})=>{
const step = {
code: val.code,
operation: OperationEvent.Command.common.choose.operation,
val: val.code
};
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
const stand = this.$store.getters['map/getDeviceByCode'](val.code);
this.currentTime = stand.parkingTime;
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.selected = val;
}
}).catch(() => {
this.$refs.noticeInfo.doShow();
});
},
handleTimeChange(val) {
if (!val) { return; }
const step = {
operation: OperationEvent.Command.common.choose1.operation,
val: val
};
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.currentTime = val;
}
}).catch(() => {
this.$refs.noticeInfo.doShow();
});
},
getParkingTime(code) {
@ -197,7 +239,7 @@ export default {
},
cancel() {
const operate = {
operation: OperationEvent.Command.cancel.menu.operation
operation: OperationEvent.Command.common.close.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {

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

@ -58,7 +58,7 @@
<el-button>应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -101,7 +101,7 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {

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

@ -15,7 +15,7 @@
<el-button>应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -57,7 +57,7 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {

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

@ -22,7 +22,7 @@
<el-button :id="show? domIdConfirm: ''" :loading="loading" @click="commit">确认</el-button>
</el-col>
<el-col :span="6" :offset="4">
<el-button :id="domIdCancel" @click="cancel">关闭</el-button>
<el-button :id="domIdClose" @click="cancel">关闭</el-button>
</el-col>
</el-row>
<notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
@ -63,7 +63,7 @@ export default {
return '';
}
},
domIdCancel() {
domIdClose() {
return this.dialogShow ? OperationEvent.Command.close.confirm.domId : '';
},
messages() {

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

@ -33,7 +33,7 @@
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
</el-col>
<el-col :span="8" :offset="0">
<el-button :id="domIdCancel" @click="cancel">取 消</el-button>
<el-button :id="domIdClose" @click="cancel">取 消</el-button>
</el-col>
</el-row>
</el-dialog>
@ -83,7 +83,7 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdConfirm() {

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

@ -22,7 +22,7 @@
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
</el-col>
<el-col :span="8" :offset="2">
<el-button :id="domIdCancel" @click="cancel">取 消</el-button>
<el-button :id="domIdClose" @click="cancel">取 消</el-button>
</el-col>
</el-row>
</el-dialog>
@ -57,7 +57,7 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdConfirm() {

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

@ -36,7 +36,7 @@
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
</el-col>
<el-col :span="8" :offset="0">
<el-button :id="domIdCancel" @click="cancel">取 消</el-button>
<el-button :id="domIdClose" @click="cancel">取 消</el-button>
</el-col>
</el-row>
</el-dialog>
@ -91,7 +91,7 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdConfirm() {

47
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="singleTable1" :data="tempData" highlight-current-row height="300px" @current-change="selectLine1">
<el-table ref="singleTable1" :data="tempData" highlight-current-row height="300px" :id="domIdChoose" @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="singleTable2" :data="limitList" highlight-current-row height="300px" @current-change="selectLine2">
<el-table ref="singleTable2" :data="limitList" highlight-current-row height="300px" :id="domIdChoose1" @current-change="handleChangeLine2">
<el-table-column prop="name" label="速度" />
</el-table>
</el-col>
@ -40,10 +40,10 @@
<el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!selected || speedLimitValue<=0" @click="commit">确定(O)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdConfirm" type="primary" :disabled="!selected || speedLimitValue<=0" :loading="loading" @click="apply">应用(A)</el-button>
<el-button :id="domIdApply" type="primary" :disabled="!selected || speedLimitValue<=0" :loading="loading" @click="apply">应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -99,6 +99,7 @@ export default {
{ name: '80', value: 80 }
],
initEle: null,
isLimitSpeed: false,
commandEleCode:null,
speedLimitValue: 0
};
@ -110,14 +111,20 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.choose.domId : '';
return this.dialogShow ? OperationEvent.Command.common.choose.domId : ''
},
domIdChoose1() {
return this.dialogShow ? OperationEvent.Command.common.choose1.domId : ''
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
return this.dialogShow ? OperationEvent.Command.common.confirm.domId : '';
},
domIdApply() {
return this.dialogShow ? OperationEvent.Command.common.apply.domId : '';
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close.domId : '';
},
title() {
return '初始化设置临时限速区域';
@ -138,6 +145,7 @@ export default {
methods: {
doShow(operate, selected) {
this.tempData = [];
this.operate = operate;
this.sectionList.forEach(item => {
if (item.type === '01' || item.type === '04') {
this.tempData.push(item);
@ -159,19 +167,21 @@ export default {
this.$refs.singleTable2.setCurrentRow();
this.$store.dispatch('training/emitTipFresh');
},
selectLine1(val) {
handleChangeLine(val) {
if (!val) { return; }
this.initEle = null;
this.commandEleCode = null;
const step = {
code: `${val.code}`,
operation: OperationEvent.Section.setSpeed.choose.operation,
param: {}
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.selected = val;
this.isLimitSpeed = val;
console.log(val, 1111111);
const sectionEle = this.$store.getters['map/getDeviceByCode'](val.code);
this.speedLimitValue = sectionEle.speedUpLimit;
if (this.speedLimitValue > 0) {
@ -184,12 +194,13 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
selectLine2(val) {
handleChangeLine2(val) {
if (!val) { return; }
this.initEle = null;
this.commandEleCode = null;
const step = {
operation: OperationEvent.Section.setSpeed.choose1.operation,
operation: OperationEvent.Command.common.choose1.operation,
val: val.value,
param: {speedLimitValue: val.value}
};
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
@ -230,9 +241,9 @@ export default {
},
commit(isClosed = true) {
const step = {
code: `${this.selected.code}`,
operation: OperationEvent.Section.setSpeed.confirm.operation,
param: {}
isLimitSpeed: this.isLimitSpeed,
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) {

52
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="singleTable" :data="tempData" highlight-current-row height="300px" @current-change="selectLine">
<el-table ref="singleTable" :data="tempData" highlight-current-row height="300px" :id="domIdChoose" @current-change="handleChangeLine">
<el-table-column prop="name" label="轨道" />
<el-table-column prop="blockStatus" label="MAU">
<template slot-scope="scope">
@ -23,13 +23,13 @@
</el-row>
<el-row justify="center" class="button-group">
<el-col :span="4" :offset="1">
<el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="commitDisabled" @click="commit">确定(O)</el-button>
<el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!selected" @click="commit">确定(O)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="commitDisabled" @click="apply">应用(A)</el-button>
<el-button :id="domIdApply" type="primary" :loading="loading" :disabled="!selected" @click="apply">应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -43,9 +43,8 @@
<script>
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
// import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import { mapGetters } from 'vuex';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import SectionOpen from './sectionOpen';
export default {
@ -77,26 +76,25 @@ export default {
'sectionList'
]),
isBlock() {
return !!this.operate && this.operate.operation === OperationEvent.Section.lock.menu.operation;
return !!this.operate && this.operate.operation === OperationEvent.Command.commandNingBo3.line_section_open.operation;
},
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.choose.domId : '';
return this.dialogShow ? OperationEvent.Command.common.choose.domId : ''
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
return this.dialogShow ? OperationEvent.Command.common.confirm.domId : '';
},
domIdApply() {
return this.dialogShow ? OperationEvent.Command.common.apply.domId : '';
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close.domId : '';
},
title() {
return this.isBlock ? '初始化关闭轨道' : '初始化开放轨道';
},
commitDisabled() {
const sectionEle = this.$store.getters['map/getDeviceByCode']((this.selected || {}).code);
return !this.selected || (sectionEle.blockade && this.isBlock) || (!sectionEle.blockade && !this.isBlock);
}
},
watch: {
@ -138,14 +136,14 @@ export default {
apply() {
this.commit(false);
},
selectLine(val) {
handleChangeLine(val) {
if (!val) { return; }
this.initEle = null;
this.commandEleCode = null;
const step = {
code: `${val.code}`,
operation: this.isBlock ? OperationEvent.Section.lock.choose.operation : OperationEvent.Section.unlock.choose.operation,
param: {}
code: val.code,
operation: OperationEvent.Command.common.choose.operation,
val: val.code
};
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
@ -178,20 +176,18 @@ export default {
}
return sectionElm.blockade ? '关闭双向：所有列车' : '打开';
},
commit(isClosed = true) {
commit(isClose = true) {
const step = {
code: `${this.selected.code}`,
operation: this.isBlock ? OperationEvent.Section.lock.confirm.operation : OperationEvent.Section.unlock.confirm.operation,
param: {}
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) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
this.$refs.sectionOpen.doShow(step, this.selected);
this.initEle = this.selected;
if (isClosed) {
this.doClose();
}
isClose && this.doClose();
}
}).catch(() => {
this.$refs.noticeInfo.doShow();
@ -205,7 +201,7 @@ export default {
},
cancel() {
const operate = {
operation: OperationEvent.Command.cancel.menu.operation
operation: OperationEvent.Command.common.close.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {

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

@ -7,6 +7,7 @@
:data="filterSignalList"
highlight-current-row
height="350px"
:id="domIdChoose"
@current-change="handleCurrentChange"
>
<el-table-column prop="name" label="信号机" />
@ -32,10 +33,10 @@
<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-button :id="domIdApply" type="primary" :loading="loading" :disabled="!selected || !!initEle" @click="commit(false)">应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -49,10 +50,10 @@
<script>
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
// import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import { mapGetters } from 'vuex';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import SignalBlock from './signalBlock';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
export default {
name: 'InitSignalBlock',
@ -68,7 +69,7 @@ export default {
dialogShow: false,
loading: false,
selected: null,
operate: {},
isBlock: true,
initEle: null,
commandEleCode: null
};
@ -77,30 +78,28 @@ export default {
...mapGetters('map', [
'signalList'
]),
isBlock() {
return this.operate && this.operate.operation === OperationEvent.Signal.lock.menu.operation;
},
filterSignalList() {
return this.signalList.map(el => {
return this.$store.getters['map/getDeviceByCode'](el.code);
}).filter(el => {
return this.isBlock ? !el.blockade : el.blockade;
});
})
},
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.choose.domId : '';
return this.dialogShow ? OperationEvent.Command.common.choose.domId : ''
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
return this.dialogShow ? OperationEvent.Command.common.confirm.domId : '';
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close.domId : '';
},
domIdApply() {
return this.dialogShow ? OperationEvent.Command.common.apply.domId : '';
},
title() {
return this.operate.operation === OperationEvent.Signal.lock.menu.operation ? '初始化信号机封锁' : '初始化信号机解除封锁';
return this.operate && this.operation === OperationEvent.Signal.lock.menu.operation ? '初始化信号机封锁' : '初始化信号机解除封锁';
}
},
watch: {
@ -135,9 +134,9 @@ export default {
},
commit(isClose = false) {
const step = {
code: `${this.selected.code}`,
operation: this.isBlock ? OperationEvent.Signal.lock.confirm.operation : OperationEvent.Signal.unlock.confirm.operation,
param: {}
operation: isClose ? OperationEvent.Command.common.confirm.operation: OperationEvent.Command.common.apply.operation,
isBlock: this.isBlock,
param: { signalCode: this.selected.code }
};
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
@ -147,7 +146,6 @@ export default {
isClose && this.isClose();
}
}).catch(() => {
isClose && this.isClose();
this.$refs.noticeInfo.doShow();
});
},
@ -156,9 +154,9 @@ export default {
this.initEle = null;
this.commandEleCode = null;
const step = {
code: `${val.code}`,
operation: this.isBlock ? OperationEvent.Signal.lock.choose.operation : OperationEvent.Signal.unlock.choose.operation,
param: {}
code: val.code,
operation: OperationEvent.Command.common.choose.operation,
val: val.code
};
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
@ -197,7 +195,7 @@ export default {
},
cancel() {
const operate = {
operation: OperationEvent.Command.cancel.menu.operation
operation: OperationEvent.Command.common.close.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {

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

@ -18,7 +18,7 @@
<el-button :loading="loading" @click="commit(false)">应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -60,7 +60,7 @@ export default {
isCbtc() {
return this.operate.operation === OperationEvent.Command.mBar.cbtcMode.operation;
},
domIdCancel() {
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {

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

@ -31,7 +31,7 @@
<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="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -76,7 +76,7 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {

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

@ -36,7 +36,7 @@
<el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!selected || !selected.callOn" @click="commit(false)">应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -81,7 +81,7 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {

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

@ -35,7 +35,7 @@
<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="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -49,9 +49,8 @@
<script>
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
// import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import { mapGetters } from 'vuex';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import SwitchBlock from './switchBlock';
export default {
@ -86,7 +85,7 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {

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

@ -36,7 +36,7 @@
<el-button>应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -73,7 +73,7 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {

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

@ -27,7 +27,7 @@
<el-button>应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -72,7 +72,7 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {

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

@ -38,7 +38,7 @@
<el-button>应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -82,7 +82,7 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {

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

@ -167,7 +167,7 @@
<el-button :id="domIdConfirm" :loading="loading" :disabled="!route" @click="commit(false)">应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -220,7 +220,7 @@ export default {
filterRouteList() {
return this.routeList.filter(el => { return el.flt == {'auto': true, 'artificial': false}[this.unlockType]; });
},
domIdCancel() {
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {

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

@ -18,7 +18,7 @@
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">打印(P)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -62,7 +62,7 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {

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

@ -71,7 +71,7 @@
<el-button>应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -117,7 +117,7 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {

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

@ -45,13 +45,13 @@
</el-row>
<el-row justify="center" class="button-group">
<el-col :span="4" :offset="1">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定(O)</el-button>
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit(true)">确定(O)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">应用(A)</el-button>
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit(false)">应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -63,9 +63,8 @@
<script>
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
// import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import { mapGetters } from 'vuex';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
export default {
@ -114,14 +113,14 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.choose.domId : '';
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
return this.dialogShow ? OperationEvent.Command.common.confirm1.domId : '';
},
domIdApply() {
return this.dialogShow ? OperationEvent.Command.common.apply1.domId : '';
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close1.domId : '';
},
title() {
return '确认/取消设置临时限速区域';
@ -150,6 +149,7 @@ export default {
this.selected = selected;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.operate = operate;
this.command = operate.isLimitSpeed;
this.speedLimitValue = value;
this.dialogShow = true;
this.$nextTick(function () {
@ -188,16 +188,16 @@ export default {
return '';
}
},
commit() {
commit(isClose=true) {
const operate = {
cmdType: this.command ? CMD.Section.CMD_SECTION_SET_LIMIT_SPEED : CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED,
operation: this.command ? OperationEvent.Section.setSpeed.confirm1.operation : OperationEvent.Section.cancelSpeed.confirm1.operation,
operation: isClose ? OperationEvent.Command.common.confirm1.operation: OperationEvent.Command.common.apply1.operation,
over: true,
param: {sectionCode: this.selected.code, speedLimitValue:this.speedLimitValue}
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.doClose();
isClose && this.doClose();
this.$emit('commandSuccess', this.selected.code, this.command ? this.speedLimitValue : 0);
}
}).catch(() => {
@ -206,7 +206,7 @@ export default {
},
cancel() {
const operate = {
operation: OperationEvent.Command.cancel.menu.operation
operation: OperationEvent.Command.common.close1.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {

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

@ -32,7 +32,7 @@
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">打印(P)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -78,7 +78,7 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {

57
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="singleTable" :data="tempData" highlight-current-row height="300px" @current-change="selectLine">
<el-table ref="sectionable" :data="tempData" highlight-current-row height="300px" :id="domIdChoose" @current-change="handleChangeLine">
<el-table-column prop="name" label="轨道" />
<el-table-column prop="blockStatus" label="MAU">
<template slot-scope="scope">
@ -33,13 +33,13 @@
</el-row>
<el-row justify="center" class="button-group">
<el-col :span="4" :offset="1">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定(O)</el-button>
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit(true)">确定(O)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">应用(A)</el-button>
<el-button :id="domIdApply" type="primary" :loading="loading" @click="commit(false)">应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -51,9 +51,8 @@
<script>
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
// import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import { mapGetters } from 'vuex';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
export default {
@ -73,7 +72,7 @@ export default {
activeName: 'first',
tempData: [],
radio: '1',
operate: {},
operate: null,
command: true
};
},
@ -82,19 +81,22 @@ export default {
'sectionList'
]),
isBlock() {
return !!this.operate && this.operate.operation === OperationEvent.Section.lock.confirm.operation;
return !!this.operate && this.operate.isBlock;
},
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.choose.domId : '';
return this.dialogShow ? OperationEvent.Command.common.choose1.domId : ''
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
return this.dialogShow ? OperationEvent.Command.common.confirm1.domId : '';
},
domIdApply() {
return this.dialogShow ? OperationEvent.Command.common.apply1.domId : '';
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close1.domId : '';
},
title() {
return this.isBlock ? '确认/取消关闭轨道' : '确认/取消开放轨道';
@ -124,7 +126,7 @@ export default {
this.operate = operate;
this.dialogShow = true;
this.$nextTick(function () {
this.$refs.singleTable.setCurrentRow(this.selected);
this.$refs.sectionable.setCurrentRow(this.selected);
this.$store.dispatch('training/emitTipFresh');
});
},
@ -133,8 +135,22 @@ export default {
this.dialogShow = false;
this.$store.dispatch('training/emitTipFresh');
},
selectLine(val) {
this.$refs.singleTable.setCurrentRow(this.selected);
handleChangeLine(val) {
if (!val) { return; }
const step = {
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.selected = val;
this.$refs.sectionable.setCurrentRow(this.selected);
}
}).catch(() => {
this.$refs.noticeInfo.doShow();
});
},
getProcess(code) {
if (this.selected && this.selected.code === code) {
@ -151,20 +167,21 @@ export default {
const sectionElm = this.$store.getters['map/getDeviceByCode'](code);
return sectionElm.blockade ? '关闭双向：所有列车' : '打开';
},
commit() {
commit(isClose=true) {
if (this.command) {
const operate = {
cmdType: this.isBlock ? CMD.Section.CMD_SECTION_BLOCK : CMD.Section.CMD_SECTION_UNBLOCK,
operation: this.isBlock ? OperationEvent.Section.lock.confirm1.operation : OperationEvent.Section.unlock.confirm1.operation,
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) {
this.doClose();
isClose && this.doClose();
this.$emit('commandSuccess', this.selected.code);
}
}).catch(() => {
isClose && this.isClose();
this.$refs.noticeInfo.doShow();
});
} else {
@ -173,7 +190,7 @@ export default {
},
cancel() {
const operate = {
operation: OperationEvent.Command.cancel.menu.operation
operation: OperationEvent.Command.common.close1.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {

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

@ -40,7 +40,7 @@
<el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="true">打印(P)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :disabled="true">帮助(H)</el-button>
@ -83,7 +83,7 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {

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

@ -41,10 +41,10 @@
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit(true)">确定(O)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button id="domIdConfirm" :loading="loading" @click="commit(false)">应用(A)</el-button>
<el-button :id="domIdApply" :loading="loading" @click="commit(false)">应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -57,7 +57,6 @@
<script>
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
// import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import { mapGetters } from 'vuex';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
@ -83,23 +82,20 @@ export default {
'signalList'
]),
isBlock() {
return this.operate && this.operate.operation === OperationEvent.Signal.lock.confirm.operation;
return this.operate && this.operate.isBlock;
},
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.choose.domId : '';
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
return this.dialogShow ? OperationEvent.Command.common.confirm1.domId : '';
},
domIdApply() {
return this.dialogShow ? OperationEvent.Command.common.apply1.domId : '';
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close1.domId : '';
}
// title() {
// return this.operate.operation === OperationEvent.Signal.lock.menu.operation ? '确认/取消信号机封锁' : '确认/取消信号机解除封锁';
// }
},
watch: {
'$store.state.map.keyboardEnterCount': function (val) {
@ -118,7 +114,7 @@ export default {
this.selected = selected;
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.title = this.operate && this.operate.operation === OperationEvent.Switch.block.confirm.operation ? '确认/取消信号机封锁' : '确认/取消信号机解除封锁';
this.title = this.isBlock ? '确认/取消信号机封锁' : '确认/取消信号机解除封锁';
this.dialogShow = true;
this.$nextTick(function () {
this.$refs.singleTable.setCurrentRow(selected);
@ -134,7 +130,7 @@ export default {
if (this.command) {
const operate = {
cmdType: this.isBlock ? CMD.Signal.CMD_SIGNAL_BLOCK : CMD.Signal.CMD_SIGNAL_UNBLOCK,
operation: this.isBlock ? OperationEvent.Signal.lock.confirm1.operation : OperationEvent.Signal.unlock.confirm1.operation,
operation: isClose ? OperationEvent.Command.common.confirm1.operation: OperationEvent.Command.common.apply1.operation,
over: true,
param: {signalCode: this.selected.code}
};
@ -171,7 +167,7 @@ export default {
},
cancel() {
const operate = {
operation: OperationEvent.Command.cancel.menu.operation
operation: OperationEvent.Command.common.close1.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {

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

@ -39,7 +39,7 @@
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit(false)">应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -80,7 +80,7 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {

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

@ -32,7 +32,7 @@
<el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="true" @click="commit">打印(P)</el-button>
</el-col>
<el-col :span="6" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="6" :offset="2">
<el-button :disabled="true">帮助(H)</el-button>
@ -69,7 +69,7 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {

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

@ -44,7 +44,7 @@
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit(false)">应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -85,7 +85,7 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {

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

@ -4,8 +4,10 @@
<el-col :span="18">
<el-table
:data="signalList"
ref="singleTable"
height="300px"
highlight-current-row
:domIdChoose="domIdChoose"
@current-change="handleCurrentChange"
>
<el-table-column prop="name" label="ID" />
@ -33,7 +35,7 @@
<el-button :id="domIdConfirm" :loading="loading" :disabled="!selected" @click="commit(false)">应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -76,14 +78,17 @@ export default {
isCbtc() {
return this.operate.operation === OperationEvent.Command.mBar.cbtcMode.operation;
},
domIdCancel() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.choose.domId : '';
return this.dialogShow ? OperationEvent.Command.common.choose.domId : ''
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
return this.dialogShow ? OperationEvent.Command.common.confirm.domId : '';
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close.domId : '';
},
domIdApply() {
return this.dialogShow ? OperationEvent.Command.common.apply.domId : '';
},
title() {
return this.isCbtc ? '确认/取消CBTC模式' : '确认/取消后备模式';
@ -102,8 +107,22 @@ export default {
});
},
methods: {
handleCurrentChange(el) {
this.selected = el;
handleCurrentChange(val) {
if (!val) { return; }
const step = {
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.selected = val;
this.$refs.singleTable.setCurrentRow(this.selected);
}
}).catch(() => {
this.$refs.noticeInfo.doShow();
});
},
doShow(operate, selected) {
this.selected = selected;
@ -121,20 +140,12 @@ export default {
},
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
}
param: { signalCode: this.selected.code }
};
if (this.command) {
step.operation = OperationEvent.Signal.atsAutoControl.confirm.operation;
// step.cmdType = CMD.Signal.CMD_SIGNAL_OPEN_AUTO_SETTING;
} else {
step.command = OperationEvent.Signal.humanControl.confirm.operation;
// step.cmdType = CMD.Signal.CMD_SIGNAL_CLOSE_AUTO_SETTING;
}
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@ -147,7 +158,7 @@ export default {
},
cancel() {
const operate = {
operation: OperationEvent.Command.cancel.menu.operation
operation: OperationEvent.Command.common.close.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {

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

@ -3,9 +3,11 @@
<el-row>
<el-col :span="18">
<el-table
ref="singleTable"
:data="filterSignalList"
height="350px"
highlight-current-row
:id="domIdChoose"
@current-change="handleCurrentChange"
>
<el-table-column prop="name" label="ID" />
@ -20,9 +22,9 @@
<el-col :span="5" :offset="1">
<div class="set-status-title">命令</div>
<div class="set-status-box">
<el-radio v-model="signalModel" :label="false">灭灯</el-radio>
<el-radio v-model="signalModel" :disabled="true" :label="false">灭灯</el-radio>
<br>
<el-radio v-model="signalModel" :label="true">点灯</el-radio>
<el-radio v-model="signalModel" :disabled="true" :label="true">点灯</el-radio>
</div>
</el-col>
</el-row>
@ -31,10 +33,10 @@
<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" :loading="loading" :disabled="!selected" @click="commit(false)">应用(A)</el-button>
<el-button :id="domIdApply" :loading="loading" :disabled="!selected" @click="commit(false)">应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -46,10 +48,9 @@
<script>
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
// import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { mapGetters } from 'vuex';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
export default {
name: 'SignalModel',
@ -59,6 +60,7 @@ export default {
data() {
return {
status: false,
operate: null,
signalModel: true,
allChecked: false,
dialogShow: false,
@ -76,18 +78,19 @@ export default {
filterSignalList() {
return this.signalList.map(el => {
return this.$store.getters['map/getDeviceByCode'](el.code);
}).filter(el => {
return this.signalModel ? el.redOpen : el.greenOpen;
});
},
domIdCancel() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
})
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.choose.domId : '';
return this.dialogShow ? OperationEvent.Command.common.choose.domId : ''
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
return this.dialogShow ? OperationEvent.Command.common.confirm.domId : '';
},
domIdApply() {
return this.dialogShow ? OperationEvent.Command.common.apply.domId : '';
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close.domId : '';
},
title() {
return '信号指示模式';
@ -106,11 +109,29 @@ export default {
});
},
methods: {
handleCurrentChange(el) {
this.selected = el;
handleCurrentChange(val) {
if (!val) { return; }
const step = {
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.selected = val;
this.signalModel = this.selected.redOpen;
this.$refs.singleTable.setCurrentRow(this.selected);
}
}).catch(() => {
console.log()
this.$refs.noticeInfo.doShow();
});
},
doShow(operate, selected) {
this.selected = selected;
this.operate = operate;
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.dialogShow = true;
this.$nextTick(function () {
@ -124,20 +145,12 @@ export default {
},
commit(isClose = false) {
const step = {
cmdType: this.signalModel ? CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL : CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL,
operation: isClose ? OperationEvent.Command.common.confirm.operation: OperationEvent.Command.common.apply.operation,
over: true,
param: {
signalCode: (this.selected || {}).code
}
param: { signalCode: this.selected.code }
};
if (this.signalModel) {
step.operation = OperationEvent.Signal.atsAutoControl.confirm.operation;
step.cmdType = CMD.Signal.CMD_SIGNAL_REOPEN_SIGNAL;
} else {
step.command = OperationEvent.Signal.humanControl.confirm.operation;
step.cmdType = CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL;
}
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@ -153,7 +166,7 @@ export default {
},
cancel() {
const operate = {
operation: OperationEvent.Command.cancel.menu.operation
operation: OperationEvent.Command.common.close.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {

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

@ -28,7 +28,7 @@
<el-button :id="domIdConfirm" type="primary" :loading="loading" disabled>打印(P)</el-button>
</el-col>
<el-col :span="6" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="6" :offset="2">
<el-button>帮助(H)</el-button>
@ -40,9 +40,8 @@
<script>
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
// import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import { mapGetters } from 'vuex';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
export default {
name: 'StandDetain',
@ -66,14 +65,14 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.choose.domId : '';
return this.dialogShow ? OperationEvent.Command.common.choose.domId : ''
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
return this.dialogShow ? OperationEvent.Command.common.confirm.domId : '';
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close.domId : '';
},
title() {
return '站台信息显示';
@ -124,7 +123,7 @@ export default {
},
cancel() {
const operate = {
operation: OperationEvent.Command.cancel.menu.operation
operation: OperationEvent.Command.common.close.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {

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

@ -9,6 +9,7 @@
:data="stationStandList"
highlight-current-row
height="280px"
:id="domIdChoose"
@current-change="handleCurrentChange"
>
<el-table-column prop="name" label="站台" />
@ -18,11 +19,7 @@
</template>
</el-table-column>
<el-table-column prop="status" label="状态" width="80">
<!--<template slot-scope="scope">-->
<!--<div slot="reference" class="name-wrapper">-->
<span>打开</span>
<!--</div>-->
<!--</template>-->
</el-table-column>
</el-table>
<el-checkbox v-model="allChecked" :disabled="true">所有站台(F)</el-checkbox>
@ -54,7 +51,7 @@
<el-button :id="domIdApply" :loading="loading" :disabled="!selected" @click="commit(false)">应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -66,9 +63,9 @@
<script>
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import { mapGetters } from 'vuex';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
export default {
name: 'StandDetain',
@ -94,17 +91,17 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.choose.domId : '';
return this.dialogShow ? OperationEvent.Command.common.choose.domId : ''
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
return this.dialogShow ? OperationEvent.Command.common.confirm.domId : '';
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close.domId : '';
},
domIdApply() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menuButton.domId : '';
return this.dialogShow ? OperationEvent.Command.common.apply.domId : '';
},
title() {
return '扣车';
@ -156,31 +153,38 @@ export default {
this.$store.dispatch('training/emitTipFresh');
},
commit(isClose = false) {
let cmdCommand = menuOperate.StationStand.setDetainTrain;
if (this.standStatus) {
cmdCommand = menuOperate.StationStand.cancelDetainTrain;
}
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,
param: {standCode: this.selected.code}
};
commitOperate(cmdCommand, {standCode: this.selected.code}, 3).then((valid)=>{
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
isClose && this.doClose();
}
}).catch(() => {
}).catch((error) => {
console.log(error);
isClose && this.doClose();
this.$refs.noticeInfo.doShow();
});
},
handleCurrentChange(val) {
if (!val) { return; }
const stand = this.$store.getters['map/getDeviceByCode'](val.code);
let cmdCommand = menuOperate.StationStand.cancelDetainTrain;
if (stand && !stand.stationHoldTrain && !stand.centerHoldTrain) {
cmdCommand = menuOperate.StationStand.setDetainTrain;
}
commitOperate(cmdCommand, {code:val.code}).then(({valid, operate})=>{
const step = {
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.selected = val;
}
}).catch(() => {
this.$refs.noticeInfo.doShow();
});
},
getDetainStatus(code) {
@ -193,7 +197,7 @@ export default {
},
cancel() {
const operate = {
operation: OperationEvent.Command.cancel.menu.operation
operation: OperationEvent.Command.common.close.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {

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

@ -39,7 +39,7 @@
<el-button>应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -52,7 +52,7 @@
<script>
import { mapGetters } from 'vuex';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import { menuOperate, commitOperate } from '@/jmapNew/theme/components/utils/menuOperate';
export default {
name: 'StationControl',
@ -121,7 +121,7 @@ export default {
domIdConfirm() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
},
domIdCancel() {
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
concertrateStationList() {

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

@ -7,6 +7,7 @@
:data="switchList"
highlight-current-row
height="300px"
:domIdChoose="domIdChoose"
@current-change="handleCurrentChange"
>
<el-table-column prop="name" width="80" label="道岔" />
@ -32,10 +33,10 @@
<el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!selected" @click="commit(true)">确定(O)</el-button>
</el-col>
<el-col :span="6" :offset="2">
<el-button :id="domIdConfirm" type="primary" :loading="loading" :disabled="!selected" @click="commit(false)">应用(A)</el-button>
<el-button :id="domIdApply" type="primary" :loading="loading" :disabled="!selected" @click="commit(false)">应用(A)</el-button>
</el-col>
<el-col :span="6" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
</el-row>
<notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
@ -71,14 +72,17 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.choose.domId : '';
return this.dialogShow ? OperationEvent.Command.common.choose.domId : ''
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
return this.dialogShow ? OperationEvent.Command.common.confirm.domId : '';
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close.domId : '';
},
domIdApply() {
return this.dialogShow ? OperationEvent.Command.common.apply.domId : '';
},
title() {
return '请求或允许动岔激活/取消激活';
@ -115,9 +119,10 @@ export default {
const step = {
over: true,
cmdType: this.active ? CMD.Switch.CMD_SWITCH_ACTIVE : CMD.Switch.CMD_SWITCH_CUT_OFF,
operation: this.active ? OperationEvent.Switch.unlock.confirm.operation : OperationEvent.Switch.lock.confirm.operation,
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) {
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
@ -131,9 +136,9 @@ export default {
handleCurrentChange(val) {
if (!val) { return; }
const step = {
code: `${val.code}`,
operation: OperationEvent.Switch.lock.choose.operation,
param: {}
code: val.code,
operation: OperationEvent.Command.common.choose.operation,
val: val.code
};
this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
if (valid) {

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

@ -7,6 +7,7 @@
:data="switchList"
highlight-current-row
height="350px"
:id="domIdChoose"
@current-change="handleCurrentChange"
>
<el-table-column prop="name" width="80" label="道岔" />
@ -40,10 +41,10 @@
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit(true)">确定(O)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit(false)">应用(A)</el-button>
<el-button :id="domIdApply" type="primary" :loading="loading" @click="commit(false)">应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -73,7 +74,6 @@ export default {
loading: false,
selected: null,
command: true,
isBlock: false,
title: ''
};
},
@ -84,14 +84,20 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
isBlock() {
return this.operate && this.operate.operation === OperationEvent.Command.commandNingBo3.line_switch_block.operation;
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.choose.domId : '';
return this.dialogShow ? OperationEvent.Command.common.choose.domId : ''
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
return this.dialogShow ? OperationEvent.Command.common.confirm.domId : '';
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close.domId : '';
},
domIdApply() {
return this.dialogShow ? OperationEvent.Command.common.apply.domId : '';
}
},
watch: {
@ -107,15 +113,12 @@ export default {
});
},
methods: {
doShow(operate, selected) {
this.selected = selected;
doShow(operate) {
// 如果不是断点激活，而是第一次显示，则需要设置初始值
this.operate = operate;
this.title = this.operate && this.operate.operation === OperationEvent.Switch.block.confirm.operation ? '确认/取消道岔封锁' : '确认/取消道岔解除封锁';
this.isBlock = !!(this.operate && this.operate.operation === OperationEvent.Switch.block.confirm.operation);
this.title = this.isBlock ? '确认/取消道岔封锁' : '确认/取消道岔解除封锁';
this.dialogShow = true;
this.$nextTick(function () {
this.$refs.singleTable.setCurrentRow(selected);
this.$store.dispatch('training/emitTipFresh');
});
},
@ -136,17 +139,17 @@ export default {
if (this.command) {
const operate = {
cmdType: this.isBlock ? CMD.Switch.CMD_SWITCH_BLOCK : CMD.Switch.CMD_SWITCH_UNBLOCK,
operation: this.isBlock ? OperationEvent.Switch.block.confirm1.operation : OperationEvent.Switch.unblock.confirm1.operation,
operation: isClose ? OperationEvent.Command.common.confirm.operation: OperationEvent.Command.common.apply.operation,
over: true,
param: { switchCode: this.selected.code }
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.doClose();
isClose && this.doClose();
this.$emit('commandSuccess', this.selected.code);
}
}).catch(() => {
this.doClose();
isClose && this.doClose();
this.$refs.noticeInfo.doShow();
});
} else {
@ -154,10 +157,24 @@ export default {
}
},
handleCurrentChange(val) {
if (!val) { return; }
const step = {
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.selected = val;
this.$refs.singleTable.setCurrentRow(this.selected);
}
}).catch(() => {
this.$refs.noticeInfo.doShow();
});
},
getProcess(code, type) {
if (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))) {
return '等待确认/取消';
} else {
return '';
@ -165,7 +182,7 @@ export default {
},
cancel() {
const operate = {
operation: OperationEvent.Command.cancel.menu.operation
operation: OperationEvent.Command.common.close.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {

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

@ -52,7 +52,7 @@
<el-button :id="domIdConfirm" type="primary" :disabled="!selected" :loading="loading" :selected="true" @click="commit(false)">应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -94,7 +94,7 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {

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

@ -24,7 +24,7 @@
<el-button :id="domIdConfirm" type="primary" :loading="loading" disabled>打印(P)</el-button>
</el-col>
<el-col :span="6" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="6" :offset="2">
<el-button>帮助(H)</el-button>
@ -66,14 +66,11 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.choose.domId : '';
},
domIdConfirm() {
return this.dialogShow ? OperationEvent.Signal.arrangementRoute.menu.domId : '';
return this.dialogShow ? OperationEvent.Command.common.confirm.domId : '';
},
domIdClose() {
return this.dialogShow ? OperationEvent.Command.common.close.domId : '';
},
title() {
return '道岔信息显示';

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

@ -83,7 +83,7 @@
<el-button>应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -125,7 +125,7 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {

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

@ -17,7 +17,7 @@
<el-button>应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -57,7 +57,7 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
isDepart() {

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

@ -171,10 +171,10 @@
</el-row>
<el-row justify="center" class="button-group">
<el-col :span="6" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="6" :offset="2">
<el-button :id="domIdCancel" @click="cancel">打印(P)</el-button>
<el-button :id="domIdClose" @click="cancel">打印(P)</el-button>
</el-col>
<el-col :span="6" :offset="2">
<el-button>帮助(H)</el-button>
@ -219,7 +219,7 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {

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

@ -63,7 +63,7 @@
<el-button>应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -104,7 +104,7 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {

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

@ -28,7 +28,7 @@
<el-button>应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -72,7 +72,7 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {

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

@ -44,7 +44,7 @@
<el-button>应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -86,7 +86,7 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {

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

@ -26,7 +26,7 @@
<el-button>应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -77,7 +77,7 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {

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

@ -39,7 +39,7 @@
<el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
</el-col>
<el-col :span="8" :offset="4">
<el-button :id="domIdCancel" @click="cancel">取 消</el-button>
<el-button :id="domIdClose" @click="cancel">取 消</el-button>
</el-col>
</el-row>
</el-dialog>
@ -86,7 +86,7 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdConfirm() {

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

@ -25,7 +25,7 @@
<el-button>应用(A)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button :id="domIdCancel" @click="cancel">关闭(C)</el-button>
<el-button :id="domIdClose" @click="cancel">关闭(C)</el-button>
</el-col>
<el-col :span="4" :offset="2">
<el-button>帮助(H)</el-button>
@ -68,7 +68,7 @@ export default {
show() {
return this.dialogShow && !this.$store.state.menuOperation.break;
},
domIdCancel() {
domIdClose() {
return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
},
domIdChoose() {

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

@ -20,9 +20,9 @@ import { mapGetters } from 'vuex';
import { OperateMode } from '@/scripts/ConstDic';
import { DeviceMenu } from '@/scripts/ConstDic';
import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
// import {mouseCancelState} from '@/jmapNew/theme/components/utils/menuItemStatus';
import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
export default {
name: 'StationMenu',
components: {

162
src/jmapNew/theme/ningbo_03/operationConfig.js
View File

@ -1,6 +1,41 @@
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
// 操作规则定义
// {id: "1", trainingType: "ControlConvertMenu", name: "车站名称"}
// {id: "2", trainingType: "ControlConvertMenu", name: "车站控制模式编号"}
// {id: "3", trainingType: "Signal", name: "进路名称"}
// {id: "4", trainingType: "Signal", name: "进路编号"}
// {id: "5", trainingType: "Signal", name: "信号机名称"}
// {id: "6", trainingType: "Signal", name: "信号机编号"}
// {id: "7", trainingType: "Switch", name: "道岔名称"}
// {id: "8", trainingType: "Section", name: "物理区段名称"}
// {id: "9", trainingType: "Section", name: "逻辑区段名称"}
// {id: "10", trainingType: "Stand", name: "车站名称"}
// {id: "11", trainingType: "Stand", name: "站台行驶方向编号"}
// {id: "12", trainingType: "Stand", name: "站台行驶方向"}
// {id: "13", trainingType: "Stand", name: "站台行驶方向编号(反)"}
// {id: "14", trainingType: "Stand", name: "站台行驶方向(反)"}
// {id: "29", trainingType: "Stand", name: "站台名称"}
// {id: "30", trainingType: "Stand", name: "站台编码"}
// {id: "15", trainingType: "Switch", name: "道岔位置"}
// {id: "16", trainingType: "Switch", name: "道岔位置(反)"}
// {id: "17", trainingType: "Switch", name: "道岔编码"}
// {id: "18", trainingType: "Section", name: "逻辑区段编码"}
// {id: "19", trainingType: "Section", name: "区段编号"}
// {id: "20", trainingType: "Section", name: "车站名称"}
// {id: "21", trainingType: "Switch", name: "车站名称"}
// {id: "22", trainingType: "Section", name: "车站编号"}
// {id: "23", trainingType: "Switch", name: "车站编号"}
// {id: "24", trainingType: "Switch", name: "道岔计轴区段编号"}
// {id: "25", trainingType: "Switch", name: "道岔计轴区段名称"}
export default {
list: [
// {
@ -806,7 +841,7 @@ export default {
{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' },
{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_stand.operation, tip: '鼠标右键菜单选择【站台】' },
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_stand_openOrClose.operation, tip: '鼠标右键菜单选择【开放/关闭】' },
{ deviceType: 'bar', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择站台【{10}】', codeType: 'STAND', val: '{10}' },
{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择站台【{29}】', codeType: 'STAND', val: '{30}' },
{ deviceType: '04', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' },
{ deviceType: '04', orderNum: 6, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' },
]
@ -824,7 +859,7 @@ export default {
{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' },
{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_stand.operation, tip: '鼠标右键菜单选择【站台】' },
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_stand_openOrClose.operation, tip: '鼠标右键菜单选择【开放/关闭】' },
{ deviceType: 'bar', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择站台【{10}】', codeType: 'STAND', val: '{10}' },
{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择站台【{29}】', codeType: 'STAND', val: '{30}' },
{ deviceType: '04', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' },
{ deviceType: '04', orderNum: 6, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' },
]
@ -841,7 +876,10 @@ export default {
stepVOList: [
{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' },
{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_stand.operation, tip: '鼠标右键菜单选择【站台】' },
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_stand_holdOrNot.operation, tip: '鼠标右键菜单选择【设置/取消扣车】' }
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_stand_holdOrNot.operation, tip: '鼠标右键菜单选择【设置/取消扣车】' },
{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择站台【{29}】', codeType: 'STAND', val: '{30}' },
{ deviceType: '04', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' },
{ deviceType: '04', orderNum: 6, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' },
]
},
{
@ -856,7 +894,10 @@ export default {
stepVOList: [
{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' },
{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_stand.operation, tip: '鼠标右键菜单选择【站台】' },
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_stand_holdOrNot.operation, tip: '鼠标右键菜单选择【设置/取消扣车】' }
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_stand_holdOrNot.operation, tip: '鼠标右键菜单选择【设置/取消扣车】' },
{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择站台【{29}】', codeType: 'STAND', val: '{30}' },
{ deviceType: '04', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' },
{ deviceType: '04', orderNum: 6, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' },
]
},
{
@ -864,14 +905,18 @@ export default {
minDuration: 5,
operateType: CMD.Stand.CMD_STAND_SET_PARK_TIME.value,
skinCode: '12',
trainingName: '信号机分配停站时间({10}-{12} 站台)',
trainingRemark: '信号机分配停站时间',
trainingName: '分配停站时间({10}-{12} 站台)',
trainingRemark: '分配停站时间-（时间：25）',
trainingType: 'Stand',
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' },
{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_stand.operation, tip: '鼠标右键菜单选择【站台】' },
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_stand_stopTime.operation, tip: '鼠标右键菜单选择【分配停站时间】' }
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_stand_stopTime.operation, tip: '鼠标右键菜单选择【分配停站时间】' },
{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择站台【{29}】', codeType: 'STAND', val: '{30}' },
{ deviceType: '04', orderNum: 4, operateCode: OperationEvent.Command.common.choose1.operation, tip: '请输入停站时间【25】', val: '25' },
{ deviceType: '04', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' },
{ deviceType: '04', orderNum: 6, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' },
]
},
{
@ -879,14 +924,15 @@ export default {
minDuration: 5,
operateType: CMD.Stand.CMD_STAND_VIEW_STATUS.value,
skinCode: '12',
trainingName: '信号机显示({10}-{12} 站台)',
trainingName: '显示({10}-{12} 站台)',
trainingRemark: '信号机显示',
trainingType: 'Stand',
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' },
{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_stand.operation, tip: '鼠标右键菜单选择【站台】' },
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_stand_detail.operation, tip: '鼠标右键菜单选择【显示】' }
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_stand_detail.operation, tip: '鼠标右键菜单选择【显示】' },
{ deviceType: '04', orderNum: 4, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' },
]
},
@ -903,7 +949,10 @@ export default {
stepVOList: [
{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' },
{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_switch.operation, tip: '鼠标右键菜单选择【道岔】' },
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_switch_cmd.operation, tip: '鼠标右键菜单选择【命令】' }
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_switch_cmd.operation, tip: '鼠标右键菜单选择【命令】' },
{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择道岔【{7}】', codeType:'SWITCH', val: '{17}' },
{ deviceType: '02', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' },
{ deviceType: '02', orderNum: 6, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' },
]
},
{
@ -918,7 +967,10 @@ export default {
stepVOList: [
{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' },
{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_switch.operation, tip: '鼠标右键菜单选择【道岔】' },
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_switch_cmd.operation, tip: '鼠标右键菜单选择【命令】' }
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_switch_cmd.operation, tip: '鼠标右键菜单选择【命令】' },
{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择道岔【{7}】', codeType:'SWITCH', val: '{17}' },
{ deviceType: '02', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' },
{ deviceType: '02', orderNum: 6, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' },
]
},
{
@ -933,7 +985,10 @@ export default {
stepVOList: [
{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' },
{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_switch.operation, tip: '鼠标右键菜单选择【道岔】' },
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_switch_block.operation, tip: '鼠标右键菜单选择【封锁】' }
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_switch_block.operation, tip: '鼠标右键菜单选择【封锁】' },
{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择道岔【{7}】', codeType:'SWITCH', val: '{17}' },
{ deviceType: '02', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' },
{ deviceType: '02', orderNum: 6, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' },
]
},
{
@ -948,7 +1003,10 @@ export default {
stepVOList: [
{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' },
{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_switch.operation, tip: '鼠标右键菜单选择【道岔】' },
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_switch_unblock.operation, tip: '鼠标右键菜单选择【解除封锁】' }
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_switch_unblock.operation, tip: '鼠标右键菜单选择【解除封锁】' },
{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择道岔【{7}】', codeType:'SWITCH', val: '{17}' },
{ deviceType: '02', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' },
{ deviceType: '02', orderNum: 6, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' },
]
},
{
@ -963,7 +1021,10 @@ export default {
stepVOList: [
{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' },
{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_switch.operation, tip: '鼠标右键菜单选择【道岔】' },
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_switch_empower.operation, tip: '鼠标右键菜单选择【请求动岔/请求或授权/取消】' }
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_switch_empower.operation, tip: '鼠标右键菜单选择【请求动岔/请求或授权/取消】' },
{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择道岔【{7}】', codeType:'SWITCH', val: '{17}' },
{ deviceType: '02', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' },
{ deviceType: '02', orderNum: 6, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' },
]
},
{
@ -978,7 +1039,10 @@ export default {
stepVOList: [
{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' },
{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_switch.operation, tip: '鼠标右键菜单选择【道岔】' },
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_switch_empower.operation, tip: '鼠标右键菜单选择【请求动岔/请求或授权/取消】' }
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_switch_empower.operation, tip: '鼠标右键菜单选择【请求动岔/请求或授权/取消】' },
{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择道岔【{7}】', codeType:'SWITCH', val: '{17}' },
{ deviceType: '02', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' },
{ deviceType: '02', orderNum: 6, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' },
]
},
@ -994,7 +1058,10 @@ export default {
stepVOList: [
{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' },
{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_signal.operation, tip: '鼠标右键菜单选择【信号机】' },
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_signal_guide.operation, tip: '鼠标右键菜单选择【引导】' }
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_signal_guide.operation, tip: '鼠标右键菜单选择【引导】' },
{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择信号机【{5}】', codeType:'SIGNAL', val: '{6}' },
{ deviceType: '04', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' },
{ deviceType: '04', orderNum: 6, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' }
]
},
{
@ -1003,13 +1070,16 @@ export default {
operateType: CMD.Signal.CMD_SIGNAL_HUMAN_RELEASE_ROUTE.value, //暂不清楚是那个指令
skinCode: '12',
trainingName: '信号机取消允许锁闭({3})',
trainingRemark: '信号机开始锁闭解除',
trainingRemark: '信号机取消允许锁闭',
trainingType: 'Signal',
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' },
{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_signal.operation, tip: '鼠标右键菜单选择【信号机】' },
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_signal_lockOrNot.operation, tip: '鼠标右键菜单选择【开始锁闭解除】' }
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_signal_lockOrNot.operation, tip: '鼠标右键菜单选择【开始锁闭解除】' },
{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择信号机【{5}】', codeType:'SIGNAL', val: '{6}' },
{ deviceType: '04', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' },
{ deviceType: '04', orderNum: 6, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' }
]
},
{
@ -1024,7 +1094,11 @@ export default {
stepVOList: [
{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' },
{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_signal.operation, tip: '鼠标右键菜单选择【信号机】' },
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_signal_block.operation, tip: '鼠标右键菜单选择【封锁】' }
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_signal_block.operation, tip: '鼠标右键菜单选择【封锁】' },
{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择信号机【{5}】', codeType:'SIGNAL', val: '{6}' },
{ deviceType: '04', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' },
{ deviceType: '04', orderNum: 6, operateCode: OperationEvent.Command.common.confirm1.operation, tip: '请点击【确定】' },
{ deviceType: '04', orderNum: 7, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' }
]
},
{
@ -1039,7 +1113,11 @@ export default {
stepVOList: [
{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' },
{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_signal.operation, tip: '鼠标右键菜单选择【信号机】' },
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_signal_unblock.operation, tip: '鼠标右键菜单选择【解除封锁】' }
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_signal_unblock.operation, tip: '鼠标右键菜单选择【解除封锁】' },
{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择信号机【{5}】', codeType:'SIGNAL', val: '{6}' },
{ deviceType: '04', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' },
{ deviceType: '04', orderNum: 6, operateCode: OperationEvent.Command.common.confirm1.operation, tip: '请点击【确定】' },
{ deviceType: '04', orderNum: 7, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' }
]
},
{
@ -1054,7 +1132,10 @@ export default {
stepVOList: [
{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' },
{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_signal.operation, tip: '鼠标右键菜单选择【信号机】' },
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_signal_indicator.operation, tip: '鼠标右键菜单选择【信号指示模式】' }
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_signal_indicator.operation, tip: '鼠标右键菜单选择【信号指示模式】' },
{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择信号机【{5}】', codeType:'SIGNAL', val: '{6}' },
{ deviceType: '04', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' },
{ deviceType: '04', orderNum: 6, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' }
]
},
{
@ -1069,7 +1150,10 @@ export default {
stepVOList: [
{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' },
{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_signal.operation, tip: '鼠标右键菜单选择【信号机】' },
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_signal_indicator.operation, tip: '鼠标右键菜单选择【信号指示模式】' }
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_signal_indicator.operation, tip: '鼠标右键菜单选择【信号指示模式】' },
{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择信号机【{5}】', codeType:'SIGNAL', val: '{6}' },
{ deviceType: '04', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' },
{ deviceType: '04', orderNum: 6, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' }
]
},
{
@ -1077,14 +1161,15 @@ export default {
minDuration: 8,
operateType: CMD.Signal.CMD_SIGNAL_DETAIL.value,
skinCode: '12',
trainingName: '信号机显示({3})',
trainingName: '显示({3})',
trainingRemark: '信号机显示',
trainingType: 'Signal',
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' },
{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_signal.operation, tip: '鼠标右键菜单选择【信号机】' },
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_signal_detail.operation, tip: '鼠标右键菜单选择【显示】' }
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_signal_detail.operation, tip: '鼠标右键菜单选择【显示】' },
{ deviceType: '04', orderNum: 4, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' }
]
},
@ -1093,14 +1178,18 @@ export default {
minDuration: 8,
operateType: CMD.Section.CMD_SECTION_UNBLOCK.value,
skinCode: '12',
trainingName: '区段开放({8}{9})',
trainingRemark: '区段开放',
trainingName: '轨道开放({8}{9})',
trainingRemark: '轨道开放',
trainingType: 'Section',
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' },
{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_section.operation, tip: '鼠标右键菜单选择【轨道】' },
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_section_open.operation, tip: '鼠标右键菜单选择【开放】' }
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_section_open.operation, tip: '鼠标右键菜单选择【开放】' },
{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择轨道【{8}】', codeType:'SECTION', val: '{19}' },
{ deviceType: '03', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' },
{ deviceType: '03', orderNum: 6, operateCode: OperationEvent.Command.common.confirm1.operation, tip: '请点击【确定】' },
{ deviceType: '03', orderNum: 7, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' }
]
},
{
@ -1108,14 +1197,18 @@ export default {
minDuration: 8,
operateType: CMD.Section.CMD_SECTION_BLOCK.value,
skinCode: '12',
trainingName: '区段关闭({8}{9})',
trainingRemark: '区段关闭',
trainingName: '轨道关闭({8}{9})',
trainingRemark: '轨道关闭',
trainingType: 'Section',
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' },
{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_section.operation, tip: '鼠标右键菜单选择【轨道】' },
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_section_close.operation, tip: '鼠标右键菜单选择【关闭】' }
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_section_close.operation, tip: '鼠标右键菜单选择【关闭】' },
{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择轨道【{8}】', codeType:'SECTION', val: '{19}' },
{ deviceType: '03', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' },
{ deviceType: '03', orderNum: 6, operateCode: OperationEvent.Command.common.confirm1.operation, tip: '请点击【确定】' },
{ deviceType: '03', orderNum: 7, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' }
]
},
{
@ -1123,14 +1216,17 @@ export default {
minDuration: 8,
operateType: CMD.Section.CMD_SECTION_SET_LIMIT_SPEED.value,
skinCode: '12',
trainingName: '区段临时限速({8}{9})',
trainingRemark: '区段临时限速',
trainingName: '轨道临时限速({8}{9})',
trainingRemark: '轨道临时限速',
trainingType: 'Section',
productTypes: ['01', '02'],
stepVOList: [
{ deviceType: 'bar', orderNum: 1, operateCode: OperationEvent.Command.commandNingBo3.line.operation, tip: '鼠标右键菜单选择【线路】' },
{ deviceType: 'bar', orderNum: 2, operateCode: OperationEvent.Command.commandNingBo3.line_section.operation, tip: '鼠标右键菜单选择【轨道】' },
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_section_limitSpeed.operation, tip: '鼠标右键菜单选择【临时限速】' }
{ deviceType: 'bar', orderNum: 3, operateCode: OperationEvent.Command.commandNingBo3.line_section_limitSpeed.operation, tip: '鼠标右键菜单选择【临时限速】' },
{ deviceType: 'mbm', orderNum: 4, operateCode: OperationEvent.Command.common.choose.operation, tip: '请选择轨道【{8}】', codeType:'SECTION', val: '{19}' },
{ deviceType: '03', orderNum: 5, operateCode: OperationEvent.Command.common.apply.operation, tip: '请点击【应用】' },
{ deviceType: '03', orderNum: 6, operateCode: OperationEvent.Command.common.close.operation, tip: '请点击【关闭】' }
]
}
]

2
src/jmapNew/theme/xian_01/operationConfig.js
View File

@ -16,6 +16,8 @@
// {id: "12", trainingType: "Stand", name: "站台行驶方向"}
// {id: "13", trainingType: "Stand", name: "站台行驶方向编号(反)"}
// {id: "14", trainingType: "Stand", name: "站台行驶方向(反)"}
// {id: "29", trainingType: "Stand", name: "站台名称"}
// {id: "30", trainingType: "Stand", name: "站台编码"}
// {id: "15", trainingType: "Switch", name: "道岔位置"}
// {id: "16", trainingType: "Switch", name: "道岔位置(反)"}

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

@ -7,8 +7,12 @@ export const OperationEvent = {
operation: 'com01',
domId: '_Tips-Cmd-Common-Choose'
},
confirm: {
select: {
operation: 'com02',
domId: '_Tips-Cmd-Common-Select'
},
confirm: {
operation: 'com03',
domId: '_Tips-Cmd-Common-Confirm'
},
apply: {
@ -23,16 +27,20 @@ export const OperationEvent = {
operation: 'com06',
domId: '_Tips-Cmd-Common-Choose1'
},
confirm1: {
select: {
operation: 'com07',
domId: '_Tips-Cmd-Common-Select'
},
confirm1: {
operation: 'com08',
domId: '_Tips-Cmd-Common-Confirm1'
},
apply1: {
operation: 'com08',
operation: 'com09',
domId: '_Tips-Cmd-Common-Apply1'
},
close1: {
operation: 'com09',
operation: 'com10',
domId: '_Tips-Cmd-Common-Close1'
},
},

2
src/scripts/cmdPlugin/ValidateHandler.js
View File

@ -32,7 +32,7 @@ class ValidateHandler {
const order = Handler.getOrder();
let valid = false;
// console.log(operate, steps[order])
console.log(operate, steps[order])
if (operate.over && steps.length == 1) { // 右键菜单直接发送校验
if (operate && steps[0] &&
operate.code == steps[0].code &&

1
src/views/newMap/mapsystemNew/plugin/trainingtip.vue
View File

@ -155,7 +155,6 @@ export default {
align = 'top';
}
console.log(align)
return {
align: align,
x: offset.x + btnDom.clientWidth / 2,