From ecd361ddbe3d59d2979ddd4017ecb3413b8836e8 Mon Sep 17 00:00:00 2001
From: zyy <1787816799@qq.com>
Date: Sun, 26 Apr 2020 14:47:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=A5=BF=E5=AE=89=E4=BA=8C?=
 =?UTF-8?q?=E5=8F=B7=E7=BA=BF=E8=BD=A6=E7=AB=99=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xian_02/menus/dialog/routeControl.vue     |  4 +-
 .../xian_02/menus/dialog/stationControl.vue   |  1 +
 .../xian_02/menus/dialog/turnBackControl.vue  |  6 +-
 .../theme/xian_02/menus/menuStation.vue       | 74 +++++++++----------
 .../xian_02/menus/menuStationControl.vue      | 28 +------
 5 files changed, 42 insertions(+), 71 deletions(-)

diff --git a/src/jmapNew/theme/xian_02/menus/dialog/routeControl.vue b/src/jmapNew/theme/xian_02/menus/dialog/routeControl.vue
index 08b613516..f06c1f6e2 100644
--- a/src/jmapNew/theme/xian_02/menus/dialog/routeControl.vue
+++ b/src/jmapNew/theme/xian_02/menus/dialog/routeControl.vue
@@ -24,8 +24,8 @@
     </el-row>
     <div v-if="passModel">
       <div style="height: 12px" />
-      <el-radio :id="upRadioId" v-model="passRadio" label="1" style="display: block; padding-left: 10px; margin-bottom: 10px;" :disabled="passRadio == '2'" @change="changeRadio">设置自动通过</el-radio>
-      <el-radio :id="upRadioId" v-model="passRadio" label="2" style="display: block; padding-left: 10px;" :disabled="passRadio == '1'" @change="changeRadio">取消自动通过</el-radio>
+      <el-radio v-model="passRadio" label="1" style="display: block; padding-left: 10px; margin-bottom: 10px;" :disabled="passRadio == '2'" @change="changeRadio">设置自动通过</el-radio>
+      <el-radio v-model="passRadio" label="2" style="display: block; padding-left: 10px;" :disabled="passRadio == '1'" @change="changeRadio">取消自动通过</el-radio>
     </div>
     <el-row justify="center" class="button-group">
       <el-col :span="10" :offset="2">
diff --git a/src/jmapNew/theme/xian_02/menus/dialog/stationControl.vue b/src/jmapNew/theme/xian_02/menus/dialog/stationControl.vue
index 161c4ea9a..f7e60a820 100644
--- a/src/jmapNew/theme/xian_02/menus/dialog/stationControl.vue
+++ b/src/jmapNew/theme/xian_02/menus/dialog/stationControl.vue
@@ -63,6 +63,7 @@ export default {
             selected: null,
             row: null,
             operation: '',
+            checked2: '',
             stationLists: [],
             disabledAll: false
         };
diff --git a/src/jmapNew/theme/xian_02/menus/dialog/turnBackControl.vue b/src/jmapNew/theme/xian_02/menus/dialog/turnBackControl.vue
index d5207e778..38d72428d 100644
--- a/src/jmapNew/theme/xian_02/menus/dialog/turnBackControl.vue
+++ b/src/jmapNew/theme/xian_02/menus/dialog/turnBackControl.vue
@@ -24,10 +24,10 @@
     </el-row>
     <el-row style="margin: 12px 0;">
       <el-col :span="11">
-        <el-radio :id="upRadioId" v-model="passRadio" label="1" style="display: block; padding-left: 10px; margin-bottom: 10px;" :disabled="passRadio == '2'">设置</el-radio>
+        <el-radiov-model="passRadio" label="1" style="display: block; padding-left: 10px; margin-bottom: 10px;" :disabled="passRadio == '2'">设置</el-radiov-model="passRadio">
       </el-col>
       <el-col :span="11" :offset="2">
-        <el-radio :id="upRadioId" v-model="passRadio" label="2" style="display: block; padding-left: 10px;" :disabled="passRadio == '1'">取消</el-radio>
+        <el-radio v-model="passRadio" label="2" style="display: block; padding-left: 10px;" :disabled="passRadio == '1'">取消</el-radio>
       </el-col>
     </el-row>
     <el-row justify="center" class="button-group">
@@ -45,7 +45,7 @@
 
 <script>
 import { OperationEvent } from '@/scripts/cmdPlugin/OperationHandler';
-import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
+// import OperationHandler from '@/scripts/cmdPlugin/OperationHandler';
 import ConfirmControl from './childDialog/confirmControl';
 import NoticeInfo from './childDialog/childDialog/noticeInfo';
 import {menuOperate, commitOperate} from '../utils/menuOperate';
diff --git a/src/jmapNew/theme/xian_02/menus/menuStation.vue b/src/jmapNew/theme/xian_02/menus/menuStation.vue
index 81b2a52f3..2f3c8efbc 100644
--- a/src/jmapNew/theme/xian_02/menus/menuStation.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuStation.vue
@@ -40,50 +40,39 @@ export default {
         return {
             menu: [],
             menuNormal: {
-                Local: [
-                    {
-                        label: '全站设置联锁自动触发',
-                        handler: this.setAutoTrigger,
-                        disabledCallback: MenuDisabledState.Station.setAutoTrigger,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: '全站取消联锁自动触发',
-                        handler: this.cancelAutoTrigger,
-                        disabledCallback: MenuDisabledState.Station.cancelAutoTrigger,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: '上电解锁',
-                        handler: this.powerUnLock,
-                        disabledCallback: MenuDisabledState.Station.powerUnLock,
-                        auth: { station: true, center: false }
-                    },
-                    {
-                        label: '执行关键操作测试',
-                        handler: this.execKeyOperationTest,
-                        disabledCallback: MenuDisabledState.Station.execKeyOperationTest,
-                        auth: { station: true, center: false }
-                    }
-                ],
+                Local: [],
                 Center: [
                     {
-                        label: '所有进路自排关',
+                        label: '本地控制许可',
                         handler: this.humanControlALL,
                         disabledCallback: MenuDisabledState.Station.humanControlALL,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: '所有进路自排开',
-                        handler: this.atsAutoControlALL,
-                        disabledCallback: MenuDisabledState.Station.atsAutoControlALL,
-                        auth: { station: false, center: true }
-                    },
-                    {
-                        label: '执行关键操作测试',
-                        handler: this.execKeyOperationTest,
-                        disabledCallback: MenuDisabledState.Station.execKeyOperationTest,
-                        auth: { station: false, center: true }
+                        auth: { station: false, center: true },
+                        children: [
+                            {
+                                label: '请求',
+                                handler: this.atsAutoControlALL,
+                                disabledCallback: MenuDisabledState.Station.atsAutoControlALL,
+                                auth: { station: false, center: true }
+                            },
+                            {
+                                label: '授权',
+                                handler: this.atsAutoControlALL,
+                                disabledCallback: MenuDisabledState.Station.atsAutoControlALL,
+                                auth: { station: false, center: true }
+                            },
+                            {
+                                label: '取消',
+                                handler: this.atsAutoControlALL,
+                                disabledCallback: MenuDisabledState.Station.atsAutoControlALL,
+                                auth: { station: false, center: true }
+                            },
+                            {
+                                label: '紧急本地控制',
+                                handler: this.atsAutoControlALL,
+                                disabledCallback: MenuDisabledState.Station.atsAutoControlALL,
+                                auth: { station: false, center: true }
+                            }
+                        ]
                     }
                 ]
             },
@@ -128,9 +117,11 @@ export default {
         },
         initMenu() {
             this.menu = [];
+            debugger;
             if (this.selected.concentrateStationCode == this.selected.code) {
                 // 编辑模式菜单列表
-                this.menu = menuFiltration(this.menuNormal);
+                // this.menu = menuFiltration(this.menuNormal);
+                this.menu = [...this.menuNormal.Center];
                 if (this.operatemode === OperateMode.ADMIN) {
                     this.menu = [...this.menu, ...this.menuForce];
                 }
@@ -144,6 +135,7 @@ export default {
             }
 
             this.menu = menuConvert(this.menu);
+            console.log(this.menu, 'menu');
         },
         doShow(point) {
             this.clickEvent();
diff --git a/src/jmapNew/theme/xian_02/menus/menuStationControl.vue b/src/jmapNew/theme/xian_02/menus/menuStationControl.vue
index fee348e7d..3e3aab18f 100644
--- a/src/jmapNew/theme/xian_02/menus/menuStationControl.vue
+++ b/src/jmapNew/theme/xian_02/menus/menuStationControl.vue
@@ -11,7 +11,7 @@ import StationControl from './dialog/stationControl';
 import { mapGetters } from 'vuex';
 import {menuOperate, commitOperate} from './utils/menuOperate';
 import { DeviceMenu, OperateMode } from '@/scripts/ConstDic';
-import CMD from '@/scripts/cmdPlugin/CommandEnum';
+// import CMD from '@/scripts/cmdPlugin/CommandEnum';
 import MenuContextHandler from '@/scripts/cmdPlugin/MenuContextHandler';
 
 export default {
@@ -32,30 +32,8 @@ export default {
         return {
             menu: [],
             menuNormal: {
-                Local: [
-                    {
-                        label: '请求站控',
-                        handler: this.setStationControl,
-                        cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL
-                    },
-                    {
-                        label: '请求遥控',
-                        handler: this.setCenterControl,
-                        cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL
-                    }
-                ],
-                Center: [
-                    {
-                        label: '请求站控',
-                        handler: this.setStationControl,
-                        cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_STATION_CONTROL
-                    },
-                    {
-                        label: '请求遥控',
-                        handler: this.setCenterControl,
-                        cmdType: CMD.ControlConvertMenu.CMD_CM_APPLY_FOR_CENTER_CONTROL
-                    }
-                ]
+                Local: [],
+                Center: []
             },
             menuForce: [
             ]