From eec3d47b849114fc764e47a649ac6e0c6ff554dd Mon Sep 17 00:00:00 2001
From: joylink_cuiweidong <364937672@qq.com>
Date: Wed, 24 Jun 2020 14:06:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A5=BF=E5=AE=89=E4=BA=8C=E5=8F=B7=E7=BA=BF?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E4=BB=A3=E7=A0=81=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../theme/ningbo_01/menus/menuStation.vue     |   4 +-
 .../menus/dialog/stationHumanControlAll.vue   | 126 ---------------
 .../dialog/stationSetRouteControlAll.vue      | 145 ------------------
 .../theme/xian_02/menus/menuRequest.vue       |   7 +-
 .../theme/xian_02/menus/menuSection.vue       |   8 +-
 .../theme/xian_02/menus/menuSignal.vue        |   4 +-
 .../theme/xian_02/menus/menuStation.vue       |  48 +++---
 .../theme/xian_02/menus/menuSwitch.vue        |   6 +-
 src/jmapNew/theme/xian_02/menus/menuTrain.vue |   2 +-
 .../theme/xian_02/menus/popStationStand.vue   |   4 +-
 10 files changed, 50 insertions(+), 304 deletions(-)
 delete mode 100644 src/jmapNew/theme/xian_02/menus/dialog/stationHumanControlAll.vue
 delete mode 100644 src/jmapNew/theme/xian_02/menus/dialog/stationSetRouteControlAll.vue

diff --git a/src/jmapNew/theme/ningbo_01/menus/menuStation.vue b/src/jmapNew/theme/ningbo_01/menus/menuStation.vue
index e6725826f..681f789db 100644
--- a/src/jmapNew/theme/ningbo_01/menus/menuStation.vue
+++ b/src/jmapNew/theme/ningbo_01/menus/menuStation.vue
@@ -150,7 +150,7 @@ export default {
             };
 
             mouseCancelState(this.selected);
-            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 {
@@ -170,7 +170,7 @@ export default {
             };
 
             mouseCancelState(this.selected);
-            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 {
diff --git a/src/jmapNew/theme/xian_02/menus/dialog/stationHumanControlAll.vue b/src/jmapNew/theme/xian_02/menus/dialog/stationHumanControlAll.vue
deleted file mode 100644
index a571a47da..000000000
--- a/src/jmapNew/theme/xian_02/menus/dialog/stationHumanControlAll.vue
+++ /dev/null
@@ -1,126 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="xian-02__system station-human-control-all"
-    :title="title"
-    :visible.sync="show"
-    width="360px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-    append-to-body
-  >
-    <div class="context">
-      <span>{{ title }}</span>
-    </div>
-    <el-row justify="center" class="button-group">
-      <el-col :span="10" :offset="2">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" pop-class="xian-02__systerm" />
-  </el-dialog>
-</template>
-
-<script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-
-export default {
-    name: 'StationHumanControlAll',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            selected: null,
-            operation: null
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        title() {
-            return '全集中站进路交人工控';
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Station.humanControlALL.menu.domId : '';
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate, selected) {
-            this.selected = selected;
-            if (!this.dialogShow) {
-                this.loading = false;
-                this.operation = operate.operation;
-            }
-
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        commit() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.Station.type,
-                label: MapDeviceType.Station.label,
-                operation: OperationEvent.Station.humanControlALL.menu.operation
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        cancel() {
-            const operate = {
-                type: MapDeviceType.Station.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        }
-    }
-};
-
-</script>
-<style>
-    .station-human-control-all .context {
-        padding-bottom: 40px !important;
-        border: 1px solid lightgray;
-    }
-</style>
diff --git a/src/jmapNew/theme/xian_02/menus/dialog/stationSetRouteControlAll.vue b/src/jmapNew/theme/xian_02/menus/dialog/stationSetRouteControlAll.vue
deleted file mode 100644
index 14b9367a3..000000000
--- a/src/jmapNew/theme/xian_02/menus/dialog/stationSetRouteControlAll.vue
+++ /dev/null
@@ -1,145 +0,0 @@
-<template>
-  <el-dialog
-    v-dialogDrag
-    class="xian-02__system station-set-route-control-all"
-    :title="title"
-    :visible.sync="show"
-    width="320px"
-    :before-close="doClose"
-    :z-index="2000"
-    :modal="false"
-    :close-on-click-modal="false"
-    append-to-body
-  >
-    <div style="padding: 0px 10px">
-      <el-form ref="form" size="small" label-width="90px" label-position="left">
-        <el-form-item label="集中站名称:" prop="stationName">
-          <el-input v-model="stationName" size="small" disabled />
-        </el-form-item>
-      </el-form>
-      <el-radio-group v-model="mode">
-        <el-row>
-          <el-radio :label="true">检查冲突</el-radio>
-        </el-row>
-        <el-row style="margin-top: 20px">
-          <el-radio :label="false">不检查冲突</el-radio>
-        </el-row>
-      </el-radio-group>
-    </div>
-    <el-row justify="center" class="button-group">
-      <el-col :span="10" :offset="2">
-        <el-button :id="domIdConfirm" type="primary" :loading="loading" @click="commit">确定</el-button>
-      </el-col>
-      <el-col :span="8" :offset="4">
-        <el-button :id="domIdCancel" @click="cancel">取 消</el-button>
-      </el-col>
-    </el-row>
-    <notice-info ref="noticeInfo" pop-class="xian-02__systerm" />
-  </el-dialog>
-</template>
-
-<script>
-import { MapDeviceType, OperationEvent } from '@/scripts/ConstDic';
-import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
-
-export default {
-    name: 'StationSetRouteControlAll',
-    components: {
-        NoticeInfo
-    },
-    data() {
-        return {
-            dialogShow: false,
-            loading: false,
-            selected: null,
-            operation: null,
-            stationName: '',
-            mode: true
-        };
-    },
-    computed: {
-        show() {
-            return this.dialogShow && !this.$store.state.menuOperation.break;
-        },
-        title() {
-            return '全集中站设置进路控制模式';
-        },
-        domIdCancel() {
-            return this.dialogShow ? OperationEvent.Command.cancel.menu.domId : '';
-        },
-        domIdConfirm() {
-            return this.dialogShow ? OperationEvent.Station.atsAutoControlALL.menu.domId : '';
-        }
-    },
-    mounted() {
-        this.$nextTick(() => {
-            this.$store.dispatch('training/tipReload');
-        });
-    },
-    methods: {
-        doShow(operate, selected) {
-            this.selected = selected;
-            if (!this.dialogShow) {
-                this.loading = false;
-                this.operation = operate.operation;
-                this.stationName = '';
-                if (selected) {
-                    this.stationName = selected.name;
-                }
-            }
-
-            this.dialogShow = true;
-            this.$nextTick(function () {
-                this.$store.dispatch('training/emitTipFresh');
-            });
-        },
-        doClose() {
-            this.loading = false;
-            this.dialogShow = false;
-            this.$store.dispatch('training/emitTipFresh');
-        },
-        commit() {
-            const operate = {
-                send: true,
-                type: MapDeviceType.Station.type,
-                label: MapDeviceType.Station.label,
-                operation: OperationEvent.Station.atsAutoControlALL.menu.operation,
-                val: this.mode
-            };
-
-            this.loading = true;
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                this.loading = false;
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.loading = false;
-                this.doClose();
-                this.$refs.noticeInfo.doShow(operate);
-            });
-        },
-        cancel() {
-            const operate = {
-                type: MapDeviceType.Station.type,
-                operation: OperationEvent.Command.cancel.menu.operation
-            };
-
-            this.$store.dispatch('training/next', operate).then(({ valid }) => {
-                if (valid) {
-                    this.doClose();
-                }
-            }).catch(() => {
-                this.doClose();
-            });
-        }
-    }
-};
-
-</script>
-<style>
-    .station-set-route-control-all .context {
-        padding-bottom: 40px !important;
-        border: 1px solid lightgray;
-    }
-</style>
diff --git a/src/jmapNew/theme/xian_02/menus/menuRequest.vue b/src/jmapNew/theme/xian_02/menus/menuRequest.vue
index 2a40a1c98..5f2bd4336 100644
--- a/src/jmapNew/theme/xian_02/menus/menuRequest.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuRequest.vue
@@ -69,7 +69,12 @@ export default {
             if (list && list.length) {
                 list.forEach(item => {
                     if (item.device && item.device.code) {
-                        const station = this.$store.getters['map/getDeviceByCode'](item.device.stationCode);
+                        let station;
+                        if (item.device._type == 'Station') {
+                            station = item.device;
+                        } else {
+                            station = this.$store.getters['map/getDeviceByCode'](item.device.stationCode);
+                        }
                         const param = {
                             station: `CP  ${station.name}`,
                             operation: `${item.device.name}   ${item.operation.name}`,
diff --git a/src/jmapNew/theme/xian_02/menus/menuSection.vue b/src/jmapNew/theme/xian_02/menus/menuSection.vue
index f1f7e605a..9cd8a0615 100644
--- a/src/jmapNew/theme/xian_02/menus/menuSection.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuSection.vue
@@ -1,12 +1,12 @@
 <template>
   <div>
     <pop-menu ref="popMenu" :menu="menu" pop-class="xian-02__pop_tip_station" :tip-msg="topTip" :tip-subhead="tipSubhead" />
-    <section-control ref="sectionControl" pop-class="xian-02__systerm" />
+    <section-control ref="sectionControl" pop-class="xian-02__system" />
     <section-un-lock ref="sectionUnLock" />
     <speed-limit-control ref="speedLimitControl" />
-    <notice-info ref="noticeInfo" pop-class="xian-02__systerm" />
-    <set-fault ref="setFault" pop-class="xian-02__systerm" />
-    <train-add-plan ref="trainAddPlan" pop-class="xian-02__systerm" />
+    <notice-info ref="noticeInfo" pop-class="xian-02__system" />
+    <set-fault ref="setFault" pop-class="xian-02__system" />
+    <train-add-plan ref="trainAddPlan" pop-class="xian-02__system" />
   </div>
 </template>
 
diff --git a/src/jmapNew/theme/xian_02/menus/menuSignal.vue b/src/jmapNew/theme/xian_02/menus/menuSignal.vue
index 80c4eebe4..2ecae142a 100644
--- a/src/jmapNew/theme/xian_02/menus/menuSignal.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuSignal.vue
@@ -2,8 +2,8 @@
   <div>
     <pop-menu ref="popMenu" :menu="menu" :tip-msg="topTip" :tip-subhead="tipSubhead" pop-class="xian-02__pop_tip_station" />
     <route-detail ref="routeDetail" />
-    <notice-info ref="noticeInfo" pop-class="xian-02__systerm" />
-    <set-fault ref="setFault" pop-class="xian-02__systerm" />
+    <notice-info ref="noticeInfo" pop-class="xian-02__system" />
+    <set-fault ref="setFault" pop-class="xian-02__system" />
   </div>
 </template>
 
diff --git a/src/jmapNew/theme/xian_02/menus/menuStation.vue b/src/jmapNew/theme/xian_02/menus/menuStation.vue
index dabca966c..9f196748b 100644
--- a/src/jmapNew/theme/xian_02/menus/menuStation.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuStation.vue
@@ -2,8 +2,6 @@
   <div class="xian-02__system">
     <pop-menu ref="popMenu" :menu="menu" pop-class="xian-02__pop_tip_station" :tip-msg="topTip" :tip-subhead="tipSubhead" />
     <station-cmd-control ref="stationCmdControl" />
-    <station-human-control-all ref="stationHumanControlAll" />
-    <station-set-route-control-all ref="stationSetRouteControlAll" />
     <notice-info ref="noticeInfo" pop-class="xian-02__systerm" />
   </div>
 </template>
@@ -11,8 +9,6 @@
 <script>
 import PopMenu from '@/components/PopMenu/index';
 import StationCmdControl from './dialog/stationCmdControl';
-import StationHumanControlAll from './dialog/stationHumanControlAll';
-import StationSetRouteControlAll from './dialog/stationSetRouteControlAll';
 import NoticeInfo from '@/jmapNew/theme/components/menus/childDialog/noticeInfo';
 import { mapGetters } from 'vuex';
 
@@ -26,8 +22,6 @@ export default {
     components: {
         PopMenu,
         StationCmdControl,
-        StationHumanControlAll,
-        StationSetRouteControlAll,
         NoticeInfo
     },
     props: {
@@ -241,37 +235,55 @@ export default {
         },
         // 所有进路自排关
         humanControlALL() {
-            const operate = {
+            const step = {
                 start: true,
-                over: true,
+                code: `${this.selected.code}`,
                 operation: OperationEvent.Station.humanControlALL.menu.operation,
-                cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING,
                 param: {
                     stationCode: this.selected.code
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
-                    this.doClose();
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$store.dispatch('menuOperation/pushRequestList', {
+                        device: this.selected,
+                        operation: { code: OperationEvent.Station.humanControlALL.menu.operation, name: '所有进路自排关'},
+                        cmdType: CMD.Station.CMD_STATION_CLOSE_AUTO_SETTING,
+                        param: step.param
+                    });
+                } else {
+                    this.$refs.noticeInfo.doShow(step);
                 }
-            }).catch(() => this.doClose());
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
         },
         // 所有进路自排开
         atsAutoControlALL() {
-            const operate = {
+            const step = {
                 start: true,
-                over: true,
+                code: `${this.selected.code}`,
                 operation: OperationEvent.Station.atsAutoControlALL.menu.operation,
-                cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING,
                 param: {
                     stationCode: this.selected.code
                 }
             };
-            this.$store.dispatch('training/nextNew', operate).then(({ valid }) => {
+            this.$store.dispatch('training/nextNew', step).then(({ valid }) => {
                 if (valid) {
-                    this.doClose();
+                    this.$store.dispatch('menuOperation/handleBreakFlag', { break: true });
+                    this.$store.dispatch('menuOperation/pushRequestList', {
+                        device: this.selected,
+                        operation: { code: OperationEvent.Station.atsAutoControlALL.menu.operation, name: '所有进路自排开'},
+                        cmdType: CMD.Station.CMD_STATION_OPEN_AUTO_SETTING,
+                        param: step.param
+                    });
+                } else {
+                    this.$refs.noticeInfo.doShow(step);
                 }
-            }).catch(() => this.doClose());
+            }).catch(() => {
+                this.$refs.noticeInfo.doShow(step);
+            });
         },
         undeveloped() {
             this.doClose();
diff --git a/src/jmapNew/theme/xian_02/menus/menuSwitch.vue b/src/jmapNew/theme/xian_02/menus/menuSwitch.vue
index 2b3ecc662..d0df0da9e 100644
--- a/src/jmapNew/theme/xian_02/menus/menuSwitch.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuSwitch.vue
@@ -1,11 +1,11 @@
 <template>
   <div>
     <pop-menu ref="popMenu" :menu="menu" pop-class="xian-02__pop_tip_station" :tip-msg="topTip" :tip-subhead="tipSubhead" />
-    <switch-control ref="switchControl" pop-class="xian-02__systerm" />
+    <switch-control ref="switchControl" pop-class="xian-02__system" />
     <switch-un-lock ref="switchUnLock" />
     <speed-limit-control ref="speedLimitControl" />
-    <notice-info ref="noticeInfo" pop-class="xian-02__systerm" />
-    <set-fault ref="setFault" pop-class="xian-02__systerm" />
+    <notice-info ref="noticeInfo" pop-class="xian-02__system" />
+    <set-fault ref="setFault" pop-class="xian-02__system" />
   </div>
 </template>
 
diff --git a/src/jmapNew/theme/xian_02/menus/menuTrain.vue b/src/jmapNew/theme/xian_02/menus/menuTrain.vue
index e2ea5ff87..5fa9ad9e8 100644
--- a/src/jmapNew/theme/xian_02/menus/menuTrain.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuTrain.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <pop-menu ref="popMenu" :menu="menu" :tip-msg="topTip" :tip-subhead="tipSubhead" pop-class="xian-02__pop_tip_station" />
-    <notice-info ref="noticeInfo" pop-class="xian-02__systerm" />
+    <notice-info ref="noticeInfo" pop-class="xian-02__system" />
     <train-delete ref="trainDelete" />
     <train-define ref="trainDefine" />
     <train-move ref="trainMove" />
diff --git a/src/jmapNew/theme/xian_02/menus/popStationStand.vue b/src/jmapNew/theme/xian_02/menus/popStationStand.vue
index 2cc761c8e..af805793f 100644
--- a/src/jmapNew/theme/xian_02/menus/popStationStand.vue
+++ b/src/jmapNew/theme/xian_02/menus/popStationStand.vue
@@ -1,11 +1,11 @@
 <template>
   <div>
     <pop-menu ref="popMenu" :menu="menu" trigger="click" :tip-msg="topTip" text-align="left" pop-class="xian-02__pop_tip_station" />
-    <notice-info ref="noticeInfo" pop-class="xian-02__systerm" />
+    <notice-info ref="noticeInfo" pop-class="xian-02__system" />
     <update-stand-plan ref="updateStandPlan" :selected="selected" />
     <warning-confirm ref="warningConfirm" :selected="selected" />
     <stop-profile ref="stopProfile" :selected="selected" />
-    <set-fault ref="setFault" pop-class="xian-02__systerm" />
+    <set-fault ref="setFault" pop-class="xian-02__system" />
   </div>
 </template>