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

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

Browse Source
This commit is contained in:
lVAL 2021-02-19 10:43:06 +08:00
commit 86a420d8ec
6 changed files with 91 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/jmapNew/theme/components/menus/dialog/routeControl.vue
View File

@ -39,6 +39,7 @@
<confirm-control ref="confirmControl" :pop-class="popClass" />
<password-box ref="password" :pop-class="popClass" @checkOver="passWordCommit" />
<notice-info ref="noticeInfo" :pop-class="popClass" />
<ning-bo-confirm-tip ref="ningBoConfirmTip" />
</el-dialog>
</template>
@ -50,13 +51,15 @@ import ConfirmControl from '../childDialog/confirmControl';
import NoticeInfo from '../childDialog/noticeInfo';
import PasswordBox from '../childDialog/passwordInputBox';
import {menuOperate, commitOperate} from '../../utils/menuOperate';
import ningBoConfirmTip from '../../../ningbo_01/menus/dialog/childDialog/confirmTip';
export default {
name: 'RouteControl',
components: {
ConfirmControl,
NoticeInfo,
PasswordBox
PasswordBox,
ningBoConfirmTip
},
props: {
popClass: {
@ -184,7 +187,11 @@ export default {
switch (this.popClass) {
case 'ningbo-01__systerm':
// 信号机总取消
this.sendCommand(menuOperate.Signal.signalTotalCancle);
// this.sendCommand(menuOperate.Signal.signalTotalCancle);
this.sendCommandNext(menuOperate.Signal.cancelTrainRoute).then(operate => {
operate.message = `命令：进路取消<br/>始端信号机：${this.stationName} ${this.signalName}`;
this.$refs.ningBoConfirmTip.doShow(operate);
});
break;
case 'fuzhou-01__systerm':
if (this.$store.state.training.prdType === '01') {

17
src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/confirmTip.vue
View File

@ -69,6 +69,7 @@ export default {
this.operation = operate.operation;
},
confirm() {
try {
if (this.operation === OperationEvent.Signal.arrangementRoute.menu.operation) {
const step = {
operation: OperationEvent.Signal.arrangementRoute.secondaryConfirm.operation,
@ -79,10 +80,22 @@ export default {
this.$emit('close');
this.doClose();
}
}).catch(() => {
});
} else if (this.operation === OperationEvent.Signal.cancelTrainRoute.menu.operation) {
const step = {
operation: OperationEvent.Signal.cancelTrainRoute.secondaryConfirm.operation,
cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
};
commitOperate(step, {}, 2).then(({valid}) => {
if (valid) {
this.doClose();
}
});
}
} catch (e) {
console.error(e);
this.doClose();
this.$refs.noticeInfo.doShow();
});
}
},
doClose() {

6
src/jmapNew/theme/ningbo_01/menus/dialog/childDialog/operateConfirm.vue
View File

@ -76,6 +76,12 @@ export default {
this.doClose();
}
});
} else if (this.operation === OperationEvent.Station.atsAutoControlALL.confirm) {
commitOperate({ operation: this.operation, cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING }, {stationCode: this.$store.state.map.showCentralizedStationCode }, 2).then(({valid}) => {
if (valid) {
this.doClose();
}
});
}
},
doClose() {

4
src/jmapNew/theme/ningbo_01/menus/dialog/routeSelection.vue
View File

@ -37,7 +37,7 @@
</el-col>
</el-row>
<notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
<confirm-tip ref="confirmTip" />
<confirm-tip ref="confirmTip" @close="doClose" />
</el-dialog>
</template>
@ -268,7 +268,7 @@ export default {
if (valid) {
const signal = this.$store.getters['map/getDeviceByCode'](this.row.startSignalCode);
operate.message = `命令：进路设置<br/>始端信号机：${signal.name}<br/>进路：${this.row.name}`;
this.doClose();
// this.doClose();
this.$refs.confirmTip.doShow(operate);
}
}).catch(() => {

42
src/jmapNew/theme/ningbo_01/menus/menuBar.vue
View File

@ -60,7 +60,7 @@
@click.stop="hookClick(child)"
>
<span class="status">&ensp;</span>
<span class="label">{{ child.title }}</span>
<span class="label">{{ child.computedTitle?computedTitle(child): child.title }}</span>
</li>
</template>
</template>
@ -292,17 +292,20 @@ export default {
{
title: '设置全站自动通过进路',
operate: OperationEvent.Station.stationSetCIAuto.mbar,
click: this.setAllCiAuto
click: this.setAllCiAuto,
computedTitle: true
},
{
title: '取消全站自动通过进路',
operate: OperationEvent.Station.stationCancelCIAuto.mbar,
click: this.cancelAllCiAuto
click: this.cancelAllCiAuto,
computedTitle: true
},
{
title: '全站自动交自动控',
operate: OperationEvent.Station.atsAutoControlALL.mbar,
click: ''
click: this.setAllAutoControl,
computedTitle: true
}
]
},
@ -631,6 +634,18 @@ export default {
}
return true;
},
computedTitle(child) {
const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
if (child.operate === OperationEvent.Station.stationSetCIAuto.mbar && station) {
return `设置${station.name}全站自动通过进路`;
} else if (child.operate === OperationEvent.Station.stationCancelCIAuto.mbar && station) {
return `取消${station.name}全站自动通过进路`;
} else if (child.operate === OperationEvent.Station.atsAutoControlALL.mbar && station) {
return `${station.name}全站进路交自动控`;
} else {
return '';
}
},
initStationList() {
const list = [];
this.stationList.forEach(station => {
@ -923,6 +938,25 @@ export default {
}
});
},
setAllAutoControl(order) {
const operate = {
type: 'bar',
operation: order.operation
};
this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
if (valid) {
this.closeMenu(true);
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.map.showCentralizedStationCode);
const nextOperate = {
operation: OperationEvent.Station.atsAutoControlALL.confirm,
message: `是否要执行批处理命令: ${station.name}全站进路交自动控`
};
this.$refs.operateConfirm.doShow(nextOperate);
}
});
},
cancelAllCiAuto(order) {
const operate = {
type: 'bar',

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

@ -1111,6 +1111,10 @@ export const OperationEvent = {
choose: {
operation: '3033',
domId: '_Tips-Signal-CancelTrainRoute-Choose'
},
secondaryConfirm: {
operation: '3034',
domId: '_Tips-Signal-CancelTrainRoute-SecondaryConfirm'
}
},
// 信号重开
@ -2279,6 +2283,10 @@ export const OperationEvent = {
mbar: {
operation: '6062',
domId: '_Tips-Station-AtsAutoControlAll-Mbar'
},
confirm: {
operation: '6063',
domId: '_Tips-Station-AtsAutoControlAll-Confirm'
}
},
split: {