diff --git a/src/jmapNew/config/skinCode/ningbo_01.js b/src/jmapNew/config/skinCode/ningbo_01.js
index 3651e1826..4c04cbd03 100644
--- a/src/jmapNew/config/skinCode/ningbo_01.js
+++ b/src/jmapNew/config/skinCode/ningbo_01.js
@@ -484,7 +484,7 @@ class SkinCode extends defaultStyle {
lamp: {
fill: 'rgba(0,0,0,0)', // 填充色
radiusR: 6, // 控制灯大小
- controlColor: '#b5b3b3' // 控制灯颜色 (灰色)
+ controlColor: 'red' // 控制灯颜色 (灰色)
}
};
diff --git a/src/jmapNew/shape/Automactic/index.js b/src/jmapNew/shape/Automactic/index.js
index 459e1faee..e551ccd5f 100644
--- a/src/jmapNew/shape/Automactic/index.js
+++ b/src/jmapNew/shape/Automactic/index.js
@@ -104,9 +104,16 @@ export default class Automactic extends Group {
this.add(this.text);
}
+ recover() {
+ this.control.setStyle({ fill: this.style.AutoTurnBack.lamp.controlColor });
+ }
+ handleSignal() {
+ this.control.setStyle({ fill: 'green' });
+ }
// 设置状态
setState(model) {
- // model.show && this.handleSignal();
+ this.recover();
+ model.green && this.handleSignal();
}
createMouseEvent() {
diff --git a/src/jmapNew/shape/AxleReset/index.js b/src/jmapNew/shape/AxleReset/index.js
index a961fa6a0..d1c85dfbf 100644
--- a/src/jmapNew/shape/AxleReset/index.js
+++ b/src/jmapNew/shape/AxleReset/index.js
@@ -40,7 +40,8 @@ export default class AxleReset extends Group {
r: this.style.AxleReset.lamp.radiusR
},
style: {
- lineWidth: 0,
+ stroke: '##b5b3b3',
+ lineWidth: 1.5,
fill: this.style.AxleReset.lamp.controlColor
}
});
diff --git a/src/jmapNew/shape/Signal/index.js b/src/jmapNew/shape/Signal/index.js
index c5df0e0bc..79cc201c3 100644
--- a/src/jmapNew/shape/Signal/index.js
+++ b/src/jmapNew/shape/Signal/index.js
@@ -362,7 +362,7 @@ class Signal extends Group {
// 引导
guid() {
- if (this.style.Signal.lamp.guidName == 'ningbo_01' && this.count == 1) {
+ if (this.style.Signal.lamp.guidName == 'ningbo_01') {
this.lamps[1].show();
}
if (this.count == 2 && !this.model.lightType && this.style.Signal.lamp.guidName != 'chengdu_03') { // 双灯 物理点灯 允许引导信号
@@ -480,7 +480,7 @@ class Signal extends Group {
if (this.style.Signal.lamp.guidName == 'chengdu_03') {
this.lamps[0].setStyle({ lineWidth: this.style.Signal.lamp.borderWidth });
}
- if (this.style.Signal.lamp.guidName == 'ningbo_01' && this.count == 1) {
+ if (this.style.Signal.lamp.guidName == 'ningbo_01') {
this.lamps[1].hide();
}
}
diff --git a/src/jmapNew/theme/ningbo_01/menus/dialog/sectionAlxeReset.vue b/src/jmapNew/theme/ningbo_01/menus/dialog/sectionAlxeReset.vue
new file mode 100644
index 000000000..33a16f85a
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/dialog/sectionAlxeReset.vue
@@ -0,0 +1,157 @@
+
+
+
+
+
+ 确定
+
+
+ 取 消
+
+
+
+
+
+
+
diff --git a/src/jmapNew/theme/ningbo_01/menus/index.vue b/src/jmapNew/theme/ningbo_01/menus/index.vue
index 1694aab05..e80fc73b5 100644
--- a/src/jmapNew/theme/ningbo_01/menus/index.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/index.vue
@@ -4,6 +4,7 @@
+
>
@@ -25,6 +26,7 @@ import { mapGetters } from 'vuex';
import MenuCancel from './menuCancel';
import MenuSignal from './menuSignal';
// import MenuButton from './menuButton';
+import MenuAxleReset from './menuAxleReset';
import MenuAutoTrunRoute from './menuAutoTrunRoute';
import MenuStationStand from './menuStationStand';
import MenuStationControl from './menuStationControl';
@@ -43,6 +45,7 @@ export default {
components: {
MenuBar,
// MenuButton,
+ MenuAxleReset,
MenuAutoTrunRoute,
MenuCancel,
MenuSignal,
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuAxleReset.vue b/src/jmapNew/theme/ningbo_01/menus/menuAxleReset.vue
new file mode 100644
index 000000000..1237a53ae
--- /dev/null
+++ b/src/jmapNew/theme/ningbo_01/menus/menuAxleReset.vue
@@ -0,0 +1,108 @@
+
+
+
+
+
diff --git a/src/scripts/ConstDic.js b/src/scripts/ConstDic.js
index 491ecb334..64ff2cc58 100644
--- a/src/scripts/ConstDic.js
+++ b/src/scripts/ConstDic.js
@@ -105,6 +105,7 @@ export const DeviceMenu = {
TrainWindow: '09',
LimitControl: '10',
AutoTurnBack: '11',
+ AxleReset: '12',
Map: '100',
PrdCategory: '101',
diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js
index 660e9bc13..ebe08e9ea 100644
--- a/src/scripts/cmdPlugin/OperationHandler.js
+++ b/src/scripts/cmdPlugin/OperationHandler.js
@@ -1946,6 +1946,23 @@ export const OperationEvent = {
}
},
+ AxleReset: {
+ SetAxleReset: {
+ menu: {
+ operation: '1000',
+ domId: '_Tips-Axle-Reset-Menu'
+ },
+ choose: {
+ operation: '10001',
+ domId: '_Tips-Axle-Reset-Choose-Menu'
+ },
+ confirm: {
+ operation: '10002',
+ domId: '_Tips-Axle-Reset-confirm-Menu'
+ }
+ }
+ },
+
// 混合指令
MixinCommand: {
/** 控制模式操作 */