哈尔滨线路 实训操作调整

剧本录制页面聊天代码调整

src/jmapNew/theme/haerbin_01/menus/menuButton.vue

@@ -197,22 +197,26 @@ export default {
         },
         clickCommand(row) {
             this.clearAllMenuShow();
-            const setList = ['ATP进路', '联锁进路', '引导进路'];
+            const commandList = ['ATP进路', '取消ATP', '联锁进路', '取消联锁', '引导进路', '取消引导'];
-            const cancleList = ['取消ATP', '取消联锁', '取消引导'];
             const routeList = [this.atpRoute, this.groundRoute, this.guideRoute];
-            const setIndex = setList.indexOf(row.name);
+            const commandIndex = commandList.indexOf(row.name);
-            const cancleIndex = cancleList.indexOf(row.name);
+            const currentIndex = Math.floor(commandIndex / 2);
-            let currentIndex = -1;
             const step = {};
-            if (setIndex >= 0) { currentIndex = setIndex; }
-            if (cancleIndex >= 0) { currentIndex = cancleIndex; }
             if (currentIndex >= 0) {
                 this.route = routeList[currentIndex];
+                this.tempData = [];
                 this.tempData.push(this.route);
+                console.log(this.route);
+                if (currentIndex == 2) {
+                    step.param = {
+                        signalCode: this.route.startSignalCode
+                    };
+                } else {
                     step.param = {
                         routeCode: this.route.code
                     };
                 }
+            }
             if (this.tempData.length) {
                 row.show = true;
                 this.operate = row.operate.operation;
@@ -517,17 +521,17 @@ export default {
                 { name: '关单信号', cmdType: CMD.Signal.CMD_SIGNAL_CLOSE_SIGNAL, operate: OperationEvent.Signal.signalClose.menuButton, show: false }
             ];
             this.stationParamList = this.$store.state.training.prdType === '01' ? [
-                { name: '关站信号', cmdType: CMD.Station.CMD_STATION_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.closeAllSignal.menu, show: false }
+                { name: '关站信号', cmdType: CMD.Station.CMD_STATION_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.closeAllSignal.menuButton, show: false }
                 // { name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, show: false, disabledName: 'controlMode', mode: 'Center' },
                 // { name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menu, show: false, disabledName: 'controlMode', mode: 'None' }
             ] : [
-                { name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menu, show: false, disabledName: 'controlMode', mode: 'Center' },
+                { name: '接收控制', cmdType: CMD.ControlConvertMenu.CMD_CM_RECEIVE_CONTROL, operate: OperationEvent.StationControl.requestStationControl.menuButton, show: false, disabledName: 'controlMode', mode: 'Center' },
-                { name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menu, show: false, disabledName: 'controlMode', mode: 'None' },
+                { name: '交出控制', cmdType: CMD.ControlConvertMenu.CMD_CM_SURRENDER_CONTROL, operate: OperationEvent.StationControl.requestCentralControl.menuButton, show: false, disabledName: 'controlMode', mode: 'None' },
-                { name: '追踪全开', cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER, operate: OperationEvent.Station.setAutoTrigger.menu, show: false },
+                { name: '追踪全开', cmdType: CMD.Station.CMD_STATION_SET_CI_AUTO_TRIGGER, operate: OperationEvent.Station.setAutoTrigger.menuButton, show: false },
-                { name: '追踪全关', cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER, operate: OperationEvent.Station.cancelAutoTrigger.menu, show: false },
+                { name: '追踪全关', cmdType: CMD.Station.CMD_STATION_CANCEL_CI_AUTO_TRIGGER, operate: OperationEvent.Station.cancelAutoTrigger.menuButton, show: false },
-                { name: '关区信号', cmdType: CMD.Station.CMD_STATION_CIAREA_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.ciAreaCloseAllSignal.menu, show: false },
+                { name: '关区信号', cmdType: CMD.Station.CMD_STATION_CIAREA_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.ciAreaCloseAllSignal.menuButton, show: false },
-                { name: '自排全开', cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING, operate: OperationEvent.Station.atsAutoControlALL.menu, show: false },
+                { name: '自排全开', cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING, operate: OperationEvent.Station.atsAutoControlALL.menuButton, show: false },
-                { name: '自排全关', cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING, operate: OperationEvent.Station.humanControlALL.menu, show: false }
+                { name: '自排全关', cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING, operate: OperationEvent.Station.humanControlALL.menuButton, show: false }
                 // { name: '关站信号', cmdType: CMD.Station.CMD_STATION_CLOSE_ALLSIGNAL, operate: OperationEvent.Station.closeAllSignal.menu, show: false }
             ];
             this.standParamList = this.$store.state.training.prdType === '01' ? [] : [
@@ -544,8 +548,8 @@ export default {
                 this.routeParamList.push({ name: '取消ATP', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE, operate: OperationEvent.Signal.cancelTrainRoute.menuButton, show: false });
             }
             if (this.ground) {
-                this.routeParamList.push({ name: '联锁进路', cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE, operate: OperationEvent.Signal.arrangementRoute.menuButton, show: false });
+                this.routeParamList.push({ name: '联锁进路', cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE, operate: OperationEvent.Signal.interlockRoute.menuButton, show: false });
-                this.routeParamList.push({ name: '取消联锁', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE, operate: OperationEvent.Signal.cancelTrainRoute.menuButton, show: false });
+                this.routeParamList.push({ name: '取消联锁', cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE, operate: OperationEvent.Signal.cancelinterlock.menuButton, show: false });
             }
             if (this.guide) {
                 this.routeParamList.push({ name: '引导进路', cmdType: CMD.Signal.CMD_SIGNAL_ROUTE_GUIDE, operate: OperationEvent.Signal.guide.menuButton, show: false, securityCommand: true });

src/jmapNew/theme/haerbin_01/operationConfig.js

@@ -682,7 +682,7 @@ export default {
             stepVOList: [
                 { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'START_SIGNAL' },
                 { deviceType: '04', orderNum: 2, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'END_SIGNAL' },
-                { deviceType: '04', orderNum: 3, operateCode: '3013', tip: '鼠标左键点击【联锁进路】按钮' },
+                { deviceType: '04', orderNum: 3, operateCode: '3191', tip: '鼠标左键点击【联锁进路】按钮' },
                 { deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
             ]
         },
@@ -698,7 +698,7 @@ export default {
             stepVOList: [
                 { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'START_SIGNAL' },
                 { deviceType: '04', orderNum: 2, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'END_SIGNAL' },
-                { deviceType: '04', orderNum: 3, operateCode: '3032', tip: '鼠标左键点击【取消联锁】按钮' },
+                { deviceType: '04', orderNum: 3, operateCode: '3201', tip: '鼠标左键点击【取消联锁】按钮' },
                 { deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
             ]
         },
@@ -714,7 +714,7 @@ export default {
             stepVOList: [
                 { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'START_SIGNAL' },
                 { deviceType: '04', orderNum: 2, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'END_SIGNAL' },
-                { deviceType: '04', orderNum: 3, operateCode: '3013', tip: '鼠标左键点击【联锁进路】按钮' },
+                { deviceType: '04', orderNum: 3, operateCode: '3191', tip: '鼠标左键点击【联锁进路】按钮' },
                 { deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
             ]
         },
@@ -730,7 +730,7 @@ export default {
             stepVOList: [
                 { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'START_SIGNAL' },
                 { deviceType: '04', orderNum: 2, operateCode: 'click', tip: '鼠标左键点击选择该信号机', codeType:'END_SIGNAL' },
-                { deviceType: '04', orderNum: 3, operateCode: '3032', tip: '鼠标左键点击【取消联锁】按钮' },
+                { deviceType: '04', orderNum: 3, operateCode: '3201', tip: '鼠标左键点击【取消联锁】按钮' },
                 { deviceType: '04', orderNum: 4, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
             ]
         },
@@ -917,6 +917,126 @@ export default {
                 { deviceType: '04', orderNum: 2, operateCode: '5035', tip: '鼠标左键点击【取消越站】按钮' },
                 { deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
             ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Station_Close_AllSignal',
+            skinCode: '07',
+            trainingName: '关站信号({10})',
+            trainingRemark: '关站信号',
+            trainingType: 'Station',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该车站' },
+                { deviceType: '04', orderNum: 2, operateCode: '6114', tip: '鼠标左键点击【关站信号】按钮' },
+                { deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Station_Set_CI_Auto_Trigger',
+            skinCode: '07',
+            trainingName: '追踪全开({10})',
+            trainingRemark: '追踪全开',
+            trainingType: 'Station',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该车站' },
+                { deviceType: '04', orderNum: 2, operateCode: '6011', tip: '鼠标左键点击【追踪全开】按钮' },
+                { deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Station_Cancel_CI_Auto_Trigger',
+            skinCode: '07',
+            trainingName: '追踪全关({10})',
+            trainingRemark: '追踪全关',
+            trainingType: 'Station',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该车站' },
+                { deviceType: '04', orderNum: 2, operateCode: '6021', tip: '鼠标左键点击【追踪全关】按钮' },
+                { deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Station_Open_Auto_Setting',
+            skinCode: '07',
+            trainingName: '自排全开({10})',
+            trainingRemark: '自排全开',
+            trainingType: 'Station',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该车站' },
+                { deviceType: '04', orderNum: 2, operateCode: '6061', tip: '鼠标左键点击【自排全开】按钮' },
+                { deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Station_Close_Auto_Setting',
+            skinCode: '07',
+            trainingName: '自排全关({10})',
+            trainingRemark: '自排全关',
+            trainingType: 'Station',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该车站' },
+                { deviceType: '04', orderNum: 2, operateCode: '6051', tip: '鼠标左键点击【自排全关】按钮' },
+                { deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'Station_CIArea_Close_AllSignal',
+            skinCode: '07',
+            trainingName: '关区信号({10})',
+            trainingRemark: '关区信号',
+            trainingType: 'Station',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该车站' },
+                { deviceType: '04', orderNum: 2, operateCode: '6124', tip: '鼠标左键点击【关区信号】按钮' },
+                { deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'CM_Receive_Control',
+            skinCode: '07',
+            trainingName: '接收控制({10})',
+            trainingRemark: '接收控制',
+            trainingType: 'ControlConvertMenu',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该车站' },
+                { deviceType: '04', orderNum: 2, operateCode: '2024', tip: '鼠标左键点击【接收控制】按钮' },
+                { deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: 'CM_Surrender_Control',
+            skinCode: '07',
+            trainingName: '交出控制({10})',
+            trainingRemark: '交出控制',
+            trainingType: 'ControlConvertMenu',
+            productTypes: ['02'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: 'click', tip: '鼠标左键点击选择该车站' },
+                { deviceType: '04', orderNum: 2, operateCode: '2044', tip: '鼠标左键点击【交出控制】按钮' },
+                { deviceType: '04', orderNum: 3, operateCode: '008', tip: '鼠标左键点击【执行】按钮' }
+            ]
         }
     ]
 };

src/scripts/cmdPlugin/OperationHandler.js

@@ -641,6 +641,10 @@ export const OperationEvent = {
             confirm: {
                 operation: '2023',
                 domId: '_Tips-Control-Request-Confirm'
+            },
+            menuButton: {
+                operation: '2024',
+                domId: '_Tips-Control-Request-Menu{BOTTOM}'
             }
         },
         // 强行站控
@@ -687,6 +691,10 @@ export const OperationEvent = {
             confirm: {
                 operation: '2043',
                 domId: '_Tips-Control-Central-Confirm'
+            },
+            menuButton: {
+                operation: '2044',
+                domId: '_Tips-Control-Central-Menu{BOTTOM}'
             }
         },
         // 控制模式应答同意
@@ -1057,6 +1065,20 @@ export const OperationEvent = {
                 operation: '3181',
                 domId: '_Tips-Signal-cancelGuide-Confirm'
             }
+        },
+        // 联锁进路
+        interlockRoute:{
+            menuButton: {
+                operation: '3191',
+                domId: '_Tips-Signal-interlockRoute-Menu{BOTTOM}'
+            }
+        },
+        // 取消联锁
+        cancelinterlock:{
+            menuButton: {
+                operation: '3201',
+                domId: '_Tips-Signal-cancelinterlock-Menu{BOTTOM}'
+            }
         }
     },
 
@@ -1739,6 +1761,10 @@ export const OperationEvent = {
             menu: {
                 operation: '601',
                 domId: '_Tips-Station-SetAutoTrigger-Menu'
+            },
+            menuButton: {
+                operation: '6011',
+                domId: '_Tips-Station-SetAutoTrigger-Menu{BOTTOM}'
             }
         },
         // 全站取消联锁自动触发
@@ -1746,6 +1772,10 @@ export const OperationEvent = {
             menu: {
                 operation: '602',
                 domId: '_Tips-Station-CancelAutoTrigger-Menu'
+            },
+            menuButton: {
+                operation: '6021',
+                domId: '_Tips-Station-CancelAutoTrigger-Menu{BOTTOM}'
             }
         },
         // 上电解锁
@@ -1807,6 +1837,10 @@ export const OperationEvent = {
             menu: {
                 operation: '605',
                 domId: '_Tips-Station-HumanControlALL-Menu'
+            },
+            menuButton: {
+                operation: '6051',
+                domId: '_Tips-Station-HumanControlALL-Menu{BOTTOM}'
             }
         },
         // 所有进路自排开
@@ -1814,6 +1848,10 @@ export const OperationEvent = {
             menu: {
                 operation: '606',
                 domId: '_Tips-Station-AtsAutoControlALL-Menu'
+            },
+            menuButton: {
+                operation: '6061',
+                domId: '_Tips-Station-AtsAutoControlALL-Menu{BOTTOM}'
             }
         },
         split: {
@@ -1866,6 +1904,7 @@ export const OperationEvent = {
                 domId: '_Tips-Station-setBackStrategy-confirm'
             }
         },
+        // 关站信号
         closeAllSignal: {
             menu: {
                 operation: '611',
@@ -1882,6 +1921,10 @@ export const OperationEvent = {
             confirm: {
                 operation: '6113',
                 domId: '_Tips-Station-closeAllSignal-confirm'
+            },
+            menuButton: {
+                operation: '6114',
+                domId: '_Tips-Station-closeAllSignal-menu{BOTTOM}'
             }
         },
         ciAreaCloseAllSignal: {
@@ -1900,6 +1943,10 @@ export const OperationEvent = {
             confirm: {
                 operation: '6123',
                 domId: '_Tips-Station-ciAreaCloseAllSignal-Confirm'
+            },
+            menuButton: {
+                operation: '6124',
+                domId: '_Tips-Station-ciAreaCloseAllSignal-menu{BOTTOM}'
             }
         }
     },
@@ -2188,7 +2235,7 @@ export const OperationEvent = {
                 operation: '70i',
                 domId: '_Tips-Train-deleteDestinationTrainId-Menu'
             }
-        },
+        }
     },
 
     // 取消全线临时限速

src/views/newMap/displayNew/menuLesson.vue

@@ -213,10 +213,21 @@ export default {
                                 zIndex: 9999
                             }).then(() => {
                                 this.backDisable = false;
+                                const mode = {
+                                    mode: this.demoMode,
+                                    id: this.trainingObj.id,
+                                    lessonId: this.$route.query.lessonId,
+                                    usedTime: this.usedTime
+                                };
+                                endTrainingNew(mode, this.group).then(response => {
+                                    // const data = response.data;
                                     this.$store.dispatch('training/end', null);
                                     this.$store.dispatch('training/setStopCountTime');
                                     this.$store.dispatch('training/setScore', 0);
                                     this.$store.dispatch('training/emitTipFresh');
+                                }).catch(() => {
+                                    this.$messageBox(this.$t('display.lesson.endTrainingError'));
+                                });
                             }).catch(() => {
                                 this.isDisable = true;
                                 this.backDisable = false;

src/views/newMap/displayNew/scriptChat.vue

@@ -216,7 +216,8 @@ export default {
                             memberList.push(member);
                         } else {
                             const member = this.memberData.find(member=>{ return member.id == id; });
-                            member.connect = false;
+                            // member.connect = false;
+                            member.connect = true;
                             member && memberList.push(member);
                         }
                     });