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

代码调整

Browse Source
This commit is contained in:
fan 2023-07-07 18:03:03 +08:00
parent 104496ac5a
commit 502a994451
4 changed files with 63 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jmapNew/theme/datie_02/menus/dispatchWorkMenuBar.vue
View File

@ -110,12 +110,12 @@ export default {
operate: OperationEvent.Switch.reverse.mbar,
},
{
title: 'Turnout Lock',
title: 'Turnout Block',
click: this.handleSwitchOperate,
operate: OperationEvent.Switch.lock.mBar,
},
{
title: 'Turnout Unlock',
title: 'Turnout Unblock',
click: this.handleSwitchOperate,
operate: OperationEvent.Switch.unlock.mbar,
},

4
src/jmapNew/theme/datie_02/menus/localWorkMenuBar.vue
View File

@ -109,12 +109,12 @@ export default {
operate: OperationEvent.Switch.reverse.mbar
},
{
title: 'Turnout Lock',
title: 'Turnout Block',
click: this.handleSwitchOperate,
operate: OperationEvent.Switch.lock.mBar
},
{
title: 'Turnout Unlock',
title: 'Turnout Unblock',
click: this.handleSwitchOperate,
operate: OperationEvent.Switch.unlock.mbar
}

108
src/jmapNew/theme/datie_02/menus/menuButton.vue
View File

@ -2,7 +2,7 @@
<div id="menuButtons_box" class="menu menuButton" style="height:40px;" :style="{left: point.x+'px', bottom: point.y+'px' }">
<button :id="Station.stationMasterLock.rightButton.domId" class="button_box" :style="{width: width+'px', backgroundColor: xGuideMasterLock? guideColorDown: guideColorUp}" @click="guideLockRightButtonDown()">
<span style="color: #800000">
<center><b>X Guided Master Lock</b></center>
<center><b>X Guided Lock</b></center>
</span>
</button>
<!--<button :id="Station.guideLock.button.domId" style="cursor: not-allowed;" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Station.guideLock.button.operation, ['GuideLock'])">-->
@ -13,27 +13,27 @@
<!--</button>-->
<button :id="MixinCommand.totalCancel.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(MixinCommand.totalCancel.button.operation, ['Signal','SignalButton'])">
<span style="color: black">
<center><b>Total Cancellation</b></center>
<center><b>Cancel Route</b></center>
</span>
</button>
<button :id="Signal.humanTrainRoute.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.humanTrainRoute.button.operation, ['Signal','SignalButton'])">
<span style="color: #800000">
<center><b>Total man unlock</b></center>
<center><b>Manually Unlock</b></center>
</span>
</button>
<!-- <button :id="Section.fault.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Section.fault.button.operation, ['Section'])">-->
<!-- <span style="color: #800000">-->
<!-- <center><b>Zone fault release</b></center>-->
<!-- </span>-->
<!-- </button>-->
<!-- <button :id="Section.fault.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Section.fault.button.operation, ['Section'])">-->
<!-- <span style="color: #800000">-->
<!-- <center><b>Zone fault release</b></center>-->
<!-- </span>-->
<!-- </button>-->
<button :id="Switch.locate.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Switch.locate.button.operation, ['Switch'])">
<span style="color: black">
<center><b>Total positioning</b></center>
<center><b>Turnout Normal</b></center>
</span>
</button>
<button :id="Switch.reverse.button.domId" class="button_box" :style="{width: width+'px',backgroundColor:buttonUpColor}" @click="buttonDown(Switch.reverse.button.operation, ['Switch'])">
<span style="color: black">
<center><b>Total inversion</b></center>
<center><b>Turnout Reverse</b></center>
</span>
</button>
<button :id="Command.cancel.clearMbm.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Command.cancel.clearMbm.operation)">
@ -43,74 +43,74 @@
</button>
<button :id="Switch.lock.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Switch.lock.button.operation, ['Switch'])">
<span style="color: black">
<center><b>Individually locked</b></center>
<center><b>Signal Lock</b></center>
</span>
</button>
<button :id="Switch.unlock.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Switch.unlock.button.operation, ['Switch'])">
<span style="color: black">
<center><b>Individually unlock</b></center>
<center><b>Signal Unlock</b></center>
</span>
</button>
<button :id="Signal.lock.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.lock.button.operation, ['Signal', 'SignalButton'])">
<span style="color: black">
<center><b>Button blocking</b></center>
<center><b>Button Lock</b></center>
</span>
</button>
<button :id="Signal.unlock.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.unlock.button.operation, ['Signal', 'SignalButton'])">
<span style="color: black">
<center><b>Push-button unblocking</b></center>
<center><b>Button Unlock</b></center>
</span>
</button>
<button :id="Switch.block.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Switch.block.button.operation, ['Switch'])">
<span style="color: black">
<center><b>Switch blocking</b></center>
<center><b>Turnout Lock</b></center>
</span>
</button>
<button :id="Switch.unblock.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Switch.unblock.button.operation, ['Switch'])">
<span style="color: black">
<center><b>Switch unblocking</b></center>
<center><b>Turnout Unlock</b></center>
</span>
</button>
<!-- <button :id="Signal.signalTurnOn.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.signalTurnOn.menuButton.operation, ['SignalButton'])">-->
<!-- <span style="color: black">-->
<!-- <center><b>Light up</b></center>-->
<!-- </span>-->
<!-- </button>-->
<!-- <button :id="Signal.signalTurnOff.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.signalTurnOff.menuButton.operation, ['SignalButton'])">-->
<!-- <span style="color:#800000">-->
<!-- <center><b>Extinguish light</b></center>-->
<!-- </span>-->
<!-- </button>-->
<!-- <button :id="Signal.signalTurnOn.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.signalTurnOn.menuButton.operation, ['SignalButton'])">-->
<!-- <span style="color: black">-->
<!-- <center><b>Light up</b></center>-->
<!-- </span>-->
<!-- </button>-->
<!-- <button :id="Signal.signalTurnOff.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.signalTurnOff.menuButton.operation, ['SignalButton'])">-->
<!-- <span style="color:#800000">-->
<!-- <center><b>Extinguish light</b></center>-->
<!-- </span>-->
<!-- </button>-->
<button :id="Station.stationMasterLock.leftButton.domId" class="button_box" :style="{width: width+'px', backgroundColor: sGuideMasterLock? guideColorDown: guideColorUp}" @click="guideLockLeftButtonDown()">
<span style="color: #800000">
<center><b>S Guided Master Lock</b></center>
<center><b>S Guided Lock</b></center>
</span>
</button>
<!-- powerOnUnlock -->
<!-- <button :id="Station.powerUnLock.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Station.powerUnLock.button.operation,['Station'])">-->
<!-- &lt;!&ndash;<span style="color:black">&ndash;&gt;-->
<!-- <span style="color:#800000">-->
<!-- <center><b>Upper electrolytic lock</b></center>-->
<!-- </span>-->
<!-- </button>-->
<!-- <button :disabled="true" style="cursor: not-allowed;" class="button_box" :style="{width: width+'px',backgroundColor:buttonUpColor}" @click="buttonDown()">-->
<!-- &lt;!&ndash;<span style="color: black">&ndash;&gt;-->
<!-- <span style="color: #808080">-->
<!-- <center><b>Auxiliary menu</b></center>-->
<!-- </span>-->
<!-- </button>-->
<!-- <button :id="Section.defectiveShunting.button.domId" class="button_box" :style="{width: width+'px',backgroundColor:buttonUpColor}" @click="buttonDown(Section.defectiveShunting.button.operation, ['Section'])">-->
<!-- &lt;!&ndash;<span style="color:black">&ndash;&gt;-->
<!-- <span style="color:#800000 ">-->
<!-- <center><b>Bad split</b></center>-->
<!-- </span>-->
<!-- </button>-->
<!-- <button :disabled="true" style="cursor: not-allowed;" class="button_box" :style="{width: width+'px',backgroundColor:buttonUpColor}" @click="buttonDown()">-->
<!-- &lt;!&ndash;<span style="color: black">&ndash;&gt;-->
<!-- <span style="color: #808080">-->
<!-- <center><b>Marking window</b></center>-->
<!-- </span>-->
<!-- </button>-->
<!-- <button :id="Station.powerUnLock.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Station.powerUnLock.button.operation,['Station'])">-->
<!-- &lt;!&ndash;<span style="color:black">&ndash;&gt;-->
<!-- <span style="color:#800000">-->
<!-- <center><b>Upper electrolytic lock</b></center>-->
<!-- </span>-->
<!-- </button>-->
<!-- <button :disabled="true" style="cursor: not-allowed;" class="button_box" :style="{width: width+'px',backgroundColor:buttonUpColor}" @click="buttonDown()">-->
<!-- &lt;!&ndash;<span style="color: black">&ndash;&gt;-->
<!-- <span style="color: #808080">-->
<!-- <center><b>Auxiliary menu</b></center>-->
<!-- </span>-->
<!-- </button>-->
<!-- <button :id="Section.defectiveShunting.button.domId" class="button_box" :style="{width: width+'px',backgroundColor:buttonUpColor}" @click="buttonDown(Section.defectiveShunting.button.operation, ['Section'])">-->
<!-- &lt;!&ndash;<span style="color:black">&ndash;&gt;-->
<!-- <span style="color:#800000 ">-->
<!-- <center><b>Bad split</b></center>-->
<!-- </span>-->
<!-- </button>-->
<!-- <button :disabled="true" style="cursor: not-allowed;" class="button_box" :style="{width: width+'px',backgroundColor:buttonUpColor}" @click="buttonDown()">-->
<!-- &lt;!&ndash;<span style="color: black">&ndash;&gt;-->
<!-- <span style="color: #808080">-->
<!-- <center><b>Marking window</b></center>-->
<!-- </span>-->
<!-- </button>-->
<!--<button class="button_box" :style="{width: width + 'px', backgroundColor:buttonUpColor}" @click="buttonDown()">-->
<!--<span style="color: #800000">-->
<!--<center><b>故障通知</b></center>-->
@ -412,6 +412,12 @@ export default {
},
buttonDown(operation, commandTypeList) {
this.clearOperate();
// if()
const station = this.$store.getters['map/getDeviceByCode'](this.$store.state.training.roleDeviceCode);
if (station.controlMode !== 'Local') {
this.$message.error('Control error');
return;
}
const operate = {
start: true,
operation: operation,

4
src/jmapNew/theme/datie_02/menus/menuDialog/switchControl.vue
View File

@ -159,11 +159,11 @@ export default {
},
// 道岔单锁
lock() {
this.sendCommand(menuOperate.Switch.lock);
this.sendCommand(menuOperate.Switch.block);
},
// 道岔解锁
unlock() {
this.sendCommand(menuOperate.Switch.unlock);
this.sendCommand(menuOperate.Switch.unblock);
},
// 道岔定位
locate() {