diff --git a/src/jmapNew/shape/graph/Train/TrainBody.js b/src/jmapNew/shape/graph/Train/TrainBody.js
index f0638ec8a..cf69aa789 100644
--- a/src/jmapNew/shape/graph/Train/TrainBody.js
+++ b/src/jmapNew/shape/graph/Train/TrainBody.js
@@ -1,3 +1,4 @@
+/* 观的角度来看当前所处的位置。 */
import Group from 'zrender/src/container/Group';
import TrainBodyBox from './TrainBodyBox';
// import '../StationStand/EDetain';
@@ -301,8 +302,8 @@ export default class TrainBody extends Group {
// Style('fill', color);
}
setTrainBorderColor(color) {
- this.trainBodyBox && this.trainBodyBox.setColor('stroke', color);
- }
+ this.trainBodyBox && this.trainBodyBox.setColor('stroke', color);
+ }
setHShow(isShow) {
if (this.textH) {
isShow ? this.textH.show() : this.textH.hide();
diff --git a/src/jmapNew/theme/components/utils/menuOperate.js b/src/jmapNew/theme/components/utils/menuOperate.js
index a5f912339..56b9af7c4 100644
--- a/src/jmapNew/theme/components/utils/menuOperate.js
+++ b/src/jmapNew/theme/components/utils/menuOperate.js
@@ -501,25 +501,40 @@ export const menuOperate = {
deletDestionation: {
operation: OperationEvent.Train.deleteDestinationTrainId.menu.operation,
cmdType: CMD.TrainWindow.CMD_TRAIN_SET_MANUAL
+ },
+ updateTrip:{
+ // 修改车次号 (大铁线路 车次号 车组号)
+ operation: OperationEvent.Train.updateTrip.menu.operation,
+ cmdType: CMD.Train.CMD_TRAIN_UPDATE_TRIP_NUMBER_TRAIN
+ },
+ updateTripCommit:{
+ // 修改车次号 (大铁线路 车次号 车组号)
+ operation: OperationEvent.Train.updateTrip.confirm.operation,
+ cmdType: CMD.Train.CMD_TRAIN_UPDATE_TRIP_NUMBER_TRAIN
+ },
+ removeTrip:{
+ // 删车次号 (大铁线路 车组号)
+ operation: OperationEvent.Train.removeTrip.menu.operation,
+ cmdType: CMD.Train.CMD_TRAIN_REMOVE_TRAIN_TRACE
}
},
- CTC: {
+ CTC: {
// 接预
- receivingNotice: {
- operation: OperationEvent.CTCCommand.receivingNotice.menu.operation,
- cmdType: CMD.CTC.CTC_RECEIVING_NOTICE
- },
- // 发预
- departureNotice: {
- operation: OperationEvent.CTCCommand.departureNotice.menu.operation,
- cmdType: CMD.CTC.CTC_DEPARTURE_NOTICE
- },
- // 自动触发
- autoTrigger: {
- operation: OperationEvent.CTCCommand.autoTrigger.menu.operation,
- cmdType: CMD.CTC.CTC_AUTO_TRIGGER
- }
- }
+ receivingNotice: {
+ operation: OperationEvent.CTCCommand.receivingNotice.menu.operation,
+ cmdType: CMD.CTC.CTC_RECEIVING_NOTICE
+ },
+ // 发预
+ departureNotice: {
+ operation: OperationEvent.CTCCommand.departureNotice.menu.operation,
+ cmdType: CMD.CTC.CTC_DEPARTURE_NOTICE
+ },
+ // 自动触发
+ autoTrigger: {
+ operation: OperationEvent.CTCCommand.autoTrigger.menu.operation,
+ cmdType: CMD.CTC.CTC_AUTO_TRIGGER
+ }
+ }
};
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/addSpareTrain.vue b/src/jmapNew/theme/datie_02/menus/dialog/addSpareTrain.vue
index 7a47b6c24..f2964cbb2 100644
--- a/src/jmapNew/theme/datie_02/menus/dialog/addSpareTrain.vue
+++ b/src/jmapNew/theme/datie_02/menus/dialog/addSpareTrain.vue
@@ -15,12 +15,12 @@
上下行
-
+
{{ messageTip1 }}
-
+
@@ -118,18 +118,22 @@ export default {
const figuresOfServiceMaxNumber = 6;
// this.$store.state.map.mapConfig.figuresOfServiceNumber;
const tripNumber = this.addModel.tripNumber;
- const judge = /^[a-zA-Z0-9]{1,}$/.test(this.addModel.tripNumber);
+ const judge = /^[a-zA-Z0-9]*[\d]$/.test(this.addModel.tripNumber);
if (judge) {
if (tripNumber.toString().length > figuresOfServiceMaxNumber || tripNumber.toString().length < figuresOfServiceMinNumber) {
this.messageTip1 = '车次号长度' + figuresOfServiceMinNumber + '-' + figuresOfServiceMaxNumber + '位';
} else {
this.addModel.tripNumber = tripNumber;
this.messageTip1 = '';
+ const result = this.addModel.tripNumber.match(/[\d]$(?=[a-zA-Z0-9]*)/);
+ if (result) {
+ const is_even = result[0] % 2 == 0;
+ this.addModel.right = is_even;
+ }
}
} else {
- // debugger;
this.addModel.tripNumber = '';
- this.messageTip1 = '请输入车次号';
+ this.messageTip1 = '请输入车次号(最后一位必须是数字)';
}
},
commit() {
@@ -143,10 +147,10 @@ export default {
result = true;
}
if (this.addModel.tripNumber && result) {
- if (this.addModel.right === '') {
- this.messageTip2 = '请选择上下行';
- return;
- }
+ // if (this.addModel.right === '') {
+ // this.messageTip2 = '请选择上下行';
+ // return;
+ // }
const params = {
tripNumber: this.addModel.tripNumber,
sectionCode: this.addModel.sectionCode,
@@ -170,7 +174,6 @@ export default {
} else {
this.messageTip1 = '请输入车次号';
}
-
}
},
cancel() {
diff --git a/src/jmapNew/theme/datie_02/menus/dialog/updateTrip.vue b/src/jmapNew/theme/datie_02/menus/dialog/updateTrip.vue
new file mode 100644
index 000000000..0e985813a
--- /dev/null
+++ b/src/jmapNew/theme/datie_02/menus/dialog/updateTrip.vue
@@ -0,0 +1,165 @@
+
+
+
+
+
+ 确定
+
+
+ 取 消
+
+
+
+
+
+
+
diff --git a/src/jmapNew/theme/datie_02/menus/menuSection.vue b/src/jmapNew/theme/datie_02/menus/menuSection.vue
index 4983ccc7f..a0cb690ef 100644
--- a/src/jmapNew/theme/datie_02/menus/menuSection.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuSection.vue
@@ -63,6 +63,11 @@ export default {
// label: '基础设备培训',
// handler: this.baDeTrCall
// }
+ {
+ label: ' 增加车次',
+ handler: this.addSpare,
+ cmdType: CMD.Section.CMD_TRAIN_LOAD_TRIP_NUMBER_TRAIN
+ }
],
Center: [
// {
@@ -75,6 +80,11 @@ export default {
// handler: this.detail,
// cmdType: CMD.Section.CMD_SECTION_DETAILS
// }
+ {
+ label: ' 增加车次',
+ handler: this.addSpare,
+ cmdType: CMD.Section.CMD_TRAIN_LOAD_TRIP_NUMBER_TRAIN
+ }
]
},
menuForce: [
@@ -92,17 +102,12 @@ export default {
label: '触发故障管理',
handler: this.triggerFaultManagement,
cmdType: CMD.Fault.CMD_TRIGGER_FAULT
- },
+ }
// {
// label: '设置备用车',
// handler: this.loadSpare,
// cmdType: CMD.Section.CMD_TRAIN_LOAD_SPARE_TRAIN
// }
- {
- label: '增加备用车',
- handler: this.addSpare,
- cmdType: CMD.Section.CMD_TRAIN_LOAD_TRIP_NUMBER_TRAIN
- }
]
};
},
@@ -173,7 +178,7 @@ export default {
// });
// },
addSpare() {
- commitOperate(menuOperate.Section.addSpareTrain, {sectionCode:this.selected.code}).then(({valid, operate})=>{
+ commitOperate(menuOperate.Section.addSpareTrain, {sectionCode:this.selected.code}, 0).then(({valid, operate})=>{
if (valid) {
this.$refs.addSpareTrain.doShow(operate, this.selected);
}
diff --git a/src/jmapNew/theme/datie_02/menus/menuTrain.vue b/src/jmapNew/theme/datie_02/menus/menuTrain.vue
index 412b6c420..513bbed09 100644
--- a/src/jmapNew/theme/datie_02/menus/menuTrain.vue
+++ b/src/jmapNew/theme/datie_02/menus/menuTrain.vue
@@ -9,7 +9,8 @@
-
+
+
@@ -25,7 +26,8 @@ import TrainMoveNumber from './dialog/trainMoveNumber';
import TrainCreateNumber from './dialog/trainCreateNumber';
import TrainDeleteNumber from './dialog/trainDeleteNumber';
import TrainDetailInfo from './dialog/trainDetailInfo';
-import TrainSetPlan from './dialog/trainSetPlan';
+// import TrainSetPlan from './dialog/trainSetPlan';
+import UpdateTrip from './dialog/updateTrip';
import CancelMouseState from '@/mixin/CancelMouseState';
import CMD from '@/scripts/cmdPlugin/CommandEnum';
import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
@@ -44,7 +46,8 @@ export default {
TrainDeleteNumber,
TrainDetailInfo,
SetFault,
- TrainSetPlan
+ UpdateTrip
+ // TrainSetPlan
},
mixins: [
CancelMouseState
@@ -62,18 +65,33 @@ export default {
menu: [],
menuNormal: {
Local: [
- {
- label: '设置计划车',
- handler: this.setPlanTrain,
- cmdType: CMD.TrainWindow.CMD_TRAIN_SET_PLAN
- },
+ // {
+ // label: '设置计划车',
+ // handler: this.setPlanTrain,
+ // cmdType: CMD.TrainWindow.CMD_TRAIN_SET_PLAN
+ // },
+ {
+ label: '变更车次号',
+ handler: this.modifyTripNumber,
+ cmdType: CMD.Train.CMD_TRAIN_UPDATE_TRIP_NUMBER_TRAIN
+ },
+ {
+ label: '删车次号',
+ handler: this.removeTripNumber,
+ cmdType: CMD.Train.CMD_TRAIN_REMOVE_TRAIN_TRACE
+ }
],
Center: [
- {
- label: '设置计划车',
- handler: this.setPlanTrain,
- cmdType: CMD.TrainWindow.CMD_TRAIN_SET_PLAN
- }
+ {
+ label: '变更车次号',
+ handler: this.modifyTripNumber,
+ cmdType: CMD.Train.CMD_TRAIN_UPDATE_TRIP_NUMBER_TRAIN
+ }
+ // {
+ // label: '设置计划车',
+ // handler: this.setPlanTrain,
+ // cmdType: CMD.TrainWindow.CMD_TRAIN_SET_PLAN
+ // }
// {
// label: '新建车组号',
// handler: this.createTrainNo
@@ -131,31 +149,31 @@ export default {
}
],
menuDirective: [
- {
- label: '切换驾驶模式',
- children: [
- {
- label: '转AM-C模式',
- handler: this.handlerApplyAmcMode
- },
- {
- label: '转SM-C模式',
- handler: this.handlerApplySmcMode
- },
- {
- label: '转AM-I模式',
- handler: this.handlerApplyAmiMode
- },
- {
- label: '转SM-I模式',
- handler: this.handlerApplySmiMode
- },
- {
- label: '转RM模式',
- handler: this.handlerApplyRmMode
- }
- ]
- },
+ {
+ label: '切换驾驶模式',
+ children: [
+ {
+ label: '转AM-C模式',
+ handler: this.handlerApplyAmcMode
+ },
+ {
+ label: '转SM-C模式',
+ handler: this.handlerApplySmcMode
+ },
+ {
+ label: '转AM-I模式',
+ handler: this.handlerApplyAmiMode
+ },
+ {
+ label: '转SM-I模式',
+ handler: this.handlerApplySmiMode
+ },
+ {
+ label: '转RM模式',
+ handler: this.handlerApplyRmMode
+ }
+ ]
+ },
{
label: '确认运行至前方站',
handler: this.nextStation
@@ -172,18 +190,22 @@ export default {
label: '越红灯行驶',
handler: this.handleOverEedLight
},
- // {
- // label: '驾驶至',
- // handler: this.handleDriveTo
- // },
- {
- label: '换端',
- handler: this.handleTurnDirection
- },
+ // {
+ // label: '驾驶至',
+ // handler: this.handleDriveTo
+ // },
{
- label: '发车',
- handler: this.handleDepartTrain
- }
+ label: '换端',
+ handler: this.handleTurnDirection
+ },
+ {
+ label: '发车',
+ handler: this.handleDepartTrain
+ },
+ {
+ label: '停车',
+ handler: this.handleParkingTrain
+ }
],
menuSpeed: [
{
@@ -333,21 +355,21 @@ export default {
this.$refs.noticeInfo.doShow();
});
},
- // 设置计划车
- setPlanTrain() {
- const operate = {
- start: true,
- code: this.selected.code,
- operation: OperationEvent.Train.editTrainId.menu.operation,
- param: {}
- };
- this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
- if (valid) {
- this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
- this.$refs.trainSetPlan.doShow(operate, this.selected);
- }
- });
- },
+ // 设置计划车
+ // setPlanTrain() {
+ // const operate = {
+ // start: true,
+ // code: this.selected.code,
+ // operation: OperationEvent.Train.editTrainId.menu.operation,
+ // param: {}
+ // };
+ // this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+ // if (valid) {
+ // this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+ // this.$refs.trainSetPlan.doShow(operate, this.selected);
+ // }
+ // });
+ // },
// 设计划车
setPlanTrainId() {
const operate = {
@@ -476,105 +498,135 @@ export default {
}
});
},
- handlerApplyAmcMode() {
- const group = this.$route.query.group;
- const param = {
- commandType: 'Change_Preselection_Mode',
- targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
- params: { preselectionMode: 'AM_C' }
- };
- commitTrainSend(group, param).then(({ valid, operate }) => {
- }).catch((error) => {
- console.error(error);
- this.$refs.noticeInfo.doShow();
- });
- },
- handlerApplySmcMode() {
- const group = this.$route.query.group;
- const param = {
- commandType: 'Change_Preselection_Mode',
- targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
- params: { preselectionMode: 'SM_C' }
- };
- commitTrainSend(group, param).then(({ valid, operate }) => {
- }).catch((error) => {
- console.error(error);
- this.$refs.noticeInfo.doShow();
- });
- },
- handlerApplyAmiMode() {
- const group = this.$route.query.group;
- const param = {
- commandType: 'Change_Preselection_Mode',
- targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
- params: { preselectionMode: 'AM_I' }
- };
- commitTrainSend(group, param).then(({ valid, operate }) => {
- }).catch((error) => {
- console.error(error);
- this.$refs.noticeInfo.doShow();
- });
- },
- handlerApplySmiMode() {
- const group = this.$route.query.group;
- const param = {
- commandType: 'Change_Preselection_Mode',
- targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
- params: { preselectionMode: 'SM_I' }
- };
- commitTrainSend(group, param).then(({ valid, operate }) => {
- }).catch((error) => {
- console.error(error);
- this.$refs.noticeInfo.doShow();
- });
- },
- handlerApplyRmMode() {
- const group = this.$route.query.group;
- const param = {
- commandType: 'Change_Preselection_Mode',
- targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
- params: { preselectionMode: 'RM' }
- };
- commitTrainSend(group, param).then(({ valid, operate }) => {
- }).catch((error) => {
- console.error(error);
- this.$refs.noticeInfo.doShow();
- });
- },
- // 驾驶至(托管)
- handleDriveTo() {
- commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
- if (valid) {
- this.$refs.setFault.doShow(menuOperate.Common.collocation, this.selected, true);
- }
- });
- },
- // 换端
- handleTurnDirection() {
- const group = this.$route.query.group;
- const param = {
- commandType: 'Turn_Direction',
- targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
- params: {}
- };
- commitTrainSend(group, param).then(({valid, operate}) => {
- }).catch((error)=> {
- console.error(error);
- this.$refs.noticeInfo.doShow();
- });
- },
+ handlerApplyAmcMode() {
+ const group = this.$route.query.group;
+ const param = {
+ commandType: 'Change_Preselection_Mode',
+ targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+ params: { preselectionMode: 'AM_C' }
+ };
+ commitTrainSend(group, param).then(({ valid, operate }) => {
+ }).catch((error) => {
+ console.error(error);
+ this.$refs.noticeInfo.doShow();
+ });
+ },
+ handlerApplySmcMode() {
+ const group = this.$route.query.group;
+ const param = {
+ commandType: 'Change_Preselection_Mode',
+ targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+ params: { preselectionMode: 'SM_C' }
+ };
+ commitTrainSend(group, param).then(({ valid, operate }) => {
+ }).catch((error) => {
+ console.error(error);
+ this.$refs.noticeInfo.doShow();
+ });
+ },
+ handlerApplyAmiMode() {
+ const group = this.$route.query.group;
+ const param = {
+ commandType: 'Change_Preselection_Mode',
+ targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+ params: { preselectionMode: 'AM_I' }
+ };
+ commitTrainSend(group, param).then(({ valid, operate }) => {
+ }).catch((error) => {
+ console.error(error);
+ this.$refs.noticeInfo.doShow();
+ });
+ },
+ handlerApplySmiMode() {
+ const group = this.$route.query.group;
+ const param = {
+ commandType: 'Change_Preselection_Mode',
+ targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+ params: { preselectionMode: 'SM_I' }
+ };
+ commitTrainSend(group, param).then(({ valid, operate }) => {
+ }).catch((error) => {
+ console.error(error);
+ this.$refs.noticeInfo.doShow();
+ });
+ },
+ handlerApplyRmMode() {
+ const group = this.$route.query.group;
+ const param = {
+ commandType: 'Change_Preselection_Mode',
+ targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+ params: { preselectionMode: 'RM' }
+ };
+ commitTrainSend(group, param).then(({ valid, operate }) => {
+ }).catch((error) => {
+ console.error(error);
+ this.$refs.noticeInfo.doShow();
+ });
+ },
+ // 驾驶至(托管)
+ handleDriveTo() {
+ commitOperate(menuOperate.Common.collocation, { code: this.selected.code }, 0).then(({valid, operate})=>{
+ if (valid) {
+ this.$refs.setFault.doShow(menuOperate.Common.collocation, this.selected, true);
+ }
+ });
+ },
+ // 换端
+ handleTurnDirection() {
+ const group = this.$route.query.group;
+ const param = {
+ commandType: 'Turn_Direction',
+ targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+ params: {}
+ };
+ commitTrainSend(group, param).then(({valid, operate}) => {
+ }).catch((error)=> {
+ console.error(error);
+ this.$refs.noticeInfo.doShow();
+ });
+ },
handleDepartTrain() {
const group = this.$route.query.group;
- const param = {
- commandType: 'Depart_Train',
- targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
- params: {}
- };
- commitTrainSend(group, param).then(({valid, operate}) => {
- }).catch((error)=> {
- console.error(error);
- this.$refs.noticeInfo.doShow();
- });
+ const param = {
+ commandType: 'Depart_Train',
+ targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+ params: {}
+ };
+ commitTrainSend(group, param).then(({valid, operate}) => {
+ }).catch((error)=> {
+ console.error(error);
+ this.$refs.noticeInfo.doShow();
+ });
+ },
+ handleParkingTrain() {
+ const group = this.$route.query.group;
+ const param = {
+ commandType: 'Parking_Train',
+ targetMemberId: this.memberList.find(ele => ele.deviceCode == this.selected.code).id,
+ params: {}
+ };
+ commitTrainSend(group, param).then(({valid, operate}) => {
+ }).catch((error)=> {
+ console.error(error);
+ this.$refs.noticeInfo.doShow();
+ });
+
+ },
+ modifyTripNumber() {
+ commitOperate(menuOperate.Train.updateTrip, {groupNumber:this.selected.groupNumber}, 0).then(({valid, operate})=>{
+ if (valid) {
+ this.$refs.updateTrip.doShow(operate, this.selected.tripNumber);
+ }
+ });
+ },
+ removeTripNumber() {
+ commitOperate(menuOperate.Train.removeTrip, {groupNumber:this.selected.groupNumber}, 3).then(({valid, operate})=>{
+ if (valid) {
+ }
+ }).catch((error)=> {
+ console.error(error);
+ this.$refs.noticeInfo.doShow();
+ });
},
undeveloped() {
this.doClose();
diff --git a/src/scripts/cmdPlugin/CommandEnum.js b/src/scripts/cmdPlugin/CommandEnum.js
index 93cd1fac6..ebd795620 100644
--- a/src/scripts/cmdPlugin/CommandEnum.js
+++ b/src/scripts/cmdPlugin/CommandEnum.js
@@ -180,7 +180,6 @@ export default {
CMD_TRAIN_LOAD_TRIP_NUMBER_TRAIN: {value: 'Train_Load_Trip_Number_Train', label: '增加备用车'},
/** 分路不良 大铁线路使用*/
CMD_SECTION_DEFECTIVE_SHUNTING: {value: 'Section_Defective_Shunting', label: '分路不良'}
-
},
// 站台
@@ -335,7 +334,11 @@ export default {
/** 选择调度模式 */
CMD_TRAIN_REGULATION : { value:'Train_Regulation', label:'选择调度模式' },
/** 计算列车间隔 */
- CMD_TRAIN_CALCULATE_INTERVAL : {value: 'Train_Calculate_Interval', label: '计算列车间隔'}
+ CMD_TRAIN_CALCULATE_INTERVAL : {value: 'Train_Calculate_Interval', label: '计算列车间隔'},
+ /** 修改车次号 大铁线路使用*/
+ CMD_TRAIN_UPDATE_TRIP_NUMBER_TRAIN: {value: 'Train_Update_Trip_Number_Train', label: '变更车次号'},
+ /** 删除车次号 大铁线路使用*/
+ CMD_TRAIN_REMOVE_TRAIN_TRACE:{value: 'Train_Remove_Train_Trace', label: '删车次号'}
},
TrainWindow: {
/** 修改列车识别号 */
diff --git a/src/scripts/cmdPlugin/CommandHandler.js b/src/scripts/cmdPlugin/CommandHandler.js
index 01d68789d..c18329953 100644
--- a/src/scripts/cmdPlugin/CommandHandler.js
+++ b/src/scripts/cmdPlugin/CommandHandler.js
@@ -40,6 +40,10 @@ class CommandHandle {
operate: 'Train_Load_Trip_Number_Train',
paramList:[{name: 'tripNumber'}, {name: 'sectionCode'}, {name: 'right'}]
},
+ // Train_Update_Trip_Number_Train:{
+ // operate: 'Train_Update_Trip_Number_Train',
+ // paramList:[{name: 'tripNumber'}, {name: 'groupNumber'}]
+ // },
Train_Trust: {
operate: 'Train_Trust',
paramList:[{name: 'groupNumber'}, {name: 'targetDeviceCode'}],
diff --git a/src/scripts/cmdPlugin/OperationHandler.js b/src/scripts/cmdPlugin/OperationHandler.js
index 643e86fa1..b75a736d9 100644
--- a/src/scripts/cmdPlugin/OperationHandler.js
+++ b/src/scripts/cmdPlugin/OperationHandler.js
@@ -3397,6 +3397,26 @@ export const OperationEvent = {
operation: '70t3',
domId: '_Tips-Train-trainSetRunType-Confirm'
}
+ },
+ updateTrip: {
+ menu: {
+ operation: '70u',
+ domId: '_Tips-Train-updateTrip-Menu'
+ },
+ changeTripNumber: {
+ operation: '70u1',
+ domId: '_Tips-Train-updateTrip-ChangeTripNumber'
+ },
+ confirm: {
+ operation: '70u2',
+ domId: '_Tips-Train-updateTrip-Confirm'
+ }
+ },
+ removeTrip:{
+ menu: {
+ operation: '70v',
+ domId: '_Tips-Train-removeTrip-Menu'
+ }
}
},
diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js
index ce530d24f..05d02e164 100644
--- a/src/utils/baseUrl.js
+++ b/src/utils/baseUrl.js
@@ -30,7 +30,7 @@ export function handlerUrl(data) {
// BASE_API = 'http://192.168.8.172:9200'; // 旭强
// BASE_API = 'http://192.168.3.15:9000'; // 张赛
// BASE_API = 'http://192.168.8.140:9000'; // 杜康
- // BASE_API = 'http://192.168.3.37:9000'; // 卫志宏
+ // BASE_API = 'http://192.168.3.37:9000'; // 卫志宏
// BASE_API = 'http://b29z135112.zicp.vip';
// BASE_API = 'http://2925963m2a.zicp.vip'; // 杜康
// BASE_API = 'http://2i38984j47.qicp.vip'; // 张赛
diff --git a/src/views/newMap/displayNew/index.vue b/src/views/newMap/displayNew/index.vue
index 29dce890a..7a13f3fb9 100644
--- a/src/views/newMap/displayNew/index.vue
+++ b/src/views/newMap/displayNew/index.vue
@@ -11,7 +11,7 @@
-
+