From 7377a3e16752447cee25e174e58d168a94fa9c86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Fri, 1 Apr 2022 20:25:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B2=97=E4=BD=8D=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E5=88=A0=E9=99=A4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/System/SysPostController.cs   |  6 ++-
 ZR.Vue/src/components/TopNav/index.vue        |  2 +-
 .../src/layout/components/Sidebar/index.vue   | 41 ++++++++++---------
 ZR.Vue/src/views/system/user/index.vue        |  9 +---
 4 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/ZR.Admin.WebApi/Controllers/System/SysPostController.cs b/ZR.Admin.WebApi/Controllers/System/SysPostController.cs
index 5deb34a..9143d49 100644
--- a/ZR.Admin.WebApi/Controllers/System/SysPostController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/SysPostController.cs
@@ -9,6 +9,7 @@ using Infrastructure.Attribute;
 using Infrastructure.Enums;
 using Infrastructure;
 using ZR.Service.System.IService;
+using ZR.Common;
 
 namespace ZR.Admin.WebApi.Controllers.System
 {
@@ -106,9 +107,10 @@ namespace ZR.Admin.WebApi.Controllers.System
         [HttpDelete("{id}")]
         [ActionPermissionFilter(Permission = "system:post:remove")]
         [Log(Title = "岗位删除", BusinessType = BusinessType.DELETE)]
-        public IActionResult Delete(int id = 0)
+        public IActionResult Delete(string id)
         {
-            return ToResponse(ToJson(PostService.Delete(id)));
+            int[] ids = Tools.SpitIntArrary(id);
+            return ToResponse(ToJson(PostService.Delete(ids)));
         }
 
         /// <summary>
diff --git a/ZR.Vue/src/components/TopNav/index.vue b/ZR.Vue/src/components/TopNav/index.vue
index e92d381..16632e0 100644
--- a/ZR.Vue/src/components/TopNav/index.vue
+++ b/ZR.Vue/src/components/TopNav/index.vue
@@ -97,7 +97,7 @@ export default {
       if (routes.length === 0) {
         activePath = this.currentIndex || this.defaultRouter();
 
-      console.log("activePath", activePath);
+      	console.log("activePath", activePath);
         this.activeRoutes(activePath);
       }
       return activePath;
diff --git a/ZR.Vue/src/layout/components/Sidebar/index.vue b/ZR.Vue/src/layout/components/Sidebar/index.vue
index 06dc015..0b1e16e 100644
--- a/ZR.Vue/src/layout/components/Sidebar/index.vue
+++ b/ZR.Vue/src/layout/components/Sidebar/index.vue
@@ -1,11 +1,12 @@
 <template>
-  <div :class="{'has-logo':showLogo}" :style="{ backgroundColor: settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
+  <div :class="{'has-logo':showLogo}"
+    :style="{ backgroundColor: settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
     <logo v-if="showLogo" :collapse="isCollapse" />
     <el-scrollbar :class="settings.sideTheme" wrap-class="scrollbar-wrapper">
-
-      <el-menu :default-active="activeMenu" :collapse="isCollapse" :background-color="settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground" :text-color="settings.sideTheme === 'theme-dark' ? variables.menuColor : variables.menuLightColor" :unique-opened="true"
+      <el-menu :default-active="activeMenu" :collapse="isCollapse"
+        :background-color="settings.sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground"
+        :text-color="settings.sideTheme === 'theme-dark' ? variables.menuColor : variables.menuLightColor" :unique-opened="true"
         :active-text-color="settings.theme" :collapse-transition="false" mode="vertical">
-
         <sidebar-item v-for="(route, index) in sidebarRouters" :key="route.path  + index" :item="route" :base-path="route.path" />
       </el-menu>
     </el-scrollbar>
@@ -13,34 +14,34 @@
 </template>
 
 <script>
-import { mapGetters, mapState } from "vuex";
-import Logo from "./Logo";
-import SidebarItem from "./SidebarItem";
-import variables from "@/assets/styles/variables.scss";
+import { mapGetters, mapState } from 'vuex'
+import Logo from './Logo'
+import SidebarItem from './SidebarItem'
+import variables from '@/assets/styles/variables.scss'
 
 export default {
   components: { SidebarItem, Logo },
   computed: {
-    ...mapState(["settings"]),
-    ...mapGetters(["sidebarRouters", "sidebar"]),
+    ...mapState(['settings']),
+    ...mapGetters(['sidebarRouters', 'sidebar']),
     activeMenu() {
-      const route = this.$route;
-      const { meta, path } = route;
+      const route = this.$route
+      const { meta, path } = route
       // if set path, the sidebar will highlight the path you set
       if (meta.activeMenu) {
-        return meta.activeMenu;
+        return meta.activeMenu
       }
-      return path;
+      return path
     },
     showLogo() {
-      return this.$store.state.settings.sidebarLogo;
+      return this.$store.state.settings.sidebarLogo
     },
     variables() {
-      return variables;
+      return variables
     },
     isCollapse() {
-      return !this.sidebar.opened;
-    },
-  },
-};
+      return !this.sidebar.opened
+    }
+  }
+}
 </script>
diff --git a/ZR.Vue/src/views/system/user/index.vue b/ZR.Vue/src/views/system/user/index.vue
index b9a205e..c5fcc82 100644
--- a/ZR.Vue/src/views/system/user/index.vue
+++ b/ZR.Vue/src/views/system/user/index.vue
@@ -41,14 +41,10 @@
           <el-col :span="1.5">
             <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:user:add']">新增</el-button>
           </el-col>
-          <el-col :span="1.5">
+          <!-- <el-col :span="1.5">
             <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
               v-hasPermi="['system:user:edit']">修改</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
-              v-hasPermi="['system:user:remove']">删除</el-button>
-          </el-col>
+          </el-col> -->
           <el-col :span="1.5">
             <el-button type="info" plain icon="el-icon-upload2" size="mini" @click="handleImport" v-hasPermi="['system:user:import']">导入</el-button>
           </el-col>
@@ -59,7 +55,6 @@
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
         </el-row>
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="编号" align="center" prop="userId" width="60" />
           <el-table-column label="登录名" align="center" prop="userName" :show-overflow-tooltip="true" />
           <el-table-column label="昵称" align="center" prop="nickName" :show-overflow-tooltip="true" />