-
@@ -14,7 +13,6 @@
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue
index ed1b72216..705823436 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuButton.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuButton.vue
@@ -2,14 +2,241 @@
diff --git a/src/jmapNew/theme/haerbin_01/menus/menuSignal.vue b/src/jmapNew/theme/haerbin_01/menus/menuSignal.vue
index 609545c0b..6de9e9a6e 100644
--- a/src/jmapNew/theme/haerbin_01/menus/menuSignal.vue
+++ b/src/jmapNew/theme/haerbin_01/menus/menuSignal.vue
@@ -25,7 +25,7 @@ import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import { mapGetters } from 'vuex';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import { querySignalStatus } from '@/api/simulation';
+// import { querySignalStatus } from '@/api/simulation';
export default {
name: 'SignalMenu',
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: {
/** 控制模式操作 */
diff --git a/src/store/modules/map.js b/src/store/modules/map.js
index 57d6e18f5..c3a854838 100644
--- a/src/store/modules/map.js
+++ b/src/store/modules/map.js
@@ -183,6 +183,8 @@ const map = {
routeList: [], // 进路list
autoReentryData: {}, // 自动折返数据
autoReentryList: [], // 自动折返list
+ signalApproachSectionData: {}, // 信号机接近区段数据
+ signalApproachSectionList: [], // 信号机接近区段list
stepData: [], // 缓存数据
mapConfig: [], // 地图所属线路配置
recoverStepData: [], // 缓存恢复数据
@@ -224,6 +226,12 @@ const map = {
autoReentryList: (state) => {
return state.autoReentryList;
},
+ signalApproachSectionData: (state) => {
+ return state.signalApproachSectionData;
+ },
+ signalApproachSectionList: (state) => {
+ return state.signalApproachSectionList;
+ },
seclectDeviceList: (state) => {
return state.seclectDeviceList;
},
@@ -446,6 +454,9 @@ const map = {
getDeviceByCode: (state) => (code) => {
return state.mapDevice[code];
},
+ getApproachSectionByCode: (state) => (code) => {
+ return state.signalApproachSectionData[code];
+ },
// 查询区段关联的计数器
getCounterBySectionCode: (state) => (code, type) => {
@@ -664,6 +675,12 @@ const map = {
});
state.autoReentryList = autoReentryList;
},
+ setSignalApproachSectionData: (state, signalApproachSectionList) => {
+ signalApproachSectionList.forEach(data => {
+ state.signalApproachSectionData[data.signalCode] = data;
+ });
+ state.signalApproachSectionList = signalApproachSectionList;
+ },
updateRouteState: (state, status) => {
state.routeData[status.code] = deepAssign(state.routeData[status.code], status);
},
@@ -701,6 +718,9 @@ const map = {
setAutoReentryData: ({ commit }, autoReentryData) => {
commit('setAutoReentryData', autoReentryData);
},
+ setSignalApproachSectionData: ({ commit }, signalApproachSectionList) => {
+ commit('setSignalApproachSectionData', signalApproachSectionList);
+ },
updateRouteState: ({ commit }, status) => { // 设置进路数据状态
commit('updateRouteState', status);
},
diff --git a/src/store/modules/menuoperation.js b/src/store/modules/menuoperation.js
index 85be30852..b53cf5738 100644
--- a/src/store/modules/menuoperation.js
+++ b/src/store/modules/menuoperation.js
@@ -13,6 +13,7 @@ const menuOperation = {
selected: {}, // 选中的地图对象
subType: '', // 选中的设备子元素类型
selectedCount: 0, // 选中对象变更标识
+ setMenuChangeCount: 0, // 哈尔滨线路左键点击变更标识
menu: null, // 弹出菜单设备
menuPosition: {}, // 弹出菜单位置
menuCount: 0, // 弹出菜单变更标识
@@ -79,6 +80,11 @@ const menuOperation = {
state.subType = selected.subType;
state.selectedCount += 1;
},
+ setMenuChange: (state, selected) => {
+ state.selected = selected.device;
+ state.subType = selected.subType;
+ state.setMenuChangeCount += 1;
+ },
mbmpCountIncrement: (state) => {
state.mbmpCount += 1;
},
@@ -175,6 +181,10 @@ const menuOperation = {
setSelected: ({ commit }, selected) => {
commit('setSelected', selected);
},
+ // 改变哈尔滨底部菜单
+ setMenuChange: ({ commit }, selected) => {
+ commit('setMenuChange', selected);
+ },
/**
* 设置菜单
diff --git a/src/utils/loaddata.js b/src/utils/loaddata.js
index ca0b560db..d4d2e8a5e 100644
--- a/src/utils/loaddata.js
+++ b/src/utils/loaddata.js
@@ -49,8 +49,10 @@ export function loadNewMapDataByGroup(group) {
});
const routeData = resp.data.logicDataNew.routeList; // 设置进路数据
const autoReentryData = resp.data.logicDataNew.autoReentryList; // 自动折返数据
+ const signalApproachSectionData = resp.data.logicDataNew.signalApproachSectionList; // 信号机接近区段数据
store.dispatch('map/setRouteData', routeData);
store.dispatch('map/setAutoReentryData', autoReentryData);
+ store.dispatch('map/setSignalApproachSectionData', signalApproachSectionData);
const mapConfig = resp.data.configVO;
store.dispatch('map/setMapConfig', mapConfig);
store.dispatch('map/setMapVersion', resp.data.version);
diff --git a/src/views/newMap/displayNew/menuDemon.vue b/src/views/newMap/displayNew/menuDemon.vue
index 948e2c5e0..6966ae6c7 100644
--- a/src/views/newMap/displayNew/menuDemon.vue
+++ b/src/views/newMap/displayNew/menuDemon.vue
@@ -5,7 +5,7 @@
{{ $t('display.demon.trialTime') }} {{ countTime }}
-