diff --git a/src/jmapNew/shape/AxleReset/EMouse.js b/src/jmapNew/shape/AxleReset/EMouse.js index f2547d8c6..fa836611b 100644 --- a/src/jmapNew/shape/AxleReset/EMouse.js +++ b/src/jmapNew/shape/AxleReset/EMouse.js @@ -31,10 +31,10 @@ export default class EMouse extends Group { if (e.target && e.target._subType == 'Text') { this.text.show(); } else { - this.device.control.setControlColor(this.device.style.LcControl.mouseOverStyle.arcColor); - this.device.control.setTextColor(this.device.style.LcControl.mouseOverStyle.textColor); - this.device.control.setTextBorder(true); - this.device.control.setArcBorder(true); + // this.device.control.setControlColor(this.device.style.LcControl.mouseOverStyle.arcColor); + // this.device.control.setTextColor(this.device.style.LcControl.mouseOverStyle.textColor); + // this.device.control.setTextBorder(true); + // this.device.control.setArcBorder(true); } } @@ -43,10 +43,10 @@ export default class EMouse extends Group { if (e.target && e.target._subType == 'Text') { this.text.hide(); } else { - this.device.control.setControlColor(this.device.style.LcControl.lamp.controlColor); - this.device.control.setTextColor('#FFFFFF'); - this.device.control.setTextBorder(false); - this.device.control.setArcBorder(false); + // this.device.control.setControlColor(this.device.style.LcControl.lamp.controlColor); + // this.device.control.setTextColor('#FFFFFF'); + // this.device.control.setTextBorder(false); + // this.device.control.setArcBorder(false); } } } diff --git a/src/jmapNew/theme/components/utils/menuOperate.js b/src/jmapNew/theme/components/utils/menuOperate.js index 5f3b7c911..33b4c9793 100644 --- a/src/jmapNew/theme/components/utils/menuOperate.js +++ b/src/jmapNew/theme/components/utils/menuOperate.js @@ -421,6 +421,11 @@ export const menuOperate = { setPreReset: { operation: OperationEvent.Station.setPreReset.menu.operation, cmdType: CMD.Station.CMD_STATION_PRE_RESET + }, + // 取消计轴预复位 + cancelPreReset: { + operation: OperationEvent.Station.cancelPreReset.menu.operation, + cmdType: CMD.Station.CMD_STATION_PRE_RESET } }, // 设置/取消强制点灯 diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/buttonDown.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/buttonDown.vue index 3a71065dd..9131a79c2 100644 --- a/src/jmapNew/theme/ningbo_01/menus/dialog/buttonDown.vue +++ b/src/jmapNew/theme/ningbo_01/menus/dialog/buttonDown.vue @@ -9,43 +9,44 @@ :z-index="2000" :modal="false" :close-on-click-modal="false" - append-to-body > - - - - 确定 - 关闭 + 集中站 + {{ stationName }} + + 按钮 + {{ buttonName }} + + + + 确定 + + + 关闭 + + +