Merge branch 'test_dispaly' of https://git.code.tencent.com/lian-cbtc/jl-client into test_dispaly1
This commit is contained in:
commit
a3791a0cbf
@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<div v-if="isShowBtn" id="menuButtons_box" class="menu menuButton" style="height: 45px;" :style="{left: point.x+'px', bottom: point.y+'px' }">
|
||||
<div id="menuButtons_box" class="menu menuButton" style="height: 45px;" :style="{left: point.x+'px', bottom: point.y+'px' }">
|
||||
<button :id="Signal.arrangementRoute.button.domId" class="button_box" :style="{width: width+'px', backgroundColor:buttonUpColor}" @click="buttonDown(Signal.arrangementRoute.button.operation, ['Signal'])">
|
||||
<span style="color: black">
|
||||
<center><b>排</b><b>列</b></center>
|
||||
@ -172,9 +172,6 @@ export default {
|
||||
Command() {
|
||||
return OperationEvent.Command;
|
||||
},
|
||||
isShowBtn() {
|
||||
return this.$store.state.training.prdType == '01';
|
||||
},
|
||||
CMD() {
|
||||
return CMD;
|
||||
},
|
||||
@ -320,7 +317,7 @@ export default {
|
||||
this.commandTypeList = [];
|
||||
this.$store.dispatch('menuOperation/setButtonOperation', null);
|
||||
this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
|
||||
Handler.clear(); // 清空操作组
|
||||
// Handler.clear(); // 清空操作组
|
||||
}
|
||||
});
|
||||
}
|
||||
@ -328,7 +325,7 @@ export default {
|
||||
resetMbmButton() {
|
||||
this.commandTypeList = [];
|
||||
this.$store.dispatch('menuOperation/setButtonOperation', null);
|
||||
Handler.clear(); // 清空操作组
|
||||
// Handler.clear(); // 清空操作组
|
||||
},
|
||||
// 排列进路 OR 信号重开操作
|
||||
arrangementRouteOperation(deviceList) {
|
||||
@ -691,11 +688,6 @@ export default {
|
||||
});
|
||||
},
|
||||
selectedChange() {
|
||||
// 按钮按下时
|
||||
if (this.$store.state.training.prdType != '01') {
|
||||
return '';
|
||||
}
|
||||
|
||||
const buttonOperation = this.$store.state.menuOperation.buttonOperation;
|
||||
const model = this.$store.state.menuOperation.selected; // 选择设备
|
||||
const subType = this.$store.state.menuOperation.subType; // 选择设备的子元素
|
||||
@ -743,7 +735,7 @@ export default {
|
||||
}
|
||||
},
|
||||
clearOperate() {
|
||||
Handler.clear(); // 清空操作组
|
||||
// Handler.clear(); // 清空操作组
|
||||
this.deviceList = [];
|
||||
this.$store.dispatch('menuOperation/setButtonOperation', null);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user