Forráskód Böngészése

组织架构样式调整

wuhb 6 hónapja
szülő
commit
a4357c2110

+ 19 - 17
ygtx-ui/src/views/system/dept/index.vue

@@ -1,17 +1,16 @@
 <template>
    <div class="app-container">
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-         <el-form-item label="部门名称" prop="deptName">
+      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-position="top">
+         <el-form-item label="部门名称" prop="deptName" label-position="top">
             <el-input
                v-model="queryParams.deptName"
                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-form-item label="状态" prop="status" label-position="top">
+            <el-select v-model="queryParams.status" placeholder="部门状态" clearable>
                <el-option
                   v-for="dict in sys_normal_disable"
                   :key="dict.value"
@@ -20,12 +19,11 @@
                />
             </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 style="float: right;">
+          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+      </div>
       <el-row :gutter="10" class="mb8">
          <el-col :span="1.5">
             <el-button
@@ -42,7 +40,6 @@
                @click="toggleExpandAll"
             >展开/折叠</el-button>
          </el-col>
-         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
 
       <el-table
@@ -53,23 +50,23 @@
          :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="deptName" label="部门名称"></el-table-column>
          <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
          <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" prop="createTime" width="200">
+         <el-table-column label="创建时间" prop="createTime" width="200">
             <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="操作" class-name="small-padding fixed-width" width="210">
             <template #default="scope">
-               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:dept:edit']">修改</el-button>
-               <el-button link type="primary" icon="Plus" @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 link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['system:dept:edit']"><i class="fa fa-edit"></i>编辑</el-button>
+               <el-button link type="success" @click="handleAdd(scope.row)" v-hasPermi="['system:dept:add']"><i class="fa fa-plus"></i>新增</el-button>
+               <el-button v-if="scope.row.parentId != 0" link type="danger" @click="handleDelete(scope.row)" v-hasPermi="['system:dept:remove']"><i class="fa fa-trash"></i>删除</el-button>
             </template>
          </el-table-column>
       </el-table>
@@ -279,3 +276,8 @@ function handleDelete(row) {
 
 getList()
 </script>
+<style scoped>
+.el-form--inline.el-form--label-top .el-form-item {
+  width: 21%;
+}
+</style>

+ 21 - 18
ygtx-ui/src/views/system/menu/index.vue

@@ -1,17 +1,16 @@
 <template>
    <div class="app-container">
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-position="top">
          <el-form-item label="菜单名称" prop="menuName">
             <el-input
                v-model="queryParams.menuName"
                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-form-item label="状态" prop="status" label-position="top">
+            <el-select v-model="queryParams.status" placeholder="菜单状态" clearable>
                <el-option
                   v-for="dict in sys_normal_disable"
                   :key="dict.value"
@@ -20,11 +19,11 @@
                />
             </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 style="float: right;">
+          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+      </div>
 
       <el-row :gutter="10" class="mb8">
          <el-col :span="1.5">
@@ -42,7 +41,6 @@
                @click="toggleExpandAll"
             >展开/折叠</el-button>
          </el-col>
-         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
       </el-row>
 
       <el-table
@@ -53,30 +51,30 @@
          :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="icon" label="图标" align="center" width="100">
+         <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true"></el-table-column>
+         <el-table-column prop="icon" label="图标" 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="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="perms" label="权限标识" :show-overflow-tooltip="true" width="300"></el-table-column>
+         <el-table-column prop="component" label="组件路径" :show-overflow-tooltip="true" width="250"></el-table-column>
          <el-table-column prop="status" label="状态" width="80">
             <template #default="scope">
                <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
             </template>
          </el-table-column>
-         <el-table-column label="创建时间" align="center" width="160" prop="createTime">
+         <el-table-column label="创建时间" width="160" prop="createTime">
             <template #default="scope">
                <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
          </el-table-column>
-         <el-table-column label="操作" align="center" width="210" class-name="small-padding fixed-width">
+         <el-table-column label="操作" width="210" class-name="small-padding fixed-width">
             <template #default="scope">
-               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:menu:edit']">修改</el-button>
-               <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['system:menu:add']">新增</el-button>
-               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:menu:remove']">删除</el-button>
+               <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['system:menu:edit']"><i class="fa fa-edit"></i>编辑</el-button>
+               <el-button link type="success" @click="handleAdd(scope.row)" v-hasPermi="['system:menu:add']"><i class="fa fa-plus"></i>新增</el-button>
+               <el-button link type="danger" @click="handleDelete(scope.row)" v-hasPermi="['system:menu:remove']"><i class="fa fa-trash"></i>删除</el-button>
             </template>
          </el-table-column>
       </el-table>
@@ -448,3 +446,8 @@ function handleDelete(row) {
 
 getList()
 </script>
+<style scoped>
+.el-form--inline.el-form--label-top .el-form-item {
+  width: 21%;
+}
+</style>

+ 24 - 22
ygtx-ui/src/views/system/post/index.vue

@@ -1,26 +1,24 @@
 <template>
    <div class="app-container">
-      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-         <el-form-item label="岗位编码" prop="postCode">
+      <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-position="top">
+         <el-form-item label="岗位编码" prop="postCode" label-position="top">
             <el-input
                v-model="queryParams.postCode"
                placeholder="请输入岗位编码"
                clearable
-               style="width: 200px"
                @keyup.enter="handleQuery"
             />
          </el-form-item>
-         <el-form-item label="岗位名称" prop="postName">
+         <el-form-item label="岗位名称" prop="postName" label-position="top">
             <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-form-item label="状态" prop="status" label-position="top">
+            <el-select v-model="queryParams.status" placeholder="岗位状态" clearable>
                <el-option
                   v-for="dict in sys_normal_disable"
                   :key="dict.value"
@@ -29,12 +27,11 @@
                />
             </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 style="float: right;">
+          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+      </div>
       <el-row :gutter="10" class="mb8">
          <el-col :span="1.5">
             <el-button
@@ -74,25 +71,25 @@
       </el-row>
 
       <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">
+         <el-table-column type="selection" width="55" />
+         <el-table-column label="岗位编号" prop="postId" />
+         <el-table-column label="岗位编码" prop="postCode" />
+         <el-table-column label="岗位名称" prop="postName" />
+         <el-table-column label="岗位排序" prop="postSort" />
+         <el-table-column label="状态" 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">
+         <el-table-column label="创建时间" 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">
+         <el-table-column label="操作" width="180" 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>
+               <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['system:post:edit']"><i class="fa fa-edit"></i>编辑</el-button>
+               <el-button link type="danger" @click="handleDelete(scope.row)" v-hasPermi="['system:post:remove']"><i class="fa fa-trash"></i>删除</el-button>
             </template>
          </el-table-column>
       </el-table>
@@ -281,3 +278,8 @@ function handleExport() {
 
 getList()
 </script>
+<style scoped>
+.el-form--inline.el-form--label-top .el-form-item {
+  width: 21%;
+}
+</style>

+ 29 - 28
ygtx-ui/src/views/system/role/index.vue

@@ -1,30 +1,27 @@
 <template>
    <div class="app-container">
-      <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true" label-width="68px">
-         <el-form-item label="角色名称" prop="roleName">
+      <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true" label-position="top">
+         <el-form-item label="角色名称" prop="roleName" label-position="top">
             <el-input
                v-model="queryParams.roleName"
                placeholder="请输入角色名称"
                clearable
-               style="width: 240px"
                @keyup.enter="handleQuery"
             />
          </el-form-item>
-         <el-form-item label="权限字符" prop="roleKey">
+         <el-form-item label="权限字符" prop="roleKey" label-position="top">
             <el-input
                v-model="queryParams.roleKey"
                placeholder="请输入权限字符"
                clearable
-               style="width: 240px"
                @keyup.enter="handleQuery"
             />
          </el-form-item>
-         <el-form-item label="状态" prop="status">
+         <el-form-item label="状态" prop="status" label-position="top">
             <el-select
                v-model="queryParams.status"
                placeholder="角色状态"
                clearable
-               style="width: 240px"
             >
                <el-option
                   v-for="dict in sys_normal_disable"
@@ -34,7 +31,7 @@
                />
             </el-select>
          </el-form-item>
-         <el-form-item label="创建时间" style="width: 308px">
+         <el-form-item label="创建时间" label-position="top">
             <el-date-picker
                v-model="dateRange"
                value-format="YYYY-MM-DD"
@@ -44,11 +41,13 @@
                end-placeholder="结束日期"
             ></el-date-picker>
          </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 style="float: right;">
+          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+      </div>
+
       <el-row :gutter="10" class="mb8">
          <el-col :span="1.5">
             <el-button
@@ -89,12 +88,12 @@
 
       <!-- 表格数据 -->
       <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
-         <el-table-column type="selection" width="55" align="center" />
+         <el-table-column type="selection" width="55" />
          <el-table-column label="角色编号" prop="roleId" width="120" />
          <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
          <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" width="150" />
          <el-table-column label="显示顺序" prop="roleSort" width="100" />
-         <el-table-column label="状态" align="center" width="100">
+         <el-table-column label="状态" width="100">
             <template #default="scope">
                <el-switch
                   v-model="scope.row.status"
@@ -104,25 +103,17 @@
                ></el-switch>
             </template>
          </el-table-column>
-         <el-table-column label="创建时间" align="center" prop="createTime">
+         <el-table-column label="创建时间" 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="操作" 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" @click="handleUpdate(scope.row)" v-hasPermi="['system:role:edit']"><i class="fa fa-edit"></i>编辑</el-button>
+              <el-button link type="danger" @click="handleDelete(scope.row)" v-hasPermi="['system:role:remove']"><i class="fa fa-trash"></i>删除</el-button>
+              <el-button link type="warning" @click="handleDataScope(scope.row)" v-hasPermi="['system:role:edit']"><i class="fa fa-check-circle"></i>权限</el-button>
+              <el-button link type="success" @click="handleAuthUser(scope.row)" v-hasPermi="['system:role:edit']"><i class="fa fa-user"></i>用户</el-button>               
             </template>
          </el-table-column>
       </el-table>
@@ -578,3 +569,13 @@ function cancelDataScope() {
 
 getList()
 </script>
+
+<style scoped>
+.el-form--inline.el-form--label-top .el-form-item {
+  width: 21%;
+}
+
+.el-form--inline.el-form--label-top{
+  justify-content:space-between;
+}
+</style>

+ 35 - 33
ygtx-ui/src/views/system/user/index.vue

@@ -16,27 +16,28 @@
         <!--用户数据-->
         <pane size="84">
           <el-col>
-            <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-              <el-form-item label="用户名称" prop="userName">
-                <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable style="width: 240px" @keyup.enter="handleQuery" />
+            <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-position="top">
+              <el-form-item label="用户名称" prop="userName" label-position="top">
+                <el-input v-model="queryParams.userName" placeholder="请输入用户名称" clearable @keyup.enter="handleQuery" />
               </el-form-item>
-              <el-form-item label="手机号码" prop="phonenumber">
-                <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable style="width: 240px" @keyup.enter="handleQuery" />
+              <el-form-item label="手机号码" prop="phonenumber" label-position="top">
+                <el-input v-model="queryParams.phonenumber" placeholder="请输入手机号码" clearable @keyup.enter="handleQuery" />
               </el-form-item>
-              <el-form-item label="状态" prop="status">
-                <el-select v-model="queryParams.status" placeholder="用户状态" clearable style="width: 240px">
+              <el-form-item label="状态" prop="status" label-position="top">
+                <el-select v-model="queryParams.status" placeholder="用户状态" clearable >
                   <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 label="创建时间" style="width: 308px">
+              <el-form-item label="创建时间" label-position="top">
                 <el-date-picker v-model="dateRange" value-format="YYYY-MM-DD" type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
               </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 style="float: right;">
+                <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+                <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+            </div>
+
             <el-row :gutter="10" class="mb8">
               <el-col :span="1.5">
                 <el-button type="primary" icon="Plus" @click="handleAdd" v-hasPermi="['system:user:add']">新增</el-button>
@@ -57,13 +58,13 @@
             </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" key="userId" prop="userId" v-if="columns.userId.visible" />
-              <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns.userName.visible" :show-overflow-tooltip="true" />
-              <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns.nickName.visible" :show-overflow-tooltip="true" />
-              <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns.deptName.visible" :show-overflow-tooltip="true" />
-              <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns.phonenumber.visible" width="120" />
-              <el-table-column label="状态" align="center" key="status" v-if="columns.status.visible">
+              <el-table-column type="selection" width="50" />
+              <el-table-column label="用户编号" key="userId" prop="userId" v-if="columns.userId.visible" />
+              <el-table-column label="用户名称" key="userName" prop="userName" v-if="columns.userName.visible" />
+              <el-table-column label="用户昵称" key="nickName" prop="nickName" v-if="columns.nickName.visible"/>
+              <el-table-column label="部门" key="deptName" prop="dept.deptName" v-if="columns.deptName.visible" :show-overflow-tooltip="true" />
+              <el-table-column label="手机号码" key="phonenumber" prop="phonenumber" v-if="columns.phonenumber.visible" width="120" />
+              <el-table-column label="状态" key="status" v-if="columns.status.visible">
                 <template #default="scope">
                   <el-switch
                     v-model="scope.row.status"
@@ -73,25 +74,17 @@
                   ></el-switch>
                 </template>
               </el-table-column>
-              <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns.createTime.visible" width="160">
+              <el-table-column label="创建时间" prop="createTime" v-if="columns.createTime.visible" width="160">
                 <template #default="scope">
                   <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="操作" width="210" 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 v-if="scope.row.userId !== 1" link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']"><i class="fa fa-edit"></i>编辑</el-button>
+                  <el-button v-if="scope.row.userId !== 1" link type="danger" @click="handleDelete(scope.row)" v-hasPermi="['system:user:remove']"><i class="fa fa-trash"></i>删除</el-button>
+                  <el-button v-if="scope.row.userId !== 1" link type="warning" @click="handleResetPwd(scope.row)" v-hasPermi="['system:user:resetPwd']"><i class="fa fa-key" />密码</el-button>
+                  <el-button v-if="scope.row.userId !== 1" link type="success" @click="handleAuthRole(scope.row)" v-hasPermi="['system:user:edit']"><i class="fa fa-vcard"></i>角色</el-button>
                 </template>
               </el-table-column>
             </el-table>
@@ -557,3 +550,12 @@ onMounted(() => {
   })
 })
 </script>
+<style scoped>
+.el-form--inline.el-form--label-top .el-form-item {
+  width: 21%;
+}
+
+.el-form--inline.el-form--label-top{
+  justify-content:space-between;
+}
+</style>