Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

src/jmapNew/theme/components/menus/dialog/standRunLevel.vue

@@ -216,7 +216,7 @@ export default {
                     stationStand = this.stationStandList.find(stand => stand.stationCode === station.code && stand.right) || {};
                 }
             }
-            this.tempData.push({ name: `${stationStand.name}(${station.name})`, level: selected.runLevelTime ? this.getLevelByTime(selected.runLevelTime) : '0', time: selected.runLevelTime ? selected.runLevelTime : 0, check: selected.runLevelTimeForever });
+            this.tempData.push({ name: stationStand ? `${stationStand.name}(${station.name})` : '无', level: selected.runLevelTime ? this.getLevelByTime(selected.runLevelTime) : '0', time: selected.runLevelTime ? selected.runLevelTime : 0, check: selected.runLevelTimeForever });
         },
         doShow(operate, selected) {
             this.selected = selected;

src/jmapNew/theme/components/menus/dialog/switchControl.vue

@@ -110,12 +110,14 @@ export default {
             return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
         },
         domIdConfirm() {
-            if (this.operation == OperationEvent.Switch.fault.menu.operation) {
+            if (this.popClass == 'chengdou-03__systerm') {
-                return OperationEvent.Switch.fault.confirm.domId;
+                if (this.operation == OperationEvent.Switch.fault.menu.operation) {
-            } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
+                    return OperationEvent.Switch.fault.confirm.domId;
-                return OperationEvent.Switch.unblock.confirm.domId;
+                } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
-            } else if (this.operation == OperationEvent.Switch.block.menu.operation) {
+                    return OperationEvent.Switch.unblock.confirm.domId;
-                return OperationEvent.Switch.block.confirm.domId;
+                } else if (this.operation == OperationEvent.Switch.block.menu.operation) {
+                    return OperationEvent.Switch.block.confirm.domId;
+                }
             }
             return this.dialogShow ? OperationHandler.getDomIdByOperation(this.operation) : '';
         },

src/jmapNew/theme/foshan_01/menus/menuDialog/stationControl.vue

@@ -15,9 +15,8 @@
     <el-form ref="form" :model="formModel" :rules="rules">
 
       <el-row style="margin-bottom: 20px">
-        <el-form-item prop="stationCode">
+        <el-form-item :id="domIdChooseStation" prop="stationCode">
           <el-select
-            :id="domIdChooseStation"
             v-model="formModel.stationCode"
             filterable
             placeholder="请选择"

src/jmapNew/theme/foshan_01/operationConfig.js

@@ -33,10 +33,44 @@
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 export default {
     list: [
+		{
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL.value,
+            skinCode: '02',
+            trainingName: '系统/站遥控({1})',
+            trainingRemark: '控制模式转换，中控转站控',
+            trainingType: 'ControlConvertMenu',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: 'bar', orderNum: 1, operateCode: '002', tip: '鼠标左键点击顶部菜单栏【系统】' },
+                { deviceType: 'bar', orderNum: 2, operateCode: '2999', tip: '鼠标左键点击【站遥控】' },
+				{ deviceType: '05', orderNum: 3, operateCode: '0071', tip: '鼠标左键选择所需要转换的集中站【{1}】' },
+				{ deviceType: '05', orderNum: 4, operateCode: '007', tip: '鼠标左键选择【站控】'},
+                { deviceType: '05', orderNum: 5, operateCode: '202', tip: '鼠标左键点击【确认】按钮' },
+            ]
+		},
+		{
+            maxDuration: 15,
+            minDuration: 8,
+            operateType: CMD.ControlConvertMenu.CMD_CM_EMERGENCY_STATION_CONTROL.value,
+            skinCode: '02',
+            trainingName: '系统/站遥控({1})',
+            trainingRemark: '控制模式转换，中控转紧急站控',
+            trainingType: 'ControlConvertMenu',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: 'bar', orderNum: 1, operateCode: '002', tip: '鼠标左键点击顶部菜单栏【系统】' },
+                { deviceType: 'bar', orderNum: 2, operateCode: '2999', tip: '鼠标左键点击【站遥控】' },
+				{ deviceType: '05', orderNum: 3, operateCode: '0071', tip: '鼠标左键选择所需要转换的集中站【{1}】' },
+				{ deviceType: '05', orderNum: 4, operateCode: '007', tip: '鼠标左键选择【紧急站控】'},
+                { deviceType: '05', orderNum: 5, operateCode: '201', tip: '鼠标左键点击【确认】按钮' },
+            ]
+        },
         {
             maxDuration: 8,
             minDuration: 5,
-            operateType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN.value,
+            operateType: CMD.Stand.CMD_STAND_SET_HOLD_TRAIN.value,
             skinCode: '08',
             trainingName: '设置扣车({10}-{12} 站台)',
             trainingRemark: '设置扣车功能',
@@ -86,7 +120,7 @@ export default {
             productTypes: ['02'], // 产品类型 01 现地 02 行调
             stepVOList: [
                 { deviceType: '06', orderNum: 1, operateCode: '502', tip: '鼠标右键菜单选择【设置跳停】' },
-                { deviceType: '06', orderNum: 2, operateCode: '5024', tip: '鼠标左键点击' },
+                { deviceType: '06', orderNum: 2, operateCode: '5024', tip: '鼠标左键点击 指定列车{12}跳停' },
                 { deviceType: '06', orderNum: 3, operateCode: '5022', tip: '请选择001号车', val: '001' },
                 { deviceType: '06', orderNum: 4, operateCode: '502', tip: '鼠标左键点击【确定】按钮' }
             ]
@@ -153,13 +187,13 @@ export default {
             operateType:CMD.Stand.CMD_STAND_SET_PARK_TIME.value,
             skinCode: '08',
             trainingName: '设置停站时间({10}-{12} 站台)',
-            trainingRemark: '停站时间控制(人工, 40秒, 一直有效)',
+            trainingRemark: '停站时间控制(人工, 20秒, 一直有效)',
             trainingType:'Stand',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【设置停站时间】' },
                 { deviceType: '06', orderNum: 2, operateCode: '5092', tip: '鼠标左键点击，选择【全人工】', val: '02' },
-                { deviceType: '06', orderNum: 3, operateCode: '5094', tip: '输入或鼠标点击，调整为【40】', val: '40' },
+                { deviceType: '06', orderNum: 3, operateCode: '5094', tip: '输入或鼠标点击，调整为【20】', val: '20' },
                 { deviceType: '06', orderNum: 4, operateCode: '509', tip: '鼠标左键点击【确认】按钮' }
             ]
         },
@@ -169,13 +203,13 @@ export default {
             operateType:CMD.Stand.CMD_STAND_SET_PARK_TIME.value,
             skinCode: '08',
             trainingName: '设置停站时间({10}-{12} 站台)',
-            trainingRemark: '停站时间控制(人工, 40秒, 一次有效)',
+            trainingRemark: '停站时间控制(人工, 20秒, 一次有效)',
             trainingType:'Stand',
             productTypes: ['02'],
             stepVOList: [
                 { deviceType: '06', orderNum: 1, operateCode: '509', tip: '鼠标右键菜单选择【设置停站时间】' },
                 { deviceType: '06', orderNum: 2, operateCode: '5092', tip: '鼠标左键点击，选择【全人工】', val: '02' },
-                { deviceType: '06', orderNum: 3, operateCode: '5094', tip: '输入或鼠标点击，调整为【40】', val: '20' },
+                { deviceType: '06', orderNum: 3, operateCode: '5094', tip: '输入或鼠标点击，调整为【20】', val: '20' },
                 { deviceType: '06', orderNum: 4, operateCode: '5093', tip: '鼠标左键点击，选择【一次有效】', val: 'false' },
                 { deviceType: '06', orderNum: 5, operateCode: '509', tip: '鼠标左键点击【确认】按钮' }
             ]
@@ -264,7 +298,7 @@ export default {
             trainingName: '设置临时限速({8}{9} 区段)',
             trainingRemark: '设置临时限速功能（限速值：15）',
             trainingType: 'Section',
-            productTypes: ['02'],
+            productTypes: ['01', '02'],
             stepVOList: [
                 { deviceType: '03', orderNum: 1, operateCode: '407', tip: '鼠标右键菜单选择【设置临时限速】' },
                 { deviceType: '03', orderNum: 2, operateCode: '4076', tip: '鼠标左键选择【限速值15】', val: '15' },
@@ -274,8 +308,35 @@ export default {
                 { deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮', val: '15' },
                 { deviceType: '03', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
             ]
+		},
+		// {
+        //     maxDuration: 15,
+        //     minDuration: 8,
+        //     operateType:CMD.Section.CMD_SECTION_SET_LIMIT_SPEED.value,
+        //     skinCode: '08',
+        //     trainingName: '全线取消限速({8}{9} 区段)',
+        //     trainingRemark: '设置全线取消限速',
+        //     trainingType: 'Section',
+        //     productTypes: ['01', '02'],
+        //     stepVOList: [
+        //         { deviceType: '03', orderNum: 1, operateCode: '408', tip: '鼠标右键菜单选择【设置全线取消限速】' },
+        //         { deviceType: '03', orderNum: 4, operateCode: '4082', tip: '鼠标左键点击【确定】按钮' },
+        //     ]
+		// },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType:CMD.Section.CMD_SECTION_ACTIVE.value,
+            skinCode: '08',
+            trainingName: '区段激活({8}{9} 区段)',
+            trainingRemark: '区段激活功能',
+            trainingType:'Section',
+            productTypes: ['01', '02'],
+            stepVOList: [
+                { deviceType: '03', orderNum: 1, operateCode: '406', tip: '鼠标右键菜单选择【区段激活】' },
+                { deviceType: '03', orderNum: 2, operateCode: '406', tip: '鼠标左键点击【确定】按钮' }
+            ]
         },
-
         {
             maxDuration: 15,
             minDuration: 8,
@@ -461,7 +522,7 @@ export default {
             trainingType:'Signal',
             productTypes: ['01', '02'],
             stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '301', tip: '鼠标右键菜单选择【排列进路】' },
+                { deviceType: '04', orderNum: 1, operateCode: '301', tip: '鼠标右键菜单选择【进路选排】' },
                 { deviceType: '04', orderNum: 2, operateCode: '3011', tip: '鼠标左键选择进路名称【{3}】', val: '{4}' },
                 { deviceType: '04', orderNum: 3, operateCode: '301', tip: '鼠标左键点击【确定】按钮' }
             ]
@@ -476,7 +537,7 @@ export default {
             trainingType:'Signal',
             productTypes: ['02'],
             stepVOList: [
-                { deviceType: '04', orderNum: 1, operateCode: '303', tip: '鼠标右键菜单选择【取消进路】' },
+                { deviceType: '04', orderNum: 1, operateCode: '303', tip: '鼠标右键菜单选择【进路取消】' },
                 { deviceType: '04', orderNum: 2, operateCode: '303', tip: '鼠标左键点击【确定】按钮' }
             ]
         },
@@ -607,6 +668,34 @@ export default {
                 { deviceType: '04', orderNum: 1, operateCode: '312', tip: '鼠标右键菜单选择【取消联锁自动触发】' },
                 { deviceType: '04', orderNum: 2, operateCode: '312', tip: '鼠标左键点击【确定】按钮' }
             ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType:CMD.Signal.CMD_SIGNAL_BLOCK.value,
+            skinCode: '08',
+            trainingName: '按钮封闭({5}) 信号机',
+            trainingRemark: '按钮封闭功能',
+            trainingType:'Signal',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '3060', tip: '鼠标左键点击【道岔封闭】' },
+                { deviceType: '04', orderNum: 2, operateCode: '306', tip: '鼠标左键点击【信号机】', codeType:'SIGNAL' }
+            ]
+        },
+        {
+            maxDuration: 15,
+            minDuration: 8,
+            operateType:CMD.Signal.CMD_SIGNAL_UNBLOCK.value,
+            skinCode: '08',
+            trainingName: '按钮解封({5}) 信号机',
+            trainingRemark: '按钮解封功能',
+            trainingType:'Signal',
+            productTypes: ['01'],
+            stepVOList: [
+                { deviceType: '04', orderNum: 1, operateCode: '3070', tip: '鼠标左键点击【按钮解封】' },
+                { deviceType: '04', orderNum: 2, operateCode: '307', tip: '鼠标左键点击【信号机】', codeType:'SIGNAL' }
+            ]
         }
     ]
 };

src/scripts/cmdPlugin/OperationHandler.js

@@ -217,7 +217,7 @@ export const OperationEvent = {
             },
             choose1: {
                 operation: '0071',
-                domId: '_Tips-Order-Choose1'
+                domId: '_Tips-Order-Choose1{BOTTOM}'
             }
         },
         // 哈尔滨执行命令