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

src/jmapNew/theme/ningbo_01/menus/dialog/alxeEffective.vue

@@ -107,7 +107,6 @@ export default {
             loading: false,
             type: 'text',
             timeout: 1000,
-            timenum: 30,
             stepNum: 0,
             task: null,
             model: {
@@ -189,18 +188,6 @@ export default {
         }
     },
     watch: {
-        'model.stationCode': function(code) {
-            this.randomSectionList = [];
-            this.sectionList.forEach(section => {
-                if (section.stationCode == this.model.stationCode) {
-                    let name = section.name;
-                    if (section.type == '02') {
-                        name = section.name;
-                    }
-                    this.randomSectionList.push({ name: `${name}(${section.code})`, code: section.code });
-                }
-            });
-        }
     },
     mounted() {
         this.$nextTick(() => {
@@ -231,7 +218,10 @@ export default {
             this.model.sectionName = '';
             this.model.confirmStationCode = '';
             this.model.confirmSectionCode = '';
+            this.model.sectionCode = '';
+            this.model.stationCode = '';
             if (selected) {
+                this.model.sectionCode = selected.code;
                 if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) {
                     if (selected.isSwitchSection) {
                         const section = this.$store.getters['map/getDeviceByCode'](selected.parentCode);
@@ -251,7 +241,6 @@ export default {
                     const section = this.$store.getters['map/getDeviceByCode'](selected.switchSectionCode);
                     if (section) {
                         this.model.sectionName = section.name;
-                        this.model.sectionCode = section.code;
                     }
                 }
 
@@ -275,6 +264,19 @@ export default {
             this.$store.dispatch('training/emitTipFresh');
             this.mouseCancelState(this.selected);
         },
+        getSectionList(code) {
+            this.randomSectionList = [];
+            this.sectionList.forEach(section => {
+                if (section.stationCode == code) {
+                    let name = section.name;
+                    if (section.type == '02') {
+                        const sectionParent = this.$store.getters['map/getDeviceByCode'](section.parentCode);
+                        name = `${sectionParent.name}-${section.name}`;
+                    }
+                    this.randomSectionList.push({ name: `${name}`, code: section.code });
+                }
+            });
+        },
         waitSelectEvent() {
             if (!this.$store.state.menuOperation.break) {
                 this.model.time -= 1;
@@ -299,22 +301,17 @@ export default {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                     this.type = 'password';
-                    this.model.time = this.timenum;
+                    this.model.time = 60;
                     this.task = setInterval(this.waitSelectEvent, this.timeout);
                 }
             });
         },
         stationSelectChange(code) {
-            if (this.model.confirmStationCode === this.model.sectionCode) {
-                this.stepNum = 2;
-            } else {
-                this.model.time = 0;
-            }
-            console.log(code, 'code');
             const operate = {
                 operation: '',
                 val: code
             };
+            this.getSectionList(code);
 
             if (this.operation == OperationEvent.Section.alxeEffective.menu.operation) {
                 operate.operation = OperationEvent.Section.alxeEffective.choose1.operation;
@@ -327,12 +324,6 @@ export default {
             });
         },
         sectionSelectChange(code) {
-            if (this.model.confirmSectionCode === this.model.sectionCode) {
-                this.stepNum = 2;
-            } else {
-                this.model.time = 0;
-            }
-            console.log(code, 'code');
             const operate = {
                 operation: '',
                 val: code
@@ -345,9 +336,7 @@ export default {
             }
 
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                this.$store.dispatch('menuOperation/handleBreakFlag', {
+                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    break: true
-                });
             });
         },
         /** 确认计轴恢复工作*/
@@ -382,6 +371,7 @@ export default {
                     }
                 }).catch((error) => {
                     this.loading = false;
+                    this.doClose();
                     this.$refs.noticeInfo.doShow(operate, error.message);
                 });
             } else {

src/jmapNew/theme/ningbo_01/menus/dialog/routeUnLock.vue

@@ -15,11 +15,11 @@
       <div style="overflow: hidden;">
         <div>操作设备</div>
         <el-col :span="11">
-            <el-input :value="messageText1" placeholder="" size="mini" disabled />
+          <el-input :value="messageText1" placeholder="" size="mini" disabled />
         </el-col>
         <el-col :span="8" :offset="1">
-            <el-button :id="confirmId1" class="status_btn" :disabled="disabledConfirm1" @click="confirm1">确认
+          <el-button :id="confirmId1" class="status_btn" :disabled="disabledConfirm1" @click="confirm1">确认
-            </el-button>
+          </el-button>
         </el-col>
       </div>
     </div>
@@ -28,13 +28,13 @@
       <div style="overflow: hidden;">
         <div>操作设备</div>
         <el-col :span="11">
-            <el-select :id="domIdChoose" v-model="messageText2" filterable size="mini" :disabled="disabledConfirm2" @change="SelectChange">
+          <el-select :id="domIdChoose" v-model="messageText2" filterable size="mini" :disabled="disabledConfirm2" @change="SelectChange">
-              <el-option v-for="option in signalList" :key="option.code" :label="option.name" :value="option.name" />
+            <el-option v-for="option in signalList" :key="option.code" :label="option.name" :value="option.code" />
-            </el-select>
+          </el-select>
         </el-col>
         <el-col :span="8" :offset="1">
-            <el-button :id="confirmId2" class="status_btn" :disabled="disabledConfirm2" @click="confirm2">确认
+          <el-button :id="confirmId2" class="status_btn" :disabled="disabledConfirm2" @click="confirm2">确认
-            </el-button>
+          </el-button>
         </el-col>
       </div>
     </div>
@@ -49,7 +49,9 @@
     </div>
     <div class="body_cont">
       <div class="status_text">状态</div>
-      <div class="textarea_content" />
+      <div class="textarea_content">
+        {{ message }}
+      </div>
     </div>
 
     <el-button :id="domIdConfirm" class="close_btn" type="primary" @click="commit">关闭</el-button>
@@ -73,8 +75,10 @@ export default {
             dialogShow: false,
             selected: null,
             operation: null,
+            message: '',
 
             messageText1: '',
+            signalCode: '',
             messageText2: '',
             timeCountConfirm: -1,
             disabledConfirm1: false,
@@ -120,8 +124,10 @@ export default {
     methods: {
         doShow(operate, selected) {
             this.selected = selected;
+            this.message = '';
             if (!this.dialogShow) {
                 this.messageText1 = selected.name;
+                this.signalCode = selected.code;
 
                 this.operation = operate.operation;
             }
@@ -132,6 +138,13 @@ export default {
         },
         doClose() {
             this.dialogShow = false;
+            this.messageText1 = '';
+            this.messageText2 = '';
+            this.message = '';
+            this.signalCode = '';
+            this.timeCountConfirm = -1;
+            this.disabledConfirm1 = false;
+            this.disabledConfirm2 = true;
             this.$store.dispatch('training/emitTipFresh');
             this.mouseCancelState(this.selected);
         },
@@ -170,30 +183,34 @@ export default {
             });
         },
         confirm2() {
-            const operate = {
+            if (this.messageText2 == this.signalCode) {
-                operation: OperationEvent.Signal.unlock.confirm2.operation,
+                const operate = {
-                cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK
+                    operation: OperationEvent.Signal.unlock.confirm2.operation,
-            };
+                    cmdType: CMD.Signal.CMD_SIGNAL_UNBLOCK
+                };
 
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
+                    if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.messageText2 = '*****';
+                        this.messageText2 = '*****';
-                    this.disabledConfirm2 = true;
+                        this.disabledConfirm2 = true;
-                    this.timeCountConfirm = -1;
+                        this.timeCountConfirm = -1;
-                }
+                    }
-            }).catch((error) => {
+                }).catch((error) => {
-                this.$refs.noticeInfo.doShow(operate, error.message);
+                    this.$refs.noticeInfo.doShow(operate, error.message);
-            });
+                });
+            } else {
+                this.message = '选择信号机错误';
+            }
         },
         commit() {
             const operate = {
                 over: true,
-                operation: OperationEvent.Signal.unlock.confirm.operation,
+                operation: OperationEvent.Signal.unlock.confirm.operation
             };
 
             this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-               this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 this.doClose();
             }).catch((error) => {
                 this.doClose();

src/jmapNew/theme/ningbo_01/menus/dialog/sectionUnLock.vue

@@ -29,7 +29,7 @@
         <div>操作设备</div>
         <el-col :span="11">
           <el-select :id="domIdChoose" v-model="messageText2" filterable size="mini" :disabled="disabledConfirm2" @change="SelectChange">
-            <el-option v-for="option in sectionList" :key="option.code" :label="option.name + '(' + option.code + ')'" :value="option.name" />
+            <el-option v-for="option in sectionLists" :key="option.code" :label="option.name" :value="option.code" />
           </el-select>
         </el-col>
         <el-col :span="8" :offset="1">
@@ -49,7 +49,9 @@
     </div>
     <div class="body_cont">
       <div class="status_text">状态</div>
-      <div class="textarea_content" />
+      <div class="textarea_content">
+        {{ message }}
+      </div>
     </div>
 
     <el-button :id="domIdConfirm" class="close_btn" type="primary" @click="commit">关闭</el-button>
@@ -73,8 +75,10 @@ export default {
             dialogShow: false,
             selected: null,
             operation: null,
+            message: '',
 
             messageText1: '',
+            sectionCode: '',
             messageText2: '',
             timeCountConfirm: -1,
             disabledConfirm1: false,
@@ -107,6 +111,18 @@ export default {
                 return '区故解';
             }
             return '';
+        },
+        sectionLists() {
+            const list = [];
+            this.sectionList.forEach(section => {
+                let name = section.name;
+                if (section.type == '02') {
+                    const sectionParent = this.$store.getters['map/getDeviceByCode'](section.parentCode);
+                    name = `${sectionParent.name}-${section.name}`;
+                }
+                list.push({ name: name, code: section.code });
+            });
+            return list;
         }
     },
     mounted() {
@@ -125,12 +141,14 @@ export default {
     methods: {
         doShow(operate, selected) {
             this.selected = selected;
+            this.message = '';
             if (!this.dialogShow) {
-                this.messageText1 = `${selected.name}(${selected.code})`;
+                this.messageText1 = selected.name;
-                // if (selected.parentCode) {
+                this.sectionCode = selected.code;
-                //     const parentSection = this.$store.getters['map/getDeviceByCode'](selected.parentCode);
+                if (selected.type == '02') {
-                //     this.messageText1 = `${parentSection.name}${selected.name}`;
+                    const sectionParent = this.$store.getters['map/getDeviceByCode'](selected.parentCode);
-                // }
+                    this.messageText1 = `${sectionParent.name}-${selected.name}`;
+                }
 
                 this.operation = operate.operation;
             }
@@ -145,6 +163,8 @@ export default {
             this.disabledConfirm2 = true;
             this.timeCountConfirm = -1;
             this.messageText1 = '';
+            this.message = '';
+            this.sectionCode = '';
             this.messageText2 = '';
             this.$store.dispatch('training/emitTipFresh');
             this.mouseCancelState(this.selected);
@@ -196,29 +216,33 @@ export default {
             });
         },
         confirm2() {
-            const operate = {
+            if (this.messageText2 == this.sectionCode) {
-                operation: '',
+                const operate = {
-                cmdType: ''
+                    operation: '',
-            };
+                    cmdType: ''
+                };
 
-            if (this.operation == OperationEvent.Section.unlock.menu.operation) {
+                if (this.operation == OperationEvent.Section.unlock.menu.operation) {
-                operate.operation = OperationEvent.Section.unlock.confirm2.operation;
+                    operate.operation = OperationEvent.Section.unlock.confirm2.operation;
-                operate.cmdType = CMD.Section.CMD_SECTION_UNBLOCK;
+                    operate.cmdType = CMD.Section.CMD_SECTION_UNBLOCK;
-            } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
+                } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
-                operate.operation = OperationEvent.Section.fault.confirm2.operation;
+                    operate.operation = OperationEvent.Section.fault.confirm2.operation;
-                operate.cmdType = CMD.Section.CMD_SECTION_FAULT_UNLOCK;
+                    operate.cmdType = CMD.Section.CMD_SECTION_FAULT_UNLOCK;
-            }
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.messageText2 = '*****';
-                    this.disabledConfirm2 = true;
-                    this.timeCountConfirm = -1;
                 }
-            }).catch((error) => {
+
-                this.$refs.noticeInfo.doShow(operate, error.message);
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-            });
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.messageText2 = '*****';
+                        this.disabledConfirm2 = true;
+                        this.timeCountConfirm = -1;
+                    }
+                }).catch((error) => {
+                    this.$refs.noticeInfo.doShow(operate, error.message);
+                });
+            } else {
+                this.message = '选择区段错误';
+            }
         },
         commit() {
             const operate = {

src/jmapNew/theme/ningbo_01/menus/dialog/speedLimitControl.vue

@@ -378,18 +378,24 @@ export default {
                 /** 区段设置限速*/
                 operate.operation = OperationEvent.Section.setSpeed.order.operation;
                 operate.message = `在【${this.name}】区段，区段设置限速${this.speed}km/h，确认下达吗？`;
+                if (this.speed == 0) {
+                    operate.message = `在【${this.name}】区段，区段取消限速，确认下达吗？`;
+                }
             } else if (this.operation == OperationEvent.Section.cancelSpeed.menu.operation) {
                 /** 区段取消限速*/
                 operate.operation = OperationEvent.Section.cancelSpeed.order.operation;
-                operate.message = `在【${this.name}】区段，区段取消限速${this.speed}km/h，确认下达吗？`;
+                operate.message = `在【${this.name}】区段，区段取消限速，确认下达吗？`;
             } else if (this.operation == OperationEvent.Switch.setSpeed.menu.operation) {
                 /** 道岔设置限速*/
                 operate.operation = OperationEvent.Switch.setSpeed.order.operation;
                 operate.message = `在【${this.name}】区段，道岔设置限速${this.speed}km/h，确认下达吗？`;
+                if (this.speed == 0) {
+                    operate.message = `在【${this.name}】区段，道岔区段取消限速，确认下达吗？`;
+                }
             } else if (this.operation == OperationEvent.Switch.cancelSpeed.menu.operation) {
                 /** 区段取消限速*/
                 operate.operation = OperationEvent.Switch.cancelSpeed.order.operation;
-                operate.message = `在【${this.name}】区段，道岔取消限速${this.speed}km/h，确认下达吗？`;
+                operate.message = `在【${this.name}】区段，道岔区段取消限速，确认下达吗？`;
             }
 
             this.setMessage('请点击“确认1”按钮，确认命令！');

src/jmapNew/theme/ningbo_01/menus/dialog/switchUnLock.vue

@@ -29,7 +29,7 @@
         <div>道岔</div>
         <el-col :span="11">
           <el-select :id="domIdChoose" v-model="messageText2" filterable size="mini" :disabled="disabledConfirm2" @change="SelectChange">
-            <el-option v-for="option in switchList" :key="option.code" :label="option.name" :value="option.name" />
+            <el-option v-for="option in switchList" :key="option.code" :label="option.name" :value="option.code" />
           </el-select>
         </el-col>
         <el-col :span="8" :offset="1">
@@ -49,7 +49,9 @@
     </div>
     <div class="body_cont">
       <div class="status_text">状态</div>
-      <div class="textarea_content" />
+      <div class="textarea_content">
+        {{ message }}
+      </div>
     </div>
 
     <el-button :id="domIdConfirm" class="close_btn" type="primary" @click="commit">关闭</el-button>
@@ -73,8 +75,10 @@ export default {
             dialogShow: false,
             selected: null,
             operation: null,
+            message: '',
 
             messageText1: '',
+            switchCode: '',
             messageText2: '',
             timeCountConfirm: -1,
             disabledConfirm1: false,
@@ -125,8 +129,10 @@ export default {
     methods: {
         doShow(operate, selected) {
             this.selected = selected;
+            this.message = '';
             if (!this.dialogShow) {
                 this.messageText1 = selected.name;
+                this.switchCode = selected.code;
 
                 this.operation = operate.operation;
             }
@@ -139,6 +145,8 @@ export default {
             this.dialogShow = false;
             this.messageText1 = '';
             this.messageText2 = '';
+            this.message = '';
+            this.switchCode = '';
             this.timeCountConfirm = -1;
             this.disabledConfirm1 = false;
             this.disabledConfirm2 = true;
@@ -192,28 +200,32 @@ export default {
             });
         },
         confirm2() {
-            const operate = {
+            if (this.messageText2 == this.switchCode) {
-                operation: '',
+                const operate = {
-                cmdType: ''
+                    operation: '',
-            };
+                    cmdType: ''
-            if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
+                };
-                operate.operation = OperationEvent.Switch.unlock.confirm2.operation;
+                if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
-                operate.cmdType = CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK;
+                    operate.operation = OperationEvent.Switch.unlock.confirm2.operation;
-            } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
+                    operate.cmdType = CMD.Switch.CMD_SWITCH_SINGLE_UNLOCK;
-                operate.operation = OperationEvent.Switch.unblock.confirm2.operation;
+                } else if (this.operation == OperationEvent.Switch.unblock.menu.operation) {
-                operate.cmdType = CMD.Switch.CMD_SWITCH_UNBLOCK;
+                    operate.operation = OperationEvent.Switch.unblock.confirm2.operation;
-            }
+                    operate.cmdType = CMD.Switch.CMD_SWITCH_UNBLOCK;
-
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-                if (valid) {
-                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
-                    this.messageText2 = '*****';
-                    this.disabledConfirm2 = true;
-                    this.timeCountConfirm = -1;
                 }
-            }).catch((error) => {
+
-                this.$refs.noticeInfo.doShow(operate, error.message);
+                this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
-            });
+                    if (valid) {
+                        this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                        this.messageText2 = '*****';
+                        this.disabledConfirm2 = true;
+                        this.timeCountConfirm = -1;
+                    }
+                }).catch((error) => {
+                    this.$refs.noticeInfo.doShow(operate, error.message);
+                });
+            } else {
+                this.message = '选择道岔错误';
+            }
         },
         commit() {
             const operate = {

src/jmapNew/theme/ningbo_01/menus/menuSection.vue

@@ -51,12 +51,12 @@ export default {
                         cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK
                     },
                     {
-                        label: '区段激活跟踪',
+                        label: '区段跟踪激活',
                         handler: this.active,
                         cmdType: CMD.Section.CMD_SECTION_ACTIVE
                     },
                     {
-                        label: '区段切除跟踪',
+                        label: '区段跟踪切除',
                         handler: this.split,
                         cmdType: CMD.Section.CMD_SECTION_CUT_OFF
                     },

src/jmapNew/theme/ningbo_01/menus/menuSignal.vue

@@ -124,7 +124,7 @@ export default {
                         cmdType: CMD.Signal.CMD_SIGNAL_SET_ROUTE
                     },
                     {
-                        label: '取消列车进路',
+                        label: '取消进路',
                         handler: this.cancelTrainRoute,
                         cmdType: CMD.Signal.CMD_SIGNAL_CANCEL_ROUTE
                     },

src/scripts/OperationConfig.js

@@ -3462,7 +3462,7 @@ export const OperationList = {
                 trainingName: '扣车({10}-{12} 站台)',
                 trainingRemark: '设置扣车功能',
                 trainingType: '05',
-                productTypes: ['02'], // 产品类型 01 现地 02 行调
+                productTypes: ['01', '02'], // 产品类型 01 现地 02 行调
                 stepVOList: [
                     { deviceType: '06', orderNum: 1, operateCode: '504', tip: '鼠标右键菜单选择【扣车】' },
                     { deviceType: '06', orderNum: 2, operateCode: '504', tip: '鼠标左键点击【确定】按钮' }
@@ -3476,7 +3476,7 @@ export const OperationList = {
                 trainingName: '取消扣车({10}-{12} 站台)',
                 trainingRemark: '取消扣车功能',
                 trainingType: '05',
-                productTypes: ['02'], // 产品类型 01 现地 02 行调
+                productTypes: ['01', '02'], // 产品类型 01 现地 02 行调
                 stepVOList: [
                     { deviceType: '06', orderNum: 1, operateCode: '505', tip: '鼠标右键菜单选择【取消扣车】' },
                     { deviceType: '06', orderNum: 2, operateCode: '505', tip: '鼠标左键点击【确定】按钮' }
@@ -3518,7 +3518,7 @@ export const OperationList = {
                 trainingName: '提前发车({10}-{12}站台)',
                 trainingRemark: '提前发车功能',
                 trainingType: '05',
-                productTypes: ['02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '06', orderNum: 1, operateCode: '501', tip: '鼠标右键菜单选择【提前发车】' },
                     { deviceType: '06', orderNum: 2, operateCode: '501', tip: '鼠标左键点击【确定】按钮' }
@@ -3669,13 +3669,30 @@ export const OperationList = {
                 trainingName: '查看站台信息({10}-{12}站台)',
                 trainingRemark: '查看站台信息功能',
                 trainingType: '05',
-                productTypes: ['02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '06', orderNum: 1, operateCode: '507', tip: '鼠标右键菜单选择【查看站台信息】' },
                     { deviceType: '06', orderNum: 2, operateCode: '0012', tip: '鼠标左键点击【确定】按钮' }
                 ]
             },
 
+            {
+                maxDuration: 15,
+                minDuration: 8,
+                operateType: '0402',
+                skinCode: '06',
+                trainingName: '区段故障解锁({8}{9})',
+                trainingRemark: '区段故障解锁',
+                trainingType: '04',
+                productTypes: ['02'],
+                stepVOList: [
+                    { deviceType: '03', orderNum: 1, operateCode: '402', tip: '鼠标右键菜单选择【区段故障解锁】' },
+                    { deviceType: '03', orderNum: 2, operateCode: '4024', tip: '鼠标左键点击【确定】按钮' },
+                    { deviceType: '03', orderNum: 3, operateCode: '4028', tip: '鼠标左键选择({8}{9})区段', val: '' },
+                    { deviceType: '03', orderNum: 4, operateCode: '4025', tip: '鼠标左键点击【确定】按钮' },
+                    { deviceType: '03', orderNum: 5, operateCode: '402', tip: '鼠标左键点击【关闭】按钮' }
+                ]
+            },
             {
                 maxDuration: 15,
                 minDuration: 8,
@@ -3684,7 +3701,7 @@ export const OperationList = {
                 trainingName: '区段跟踪切除({8}{9})',
                 trainingRemark: '区段跟踪切除',
                 trainingType: '04',
-                productTypes: ['02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '03', orderNum: 1, operateCode: '405', tip: '鼠标右键菜单选择【区段跟踪切除】' },
                     { deviceType: '03', orderNum: 2, operateCode: '405', tip: '鼠标左键点击【确定】按钮' }
@@ -3698,7 +3715,7 @@ export const OperationList = {
                 trainingName: '区段跟踪激活({8}{9})',
                 trainingRemark: '区段跟踪激活功能',
                 trainingType: '04',
-                productTypes: ['02'],
+                productTypes: ['01', '02'],
                 stepVOList: [
                     { deviceType: '03', orderNum: 1, operateCode: '406', tip: '鼠标右键菜单选择【区段跟踪激活】' },
                     { deviceType: '03', orderNum: 2, operateCode: '406', tip: '鼠标左键点击【确定】按钮' }
@@ -3708,7 +3725,7 @@ export const OperationList = {
                 maxDuration: 15,
                 minDuration: 8,
                 operateType: '0407',
-                skinCode: '02',
+                skinCode: '06',
                 trainingName: '设置临时限速({8}{9})',
                 trainingRemark: '设置临时限速功能（限速值：5）',
                 trainingType: '04',
@@ -3727,7 +3744,7 @@ export const OperationList = {
                 maxDuration: 15,
                 minDuration: 8,
                 operateType: '0407',
-                skinCode: '02',
+                skinCode: '06',
                 trainingName: '设置临时限速({8}{9})',
                 trainingRemark: '设置临时限速功能（限速值：自动）',
                 trainingType: '04',
@@ -3741,7 +3758,38 @@ export const OperationList = {
                     { deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【确认2】按钮' },
                     { deviceType: '03', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
                 ]
-            }
+            },
+            {
+                maxDuration: 15,
+                minDuration: 8,
+                operateType: '0405',
+                skinCode: '06',
+                trainingName: '区段封锁({8}{9})',
+                trainingRemark: '区段封锁功能',
+                trainingType: '04',
+                productTypes: ['01'],
+                stepVOList: [
+                    { deviceType: '03', orderNum: 1, operateCode: '403', tip: '鼠标右键菜单选择【区段封锁】' },
+                    { deviceType: '03', orderNum: 2, operateCode: '403', tip: '鼠标左键点击【确定】按钮' }
+                ]
+            },
+            // {
+            //     maxDuration: 15,
+            //     minDuration: 8,
+            //     operateType: '0406',
+            //     skinCode: '06',
+            //     trainingName: '区段解封({8}{9})',
+            //     trainingRemark: '区段解封功能',
+            //     trainingType: '04',
+            //     productTypes: ['01'],
+            //     stepVOList: [
+            //         { deviceType: '03', orderNum: 1, operateCode: '404', tip: '鼠标右键菜单选择【区段解封】' },
+            //         { deviceType: '03', orderNum: 2, operateCode: '4043', tip: '鼠标左键点击【确定】按钮' },
+            //         { deviceType: '03', orderNum: 3, operateCode: '4046', tip: '鼠标左键选择({8}{9})区段', val: '' },
+            //         { deviceType: '03', orderNum: 4, operateCode: '4044', tip: '鼠标左键点击【确定】按钮' },
+            //         { deviceType: '03', orderNum: 5, operateCode: '404', tip: '鼠标左键点击【关闭】按钮' }
+            //     ]
+            // },
             // {
             //     maxDuration: 15,
             //     minDuration: 8,
@@ -3760,6 +3808,413 @@ export const OperationList = {
             //         { deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【关闭】按钮' }
             //     ]
             // }
+
+            {
+                maxDuration: 15,
+                minDuration: 8,
+                operateType: '0313',
+                skinCode: '06',
+                trainingName: '定操({7})',
+                trainingRemark: '定操({7})',
+                trainingType: '03',
+                productTypes: ['01', '02'],
+                stepVOList: [
+                    { deviceType: '02', orderNum: 1, operateCode: '1010', tip: '鼠标左键菜单选择【定操】' },
+                    { deviceType: '02', orderNum: 2, operateCode: '1010', tip: '鼠标左键点击【{7}】按钮' }
+                ]
+            },
+            {
+                maxDuration: 15,
+                minDuration: 8,
+                operateType: '0313', // 0313 新增定位字典
+                skinCode: '06',
+                trainingName: '反操({7})',
+                trainingRemark: '反操({7})',
+                trainingType: '03',
+                productTypes: ['01', '02'],
+                stepVOList: [
+                    { deviceType: '02', orderNum: 1, operateCode: '102', tip: '鼠标右键菜单选择【反操】' },
+                    { deviceType: '02', orderNum: 2, operateCode: '102', tip: '鼠标左键点击【确定】按钮' }
+                ]
+            },
+            {
+                maxDuration: 15,
+                minDuration: 8,
+                operateType: '0308',
+                skinCode: '06',
+                trainingName: '区段切除({7})',
+                trainingRemark: '区段切除',
+                trainingType: '03',
+                productTypes: ['02'],
+                stepVOList: [
+                    { deviceType: '02', orderNum: 1, operateCode: '111', tip: '鼠标右键菜单选择【区段切除】' },
+                    { deviceType: '02', orderNum: 2, operateCode: '111', tip: '鼠标左键点击【确定】按钮' }
+                ]
+            },
+            {
+                maxDuration: 15,
+                minDuration: 8,
+                operateType: '0309',
+                skinCode: '06',
+                trainingName: '区段激活({7})',
+                trainingRemark: '区段激活功能',
+                trainingType: '03',
+                productTypes: ['02'],
+                stepVOList: [
+                    { deviceType: '02', orderNum: 1, operateCode: '112', tip: '鼠标右键菜单选择【区段激活】' },
+                    { deviceType: '02', orderNum: 2, operateCode: '112', tip: '鼠标左键点击【确定】按钮' }
+                ]
+            },
+            // {
+            //     maxDuration: 15,
+            //     minDuration: 8,
+            //     operateType: '0314',
+            //     skinCode: '02',
+            //     trainingName: '确认计轴有效({8}{9})',
+            //     trainingRemark: '确认计轴有效功能',
+            //     trainingType: '04',
+            //     productTypes: ['02'],
+            //     stepVOList: [
+            //         { deviceType: '03', orderNum: 1, operateCode: '412', tip: '鼠标右键菜单选择【确认计轴有效】' },
+            //         { deviceType: '03', orderNum: 2, operateCode: '4123', tip: '鼠标左键选择【确认】' },
+            //         { deviceType: '03', orderNum: 3, operateCode: '4121', tip: '鼠标左键选择{10}', val: '' },
+            //         { deviceType: '03', orderNum: 4, operateCode: '4122', tip: '鼠标左键选择({8}{9})', val: '' },
+            //         { deviceType: '03', orderNum: 5, operateCode: '4124', tip: '鼠标左键点击【确认】按钮' },
+            //         { deviceType: '03', orderNum: 6, operateCode: '4074', tip: '鼠标左键点击【关闭】按钮' }
+            //     ]
+            // }
+            {
+                maxDuration: 15,
+                minDuration: 8,
+                operateType: '0301',
+                skinCode: '06',
+                trainingName: '道岔单锁({7})',
+                trainingRemark: '道岔单锁功能',
+                trainingType: '03',
+                productTypes: ['01'],
+                stepVOList: [
+                    { deviceType: '02', orderNum: 1, operateCode: '103', tip: '鼠标右键菜单选择【道岔单锁】' },
+                    { deviceType: '02', orderNum: 2, operateCode: '103', tip: '鼠标左键点击【确定】按钮' }
+                ]
+            },
+            // {
+            //     maxDuration: 15,
+            //     minDuration: 8,
+            //     operateType: '0302',
+            //     skinCode: '06',
+            //     trainingName: '道岔单解({7})',
+            //     trainingRemark: '道岔单解功能',
+            //     trainingType: '03',
+            //     productTypes: ['01'],
+            //     stepVOList: [
+            //         { deviceType: '03', orderNum: 1, operateCode: '104', tip: '鼠标右键菜单选择【区段解封】' },
+            //         { deviceType: '03', orderNum: 2, operateCode: '1043', tip: '鼠标左键点击【确定】按钮' },
+            //         { deviceType: '03', orderNum: 3, operateCode: '1046', tip: '鼠标左键选择({8}{9})区段', val: '' },
+            //         { deviceType: '03', orderNum: 4, operateCode: '1044', tip: '鼠标左键点击【确定】按钮' },
+            //         { deviceType: '03', orderNum: 5, operateCode: '104', tip: '鼠标左键点击【关闭】按钮' }
+            //     ]
+            // },
+            {
+                maxDuration: 15,
+                minDuration: 8,
+                operateType: '0303',
+                skinCode: '06',
+                trainingName: '道岔封锁({7})',
+                trainingRemark: '道岔封锁功能',
+                trainingType: '03',
+                productTypes: ['01'],
+                stepVOList: [
+                    { deviceType: '02', orderNum: 1, operateCode: '105', tip: '鼠标右键菜单选择【道岔封锁】' },
+                    { deviceType: '02', orderNum: 2, operateCode: '105', tip: '鼠标左键点击【确定】按钮' }
+                ]
+            },
+            // {
+            //     maxDuration: 15,
+            //     minDuration: 8,
+            //     operateType: '0304',
+            //     skinCode: '06',
+            //     trainingName: '道岔解封({7})',
+            //     trainingRemark: '道岔解封功能',
+            //     trainingType: '03',
+            //     productTypes: ['01'],
+            //     stepVOList: [
+            //         { deviceType: '03', orderNum: 1, operateCode: '106', tip: '鼠标右键菜单选择【区段解封】' },
+            //         { deviceType: '03', orderNum: 2, operateCode: '1063', tip: '鼠标左键点击【确定】按钮' },
+            //         { deviceType: '03', orderNum: 3, operateCode: '1066', tip: '鼠标左键选择({8}{9})区段', val: '' },
+            //         { deviceType: '03', orderNum: 4, operateCode: '1064', tip: '鼠标左键点击【确定】按钮' },
+            //         { deviceType: '03', orderNum: 5, operateCode: '106', tip: '鼠标左键点击【关闭】按钮' }
+            //     ]
+            // },
+            {
+                maxDuration: 15,
+                minDuration: 8,
+                operateType: '0310',
+                skinCode: '06',
+                trainingName: '道岔区段设置限速({7})',
+                trainingRemark: '道岔区段设置限速功能（限速值：10）',
+                trainingType: '03',
+                productTypes: ['01', '02'],
+                stepVOList: [
+                    { deviceType: '02', orderNum: 1, operateCode: '113', tip: '鼠标右键菜单选择【道岔区段设置限速】' },
+                    { deviceType: '02', orderNum: 2, operateCode: '1136', tip: '鼠标左键选择【限速值5】', val: '10' },
+                    { deviceType: '02', orderNum: 3, operateCode: '1131', tip: '鼠标左键点击【下达】按钮' },
+                    { deviceType: '02', orderNum: 4, operateCode: '1132', tip: '鼠标左键点击【确认】按钮' },
+                    { deviceType: '02', orderNum: 5, operateCode: '1133', tip: '鼠标左键点击【确认1】按钮' },
+                    { deviceType: '02', orderNum: 6, operateCode: '1134', tip: '鼠标左键点击【确认2】按钮' },
+                    { deviceType: '02', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
+                ]
+            },
+            {
+                maxDuration: 15,
+                minDuration: 8,
+                operateType: '0310',
+                skinCode: '06',
+                trainingName: '道岔区段设置限速({7})',
+                trainingRemark: '道岔区段设置限速功能（限速值：不限）',
+                trainingType: '03',
+                productTypes: ['01', '02'],
+                stepVOList: [
+                    { deviceType: '02', orderNum: 1, operateCode: '113', tip: '鼠标右键菜单选择【道岔区段设置限速】' },
+                    { deviceType: '02', orderNum: 2, operateCode: '1136', tip: '鼠标左键选择【限速值: 不限】', val: '0' },
+                    { deviceType: '02', orderNum: 3, operateCode: '1131', tip: '鼠标左键点击【下达】按钮' },
+                    { deviceType: '02', orderNum: 4, operateCode: '1132', tip: '鼠标左键点击【确认】按钮' },
+                    { deviceType: '02', orderNum: 5, operateCode: '1133', tip: '鼠标左键点击【确认1】按钮' },
+                    { deviceType: '02', orderNum: 6, operateCode: '1134', tip: '鼠标左键点击【确认2】按钮' },
+                    { deviceType: '02', orderNum: 7, operateCode: '001', tip: '鼠标左键点击【关闭】按钮' }
+                ]
+            },
+
+            {
+                maxDuration: 15,
+                minDuration: 8,
+                operateType: '0201',
+                skinCode: '06',
+                trainingName: '排列进路({3})',
+                trainingRemark: '排列进路',
+                trainingType: '02',
+                productTypes: ['01', '02'],
+                stepVOList: [
+                    { deviceType: '04', orderNum: 1, operateCode: '301', tip: '鼠标右键菜单选择【排列进路】' },
+                    { deviceType: '04', orderNum: 2, operateCode: '3011', tip: '鼠标左键选择进路名称【{3}】', val: '{4}' },
+                    { deviceType: '04', orderNum: 3, operateCode: '301', tip: '鼠标左键点击【确定】按钮' }
+                ]
+            },
+            {
+                maxDuration: 15,
+                minDuration: 8,
+                operateType: '0202',
+                skinCode: '06',
+                trainingName: '取消进路({3})',
+                trainingRemark: '取消进路',
+                trainingType: '02',
+                productTypes: ['01', '02'],
+                stepVOList: [
+                    { deviceType: '04', orderNum: 1, operateCode: '303', tip: '鼠标右键菜单选择【取消进路】' },
+                    { deviceType: '04', orderNum: 2, operateCode: '303', tip: '鼠标左键点击【确定】按钮' }
+                ]
+            },
+            {
+                maxDuration: 8,
+                minDuration: 5,
+                operateType: '0206',
+                skinCode: '06',
+                trainingName: '信号重开({3} 进路)',
+                trainingRemark: '信号重开功能',
+                trainingType: '02',
+                productTypes: ['01', '02'],
+                stepVOList: [
+                    { deviceType: '04', orderNum: 1, operateCode: '304', tip: '鼠标右键菜单选择【信号重开】' },
+                    { deviceType: '04', orderNum: 2, operateCode: '304', tip: '鼠标左键点击【确定】按钮' }
+                ]
+            },
+            {
+                maxDuration: 15,
+                minDuration: 8,
+                operateType: '0208',
+                skinCode: '06',
+                trainingName: '进路交自动控({5})',
+                trainingRemark: '进路交自动控',
+                trainingType: '02',
+                productTypes: ['01', '02'],
+                stepVOList: [
+                    { deviceType: '04', orderNum: 1, operateCode: '315', tip: '鼠标右键菜单选择【进路交自动控】' },
+                    { deviceType: '04', orderNum: 2, operateCode: '3151', tip: '鼠标左键选择【{3}】进路', val: '{4}' },
+                    { deviceType: '04', orderNum: 3, operateCode: '315', tip: '鼠标左键点击【确定】按钮' }
+                ]
+            },
+            {
+                maxDuration: 15,
+                minDuration: 8,
+                operateType: '0209',
+                skinCode: '06',
+                trainingName: '进路交人工控({5})',
+                trainingRemark: '进路交人工控',
+                trainingType: '02',
+                productTypes: ['01', '02'],
+                stepVOList: [
+                    { deviceType: '04', orderNum: 1, operateCode: '314', tip: '鼠标右键菜单选择【进路交人工控】' },
+                    { deviceType: '04', orderNum: 2, operateCode: '3141', tip: '鼠标左键选择【{3}】进路', val: '{4}' },
+                    { deviceType: '04', orderNum: 3, operateCode: '314', tip: '鼠标左键点击【确定】按钮' }
+                ]
+            },
+            {
+                maxDuration: 15,
+                minDuration: 8,
+                operateType: '0211',
+                skinCode: '06',
+                trainingName: '设置通过模式({5})',
+                trainingRemark: '设置通过模式',
+                trainingType: '02',
+                productTypes: ['02'],
+                stepVOList: [
+                    { deviceType: '04', orderNum: 1, operateCode: '309', tip: '鼠标右键菜单选择【设置通过模式】' },
+                    { deviceType: '04', orderNum: 2, operateCode: '309', tip: '鼠标左键点击【确定】按钮' }
+                ]
+            },
+            {
+                maxDuration: 15,
+                minDuration: 8,
+                operateType: '0211',
+                skinCode: '06',
+                trainingName: 'Fleet进路办理({5})',
+                trainingRemark: 'Fleet进路办理',
+                trainingType: '02',
+                productTypes: ['01'],
+                stepVOList: [
+                    { deviceType: '04', orderNum: 1, operateCode: '309', tip: '鼠标右键菜单选择【Fleet进路办理】' },
+                    { deviceType: '04', orderNum: 2, operateCode: '309', tip: '鼠标左键点击【确定】按钮' }
+                ]
+            },
+            {
+                maxDuration: 15,
+                minDuration: 8,
+                operateType: '0212',
+                skinCode: '06',
+                trainingName: '取消通过模式({5})',
+                trainingRemark: '取消通过模式',
+                trainingType: '02',
+                productTypes: ['02'],
+                stepVOList: [
+                    { deviceType: '04', orderNum: 1, operateCode: '310', tip: '鼠标右键菜单选择【取消通过模式】' },
+                    { deviceType: '04', orderNum: 2, operateCode: '310', tip: '鼠标左键点击【确定】按钮' }
+                ]
+            },
+            {
+                maxDuration: 15,
+                minDuration: 8,
+                operateType: '0212',
+                skinCode: '06',
+                trainingName: 'Fleet进路取消({5})',
+                trainingRemark: 'Fleet进路取消',
+                trainingType: '02',
+                productTypes: ['01'],
+                stepVOList: [
+                    { deviceType: '04', orderNum: 1, operateCode: '310', tip: '鼠标右键菜单选择【Fleet进路取消】' },
+                    { deviceType: '04', orderNum: 2, operateCode: '310', tip: '鼠标左键点击【确定】按钮' }
+                ]
+            },
+            {
+                maxDuration: 15,
+                minDuration: 8,
+                operateType: '0212',
+                skinCode: '06',
+                trainingName: '人工解锁进路({5})',
+                trainingRemark: '人工解锁进路',
+                trainingType: '02',
+                productTypes: ['01', '02'],
+                stepVOList: [
+                    { deviceType: '04', orderNum: 1, operateCode: '318', tip: '鼠标右键菜单选择【人工解锁进路】' },
+                    { deviceType: '04', orderNum: 2, operateCode: '318', tip: '鼠标左键点击【确定】按钮' }
+                ]
+            },
+            {
+                maxDuration: 15,
+                minDuration: 8,
+                operateType: '0212',
+                skinCode: '06',
+                trainingName: '信号机引导办理({5})',
+                trainingRemark: '信号机引导办理',
+                trainingType: '02',
+                productTypes: ['01'],
+                stepVOList: [
+                    { deviceType: '04', orderNum: 1, operateCode: '308', tip: '鼠标右键菜单选择【信号机引导办理】' },
+                    { deviceType: '04', orderNum: 2, operateCode: '308', tip: '鼠标左键点击【确定】按钮' }
+                ]
+            },
+            {
+                maxDuration: 15,
+                minDuration: 8,
+                operateType: '0203',
+                skinCode: '06',
+                trainingName: '信号封锁({5})',
+                trainingRemark: '信号封闭',
+                trainingType: '02',
+                productTypes: ['02'],
+                stepVOList: [
+                    { deviceType: '04', orderNum: 1, operateCode: '306', tip: '鼠标右键菜单选择【信号封闭】' },
+                    { deviceType: '04', orderNum: 2, operateCode: '306', tip: '鼠标左键点击【确定】按钮' }
+                ]
+            },
+            // {
+            //     maxDuration: 15,
+            //     minDuration: 8,
+            //     operateType: '0204',
+            //     skinCode: '06',
+            //     trainingName: '信号解封({5})',
+            //     trainingRemark: '信号解封功能',
+            //     trainingType: '02',
+            //     productTypes: ['01'],
+            //     stepVOList: [
+            //         { deviceType: '03', orderNum: 1, operateCode: '307', tip: '鼠标右键菜单选择【信号解封】' },
+            //         { deviceType: '03', orderNum: 2, operateCode: '3073', tip: '鼠标左键点击【确定】按钮' },
+            //         { deviceType: '03', orderNum: 3, operateCode: '3076', tip: '鼠标左键选择({8}{9})区段', val: '' },
+            //         { deviceType: '03', orderNum: 4, operateCode: '3074', tip: '鼠标左键点击【确定】按钮' },
+            //         { deviceType: '03', orderNum: 5, operateCode: '307', tip: '鼠标左键点击【关闭】按钮' }
+            //     ]
+            // },
+            {
+                maxDuration: 15,
+                minDuration: 8,
+                operateType: '0210',
+                skinCode: '06',
+                trainingName: '查询进路控制状态({5})',
+                trainingRemark: '查询进路控制状态',
+                trainingType: '02',
+                productTypes: ['01', '02'],
+                stepVOList: [
+                    { deviceType: '04', orderNum: 1, operateCode: '316', tip: '鼠标右键菜单选择【查询进路控制模式】' },
+                    { deviceType: '04', orderNum: 2, operateCode: '316', tip: '鼠标左键点击【确定】按钮' }
+                ]
+            },
+
+            {
+                maxDuration: 20,
+                minDuration: 15,
+                operateType: '0103',
+                skinCode: '06',
+                trainingName: '请求遥控({1})',
+                trainingRemark: '控制权限转换，站控转中控',
+                trainingType: '01',
+                productTypes: ['02'],
+                stepVOList: [
+                    { deviceType: '05', orderNum: 1, operateCode: '202', tip: '鼠标左键点击顶部菜单栏【请求遥控】' },
+                    { deviceType: '05', orderNum: 2, operateCode: '202', tip: '鼠标左键点击【应用】' }
+                ]
+            },
+            {
+                maxDuration: 15,
+                minDuration: 8,
+                operateType: '0101',
+                skinCode: '06',
+                trainingName: '请求站控({1})',
+                trainingRemark: '控制权限转换，中控转站控',
+                trainingType: '01',
+                productTypes: ['01'],
+                stepVOList: [
+                    { deviceType: '05', orderNum: 1, operateCode: '204', tip: '鼠标左键点击顶部菜单栏【请求站控】' },
+                    { deviceType: '05', orderNum: 2, operateCode: '204', tip: '鼠标左键点击【应用】' }
+                ]
+            }
         ]
     }
 };