From dc3e3d7b7e614308913d9e20fc42fc191b6b92f9 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Mon, 22 Feb 2021 10:27:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=81=E6=B3=A2=E4=B8=80=20=E8=AE=A1?=
=?UTF-8?q?=E8=BD=B4=E5=A4=8D=E4=BD=8D=E6=8C=89=E9=92=AE=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/jmapNew/shape/AxleReset/EMouse.js | 16 +--
.../theme/components/utils/menuOperate.js | 5 +
.../ningbo_01/menus/dialog/buttonDown.vue | 107 ++++++++----------
.../menus/dialog/childDialog/confirmTip.vue | 28 ++++-
src/jmapNew/theme/ningbo_01/menus/index.vue | 5 +-
.../ningbo_01/menus/menuStationPreReset.vue | 33 +++---
src/scripts/ConstDic.js | 3 +-
src/scripts/cmdPlugin/CommandEnum.js | 12 +-
src/scripts/cmdPlugin/OperationHandler.js | 15 ++-
src/store/modules/menuoperation.js | 12 +-
.../newMap/mapsystemNew/common/index.vue | 7 ++
11 files changed, 141 insertions(+), 102 deletions(-)
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 }}
+
+
+
+ 确定
+
+
+ 关闭
+
+
+