From eaf94f14aeecff7f58083913c1da8498b12c1ddb Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Mon, 24 Aug 2020 14:22:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B7=AF=E6=9C=89=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=98=AF=E5=90=A6=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-oper-web/src/i18n/en-US.js              |  3 ++
 epmet-oper-web/src/i18n/zh-CN.js              |  3 ++
 epmet-oper-web/src/i18n/zh-TW.js              |  3 ++
 .../src/views/main-sidebar-sub-menu.vue       | 44 +++++++++----------
 .../views/modules/sys/menu-add-or-update.vue  |  7 +++
 5 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/epmet-oper-web/src/i18n/en-US.js b/epmet-oper-web/src/i18n/en-US.js
index e57e6e7..eaf1330 100644
--- a/epmet-oper-web/src/i18n/en-US.js
+++ b/epmet-oper-web/src/i18n/en-US.js
@@ -338,6 +338,9 @@ t.menu.type0 = 'Menu'
 t.menu.type1 = 'Button'
 t.menu.sort = 'Sort'
 t.menu.url = 'Route'
+t.menu.showFlag = 'ShowFlag'
+t.menu.show1 = 'True'
+t.menu.show2 = 'False'
 t.menu.permissions = 'Auth ID'
 t.menu.permissionsTips = 'eg: sys:menu:save'
 t.menu.parentName = 'Superior'
diff --git a/epmet-oper-web/src/i18n/zh-CN.js b/epmet-oper-web/src/i18n/zh-CN.js
index 0796dd7..0692285 100644
--- a/epmet-oper-web/src/i18n/zh-CN.js
+++ b/epmet-oper-web/src/i18n/zh-CN.js
@@ -338,6 +338,9 @@ t.menu.type0 = '菜单'
 t.menu.type1 = '按钮'
 t.menu.sort = '排序'
 t.menu.url = '路由'
+t.menu.showFlag = '是否显示'
+t.menu.show1 = '是'
+t.menu.show2 = '否'
 t.menu.permissions = '授权标识'
 t.menu.permissionsTips = '如: sys:menu:save'
 t.menu.parentName = '上级菜单'
diff --git a/epmet-oper-web/src/i18n/zh-TW.js b/epmet-oper-web/src/i18n/zh-TW.js
index f016577..6c706df 100644
--- a/epmet-oper-web/src/i18n/zh-TW.js
+++ b/epmet-oper-web/src/i18n/zh-TW.js
@@ -338,6 +338,9 @@ t.menu.type0 = '菜單'
 t.menu.type1 = '按鈕'
 t.menu.sort = '排序'
 t.menu.url = '路由'
+t.menu.showFlag = '是否显示'
+t.menu.show1 = '是'
+t.menu.show2 = '否'
 t.menu.permissions = '授權標識'
 t.menu.permissionsTips = '如: sys:menu:save'
 t.menu.parentName = '上級菜單'
diff --git a/epmet-oper-web/src/views/main-sidebar-sub-menu.vue b/epmet-oper-web/src/views/main-sidebar-sub-menu.vue
index 7b5b66e..dd23fbf 100644
--- a/epmet-oper-web/src/views/main-sidebar-sub-menu.vue
+++ b/epmet-oper-web/src/views/main-sidebar-sub-menu.vue
@@ -1,27 +1,25 @@
 <template>
-  <el-submenu v-if="menu.children && menu.children.length >= 1"
-              :index="menu.id"
-              :popper-append-to-body="false">
-    <template slot="title">
-      <svg class="icon-svg aui-sidebar__menu-icon"
-           aria-hidden="true">
-        <use :xlink:href="`#${menu.icon}`"></use>
+  <div v-if="menu.showFlag">
+    <el-submenu
+      v-if="menu.children && menu.children.length >= 1"
+      :index="menu.id"
+      :popper-append-to-body="false"
+    >
+      <template slot="title">
+        <svg class="icon-svg aui-sidebar__menu-icon" aria-hidden="true">
+          <use :xlink:href="`#${menu.icon}`" />
+        </svg>
+        <span>{{ menu.name }}</span>
+      </template>
+      <sub-menu v-for="item in menu.children" :key="item.id" :menu="item"></sub-menu>
+    </el-submenu>
+    <el-menu-item v-else :index="menu.id" @click="gotoRouteHandle(menu.id)">
+      <svg class="icon-svg aui-sidebar__menu-icon" aria-hidden="true">
+        <use :xlink:href="`#${menu.icon}`" />
       </svg>
       <span>{{ menu.name }}</span>
-    </template>
-    <sub-menu v-for="item in menu.children"
-              :key="item.id"
-              :menu="item"></sub-menu>
-  </el-submenu>
-  <el-menu-item v-else
-                :index="menu.id"
-                @click="gotoRouteHandle(menu.id)">
-    <svg class="icon-svg aui-sidebar__menu-icon"
-         aria-hidden="true">
-      <use :xlink:href="`#${menu.icon}`"></use>
-    </svg>
-    <span>{{ menu.name }}</span>
-  </el-menu-item>
+    </el-menu-item>
+  </div>
 </template>
 
 <script>
@@ -40,7 +38,9 @@ export default {
   methods: {
     // 通过menuId与动态(菜单)路由进行匹配跳转至指定路由
     gotoRouteHandle (menuId) {
-      var route = window.SITE_CONFIG['dynamicMenuRoutes'].filter(item => item.meta.menuId === menuId)[0]
+      var route = window.SITE_CONFIG['dynamicMenuRoutes'].filter(
+        (item) => item.meta.menuId === menuId
+      )[0]
       if (route) {
         this.$router.push({ name: route.name })
       }
diff --git a/epmet-oper-web/src/views/modules/sys/menu-add-or-update.vue b/epmet-oper-web/src/views/modules/sys/menu-add-or-update.vue
index f7a1118..1da84e5 100644
--- a/epmet-oper-web/src/views/modules/sys/menu-add-or-update.vue
+++ b/epmet-oper-web/src/views/modules/sys/menu-add-or-update.vue
@@ -30,6 +30,12 @@
       <el-form-item v-if="dataForm.type === 0" prop="url" :label="$t('menu.url')">
         <el-input v-model="dataForm.url" :placeholder="$t('menu.url')"></el-input>
       </el-form-item>
+      <el-form-item  prop="showFlag" :label="$t('menu.showFlag')" size="mini">
+        <el-radio-group v-model="dataForm.showFlag">
+          <el-radio :label="1">{{ $t('menu.show1') }}</el-radio>
+          <el-radio :label="0">{{ $t('menu.show2') }}</el-radio>
+        </el-radio-group>
+      </el-form-item>
       <el-form-item prop="sort" :label="$t('menu.sort')">
         <el-input-number v-model="dataForm.sort" controls-position="right" :min="0" :label="$t('menu.sort')"></el-input-number>
       </el-form-item>
@@ -104,6 +110,7 @@ export default {
         pid: '0',
         parentName: '',
         url: '',
+        showFlag: 1,
         resourceList: [],
         permissions: '',
         sort: 0,