北京一号线现地区故解操作代码调整

src/jmapNew/theme/beijing_01/menus/dialog/sectionControl.vue

@@ -22,7 +22,7 @@
         <el-input v-model="sectionName" size="small" disabled />
       </el-col>
     </el-row>
-    <el-row style="margin-top: 10px;">
+    <el-row v-if="isDisplay" style="margin-top: 10px;">
       <el-col :span="11">
         <el-radio v-model="radio" label="1" :disabled="radio == 2" style="display: block; text-align: center;">
           激活</el-radio>
@@ -63,7 +63,8 @@ export default {
             operation: '',
             stationName: '',
             sectionName: '',
-            radio: ''
+            radio: '',
+            isDisplay: false
         };
     },
     computed: {
@@ -78,11 +79,11 @@ export default {
         },
         title() {
             if (this.operation == OperationEvent.Section.split.menu.operation) {
-                this.radio = '2';
                 return '区段控制';
             } else if (this.operation == OperationEvent.Section.active.menu.operation) {
-                this.radio = '1';
                 return '区段控制';
+            } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
+                return '区故解';
             } else {
                 return '';
             }
@@ -97,6 +98,15 @@ export default {
         doShow(operate, selected) {
             this.selected = selected;
             if (!this.dialogShow) {
+                if (this.operation == OperationEvent.Section.split.menu.operation) {
+                    this.radio = '2';
+                    this.isDisplay = true;
+                } else if (this.operation == OperationEvent.Section.active.menu.operation) {
+                    this.radio = '1';
+                    this.isDisplay = true;
+                } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
+                    this.isDisplay = false;
+                }
                 this.sectionName = '';
                 this.stationName = '';
                 if (selected && selected._type.toUpperCase() === 'Section'.toUpperCase()) {
@@ -133,8 +143,19 @@ export default {
             } else if (this.operation == OperationEvent.Section.active.menu.operation) {
                 /** 轨道区段激活*/
                 this.active();
+            } else if (this.operation == OperationEvent.Section.fault.menu.operation) {
+                /** 区故解*/
+                this.faultUnlock();
             }
         },
+        faultUnlock() {
+            const operate = {
+                over: true,
+                operation: OperationEvent.Section.fault.menu.operation,
+                cmdType: CMD.Section.CMD_SECTION_FAULT_UNLOCK
+            };
+            this.sendCommand(operate);
+        },
         // 轨道区段切除
         split() {
             const operate = {

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

@@ -95,7 +95,7 @@ export default {
             } else if (this.operation == OperationEvent.Switch.active.menu.operation) {
                 return '区段控制';
             } else if (this.operation == OperationEvent.Switch.unlock.menu.operation) {
-                return '道岔单解';
+                return '道岔解锁';
             } else {
                 return '';
             }

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

@@ -22,7 +22,8 @@ import AlxeEffective from './dialog/alxeEffective';
 import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
 import { mapGetters } from 'vuex';
 import { OperateMode } from '@/scripts/ConstDic';
-import { OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
+import { DeviceMenu } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 
@@ -172,14 +173,14 @@ export default {
         },
         operationHandler(buttonOperation, selectType) {
             switch (buttonOperation) {
-            case OperationEvent.Section.fault.menu.operation: {
+            case OperationEvent.Section.fault.button.operation: {
                 // 区故解
-                if (selectType.fault) {
-                    this.faultUnlock(selectType);
-                } else {
-                    this.$refs.noticeInfo.doShow({}, `该区段[${selectType.name}(${selectType.code})]没有故障`);
-                }
-                break;
+                // if (selectType.fault) {
+                this.faultUnlock(selectType);
+                // } else {
+                //     this.$refs.noticeInfo.doShow({}, `该区段[${selectType.name}(${selectType.code})]没有故障`);
+                // }
+                // break;
             }
             // case OperationEvent: {
             //     // 计轴复位
@@ -216,13 +217,13 @@ export default {
                 operation: OperationEvent.Section.fault.menu.operation,
                 param: {
                     sectionCode: selectType.code
-                },
-                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.$refs.sectionCmdControl.doShow(operate, this.selected);
+                    this.$refs.sectionControl.doShow(operate, this.selected);
                 }
             });
         },

src/jmapNew/theme/beijing_01/menus/menuStation.vue

@@ -16,7 +16,8 @@ import StationSetRouteControlAll from './dialog/stationSetRouteControlAll';
 import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
 import { mapGetters } from 'vuex';
 import { OperateMode } from '@/scripts/ConstDic';
-import { MapDeviceType, OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
+import { DeviceMenu } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { mouseCancelState } from './utils/menuItemStatus';
@@ -165,8 +166,6 @@ export default {
                 start: true,
                 send: true,
                 code: this.selected.code,
-                type: MapDeviceType.Station.type,
-                label: MapDeviceType.Station.label,
                 operation: OperationEvent.Station.stoppage.menu.operation
             };
 
@@ -187,8 +186,6 @@ export default {
                 start: true,
                 send: true,
                 code: this.selected.code,
-                type: MapDeviceType.Station.type,
-                label: MapDeviceType.Station.label,
                 operation: OperationEvent.Station.cancelStoppage.menu.operation
             };
 
@@ -209,8 +206,6 @@ export default {
                 start: true,
                 send: true,
                 code: this.selected.code,
-                type: MapDeviceType.Station.type,
-                label: MapDeviceType.Station.label,
                 operation: OperationEvent.Station.setAutoTrigger.menu.operation
             };
             this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -227,8 +222,6 @@ export default {
                 start: true,
                 send: true,
                 code: this.selected.code,
-                type: MapDeviceType.Station.type,
-                label: MapDeviceType.Station.label,
                 operation: OperationEvent.Station.cancelAutoTrigger.menu.operation
             };
             this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -244,8 +237,6 @@ export default {
             const operate = {
                 start: true,
                 code: this.selected.code,
-                type: MapDeviceType.Station.type,
-                label: MapDeviceType.Station.label,
                 operation: OperationEvent.Station.powerUnLock.menu.operation
             };
             this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -260,8 +251,6 @@ export default {
             const operate = {
                 start: true,
                 code: this.selected.code,
-                type: MapDeviceType.Station.type,
-                label: MapDeviceType.Station.label,
                 operation: OperationEvent.Station.execKeyOperationTest.menu.operation
             };
             this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -276,8 +265,6 @@ export default {
             const operate = {
                 start: true,
                 code: this.selected.code,
-                type: MapDeviceType.Station.type,
-                label: MapDeviceType.Station.label,
                 operation: OperationEvent.Station.humanControlALL.menu.operation
             };
             this.$store.dispatch('training/next', operate).then(({ valid }) => {
@@ -292,8 +279,6 @@ export default {
             const operate = {
                 start: true,
                 code: this.selected.code,
-                type: MapDeviceType.Station.type,
-                label: MapDeviceType.Station.label,
                 operation: OperationEvent.Station.atsAutoControlALL.menu.operation
             };
             this.$store.dispatch('training/next', operate).then(({ valid }) => {

src/jmapNew/theme/beijing_01/menus/menuSwitch.vue

@@ -20,7 +20,8 @@ import AlxeEffective from './dialog/alxeEffective';
 import NoticeInfo from './dialog/childDialog/childDialog/noticeInfo';
 import { mapGetters } from 'vuex';
 import { OperateMode } from '@/scripts/ConstDic';
-import {OperationEvent, DeviceMenu } from '@/scripts/ConstDic';
+import {DeviceMenu } from '@/scripts/ConstDic';
+import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
 import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { mouseCancelState } from './utils/menuItemStatus';