From a4e221c3f6a8f836fa91790adfcf9cdd918b0f0a Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Tue, 11 Jan 2022 17:25:17 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-1510=20fix:SNMP=20&=20template=20tab=20?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/page/config/credentials.vue    |  1 -
 .../src/components/page/config/mib.vue        |  1 -
 .../src/components/page/config/mibBrowser.vue |  1 -
 nezha-fronted/src/permission.js               | 15 ++++++------
 nezha-fronted/src/router/index.js             | 24 +++++++++++++++----
 5 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/nezha-fronted/src/components/page/config/credentials.vue b/nezha-fronted/src/components/page/config/credentials.vue
index a15f92158..f5f473504 100644
--- a/nezha-fronted/src/components/page/config/credentials.vue
+++ b/nezha-fronted/src/components/page/config/credentials.vue
@@ -1,7 +1,6 @@
 <template>
   <div style="height: 100%">
     <nz-data-list
-      v-if="switchTab === 'credentials'"
       ref="dataList"
       :api="url"
       :custom-table-title.sync="tools.customTableTitle"
diff --git a/nezha-fronted/src/components/page/config/mib.vue b/nezha-fronted/src/components/page/config/mib.vue
index 650388e59..a30c473e0 100644
--- a/nezha-fronted/src/components/page/config/mib.vue
+++ b/nezha-fronted/src/components/page/config/mib.vue
@@ -1,7 +1,6 @@
 <template>
   <div style="height: 100%">
     <nz-data-list
-      v-if="switchTab === 'file'"
       ref="dataList"
       :api="url"
       :custom-table-title.sync="tools.customTableTitle"
diff --git a/nezha-fronted/src/components/page/config/mibBrowser.vue b/nezha-fronted/src/components/page/config/mibBrowser.vue
index 635712d88..1ad03673b 100644
--- a/nezha-fronted/src/components/page/config/mibBrowser.vue
+++ b/nezha-fronted/src/components/page/config/mibBrowser.vue
@@ -1,7 +1,6 @@
 <template>
   <div class="mib-browser" style="height: 100%">
     <nz-data-list
-      v-if="switchTab === 'browser'"
       ref="dataList"
     >
 <!--      <template v-slot:top-tool-left>-->
diff --git a/nezha-fronted/src/permission.js b/nezha-fronted/src/permission.js
index 57adb6f95..01399a0ed 100644
--- a/nezha-fronted/src/permission.js
+++ b/nezha-fronted/src/permission.js
@@ -145,18 +145,19 @@ router.beforeEach((to, from, next) => {
 
 // menuList中是否包含route权限
 export function hasMenu (menuList, route) {
-  return menuList.some(menu => {
+  let flag = false
+  console.log(menuList, route)
+  menuList.forEach(menu => {
     if (menu.route == route) {
-      return true
+      flag = true
     } else {
-      if (menu.children) {
-        if (hasMenu(menu.children, route)) {
-          return true
-        }
+      if (menu.children && !flag) {
+        flag = hasMenu(menu.children, route)
       }
     }
-    return false
   })
+  console.log(flag, route)
+  return flag
 }
 
 export function hasButton (buttonList, code) {
diff --git a/nezha-fronted/src/router/index.js b/nezha-fronted/src/router/index.js
index 684737135..17cefd5ae 100644
--- a/nezha-fronted/src/router/index.js
+++ b/nezha-fronted/src/router/index.js
@@ -106,9 +106,21 @@ export default new Router({
           path: '/mib/:tab',
           component: resolve => require(['../components/page/config/snmp.vue'], resolve)
         },
+        // {
+        //   path: '/snmp',
+        //   component: resolve => require(['../components/page/config/snmp.vue'], resolve)
+        // },
         {
-          path: '/snmp',
-          component: resolve => require(['../components/page/config/snmp.vue'], resolve)
+          path: '/mib',
+          component: resolve => require(['../components/page/config/mib.vue'], resolve)
+        },
+        {
+          path: '/mibBrowser',
+          component: resolve => require(['../components/page/config/mibBrowser.vue'], resolve)
+        },
+        {
+          path: '/credentials',
+          component: resolve => require(['../components/page/config/credentials.vue'], resolve)
         },
         {
           path: '/system',
@@ -131,8 +143,12 @@ export default new Router({
           component: resolve => require(['../components/page/alert/alertSilence.vue'], resolve)
         },
         {
-          path: '/template',
-          component: resolve => require(['../components/page/config/template/index.vue'], resolve)
+          path: '/exprTemp',
+          component: resolve => require(['../components/page/config/template/exprTemp.vue'], resolve)
+        },
+        {
+          path: '/chartTemp',
+          component: resolve => require(['../components/page/config/template/chartTemp.vue'], resolve)
         }
       ]
     }