From c1cf25b7f0f94c3b01f9026c5eab4623e15f07c7 Mon Sep 17 00:00:00 2001
From: wangchengming <15110151257@163.com>
Date: Tue, 29 Jul 2025 16:11:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/ruoyi.scss       |   2 +-
 src/components/TopNav/index.vue    |   3 +-
 src/views/system/dept/index.vue    |  20 +-
 src/views/system/dict/data.vue     |   6 +-
 src/views/system/dict/index.vue    |   6 +-
 src/views/system/menu/index.vue    |  16 +-
 src/views/system/post/index.vue    | 342 +++++++++++++----------------
 src/views/system/role/authUser.vue |   2 +-
 src/views/system/role/index.vue    |  30 +--
 src/views/system/user/index.vue    |  26 +--
 10 files changed, 204 insertions(+), 249 deletions(-)

diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss
index 92ec3a6..b0e656f 100644
--- a/src/assets/styles/ruoyi.scss
+++ b/src/assets/styles/ruoyi.scss
@@ -341,7 +341,7 @@ h6 {
 .my_row {
   padding: 0px;
   margin: 17px 0px;
-  text-align: right;
+  // text-align: right;
 }
 
 // 按钮样式
diff --git a/src/components/TopNav/index.vue b/src/components/TopNav/index.vue
index e97058d..b3fab2a 100644
--- a/src/components/TopNav/index.vue
+++ b/src/components/TopNav/index.vue
@@ -238,7 +238,7 @@ onMounted(() => {
   border-radius: 4px 4px 4px 4px;
   background: #ffffff;
   box-shadow: 0 0 8px 0 #00328214;
-  min-width: auto !important;
+  min-width: 152px !important;
 }
 
 .el-popper.is-light,
@@ -253,6 +253,7 @@ onMounted(() => {
   font-weight: 400;
   font-size: 16px;
   color: #1E1E1E;
+  padding: 0 20px;
 }
 
 // 二级菜单悬浮和选中样式
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 84bc53d..4976c06 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -34,26 +34,26 @@
          <el-table v-if="refreshTable" v-loading="loading" height="calc(100vh - 310px)" :data="deptList"
             row-key="deptId" :default-expand-all="isExpandAll"
             :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
-            <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
-            <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
-            <el-table-column prop="status" label="状态" width="100">
+            <el-table-column prop="deptName" label="部门名称"></el-table-column>
+            <el-table-column prop="orderNum" label="排序"></el-table-column>
+            <el-table-column prop="status" label="状态">
                <template #default="scope">
                   <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
                </template>
             </el-table-column>
-            <el-table-column label="创建时间" align="center" prop="createTime" width="200">
+            <el-table-column label="创建时间" align="center" prop="createTime">
                <template #default="scope">
                   <span>{{ parseTime(scope.row.createTime) }}</span>
                </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+            <el-table-column label="操作" align="center" width="230" class-name="small-padding fixed-width">
                <template #default="scope">
-                  <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+                  <el-button link type="primary" @click="handleUpdate(scope.row)"
                      v-hasPermi="['system:dept:edit']">修改</el-button>
-                  <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)"
+                  <el-button link type="primary" @click="handleAdd(scope.row)"
                      v-hasPermi="['system:dept:add']">新增</el-button>
-                  <el-button v-if="scope.row.parentId != 0" link type="primary" icon="Delete"
-                     @click="handleDelete(scope.row)" v-hasPermi="['system:dept:remove']">删除</el-button>
+                  <el-button v-if="scope.row.parentId != 0" link type="primary" @click="handleDelete(scope.row)"
+                     v-hasPermi="['system:dept:remove']">删除</el-button>
                </template>
             </el-table-column>
          </el-table>
@@ -100,7 +100,7 @@
                   <el-form-item label="部门状态">
                      <el-radio-group v-model="form.status">
                         <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label
-                           }}</el-radio>
+                        }}</el-radio>
                      </el-radio-group>
                   </el-form-item>
                </el-col>
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index 9674894..9fd1b6e 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -69,11 +69,11 @@
                   <span>{{ parseTime(scope.row.createTime) }}</span>
                </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
+            <el-table-column label="操作" align="center" width="130" class-name="small-padding fixed-width">
                <template #default="scope">
-                  <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+                  <el-button link type="primary" @click="handleUpdate(scope.row)"
                      v-hasPermi="['system:dict:edit']">修改</el-button>
-                  <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+                  <el-button link type="primary" @click="handleDelete(scope.row)"
                      v-hasPermi="['system:dict:remove']">删除</el-button>
                </template>
             </el-table-column>
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 372dcc1..0998357 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -70,11 +70,11 @@
                   <span>{{ parseTime(scope.row.createTime) }}</span>
                </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="160" class-name="small-padding fixed-width">
+            <el-table-column label="操作" align="center" width="130" class-name="small-padding fixed-width">
                <template #default="scope">
-                  <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+                  <el-button link type="primary" @click="handleUpdate(scope.row)"
                      v-hasPermi="['system:dict:edit']">修改</el-button>
-                  <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+                  <el-button link type="primary" @click="handleDelete(scope.row)"
                      v-hasPermi="['system:dict:remove']">删除</el-button>
                </template>
             </el-table-column>
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 6c7fb43..57e7504 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -35,32 +35,32 @@
          <el-table v-if="refreshTable" v-loading="loading" height="calc(100vh - 310px)" :data="menuList"
             row-key="menuId" :default-expand-all="isExpandAll"
             :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
-            <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="160"></el-table-column>
+            <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="230"></el-table-column>
             <!-- <el-table-column prop="icon" label="图标" align="center" width="100">
                <template #default="scope">
                   <svg-icon :icon-class="scope.row.icon" />
                </template>
             </el-table-column> -->
-            <el-table-column prop="orderNum" label="排序" width="60"></el-table-column>
+            <el-table-column prop="orderNum" label="排序" width="100"></el-table-column>
             <el-table-column prop="perms" label="权限标识" :show-overflow-tooltip="true"></el-table-column>
             <el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true"></el-table-column>
-            <el-table-column prop="status" label="状态" width="80">
+            <el-table-column prop="status" label="状态" width="100">
                <template #default="scope">
                   <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
                </template>
             </el-table-column>
-            <el-table-column label="创建时间" align="center" width="230" prop="createTime">
+            <el-table-column label="创建时间" align="center" width="210" prop="createTime">
                <template #default="scope">
                   <span>{{ parseTime(scope.row.createTime) }}</span>
                </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="240" class-name="small-padding fixed-width">
+            <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width">
                <template #default="scope">
-                  <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
+                  <el-button link type="primary" @click="handleUpdate(scope.row)"
                      v-hasPermi="['system:menu:edit']">修改</el-button>
-                  <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)"
+                  <el-button link type="primary" @click="handleAdd(scope.row)"
                      v-hasPermi="['system:menu:add']">新增</el-button>
-                  <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
+                  <el-button link type="primary" @click="handleDelete(scope.row)"
                      v-hasPermi="['system:menu:remove']">删除</el-button>
                </template>
             </el-table-column>
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index 9e760d1..5e94bf2 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -1,117 +1,82 @@
 <template>
    <div class="app-container">
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-         <el-form-item label="岗位编码" prop="postCode">
-            <el-input
-               v-model="queryParams.postCode"
-               placeholder="请输入岗位编码"
-               clearable
-               style="width: 200px"
-               @keyup.enter="handleQuery"
-            />
-         </el-form-item>
-         <el-form-item label="岗位名称" prop="postName">
-            <el-input
-               v-model="queryParams.postName"
-               placeholder="请输入岗位名称"
-               clearable
-               style="width: 200px"
-               @keyup.enter="handleQuery"
-            />
-         </el-form-item>
-         <el-form-item label="状态" prop="status">
-            <el-select v-model="queryParams.status" placeholder="岗位状态" clearable style="width: 200px">
-               <el-option
-                  v-for="dict in sys_normal_disable"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-               />
-            </el-select>
-         </el-form-item>
-         <el-form-item>
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-         </el-form-item>
-      </el-form>
+      <div class="searchPanel">
+         <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" class="searchPanelForm">
+            <el-form-item label="岗位编码" prop="postCode">
+               <el-input v-model="queryParams.postCode" placeholder="请输入岗位编码" clearable style="width: 140px"
+                  @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="岗位名称" prop="postName">
+               <el-input v-model="queryParams.postName" placeholder="请输入岗位名称" clearable style="width: 140px"
+                  @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="状态" prop="status">
+               <el-select v-model="queryParams.status" placeholder="岗位状态" clearable style="width: 86px">
+                  <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label"
+                     :value="dict.value" />
+               </el-select>
+            </el-form-item>
+         </el-form>
+      </div>
+      <el-card>
+         <template #header>
+            <div class="card-header">
+               <span>系统管理</span> <span class="subHeaderTitle">- 岗位管理</span>
+            </div>
+         </template>
 
-      <el-row :gutter="10" class="mb8">
-         <el-col :span="1.5">
-            <el-button
-               type="primary"
-               plain
-               icon="Plus"
-               @click="handleAdd"
-               v-hasPermi="['system:post:add']"
-            >新增</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button
-               type="success"
-               plain
-               icon="Edit"
-               :disabled="single"
-               @click="handleUpdate"
-               v-hasPermi="['system:post:edit']"
-            >修改</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button
-               type="danger"
-               plain
-               icon="Delete"
-               :disabled="multiple"
-               @click="handleDelete"
-               v-hasPermi="['system:post:remove']"
-            >删除</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button
-               type="warning"
-               plain
-               icon="Download"
-               @click="handleExport"
-               v-hasPermi="['system:post:export']"
-            >导出</el-button>
-         </el-col>
-         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-      </el-row>
+         <el-row :gutter="10" class="my_row">
+            <el-col :span="24">
+               <el-button type="primary" class="primaryBtn" @click="handleAdd"
+                  v-hasPermi="['system:post:add']">新增</el-button>
+               <el-button type="primary" class="primaryBtn" :disabled="single" @click="handleUpdate"
+                  v-hasPermi="['system:post:edit']">修改</el-button>
+               <el-button type="primary" class="primaryBtn" :disabled="multiple" @click="handleDelete"
+                  v-hasPermi="['system:post:remove']">删除</el-button>
+               <el-button type="primary" class="primaryBtn" @click="handleExport"
+                  v-hasPermi="['system:post:export']">导出</el-button>
+               <el-button type="primary" class="primaryBtn" @click="handleQuery">搜索</el-button>
+               <el-button type="primary" class="primaryBtn" @click="resetQuery">重置</el-button>
+            </el-col>
+         </el-row>
+
+         <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange"
+            height="calc(100vh - 362px)">
+            <el-table-column type="selection" width="55" align="center" />
+            <el-table-column label="岗位编号" align="center" prop="postId" />
+            <el-table-column label="岗位编码" align="center" prop="postCode" />
+            <el-table-column label="岗位名称" align="center" prop="postName" />
+            <el-table-column label="岗位排序" align="center" prop="postSort" />
+            <el-table-column label="状态" align="center" prop="status">
+               <template #default="scope">
+                  <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
+               </template>
+            </el-table-column>
+            <el-table-column label="创建时间" align="center" prop="createTime" width="210">
+               <template #default="scope">
+                  <span>{{ parseTime(scope.row.createTime) }}</span>
+               </template>
+            </el-table-column>
+            <el-table-column label="操作" width="130" align="center" class-name="small-padding fixed-width">
+               <template #default="scope">
+                  <el-button link type="primary" @click="handleUpdate(scope.row)"
+                     v-hasPermi="['system:post:edit']">修改</el-button>
+                  <el-button link type="primary" @click="handleDelete(scope.row)"
+                     v-hasPermi="['system:post:remove']">删除</el-button>
+               </template>
+            </el-table-column>
+         </el-table>
+
+         <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+            v-model:limit="queryParams.pageSize" @pagination="getList" />
+      </el-card>
 
-      <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
-         <el-table-column type="selection" width="55" align="center" />
-         <el-table-column label="岗位编号" align="center" prop="postId" />
-         <el-table-column label="岗位编码" align="center" prop="postCode" />
-         <el-table-column label="岗位名称" align="center" prop="postName" />
-         <el-table-column label="岗位排序" align="center" prop="postSort" />
-         <el-table-column label="状态" align="center" prop="status">
-            <template #default="scope">
-               <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
-            </template>
-         </el-table-column>
-         <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-            <template #default="scope">
-               <span>{{ parseTime(scope.row.createTime) }}</span>
-            </template>
-         </el-table-column>
-         <el-table-column label="操作" width="180" align="center" class-name="small-padding fixed-width">
-            <template #default="scope">
-               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:post:edit']">修改</el-button>
-               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:post:remove']">删除</el-button>
-            </template>
-         </el-table-column>
-      </el-table>
 
-      <pagination
-         v-show="total > 0"
-         :total="total"
-         v-model:page="queryParams.pageNum"
-         v-model:limit="queryParams.pageSize"
-         @pagination="getList"
-      />
 
       <!-- 添加或修改岗位对话框 -->
-      <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-         <el-form ref="postRef" :model="form" :rules="rules" label-width="80px">
+      <el-dialog :title="title" v-model="open" width="800px" class="my_dialog" append-to-body :destroy-on-close="true"
+         :close-on-click-modal="false">
+         <el-form ref="postRef" :model="form" :rules="rules" label-width="120px" class="myInsertForm">
             <el-form-item label="岗位名称" prop="postName">
                <el-input v-model="form.postName" placeholder="请输入岗位名称" />
             </el-form-item>
@@ -123,11 +88,8 @@
             </el-form-item>
             <el-form-item label="岗位状态" prop="status">
                <el-radio-group v-model="form.status">
-                  <el-radio
-                     v-for="dict in sys_normal_disable"
-                     :key="dict.value"
-                     :value="dict.value"
-                  >{{ dict.label }}</el-radio>
+                  <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label
+                  }}</el-radio>
                </el-radio-group>
             </el-form-item>
             <el-form-item label="备注" prop="remark">
@@ -145,7 +107,11 @@
 </template>
 
 <script setup name="Post">
+import { onMounted, ref } from 'vue';
 import { listPost, addPost, delPost, getPost, updatePost } from "@/api/system/post"
+import { useBackgroundStore } from '@/store/modules/background'
+import otherbg from '@/assets/images/otherbg.png'
+const bgStore = useBackgroundStore()
 
 const { proxy } = getCurrentInstance()
 const { sys_normal_disable } = proxy.useDict("sys_normal_disable")
@@ -161,127 +127,131 @@ const total = ref(0)
 const title = ref("")
 
 const data = reactive({
-  form: {},
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    postCode: undefined,
-    postName: undefined,
-    status: undefined
-  },
-  rules: {
-    postName: [{ required: true, message: "岗位名称不能为空", trigger: "blur" }],
-    postCode: [{ required: true, message: "岗位编码不能为空", trigger: "blur" }],
-    postSort: [{ required: true, message: "岗位顺序不能为空", trigger: "blur" }],
-  }
+   form: {},
+   queryParams: {
+      pageNum: 1,
+      pageSize: 10,
+      postCode: undefined,
+      postName: undefined,
+      status: undefined
+   },
+   rules: {
+      postName: [{ required: true, message: "岗位名称不能为空", trigger: "blur" }],
+      postCode: [{ required: true, message: "岗位编码不能为空", trigger: "blur" }],
+      postSort: [{ required: true, message: "岗位顺序不能为空", trigger: "blur" }],
+   }
 })
 
 const { queryParams, form, rules } = toRefs(data)
 
 /** 查询岗位列表 */
 function getList() {
-  loading.value = true
-  listPost(queryParams.value).then(response => {
-    postList.value = response.rows
-    total.value = response.total
-    loading.value = false
-  })
+   loading.value = true
+   listPost(queryParams.value).then(response => {
+      postList.value = response.rows
+      total.value = response.total
+      loading.value = false
+   })
 }
 
 /** 取消按钮 */
 function cancel() {
-  open.value = false
-  reset()
+   open.value = false
+   reset()
 }
 
 /** 表单重置 */
 function reset() {
-  form.value = {
-    postId: undefined,
-    postCode: undefined,
-    postName: undefined,
-    postSort: 0,
-    status: "0",
-    remark: undefined
-  }
-  proxy.resetForm("postRef")
+   form.value = {
+      postId: undefined,
+      postCode: undefined,
+      postName: undefined,
+      postSort: 0,
+      status: "0",
+      remark: undefined
+   }
+   proxy.resetForm("postRef")
 }
 
 /** 搜索按钮操作 */
 function handleQuery() {
-  queryParams.value.pageNum = 1
-  getList()
+   queryParams.value.pageNum = 1
+   getList()
 }
 
 /** 重置按钮操作 */
 function resetQuery() {
-  proxy.resetForm("queryRef")
-  handleQuery()
+   proxy.resetForm("queryRef")
+   handleQuery()
 }
 
 /** 多选框选中数据 */
 function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.postId)
-  single.value = selection.length != 1
-  multiple.value = !selection.length
+   ids.value = selection.map(item => item.postId)
+   single.value = selection.length != 1
+   multiple.value = !selection.length
 }
 
 /** 新增按钮操作 */
 function handleAdd() {
-  reset()
-  open.value = true
-  title.value = "添加岗位"
+   reset()
+   open.value = true
+   title.value = "添加岗位"
 }
 
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  reset()
-  const postId = row.postId || ids.value
-  getPost(postId).then(response => {
-    form.value = response.data
-    open.value = true
-    title.value = "修改岗位"
-  })
+   reset()
+   const postId = row.postId || ids.value
+   getPost(postId).then(response => {
+      form.value = response.data
+      open.value = true
+      title.value = "修改岗位"
+   })
 }
 
 /** 提交按钮 */
 function submitForm() {
-  proxy.$refs["postRef"].validate(valid => {
-    if (valid) {
-      if (form.value.postId != undefined) {
-        updatePost(form.value).then(response => {
-          proxy.$modal.msgSuccess("修改成功")
-          open.value = false
-          getList()
-        })
-      } else {
-        addPost(form.value).then(response => {
-          proxy.$modal.msgSuccess("新增成功")
-          open.value = false
-          getList()
-        })
+   proxy.$refs["postRef"].validate(valid => {
+      if (valid) {
+         if (form.value.postId != undefined) {
+            updatePost(form.value).then(response => {
+               proxy.$modal.msgSuccess("修改成功")
+               open.value = false
+               getList()
+            })
+         } else {
+            addPost(form.value).then(response => {
+               proxy.$modal.msgSuccess("新增成功")
+               open.value = false
+               getList()
+            })
+         }
       }
-    }
-  })
+   })
 }
 
 /** 删除按钮操作 */
 function handleDelete(row) {
-  const postIds = row.postId || ids.value
-  proxy.$modal.confirm('是否确认删除岗位编号为"' + postIds + '"的数据项？').then(function() {
-    return delPost(postIds)
-  }).then(() => {
-    getList()
-    proxy.$modal.msgSuccess("删除成功")
-  }).catch(() => {})
+   const postIds = row.postId || ids.value
+   proxy.$modal.confirm('是否确认删除岗位编号为"' + postIds + '"的数据项？').then(function () {
+      return delPost(postIds)
+   }).then(() => {
+      getList()
+      proxy.$modal.msgSuccess("删除成功")
+   }).catch(() => { })
 }
 
 /** 导出按钮操作 */
 function handleExport() {
-  proxy.download("system/post/export", {
-    ...queryParams.value
-  }, `post_${new Date().getTime()}.xlsx`)
+   proxy.download("system/post/export", {
+      ...queryParams.value
+   }, `post_${new Date().getTime()}.xlsx`)
 }
 
-getList()
+// 初始化
+onMounted(() => {
+   bgStore.setBgImage(otherbg)
+   getList()
+}); 
 </script>
diff --git a/src/views/system/role/authUser.vue b/src/views/system/role/authUser.vue
index 1cd421c..36ad7ba 100644
--- a/src/views/system/role/authUser.vue
+++ b/src/views/system/role/authUser.vue
@@ -51,7 +51,7 @@
             </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
                <template #default="scope">
-                  <el-button link type="primary" icon="CircleClose" @click="cancelAuthUser(scope.row)"
+                  <el-button link type="primary" @click="cancelAuthUser(scope.row)"
                      v-hasPermi="['system:role:remove']">取消授权</el-button>
                </template>
             </el-table-column>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index e1f4ab2..21514a6 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -63,24 +63,16 @@
             <span>{{ parseTime(scope.row.createTime) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <el-table-column label="操作" align="center" width="280" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-tooltip content="修改" placement="top" v-if="scope.row.roleId !== 1">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
-                v-hasPermi="['system:role:edit']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top" v-if="scope.row.roleId !== 1">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-                v-hasPermi="['system:role:remove']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="数据权限" placement="top" v-if="scope.row.roleId !== 1">
-              <el-button link type="primary" icon="CircleCheck" @click="handleDataScope(scope.row)"
-                v-hasPermi="['system:role:edit']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="分配用户" placement="top" v-if="scope.row.roleId !== 1">
-              <el-button link type="primary" icon="User" @click="handleAuthUser(scope.row)"
-                v-hasPermi="['system:role:edit']"></el-button>
-            </el-tooltip>
+            <el-button link type="primary" v-if="scope.row.roleId !== 1" @click="handleUpdate(scope.row)"
+              v-hasPermi="['system:role:edit']">修改</el-button>
+            <el-button link type="primary" v-if="scope.row.roleId !== 1" @click="handleDelete(scope.row)"
+              v-hasPermi="['system:role:remove']">删除</el-button>
+            <el-button link type="primary" v-if="scope.row.roleId !== 1" @click="handleDataScope(scope.row)"
+              v-hasPermi="['system:role:edit']">数据权限</el-button>
+            <el-button link type="primary" v-if="scope.row.roleId !== 1" @click="handleAuthUser(scope.row)"
+              v-hasPermi="['system:role:edit']">分配用户</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -518,7 +510,7 @@ function cancelDataScope() {
 
 // 初始化
 onMounted(() => {
-   bgStore.setBgImage(otherbg)
-   getList()
+  bgStore.setBgImage(otherbg)
+  getList()
 });
 </script>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 5eb2ce2..1b56596 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -74,24 +74,16 @@
             <span>{{ parseTime(scope.row.createTime) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
+        <el-table-column label="操作" align="center" width="280" class-name="small-padding fixed-width">
           <template #default="scope">
-            <el-tooltip content="修改" placement="top" v-if="scope.row.userId !== 1">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
-                v-hasPermi="['system:user:edit']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="删除" placement="top" v-if="scope.row.userId !== 1">
-              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
-                v-hasPermi="['system:user:remove']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="重置密码" placement="top" v-if="scope.row.userId !== 1">
-              <el-button link type="primary" icon="Key" @click="handleResetPwd(scope.row)"
-                v-hasPermi="['system:user:resetPwd']"></el-button>
-            </el-tooltip>
-            <el-tooltip content="分配角色" placement="top" v-if="scope.row.userId !== 1">
-              <el-button link type="primary" icon="CircleCheck" @click="handleAuthRole(scope.row)"
-                v-hasPermi="['system:user:edit']"></el-button>
-            </el-tooltip>
+            <el-button link type="primary" v-if="scope.row.userId !== 1" @click="handleUpdate(scope.row)"
+              v-hasPermi="['system:user:edit']">修改</el-button>
+            <el-button link type="primary" v-if="scope.row.userId !== 1" @click="handleDelete(scope.row)"
+              v-hasPermi="['system:user:remove']">删除</el-button>
+            <el-button link type="primary" v-if="scope.row.userId !== 1" @click="handleResetPwd(scope.row)"
+              v-hasPermi="['system:user:resetPwd']">重置密码</el-button>
+            <el-button link type="primary" v-if="scope.row.userId !== 1" @click="handleAuthRole(scope.row)"
+              v-hasPermi="['system:user:edit']">分配角色</el-button>
           </template>
         </el-table-column>
       </el-table>