From 23b397081bd443b07bfde858829b387312dad657 Mon Sep 17 00:00:00 2001
From: fanluyan <754122931@qq.com>
Date: Mon, 25 Mar 2024 09:01:49 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=8F=9C=E5=8D=95=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=88=86=E9=85=8D=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Sidebar.vue                   | 18 +++++++++---------
 src/views/system/user/components/addUser.vue | 18 +++++++++---------
 src/views/system/user/userManagement.vue     |  4 ++--
 3 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index dfb5ad4..9a1730c 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -115,14 +115,14 @@ export default {
               index: "/userManagement",
               title: "用户管理",
             },
-            {
-              index: "/roleManagement",
-              title: "角色管理",
-            },
-            {
-              index: "/menuManagement",
-              title: "菜单功能管理",
-            },
+            // {
+            //   index: "/roleManagement",
+            //   title: "角色管理",
+            // },
+            // {
+            //   index: "/menuManagement",
+            //   title: "菜单功能管理",
+            // },
             {
               index: "/deviceUpgrade",
               title: "升级管理",
@@ -324,7 +324,7 @@ export default {
     } else if (this.role == 4) {
       this.items = this.hnjcitems;
     }
-    this.activeIndex = this.items[0].index;
+    //this.activeIndex = this.items[0].index;
     console.log(this.items);
     console.log(this.activeIndex);
   },
diff --git a/src/views/system/user/components/addUser.vue b/src/views/system/user/components/addUser.vue
index a52a067..7cdaf8b 100644
--- a/src/views/system/user/components/addUser.vue
+++ b/src/views/system/user/components/addUser.vue
@@ -106,14 +106,14 @@ export default {
       this.formdata = JSON.parse(JSON.stringify(val));
     },
     //获取角色列表
-    getRoleListAll() {
-      getRoleList()
-        .then((res) => {
-          console.log("获取角色列表", res.data);
-          this.roleoptions = res.data.filter((role) => role.id !== 0);
-        })
-        .catch((err) => {});
-    },
+    // getRoleListAll() {
+    //   getRoleList()
+    //     .then((res) => {
+    //       console.log("获取角色列表", res.data);
+    //       this.roleoptions = res.data.filter((role) => role.id !== 0);
+    //     })
+    //     .catch((err) => {});
+    // },
     // getRoleListAll() {
     //   getRoleList()
     //     .then((res) => {
@@ -163,7 +163,7 @@ export default {
     display() {
       this.isShow = true;
       this.roleUser = localStorage.getItem("role");
-      this.getRoleListAll();
+      //this.getRoleListAll();
     },
     hide() {
       this.isShow = false;
diff --git a/src/views/system/user/userManagement.vue b/src/views/system/user/userManagement.vue
index d2c4750..6c8b41d 100644
--- a/src/views/system/user/userManagement.vue
+++ b/src/views/system/user/userManagement.vue
@@ -32,12 +32,12 @@
             <template slot-scope="scope">{{ scope.row.roleName }}</template>
           </el-table-column> -->
           <el-table-column label="角色" show-overflow-tooltip prop="roleName">
-            <!-- <template slot-scope="scope">
+            <template slot-scope="scope">
               <span v-if="scope.row.role == 0">超级管理员</span>
               <span v-else-if="scope.row.role == 1">管理员</span>
               <span v-else-if="scope.row.role == 2">用户</span>
               <span v-else>{{ scope.row.role }}</span>
-            </template> -->
+            </template>
           </el-table-column>
           <el-table-column
             label="备注"