From eeadaa2c78c18ea13ac933f38861e8fda68371eb Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Mon, 24 Feb 2020 18:13:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=95=B4=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/performance/App.vue              |  4 +--
 .../settings/OrganizationMember.vue           |  1 -
 .../components/settings/SettingMenu.vue       | 26 ++++++++++++-------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/frontend/src/performance/App.vue b/frontend/src/performance/App.vue
index f4754e9ec..65b5525fb 100644
--- a/frontend/src/performance/App.vue
+++ b/frontend/src/performance/App.vue
@@ -23,7 +23,6 @@
         </el-row>
       </el-col>
       <el-col :span="10">
-        <ms-setting/>
       </el-col>
     </el-row>
     <ms-view/>
@@ -34,7 +33,6 @@
 <script>
   import MsMenus from "./components/HeaderMenus";
   import MsTopMenus from "./components/HeaderTopMenus";
-  import MsSetting from "./components/HeaderSetting";
   import MsView from "./components/router/View";
   import MsUser from "./components/HeaderUser";
   import MsWebSocket from "./components/websocket/WebSocket";
@@ -57,7 +55,7 @@
         window.location.href = "/login"
       });
     },
-    components: {MsWebSocket, MsUser, MsMenus, MsSetting, MsView, MsTopMenus},
+    components: {MsWebSocket, MsUser, MsMenus, MsView, MsTopMenus},
     methods: {
     }
   }
diff --git a/frontend/src/performance/components/settings/OrganizationMember.vue b/frontend/src/performance/components/settings/OrganizationMember.vue
index befb41d04..1c6cfe2e4 100644
--- a/frontend/src/performance/components/settings/OrganizationMember.vue
+++ b/frontend/src/performance/components/settings/OrganizationMember.vue
@@ -95,7 +95,6 @@
     methods: {
       currentUser: () => {
         let user = Cookies.get(TokenKey);
-        window.console.log(user);
         return JSON.parse(user);
       },
       initTableData() {
diff --git a/frontend/src/performance/components/settings/SettingMenu.vue b/frontend/src/performance/components/settings/SettingMenu.vue
index 21b4c6acb..ce0efbea0 100644
--- a/frontend/src/performance/components/settings/SettingMenu.vue
+++ b/frontend/src/performance/components/settings/SettingMenu.vue
@@ -3,33 +3,39 @@
     <el-submenu index="1" v-permission="['admin']">
       <template slot="title">
         <font-awesome-icon class="icon account" :icon="['far', 'address-card']" size="lg"/>
-        <span>账号</span>
+        <span>系统</span>
       </template>
       <el-menu-item index="/setting/user" v-permission="['admin']">用户</el-menu-item>
-      <el-menu-item index="/setting/testresourcepool" v-permission="['test']">测试资源池</el-menu-item>
       <el-menu-item index="/setting/organization" v-permission="['admin']">组织</el-menu-item>
-      <el-menu-item index="/setting/organizationmember" v-permission="['org_admin']">组织成员</el-menu-item>
       <el-menu-item index="/setting/workspace" v-permission="['org_admin']">工作空间</el-menu-item>
-      <el-menu-item>API Keys</el-menu-item>
+      <el-menu-item index="/setting/testresourcepool">测试资源池</el-menu-item>
     </el-submenu>
-    <el-submenu index=2 v-permission="['org_admin']">
+
+    <el-submenu index="2" v-permission="['org_admin']">
+      <template slot="title">
+        <font-awesome-icon class="icon workspace" :icon="['far', 'clone']" size="lg"/>
+        <span>组织</span>
+      </template>
+      <el-menu-item index="/setting/organizationmember" v-permission="['org_admin']">成员</el-menu-item>
+      <el-menu-item index="/setting/workspace" v-permission="['org_admin']">工作空间</el-menu-item>
+    </el-submenu>
+
+    <el-submenu index="3" v-permission="['test_manager','test_user','test_viewer']">
       <template slot="title">
         <font-awesome-icon class="icon workspace" :icon="['far', 'clone']" size="lg"/>
         <span>工作空间</span>
       </template>
       <el-menu-item index="/setting/member">成员</el-menu-item>
-      <el-menu-item>证书</el-menu-item>
-      <el-menu-item>测试计划</el-menu-item>
-      <el-menu-item>警告</el-menu-item>
     </el-submenu>
-    <el-submenu index="3">
+
+    <el-submenu index="4">
       <template slot="title">
         <font-awesome-icon class="icon" :icon="['far', 'user']" size="lg"/>
         <span>个人</span>
       </template>
       <el-menu-item>个人设置</el-menu-item>
-      <el-menu-item>API Keys</el-menu-item>
     </el-submenu>
+
   </el-menu>
 </template>
 
-- 
GitLab