佛山有轨电车 宁波一号线 全线扣车代码调整

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

@@ -11,9 +11,9 @@
     :modal="false"
     :close-on-click-modal="false"
   >
-    <el-radio-group v-model="control" :disabled="true">
+    <el-radio-group v-model="control">
       <el-row v-for="item in Object.keys(controlProps)" :key="item" style="padding-bottom: 10px;padding-top:10px">
-        <el-radio :label="item" disabled="false">{{ controlProps[item] }}</el-radio>
+        <el-radio :label="item" :disabled="controlPropDisabled[item]">{{ controlProps[item] }}</el-radio>
       </el-row>
     </el-radio-group>
     <el-row type="flex" justify="center" class="button-group">
@@ -45,8 +45,11 @@ export default {
             controlProps: {
                 '01': '全线扣车',
                 '02': '取消全线扣车'
+            },
+            controlPropDisabled:{
+                '01':false,
+                '02':false
             }
-
         };
     },
     computed: {
@@ -93,13 +96,16 @@ export default {
                 this.operate = operate || {};
                 this.operation = operate.operation;
             }
-
             if (this.operation == OperationEvent.StationStand.setDetainTrainAll.mbar.operation) {
                 // 设置全线扣车
                 this.control = '01';
+                this.controlPropDisabled['01'] = false;
+                this.controlPropDisabled['02'] = true;
             } else if (this.operation == OperationEvent.StationStand.cancelDetainTrainAll.mbar.operation) {
                 // 取消全线扣车
                 this.control = '02';
+                this.controlPropDisabled['01'] = true;
+                this.controlPropDisabled['02'] = false;
             }
 
             this.dialogShow = true;
@@ -115,7 +121,7 @@ export default {
                 operation: OperationEvent.Command.cancel.menu.operation
             };
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.doClose();
                 }
@@ -143,7 +149,7 @@ export default {
                 messages: ['确认设置全线扣车！']
             };
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {
@@ -167,7 +173,7 @@ export default {
                 messages: ['确认取消全线扣车！']
             };
 
-			this.$store.dispatch('training/next', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
                 if (valid) {
                     this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
                 } else {

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

@@ -11,9 +11,9 @@
     :modal="false"
     :close-on-click-modal="false"
   >
-    <el-radio-group v-model="control" :disabled="true">
+    <el-radio-group v-model="control">
       <el-row v-for="item in Object.keys(controlProps)" :key="item" style="padding-bottom: 10px;padding-top:10px">
-        <el-radio :label="item">{{ controlProps[item] }}</el-radio>
+        <el-radio :label="item" :disabled="controlPropDisabled[item]">{{ controlProps[item] }}</el-radio>
       </el-row>
     </el-radio-group>
     <el-row type="flex" justify="center" class="button-group">
@@ -45,8 +45,11 @@ export default {
             controlProps: {
                 '01': '取消上行全线扣车',
                 '02': '取消下行全线扣车'
+            },
+            controlPropDisabled:{
+                '01':false,
+                '02':false
             }
-
         };
     },
     computed: {
@@ -97,9 +100,13 @@ export default {
             if (this.operation == OperationEvent.StationStand.cancelUpDetainTrainAll.mbar.operation) {
                 // 取消全线上行扣车
                 this.control = '01';
+                this.controlPropDisabled['01'] = false;
+                this.controlPropDisabled['02'] = true;
             } else if (this.operation == OperationEvent.StationStand.cancelDownDetainTrainAll.mbar.operation) {
                 // 取消全线下行扣车
                 this.control = '02';
+                this.controlPropDisabled['01'] = true;
+                this.controlPropDisabled['02'] = false;
             }
 
             this.dialogShow = true;

src/jmapNew/theme/ningbo_01/menus/menuDialog/detainTrainContorl.vue

@@ -11,9 +11,9 @@
     :modal="false"
     :close-on-click-modal="false"
   >
-    <el-radio-group v-model="control" :disabled="true">
+    <el-radio-group v-model="control">
       <el-row v-for="item in Object.keys(controlProps)" :key="item" style="padding-bottom: 10px;padding-top:10px">
-        <el-radio :label="item" disabled="false">{{ controlProps[item] }}</el-radio>
+        <el-radio :label="item" :disabled="controlPropDisabled[item]">{{ controlProps[item] }}</el-radio>
       </el-row>
     </el-radio-group>
     <el-row type="flex" justify="center" class="button-group">
@@ -45,6 +45,10 @@ export default {
             controlProps: {
                 '01': '全线扣车',
                 '02': '取消全线扣车'
+            },
+            controlPropDisabled:{
+                '01':false,
+                '02':false
             }
 
         };
@@ -61,19 +65,26 @@ export default {
             return this.dialogShow && !this.$store.state.menuOperation.break;
         },
         title() {
+            if (this.dialogShow) {
                 if (this.operation == OperationEvent.StationStand.setDetainTrainAll.mbar.operation) {
                     return '全线扣车';
                 } else if (this.operation == OperationEvent.StationStand.cancelDetainTrainAll.mbar.operation) {
                     return '取消全线扣车';
-            }
+                } else {
                     return '';
+                }
+            } else {
+                return '';
+            }
         },
         domIdCommit() {
+            if (this.dialogShow) {
                 if (this.operation == OperationEvent.StationStand.setDetainTrainAll.mbar.operation) {
                     return OperationEvent.StationStand.setDetainTrainAll.menu.domId;
                 } else if (this.operation == OperationEvent.StationStand.cancelDetainTrainAll.mbar.operation) {
                     return OperationEvent.StationStand.cancelDetainTrainAll.menu.domId;
                 }
+            }
             return '';
         },
         domIdCancel() {
@@ -95,9 +106,13 @@ export default {
             if (this.operation == OperationEvent.StationStand.setDetainTrainAll.mbar.operation) {
                 // 设置全线扣车
                 this.control = '01';
+                this.controlPropDisabled['01'] = false;
+                this.controlPropDisabled['02'] = true;
             } else if (this.operation == OperationEvent.StationStand.cancelDetainTrainAll.mbar.operation) {
                 // 取消全线扣车
                 this.control = '02';
+                this.controlPropDisabled['01'] = true;
+                this.controlPropDisabled['02'] = false;
             }
 
             this.dialogShow = true;

src/jmapNew/theme/ningbo_01/menus/menuDialog/detainTrainContorlUpDown.vue

@@ -11,9 +11,9 @@
     :modal="false"
     :close-on-click-modal="false"
   >
-    <el-radio-group v-model="control" :disabled="true">
+    <el-radio-group v-model="control">
       <el-row v-for="item in Object.keys(controlProps)" :key="item" style="padding-bottom: 10px;padding-top:10px">
-        <el-radio :label="item">{{ controlProps[item] }}</el-radio>
+        <el-radio :label="item" :disabled="controlPropDisabled[item]">{{ controlProps[item] }}</el-radio>
       </el-row>
     </el-radio-group>
     <el-row type="flex" justify="center" class="button-group">
@@ -45,8 +45,11 @@ export default {
             controlProps: {
                 '01': '取消上行扣车',
                 '02': '取消下行扣车'
+            },
+            controlPropDisabled:{
+                '01':false,
+                '02':false
             }
-
         };
     },
     computed: {
@@ -61,19 +64,23 @@ export default {
             return this.dialogShow && !this.$store.state.menuOperation.break;
         },
         title() {
+            if (this.dialogShow) {
                 if (this.operation == OperationEvent.StationStand.cancelUpDetainTrainAll.mbar.operation) {
                     return '取消上行扣车';
                 } else if (this.operation == OperationEvent.StationStand.cancelDownDetainTrainAll.mbar.operation) {
                     return '取消下行扣车';
                 }
+            }
             return '';
         },
         domIdCommit() {
+            if (this.dialogShow) {
                 if (this.operation == OperationEvent.StationStand.cancelUpDetainTrainAll.mbar.operation) {
                     return OperationEvent.StationStand.cancelUpDetainTrainAll.menu.domId;
                 } else if (this.operation == OperationEvent.StationStand.cancelDownDetainTrainAll.mbar.operation) {
                     return OperationEvent.StationStand.cancelDownDetainTrainAll.menu.domId;
                 }
+            }
             return '';
         },
         domIdCancel() {
@@ -95,9 +102,13 @@ export default {
             if (this.operation == OperationEvent.StationStand.cancelUpDetainTrainAll.mbar.operation) {
                 // 取消全线上行扣车
                 this.control = '01';
+                this.controlPropDisabled['01'] = false;
+                this.controlPropDisabled['02'] = true;
             } else if (this.operation == OperationEvent.StationStand.cancelDownDetainTrainAll.mbar.operation) {
                 // 取消全线下行扣车
                 this.control = '02';
+                this.controlPropDisabled['01'] = true;
+                this.controlPropDisabled['02'] = false;
             }
 
             this.dialogShow = true;