diff --git a/src/jlmap3d/jl3ddrive/drivecontrol/simulation.js b/src/jlmap3d/jl3ddrive/drivecontrol/simulation.js
index d5a5720aa..0be6f6cae 100644
--- a/src/jlmap3d/jl3ddrive/drivecontrol/simulation.js
+++ b/src/jlmap3d/jl3ddrive/drivecontrol/simulation.js
@@ -77,73 +77,73 @@ export function bindSimulationTrain(group,groupNumber) {
})
}
//EB紧急制动
-export function trainSimulationEb(group,groupNumber) {
+export function trainSimulationEb(group,data) {
return request({
- url: `/simulation/driving/${group}/train/${groupNumber}/eb`,
- method: 'put',
- params: ''
+ url: `/simulation/${group}/operate/Driver_EB`,
+ method: 'post',
+ data: data
})
}
//改变列车牵引/制动力
-export function trainSimulationForce(group,groupNumber,percent) {
+export function trainSimulationForce(group,data) {
return request({
- url: `/simulation/driving/${group}/train/${groupNumber}/force/${percent}`,
- method: 'put',
- params: ''
+ url: `/simulation/${group}/operate/Driver_Force_Change`,
+ method: 'post',
+ data: data
})
}
//改变列车档位
-export function trainSimulationGear(group,groupNumber,gear) {
+export function trainSimulationGear(group,data) {
return request({
- url: `/simulation/driving/${group}/train/${groupNumber}/gear/${gear}`,
- method: 'put',
- params: ''
+ url: `/simulation/${group}/operate/Driver_Gear_Change`,
+ method: 'post',
+ data: data
})
}
//改变列车运行级别
-export function trainSimulationDriveMode(group,groupNumber,driveMode) {
+export function trainSimulationDriveMode(group,data) {
return request({
- url: `/simulation/driving/${group}/train/${groupNumber}/driveMode/${driveMode}`,
- method: 'put',
- params: ''
+ url: `/simulation/${group}/operate/Driver_Drive_Mode_Change`,
+ method: 'post',
+ data: data
})
}
//ATP切除
//ATO
-export function trainSimulationAtp(group,groupNumber) {
+export function trainSimulationAtp(group,data) {
return request({
- url: `/simulation/driving/${group}/train/${groupNumber}/atp`,
- method: 'put',
- params: ''
+ url: `/simulation/${group}/operate/Driver_ATP_Change`,
+ method: 'post',
+ data: data
})
}
//ATO
-export function trainSimulationAto(group,groupNumber) {
+export function trainSimulationAto(group,data) {
return request({
- url: `/simulation/driving/${group}/train/${groupNumber}/openAto`,
- method: 'put',
- params: ''
+ url: `/simulation/${group}/operate/Driver_ATO_Open`,
+ method: 'post',
+ data: data
})
}
//换端
-export function trainSimulationChangeHead(group,groupNumber) {
+export function trainSimulationChangeHead(group,data) {
return request({
- url: `/simulation/driving/${group}/train/${groupNumber}/changeHead`,
- method: 'put',
- params: ''
+ url: `/simulation/${group}/operate/Driver_Change_Head`,
+ method: 'post',
+ data: data
})
}
//
-export function trainSimulationDoorControl(group,groupNumber,direct,open) {
+export function trainSimulationDoorControl(group,data) {
return request({
- url: `/simulation/driving/${group}/train/${groupNumber}/onOrOffDoor?right=${direct}&open=${open}`,
- method: 'put',
- params: ''
+ url: `/simulation/${group}/operate/Driver_Door_On_Off`,
+ method: 'post',
+ data: data
})
}
diff --git a/src/jmapNew/theme/beijing_01/menus/menuBar.vue b/src/jmapNew/theme/beijing_01/menus/menuBar.vue
index 4e15ad56a..bcbd910fa 100644
--- a/src/jmapNew/theme/beijing_01/menus/menuBar.vue
+++ b/src/jmapNew/theme/beijing_01/menus/menuBar.vue
@@ -100,7 +100,6 @@
diff --git a/src/jmapNew/theme/components/utils/menuOperate.js b/src/jmapNew/theme/components/utils/menuOperate.js
index 1031bee29..9426ce8b2 100644
--- a/src/jmapNew/theme/components/utils/menuOperate.js
+++ b/src/jmapNew/theme/components/utils/menuOperate.js
@@ -38,6 +38,26 @@ export const menuOperate = {
// 区段故障解锁
operation: OperationEvent.Section.fault.menu.operation,
cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK
+ },
+ alxeFailure:{
+ // 设置计轴失效
+ operation: OperationEvent.Section.alxeFailure.menu.operation,
+ // cmdType 值有问题
+ cmdType: CMD.Section.CMD_SECTION_ADD_FAULT
+ },
+ unlock:{
+ // 区段解锁
+ operation: OperationEvent.Section.unlock.menu.operation,
+ cmdType: CMD.Section.CMD_SECTION_UNBLOCK
+ },
+ setFault: { // 设置故障
+ operation: OperationEvent.Section.stoppage.menu.operation,
+ cmdType: CMD.Section.CMD_SECTION_ADD_FAULT
+ },
+ cancelSpeed: {
+ // 取消限速
+ operation: OperationEvent.Section.cancelSpeed.menu.operation,
+ cmdType: CMD.Section.CMD_SECTION_CANCEL_LIMIT_SPEED
}
},
Signal:{
@@ -96,6 +116,22 @@ export const menuOperate = {
detail:{
// 查询进路状态
operation: OperationEvent.Signal.detail.menu.operation
+ },
+ guide:{ // 进路引导
+ operation: OperationEvent.Signal.guide.menu.operation,
+ cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE
+ },
+ cancelGuide:{ // 人工解锁进路(信号机取消引导)
+ operation: OperationEvent.Signal.cancelGuide.menu.operation,
+ cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_GUIDE
+ },
+ setAutoTurnBack:{ // 设置自动折返
+ operation: OperationEvent.AutoTurnBack.SetAutoTurnBackButton.menu.operation,
+ cmdType: CMD.Signal.CMD_SIGNAL_SET_AUTO_TURN_BACK
+ },
+ cancelAutoTurnBack:{ // 取消自动折返
+ operation: OperationEvent.AutoTurnBack.CancelAutoTurnBackButton.menu.operation,
+ cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_AUTO_TURN_BACK
}
},
Switch:{
@@ -162,6 +198,16 @@ export const menuOperate = {
// 区段故障解锁
operation: OperationEvent.Switch.fault.menu.operation,
cmdType: CMD.Switch.CMD_SWITCH_FAULT_UNLOCK
+ },
+ cancelSpeed: {
+ // 取消临时限速
+ operation: OperationEvent.Switch.cancelSpeed.menu.operation,
+ cmdType:CMD.Switch.CMD_SWITCH_CANCEL_LIMIT_SPEED
+ },
+ axlePreReset:{
+ // 计轴预复位
+ operation: OperationEvent.Switch.axlePreReset.menu.operation,
+ cmdType: CMD.Switch.CMD_SWITCH_AXIS_PRE_RESET
}
},
StationStand:{
@@ -218,6 +264,26 @@ export const menuOperate = {
detail:{
// 查询站台状态
operation: OperationEvent.StationStand.detail.menu.operation
+ },
+ cancelDetainTrainAll:{
+ // 全线取消扣车
+ operation: OperationEvent.StationStand.cancelDetainTrainAll.menu.operation,
+ cmdType:CMD.Stand.CMD_STAND_WHOLE_LINE_CANCEL_HOLD_TRAIN
+ },
+ cancelDetainTrainForce: {
+ // 强制取消扣车
+ operation: OperationEvent.StationStand.cancelDetainTrainForce.menu.operation,
+ cmdType: CMD.Stand.CMD_STAND_FORCE_CANCEL_HOLD_TRAIN
+ },
+ setBulkBuckleTrain:{
+ // 批量扣车
+ operation: OperationEvent.StationStand.setBulkBuckleTrain.menu.operation,
+ cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN_ALL
+ },
+ cancelBulkBuckleTrain:{
+ // 批量取消扣车
+ operation: OperationEvent.StationStand.cancelBulkBuckleTrain.menu.operation,
+ cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN_ALL
}
},
StationControl:{
@@ -235,6 +301,39 @@ export const menuOperate = {
// 紧急站控
operation: OperationEvent.StationControl.emergencyStationControl.menu.operation,
cmdType:CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL
+ },
+ setBackStrategy:{
+ // 设置折返策略
+ operation: OperationEvent.Station.setBackStrategy.menu.operation,
+ cmdType: CMD.Station.CMD_STATION_SET_TURN_BACK_STRATEGY
+ }
+ },
+ TrainWindow: {
+ editTrainId: {
+ operation: OperationEvent.Train.editTrainId.menu.operation,
+ cmdType: CMD.TrainWindow.CMD_TRAIN_UPDATE_TYPE
+ },
+ addTrainId: {
+ operation: OperationEvent.Train.addTrainId.menu.operation,
+ cmdType: ''
+ },
+ destinationTrainId: {
+ operation: OperationEvent.Train.editTrainId.menu.operation,
+ cmdType: CMD.TrainWindow.CMD_TRAIN_SET_HEAD
+ },
+ setPlanTrainId: {
+ operation: OperationEvent.Train.setPlanTrainId.menu.operation,
+ cmdType: CMD.TrainWindow.CMD_TRAIN_SET_PLAN
+ },
+ artificialTrainId: {
+ operation: OperationEvent.Train.artificialTrainId.menu.operation,
+ cmdType: CMD.TrainWindow.CMD_TRAIN_SET_MANUAL
+ }
+ },
+ LimitControl: {
+ cancelSpeed: {
+ operation: OperationEvent.LimitControl.CancelAllLimit.menu.operation,
+ cmdType: CMD.Fault.CMD_CANCEL_ALL_LIMIT_SPEED
}
},
Common: {
diff --git a/src/jmapNew/theme/ningbo_01/menus/menuBar.vue b/src/jmapNew/theme/ningbo_01/menus/menuBar.vue
index d5f26e00f..cf1cbf579 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuBar.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuBar.vue
@@ -100,7 +100,6 @@
-
-
diff --git a/src/jmapNew/theme/xian_02/menus/menuDialog/stationControl.vue b/src/jmapNew/theme/xian_02/menus/menuDialog/stationControl.vue
index 94b9cc380..ef0a3edab 100644
--- a/src/jmapNew/theme/xian_02/menus/menuDialog/stationControl.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuDialog/stationControl.vue
@@ -47,7 +47,7 @@
import { mapGetters } from 'vuex';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import TwoConfirmation from './childDialog/twoConfirmation';
-import {menuOperate, commitOperate} from '../utils/menuOperate';
+import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
export default {
name: 'StationControl',
diff --git a/src/jmapNew/theme/xian_02/menus/menuSection.vue b/src/jmapNew/theme/xian_02/menus/menuSection.vue
index 7b11690ae..7b3a63bd8 100644
--- a/src/jmapNew/theme/xian_02/menus/menuSection.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuSection.vue
@@ -20,7 +20,7 @@ import { mapGetters } from 'vuex';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
-import {menuOperate, commitOperate} from './utils/menuOperate';
+import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
export default {
diff --git a/src/jmapNew/theme/xian_02/menus/menuSignal.vue b/src/jmapNew/theme/xian_02/menus/menuSignal.vue
index 16c42919b..4f395cc9b 100644
--- a/src/jmapNew/theme/xian_02/menus/menuSignal.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuSignal.vue
@@ -20,7 +20,7 @@ import RouteHandControl from './dialog/routeHandControl';
import RouterCommand from './dialog/routerCommand';
import RouteDetail from './dialog/routeDetail';
import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-import {menuOperate, commitOperate} from './utils/menuOperate';
+import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
// import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
import { mapGetters } from 'vuex';
diff --git a/src/jmapNew/theme/xian_02/menus/menuStationControl.vue b/src/jmapNew/theme/xian_02/menus/menuStationControl.vue
index 3e3aab18f..ad66af856 100644
--- a/src/jmapNew/theme/xian_02/menus/menuStationControl.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuStationControl.vue
@@ -9,7 +9,7 @@
import PopMenu from '@/components/PopMenu';
import StationControl from './dialog/stationControl';
import { mapGetters } from 'vuex';
-import {menuOperate, commitOperate} from './utils/menuOperate';
+import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
// import CMD from '@/scripts/cmdPlugin/CommandEnum';
import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
diff --git a/src/jmapNew/theme/xian_02/menus/menuSwitch.vue b/src/jmapNew/theme/xian_02/menus/menuSwitch.vue
index 384e9f4c4..5be14c7c5 100644
--- a/src/jmapNew/theme/xian_02/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuSwitch.vue
@@ -21,7 +21,7 @@ import { mapGetters } from 'vuex';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import {menuOperate, commitOperate} from './utils/menuOperate';
+import {menuOperate, commitOperate} from '@/jmapNew/theme/components/utils/menuOperate';
export default {
name: 'SwitchMenu',
diff --git a/src/jmapNew/theme/xian_02/menus/menuTrain.vue b/src/jmapNew/theme/xian_02/menus/menuTrain.vue
index 9b3d646f0..0a86f8296 100644
--- a/src/jmapNew/theme/xian_02/menus/menuTrain.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuTrain.vue
@@ -16,7 +16,6 @@