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 2022-05-10 14:18:54 +08:00
commit 5057180826
3 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,10 +6,10 @@
</span> </span>
</button> </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'])">--> <!--<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'])">-->
<!--&lt;!&ndash;<span style="color: #800000">&ndash;&gt;--> <!--&lt;!&ndash;<span style="color: #800000">&ndash;&gt;-->
<!--<span style="color: #808080">--> <!--<span style="color: #808080">-->
<!--<center><b>坡道解锁</b></center>--> <!--<center><b>坡道解锁</b></center>-->
<!--</span>--> <!--</span>-->
<!--</button>--> <!--</button>-->
<button :id="MixinCommand.totalCancel.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(MixinCommand.totalCancel.button.operation, ['Signal','SignalButton'])"> <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"> <span style="color: black">
@ -72,14 +72,14 @@
</span> </span>
</button> </button>
<!--<button :id="Signal.signalLight.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.signalLight.menuButton.operation, ['Signal'])">--> <!--<button :id="Signal.signalLight.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.signalLight.menuButton.operation, ['Signal'])">-->
<!--<span style="color: black">--> <!--<span style="color: black">-->
<!--<center><b>点灯</b></center>--> <!--<center><b>点灯</b></center>-->
<!--</span>--> <!--</span>-->
<!--</button>--> <!--</button>-->
<!--<button :id="Signal.signalDestroy.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.signalDestroy.menuButton.operation, ['Signal'])">--> <!--<button :id="Signal.signalDestroy.menuButton.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.signalDestroy.menuButton.operation, ['Signal'])">-->
<!--<span style="color:#800000">--> <!--<span style="color:#800000">-->
<!--<center><b>灭灯</b></center>--> <!--<center><b>灭灯</b></center>-->
<!--</span>--> <!--</span>-->
<!--</button>--> <!--</button>-->
<button :id="Station.guideLock.button.domId" class="button_box" :style="{width: width+'px', backgroundColor: guideLockLeftFlag? guideColorDown: guideColorUp}" @click="guideLockLeftButtonDown()"> <button :id="Station.guideLock.button.domId" class="button_box" :style="{width: width+'px', backgroundColor: guideLockLeftFlag? guideColorDown: guideColorUp}" @click="guideLockLeftButtonDown()">
<span style="color: #800000"> <span style="color: #800000">
@ -111,9 +111,9 @@
</span> </span>
</button> </button>
<!--<button class="button_box" :style="{width: width + 'px', backgroundColor:buttonUpColor}" @click="buttonDown()">--> <!--<button class="button_box" :style="{width: width + 'px', backgroundColor:buttonUpColor}" @click="buttonDown()">-->
<!--<span style="color: #800000">--> <!--<span style="color: #800000">-->
<!--<center><b>故障通知</b></center>--> <!--<center><b>故障通知</b></center>-->
<!--</span>--> <!--</span>-->
<!--</button>--> <!--</button>-->
<password-box ref="password" @checkOver="passWordCommit" @checkCancel="clearOperate" /> <password-box ref="password" @checkOver="passWordCommit" @checkCancel="clearOperate" />
<notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" /> <notice-info ref="noticeInfo" pop-class="chengdou-03__systerm" />
@ -395,7 +395,7 @@ export default {
if (valid) { if (valid) {
this.commandTypeList = []; this.commandTypeList = [];
this.$store.dispatch('menuOperation/setButtonOperation', null); this.$store.dispatch('menuOperation/setButtonOperation', null);
this.guideLockRightFlag = false; this.guideLockRightFlag = false;
} }
}); });
} }
@ -650,7 +650,7 @@ export default {
this.clearOperate(); this.clearOperate();
} }
} else if (!buttonOperation) { } else if (!buttonOperation) {
const signalButtonList = ['ASSIST', 'CHANGE_DIRECTION', 'PICK_ASSIST', 'DEPART_ASSIST', 'OCCLUSION', 'RECOVERY']; const signalButtonList = ['ASSIST', 'CHANGE_DIRECTION', 'PICK_ASSIST', 'DEPART_ASSIST', 'OCCLUSION', 'RECOVERY', 'ACCIDENT'];
if (model._type === 'SignalButton' && !this.checkSignalBlock(model.signalCode) && model.type === 'GUIDE' ) { if (model._type === 'SignalButton' && !this.checkSignalBlock(model.signalCode) && model.type === 'GUIDE' ) {
this.handleGuideSignal(model); this.handleGuideSignal(model);
} else if (model._type === 'SignalButton' && signalButtonList.includes(model.type)) { } else if (model._type === 'SignalButton' && signalButtonList.includes(model.type)) {
@ -736,7 +736,18 @@ export default {
labelEnum:model.labelEnum, labelEnum:model.labelEnum,
stationCode:model.stationCode stationCode:model.stationCode
} }
},
// 事故按钮
'ACCIDENT':{
operation:this.CTCCommand.assistPressAccident.menu.operation,
nextCmdType:CMD.CTC.CTC_ASSIST_PRESS_ACCIDENT,
param:{
labelEnum:model.labelEnum,
stationCode:model.stationCode,
pressDown:model.pressDown ? 0 : 1 // 1按下、0弹起
}
} }
}; };
const operate = { const operate = {
operation: modelTypeMap[model.type].operation, operation: modelTypeMap[model.type].operation,

3
src/scripts/cmdPlugin/CommandEnum.js
View File

@ -376,6 +376,7 @@ export default {
CTC_ASSIST_PRESS_RECEIVE_ASSIST:{value: 'ASSIST_PRESS_RECEIVE_ASSIST', label: '接辅助'}, CTC_ASSIST_PRESS_RECEIVE_ASSIST:{value: 'ASSIST_PRESS_RECEIVE_ASSIST', label: '接辅助'},
CTC_ASSIST_PRESS_DELIVER_ASSIST:{value: 'ASSIST_PRESS_DELIVER_ASSIST', label: '发辅助'}, CTC_ASSIST_PRESS_DELIVER_ASSIST:{value: 'ASSIST_PRESS_DELIVER_ASSIST', label: '发辅助'},
CTC_ASSIST_PRESS_BLOCK:{value: 'ASSIST_PRESS_BLOCK', label: '阻塞'}, CTC_ASSIST_PRESS_BLOCK:{value: 'ASSIST_PRESS_BLOCK', label: '阻塞'},
CTC_ASSIST_PRESS_RESTORE:{value: 'ASSIST_PRESS_RESTORE', label: '复原'} CTC_ASSIST_PRESS_RESTORE:{value: 'ASSIST_PRESS_RESTORE', label: '复原'},
CTC_ASSIST_PRESS_ACCIDENT:{value: 'ASSIST_PRESS_ACCIDENT', label: '事故'}
} }
}; };

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

@ -3591,6 +3591,12 @@ export const OperationEvent = {
operation: '1108', operation: '1108',
domId: '_Tips-CTC-AssistPressRestore-Menu{TOP}' domId: '_Tips-CTC-AssistPressRestore-Menu{TOP}'
} }
},
assistPressAccident:{
menu: {
operation: '1109',
domId: '_Tips-CTC-AssistPressAccident-Menu{TOP}'
}
} }
} }