From 19bd41b214873d0073e4393242a4943fb6d97513 Mon Sep 17 00:00:00 2001
From: fan <18706759286@163.com>
Date: Thu, 21 May 2020 10:02:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4hydIcon=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/jmapNew/shape/Train/index.js              |  1 -
 src/jmapNew/theme/xian_01/menus/menuTrain.vue | 68 +++++++++----------
 .../iscs/iscsSystem/config/pis/lcdControl.vue |  1 +
 src/views/login/hydLogin.vue                  |  2 +-
 4 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/src/jmapNew/shape/Train/index.js b/src/jmapNew/shape/Train/index.js
index b13f8954e..7eae34a89 100644
--- a/src/jmapNew/shape/Train/index.js
+++ b/src/jmapNew/shape/Train/index.js
@@ -408,7 +408,6 @@ export default class Train extends Group {
             this.setHoldStatus(model.hold);
             this.setJumpStatus(model.jump);
             this.setSoonerOrLater(model.dt);
-
             const style = this.style;
             if (style.Section.trainPosition.display) {
                 this.updateSection(object);
diff --git a/src/jmapNew/theme/xian_01/menus/menuTrain.vue b/src/jmapNew/theme/xian_01/menus/menuTrain.vue
index 7f215a543..ebf7bea3f 100644
--- a/src/jmapNew/theme/xian_01/menus/menuTrain.vue
+++ b/src/jmapNew/theme/xian_01/menus/menuTrain.vue
@@ -49,42 +49,36 @@ export default {
             menuNormal: {
                 Local: [],
                 Center: [
-                    // {
-                    //     label: this.$t('menu.menuTrain.addTrainId'),
-                    //     handler: this.addTrainId,
-                    //     auth: { station: true, center: true },
-                    //     cmdType:CMD.Train.CMD_SWITCH_REMOVE_FAULT
-                    // },
-                    // {
-                    //     label: this.$t('menu.menuTrain.deleteTrainId'),
-                    //     handler: this.delTrainId,
-                    //     auth: { station: true, center: true },
-                    //     cmdType:CMD.Train.CMD_SWITCH_REMOVE_FAULT
-                    // },
-                    // {
-                    //     label: this.$t('menu.menuTrain.editTrainId'),
-                    //     handler: this.editTrainId,
-                    //     auth: { station: true, center: true },
-                    //     cmdType:CMD.Train.CMD_SWITCH_REMOVE_FAULT
-                    // },
-                    // {
-                    //     label: this.$t('menu.menuTrain.editTrainNo'),
-                    //     handler: this.editTrainNo,
-                    //     auth: { station: true, center: true },
-                    //     cmdType:CMD.Train.CMD_SWITCH_REMOVE_FAULT
-                    // },
-                    // {
-                    //     label: this.$t('menu.menuTrain.moveTrainId'),
-                    //     handler: this.moveTrainId,
-                    //     auth: { station: true, center: true },
-                    //     cmdType:CMD.Train.CMD_SWITCH_REMOVE_FAULT
-                    // },
-                    // {
-                    //     label: this.$t('menu.menuTrain.switchTrainId'),
-                    //     handler: this.switchTrainId,
-                    //     auth: { station: true, center: true },
-                    //     cmdType:CMD.Train.CMD_SWITCH_REMOVE_FAULT
-                    // }
+                    {
+                        label: this.$t('menu.menuTrain.addTrainId'),
+                        handler: this.addTrainId,
+                        cmdType:CMD.Switch.CMD_SWITCH_SINGLE_LOCK
+                    },
+                    {
+                        label: this.$t('menu.menuTrain.deleteTrainId'),
+                        handler: this.delTrainId,
+                        cmdType:CMD.Switch.CMD_SWITCH_SINGLE_LOCK
+                    },
+                    {
+                        label: this.$t('menu.menuTrain.editTrainId'),
+                        handler: this.editTrainId,
+                        cmdType:CMD.Switch.CMD_SWITCH_SINGLE_LOCK
+                    },
+                    {
+                        label: this.$t('menu.menuTrain.editTrainNo'),
+                        handler: this.editTrainNo,
+                        cmdType:CMD.Switch.CMD_SWITCH_SINGLE_LOCK
+                    },
+                    {
+                        label: this.$t('menu.menuTrain.moveTrainId'),
+                        handler: this.moveTrainId,
+                        cmdType:CMD.Switch.CMD_SWITCH_SINGLE_LOCK
+                    },
+                    {
+                        label: this.$t('menu.menuTrain.switchTrainId'),
+                        handler: this.switchTrainId,
+                        cmdType:CMD.Switch.CMD_SWITCH_REMOVE_FAULT
+                    }
                 ]
             },
             menuForce: [
@@ -146,6 +140,8 @@ export default {
                 this.menu = [...this.menuForce, ...this.menuSpeed];
             }
 
+            // this.menu = this.menuNormal.Center;
+            // console.log(this.menu, '222222222222222');
             // this.menu = MenuContextHandler.covert(this.menu);
         },
         doShow(point) {
diff --git a/src/views/iscs/iscsSystem/config/pis/lcdControl.vue b/src/views/iscs/iscsSystem/config/pis/lcdControl.vue
index 64cc1e513..68b60815b 100644
--- a/src/views/iscs/iscsSystem/config/pis/lcdControl.vue
+++ b/src/views/iscs/iscsSystem/config/pis/lcdControl.vue
@@ -8,6 +8,7 @@
     <div class="area_select" style="top: 27%;">
       <div>
         <el-radio v-model="lcdSwitch" :label="true" size="small" border>开启LCD屏</el-radio>
+        <br>
         <el-radio v-model="lcdSwitch" :label="false" size="small" border>关闭LCD屏</el-radio>
       </div>
       <div>确定</div>
diff --git a/src/views/login/hydLogin.vue b/src/views/login/hydLogin.vue
index a6ab19cc9..2eb18d7e5 100644
--- a/src/views/login/hydLogin.vue
+++ b/src/views/login/hydLogin.vue
@@ -72,7 +72,7 @@ import { UrlConfig } from '@/scripts/ConstDic';
 import { ProjectIcon } from '@/scripts/ProjectConfig';
 import { removeToken } from '@/utils/auth';
 import LangStorage from '@/utils/lang';
-import logoImgHyd from '@/assets/logo_hyd.png';
+import logoImgHyd from '@/assets/project_icon/logo_hyd.png';
 export default {
     name: 'Login',
     data() {