宁波一号线 区故解指令代码调整 计轴预复位报错调整

src/i18n/langs/en/menu.js

@@ -446,6 +446,7 @@ export default {
     setSwitchbackStrategyTipPrefix: 'Tip: Check the station',
     setSwitchbackStrategyTipSuffix: 'setting to run the switchback strategy',
     setSwitchbackStrategy: 'Set switchback strategy',
+    setSectionFaultUnlock:'set section fault unlock',
     noSwitchback: 'No switchback',
     noOneSwitchback: 'No one switchback',
     automaticChange: 'Automatic change',

src/i18n/langs/zh/menu.js

@@ -441,6 +441,7 @@ export default {
     setSwitchbackStrategyTipPrefix: '提示: 选中站台',
     setSwitchbackStrategyTipSuffix: '设置运行折返策略',
     setSwitchbackStrategy: '设置折返策略',
+    setSectionFaultUnlock:'设置区故解',
     noSwitchback: '无折返',
     noOneSwitchback: '无人折返',
     automaticChange: '自动换端',

src/jmapNew/theme/components/menus/childDialog/confirmControl.vue

@@ -1,4 +1,5 @@
 <template>
+  <div>
     <el-dialog
       v-dialogDrag
       class="confirm-control"
@@ -27,10 +28,14 @@
       </el-row>
       <notice-info ref="noticeInfo" :pop-class="popClass" />
     </el-dialog>
+    <section-un-lock ref="sectionUnLock" pop-class="ningbo-01__systerm" />
+  </div>
+
 </template>
 
 <script>
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
+import SectionUnLock from '../dialog/sectionUnLock';
 import NoticeInfo from './noticeInfo';
 import { commitOperate } from '../../utils/menuOperate';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
@@ -38,7 +43,8 @@ import CMD from '@/scripts/cmdPlugin/CommandEnum';
 export default {
     name: 'ConfirmControl',
     components: {
-        NoticeInfo
+        NoticeInfo,
+        SectionUnLock
     },
     props: {
         popClass: {
@@ -49,6 +55,7 @@ export default {
     data() {
         return {
             dialogShow: false,
+            selected:'',
             loading: false,
             operate: {},
             messages: '',
@@ -78,6 +85,8 @@ export default {
                 return this.$t('menu.stopTime');
             } else if (this.operation === OperationEvent.StationStand.setBackStrategy.menu.operation) {
                 return this.$t('menu.setSwitchbackStrategy'); // 设置折返策略
+            } else if (this.operation === OperationEvent.Section.fault.menu.operation) {
+                return this.$t('menu.setSectionFaultUnlock'); // 区故解
             }
             return '';
         },
@@ -103,13 +112,16 @@ export default {
                 return OperationEvent.StationStand.setStopTime.confirm.domId; // 设置停站时间
             } else if (this.operation === OperationEvent.StationStand.setBackStrategy.menu.operation) {
                 return OperationEvent.StationStand.setBackStrategy.confirm.domId; // 设置折返策略
+            } else if (this.operation === OperationEvent.Section.fault.menu.operation) {
+                return OperationEvent.Section.fault.menu.domId; // 设置区故解
             }
             return '';
         }
     },
     methods: {
-        doShow(operate) {
+        doShow(operate, selected) {
             if (!this.dialogShow) {
+                this.selected = selected;
                 this.loading = false;
                 this.operate = operate || {};
                 this.messages = operate.messages;
@@ -145,6 +157,8 @@ export default {
                 this.setStopTime(); // 停站时间
             } else if (this.operation === OperationEvent.StationStand.setBackStrategy.menu.operation) {
                 this.setBackStrategy(); // 设置折返策略
+            } else if (this.operation === OperationEvent.Section.fault.menu.operation) {
+                this.setSectionFaultUnlock(); // 设置区故解
             }
         },
         // 信号关灯
@@ -167,6 +181,27 @@ export default {
             this.sendCommand(operate);
         },
 
+        // 设置区故解
+        setSectionFaultUnlock() {
+            this.loading = true;
+            const operate = {
+                operation: this.operation
+                // cmdType: CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY,
+                // val: this.operate.val
+            };
+            commitOperate(operate, {}, 1).then(({valid})=>{
+                this.loading = false;
+                if (valid) {
+                    this.doClose();
+                    this.$refs.sectionUnLock.doShow(operate, this.selected);
+                }
+            }).catch(() => {
+                this.loading = false;
+                this.doClose();
+                this.$refs.noticeInfo.doShow();
+            });
+        },
+
         // 进路设置
         routeSetting() {
             const operate = {

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

@@ -20,7 +20,7 @@
           size="mini"
           @change="sectionSelectChange"
         >
-          <el-option v-for="(option,index) in switchAndPhySicalSectionList" :key="index" :label="option.name" :value="option.name" />
+          <el-option v-for="(option,index) in switchAndPhySicalSectionList" :key="index" :label="option.name" :value="option.code" />
         </el-select>
       </el-col>
     </el-row>

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

@@ -32,6 +32,7 @@ export default {
     data() {
         return {
             menu: [],
+            menuForce:[],
             menuNormal: {
                 Local: [
                     {

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

@@ -2,7 +2,8 @@
   <div>
     <pop-menu ref="popMenu" :menu="menu" />
     <section-control ref="sectionControl" pop-class="ningbo-01__systerm" />
-    <section-un-lock ref="sectionUnLock" pop-class="ningbo-01__systerm" />
+    <!-- <section-un-lock ref="sectionUnLock" pop-class="ningbo-01__systerm" /> -->
+    <confirm-control ref="confirmControl" pop-class="ningbo-01__systerm" />
     <speed-limit-control ref="speedLimitControl" pop-class="ningbo-01__systerm" />
     <alxe-effective ref="alxeEffective" />
     <notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
@@ -18,10 +19,12 @@ import SectionControl from '@/jmapNew/theme/components/menus/dialog/sectionContr
 import TrainAddPlan from '@/jmapNew/theme/components/menus/dialog/trainAddPlan';
 import LoadSpareTrain from '@/jmapNew/theme/components/menus/dialog/loadSpareTrain';
 import SetFault from '@/jmapNew/theme/components/menus/dialog/setFault';
-import SectionUnLock from '@/jmapNew/theme/components/menus/dialog/sectionUnLock';
+// import SectionUnLock from '@/jmapNew/theme/components/menus/dialog/sectionUnLock';
 import SpeedLimitControl from '@/jmapNew/theme/components/menus/dialog/speedCmdControl';
 import AlxeEffective from './dialog/alxeEffective';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+import ConfirmControl from '@/jmapNew/theme/components/menus/childDialog/confirmControl';
+
 import { mapGetters } from 'vuex';
 import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
@@ -33,12 +36,13 @@ export default {
     components: {
         PopMenu,
         SectionControl,
-        SectionUnLock,
+        // SectionUnLock,
         SpeedLimitControl,
         AlxeEffective,
         NoticeInfo,
         TrainAddPlan,
         SetFault,
+        ConfirmControl,
         LoadSpareTrain
     },
     props: {
@@ -214,7 +218,9 @@ export default {
         fault() {
             commitOperate(menuOperate.Section.fault, {sectionCode:this.selected.code}, 0).then(({valid, operate})=>{
                 if (valid) {
-                    this.$refs.sectionUnLock.doShow(operate, this.selected);
+                    // this.$refs.sectionUnLock.doShow(operate, this.selected);
+                    operate.messages = '是否执行区故解命令？';
+                    this.$refs.confirmControl.doShow(operate, this.selected);
                 }
             });
         },