实训调整

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

@@ -95,6 +95,7 @@
     <train-delete ref="trainDelete" />
     <manage-user ref="manageUser" />
     <help-about ref="helpAbout" />
+    <area-selection ref="areaSelection" />
   </div>
 </template>
 <script>
@@ -109,6 +110,7 @@ import TrainTranstalet from './menuDialog/trainTranstalet';
 import TrainDelete from './menuDialog/trainDelete';
 import ManageUser from './menuDialog/manageUser';
 import HelpAbout from './menuDialog/helpAbout';
+import AreaSelection from './menuDialog/areaSelection';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import { EventBus } from '@/scripts/event-bus';
 import { State2SimulationMap } from '@/scripts/cmdPlugin/Config';
@@ -125,7 +127,8 @@ export default {
         TrainTranstalet,
         TrainDelete,
         ManageUser,
-        HelpAbout
+        HelpAbout,
+        AreaSelection
     },
     props: {
         selected: {
@@ -167,7 +170,7 @@ export default {
                             },
                             {
                                 title: '区域选择',
-                                click: this.undeveloped
+                                click: this.selectedArea
                             },
                             {
                                 type: 'separator'
@@ -413,7 +416,7 @@ export default {
                             },
                             {
                                 title: '区域选择',
-                                click: this.undeveloped
+                                click: this.selectedArea
                             },
                             {
                                 type: 'separator'
@@ -959,6 +962,21 @@ export default {
                 }
             }
         },
+        selectedArea(order) {
+            const operate = {
+                type: 'bar'
+                // operation: order.operation
+            };
+
+            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+                if (valid) {
+                    this.closeMenu(true);
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$refs.areaSelection.doShow(operate);
+
+                }
+            });
+        },
         undeveloped() {
             this.doClose();
             this.$alert('实现中......', '提示', {

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

@@ -0,0 +1,85 @@
+<template>
+  <el-dialog
+    v-dialogDrag
+    class="ningbo-01__systerm station-control"
+    :title="title"
+    :visible.sync="show"
+    width="600px"
+    :before-close="doClose"
+    :show-close="true"
+    :z-index="2000"
+    :modal="false"
+    :close-on-click-modal="false"
+  >
+    <el-row>
+      <el-col :span="18">
+        <el-table :data="tableData" style="width: 100%" height="334px" size="mini">
+          <el-table-column prop="apply" label="申请">
+            <el-checkbox />
+          </el-table-column>
+          <el-table-column prop="release" label="释放">
+            <el-checkbox />
+          </el-table-column>
+          <el-table-column prop="distribution" label="强制分配">
+            <el-checkbox />
+          </el-table-column>
+          <el-table-column prop="name" label="车站名" />
+          <el-table-column prop="control" label="控制状态" />
+        </el-table>
+      </el-col>
+      <el-col :span="6">
+        <el-button style="width: 125px;margin-left: 10px;">全部申请</el-button>
+        <el-button style="width: 125px;margin-top: 10px;">取消全部申请</el-button>
+        <el-button style="width: 125px;margin-top: 10px;">全部释放</el-button>
+        <el-button style="width: 125px;margin-top: 10px;">取消全部释放</el-button>
+        <el-button style="width: 125px;margin-top: 10px;">全部强制分配</el-button>
+        <el-button style="width: 125px;margin-top: 10px;">取消全部强制分配</el-button>
+        <el-button style="width: 125px;margin-top: 10px;">应用</el-button>
+        <el-button style="width: 125px;margin-top: 10px;">退出</el-button>
+      </el-col>
+    </el-row>
+    <notice-info ref="noticeInfo" pop-class="ningbo-01__systerm" />
+  </el-dialog>
+</template>
+
+<script>
+import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
+import { mapGetters } from 'vuex';
+export default {
+    name: 'AreaSelection',
+    components: {
+        NoticeInfo
+    },
+    data() {
+        return {
+            show: false,
+            title: '区域选择',
+            tableData: []
+        };
+    },
+    computed: {
+        ...mapGetters('map', [
+            'stationList'
+        ])
+    },
+    methods: {
+        doShow() {
+            this.tableData = [];
+            this.stationList.forEach(item => {
+                if (item.centralized) {
+                    this.tableData.push(item);
+                }
+            });
+            console.log(this.stationList, this.tableData);
+            this.show = true;
+        },
+        doClose() {
+            this.show = false;
+        }
+    }
+};
+</script>
+
+<style scoped>
+
+</style>

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

@@ -253,7 +253,7 @@ export default {
         },
         // 批量扣车
         setBulkBuckleTrain() {
-            commitOperate(menuOperate.StationStand.setBulkBuckleTrain, {}, 0).then(({valid, operate})=>{
+            commitOperate(menuOperate.StationStand.setBulkBuckleTrain, {standCode:this.selected.code}, 0).then(({valid, operate})=>{
                 if (valid) {
                     this.$refs.standBulkBuckleTrain.doShow(operate, this.selected);
                 }
@@ -261,7 +261,7 @@ export default {
         },
         // 批量取消扣车
         cancelBulkBuckleTrain() {
-            commitOperate(menuOperate.StationStand.cancelBulkBuckleTrain, {}, 0).then(({valid, operate})=>{
+            commitOperate(menuOperate.StationStand.cancelBulkBuckleTrain, {standCode:this.selected.code}, 0).then(({valid, operate})=>{
                 if (valid) {
                     this.$refs.standBulkBuckleTrain.doShow(operate, this.selected);
                 }

src/jmapNew/theme/ningbo_01/operationConfig.js

@@ -38,7 +38,7 @@ export default {
             trainingType: 'Stand',
             productTypes: ['02'], // 产品类型 01 现地 02 行调
             stepVOList: [
-                { deviceType: '06', orderNum: 1, operateCode: '515', tip: '鼠标右键菜单选择【批量扣车】' },
+                { deviceType: '06', orderNum: 1, operateCode: '515', tip: '鼠标右键菜单选择【批量扣车】'},
                 { deviceType: '06', orderNum: 2, operateCode: '515', tip: '选择部分站台后，鼠标左键点击【确定】按钮' }
             ]
         },
@@ -52,7 +52,7 @@ export default {
             trainingType: 'Stand',
             productTypes: ['02'], // 产品类型 01 现地 02 行调
             stepVOList: [
-                { deviceType: '06', orderNum: 1, operateCode: '516', tip: '鼠标右键菜单选择【取消批量扣车】' },
+                { deviceType: '06', orderNum: 1, operateCode: '516', tip: '鼠标右键菜单选择【取消批量扣车】'},
                 { deviceType: '06', orderNum: 2, operateCode: '516', tip: '选择部分站台后，鼠标左键点击【确定】按钮' }
             ]
         },
@@ -902,15 +902,16 @@ export default {
             minDuration: 8,
             operateType: 'Station_Set_Turn_Back_Strategy',
             skinCode: '06',
-            trainingName: '设置折返策略({1})({折返策略})',
+            trainingName: '设置折返策略({1})({30})',
             trainingRemark: '设置折返策略',
             trainingType: 'Station',
-            productTypes: ['01'],
+            productTypes: ['02'],
             stepVOList: [
-                { deviceType: '', orderNum: 1, operateCode: '', tip: '鼠标右键菜单选择【设置折返策略】'},
+                { deviceType: '05', orderNum: 1, operateCode: '511', tip: '鼠标右键菜单选择【设置折返策略】'},
-                { deviceType: '', orderNum: 2, operateCode: '', tip: '选择折返策略' },
+                { deviceType: '05', orderNum: 2, operateCode: '5111', tip: '选择折返策略【{30}】', val: '2' },
-                { deviceType: '', orderNum: 3, operateCode: '', tip: '鼠标左键点击【确定】' }
+                { deviceType: '05', orderNum: 3, operateCode: '5112', tip: '鼠标左键点击【确定】' }
-            ]
+            ],
+            config:{tbStrategyBT:true}
         },
         {
             maxDuration: 15,