apps/x_admin
1
0
Fork 0
mirror of https://gitee.com/xiangheng/x_admin.git synced 2026-04-22 22:57:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
xh
2025-09-17 03:12:33 +08:00
parent 519946ffc1
commit 068cda72df
6 changed files with 52 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/src/views/setting/permission/admin/edit.vue
+1 -1
View File
@@ -100,7 +100,7 @@
/> />
</el-form-item> </el-form-item>
<el-form-item label="管理员状态" v-if="!isRoot"> <el-form-item label="状态" v-if="!isRoot">
<el-switch v-model="formData.isDisable" :active-value="0" :inactive-value="1" /> <el-switch v-model="formData.isDisable" :active-value="0" :inactive-value="1" />
</el-form-item> </el-form-item>
</el-form> </el-form>
admin/src/views/setting/permission/admin/index.vue
+28 -22
View File
@@ -9,7 +9,7 @@
<el-input v-model="formData.nickname" clearable @keyup.enter="resetPage" /> <el-input v-model="formData.nickname" clearable @keyup.enter="resetPage" />
</el-form-item> </el-form-item>
<el-form-item label="管理员角色" class="w-[280px]"> <el-form-item label="管理员角色" class="w-[280px]">
<el-select v-model="formData.role"> <el-select v-model="formData.role" :empty-values="[null, undefined]">
<el-option label="全部" value="" /> <el-option label="全部" value="" />
<el-option <el-option
v-for="(item, index) in optionsData.role" v-for="(item, index) in optionsData.role"
@@ -56,22 +56,28 @@
导出 导出
</el-button> </el-button>
<div class="mt-4"> <div class="mt-4" style="height: calc(100vh - 360px)">
<el-table :data="pager.lists" size="large"> <vxe-table
<el-table-column label="ID" prop="id" min-width="60" /> :data="pager.lists"
<el-table-column label="头像" min-width="100"> :row-config="{
keyField: 'id'
}"
max-height="100%"
>
<vxe-column title="ID" field="id" min-width="60" />
<vxe-column title="头像" width="80">
<template #default="{ row }"> <template #default="{ row }">
<el-avatar :size="50" :src="row.avatar"></el-avatar> <el-avatar :size="40" :src="row.avatar"></el-avatar>
</template> </template>
</el-table-column> </vxe-column>
<el-table-column label="账号" prop="username" min-width="100" /> <vxe-column title="账号" field="username" min-width="100" />
<el-table-column label="名称" prop="nickname" min-width="100" /> <vxe-column title="名称" field="nickname" min-width="100" />
<el-table-column label="角色" prop="role" min-width="100" /> <vxe-column title="角色" field="role" min-width="100" />
<el-table-column label="部门" prop="dept" min-width="100" /> <vxe-column title="部门" field="dept" min-width="100" />
<el-table-column label="创建时间" prop="createTime" min-width="180" /> <vxe-column title="创建时间" field="createTime" width="150" />
<el-table-column label="最近登录时间" prop="lastLoginTime" min-width="180" /> <vxe-column title="最近登录时间" field="lastLoginTime" width="150" />
<el-table-column label="最近登录IP" prop="lastLoginIp" min-width="120" /> <vxe-column title="最近登录IP" field="lastLoginIp" width="120" />
<el-table-column label="状态" min-width="100"> <vxe-column title="状态" width="80">
<template #default="{ row }"> <template #default="{ row }">
<el-switch <el-switch
v-perms="['admin:system:admin:disable']" v-perms="['admin:system:admin:disable']"
@@ -82,8 +88,8 @@
@change="changeStatus($event, row.id)" @change="changeStatus($event, row.id)"
/> />
</template> </template>
</el-table-column> </vxe-column>
<el-table-column label="操作" width="120" fixed="right"> <vxe-column title="操作" width="120" fixed="right">
<template #default="{ row }"> <template #default="{ row }">
<el-button <el-button
v-perms="['admin:system:admin:edit']" v-perms="['admin:system:admin:edit']"
@@ -103,8 +109,8 @@
删除 删除
</el-button> </el-button>
</template> </template>
</el-table-column> </vxe-column>
</el-table> </vxe-table>
</div> </div>
<div class="flex mt-4 justify-end"> <div class="flex mt-4 justify-end">
<pagination v-model="pager" @change="getLists" /> <pagination v-model="pager" @change="getLists" />
@@ -134,9 +140,9 @@ defineOptions({
const editRef = shallowRef<InstanceType<typeof EditPopup>>() const editRef = shallowRef<InstanceType<typeof EditPopup>>()
// 表单数据 // 表单数据
const formData = reactive<any>({ const formData = reactive<any>({
// username: "", username: '',
// nickname: "", nickname: '',
// role: "", role: ''
}) })
const showEdit = ref(false) const showEdit = ref(false)
const { pager, getLists, resetParams, resetPage } = usePaging({ const { pager, getLists, resetParams, resetPage } = usePaging({
admin/src/views/setting/permission/menu/index.vue
+1 -1
View File
@@ -10,7 +10,7 @@
</el-button> </el-button>
<el-button @click="handleExpand"> 展开/收起 </el-button> <el-button @click="handleExpand"> 展开/收起 </el-button>
</div> </div>
<div style="height: calc(100vh - 200px)"> <div class="mt-4" style="height: calc(100vh - 220px)">
<vxe-table <vxe-table
ref="tableRef" ref="tableRef"
:row-config="rowConfig" :row-config="rowConfig"
admin/src/views/setting/permission/role/auth.vue
+1 -1
View File
@@ -15,7 +15,7 @@
:model="formData" :model="formData"
label-width="60px" label-width="60px"
> >
<el-scrollbar class="h-[400px] sm:h-[600px]"> <el-scrollbar class="h-[400px] sm:h-[500px]">
<el-form-item label="权限" prop="menus"> <el-form-item label="权限" prop="menus">
<div> <div>
<el-checkbox label="展开/折叠" @change="handleExpand" /> <el-checkbox label="展开/折叠" @change="handleExpand" />
admin/src/views/setting/permission/role/index.vue
+20 -18
View File
@@ -10,28 +10,30 @@
</el-button> </el-button>
</div> </div>
<div class="mt-4"> <div class="mt-4">
<div> <div style="height: calc(100vh - 270px)">
<el-table :data="pager.lists" size="large" v-loading="pager.loading"> <vxe-table
<el-table-column prop="id" label="ID" min-width="100" /> :data="pager.lists"
<el-table-column prop="name" label="名称" min-width="150" /> :row-config="{
<el-table-column keyField: 'id'
prop="remark" }"
label="备注" max-height="100%"
min-width="150" v-loading="pager.loading"
show-overflow-tooltip >
/> <vxe-column field="id" title="ID" min-width="60" />
<el-table-column prop="sort" label="排序" min-width="100" /> <vxe-column field="name" title="名称" min-width="150" />
<el-table-column prop="member" label="角色人数" min-width="120" /> <vxe-column field="remark" title="备注" min-width="150" />
<el-table-column label="岗位状态" prop="isDisable" min-width="100"> <vxe-column field="sort" title="排序" min-width="100" />
<vxe-column field="member" title="角色人数" min-width="100" />
<vxe-column title="岗位状态" field="isDisable" min-width="80">
<template #default="{ row }"> <template #default="{ row }">
<el-tag class="ml-2" :type="row.isDisable ? 'danger' : 'primary'"> <el-tag class="ml-2" :type="row.isDisable ? 'danger' : 'primary'">
{{ row.isDisable ? '停用' : '正常' }} {{ row.isDisable ? '停用' : '正常' }}
</el-tag> </el-tag>
</template> </template>
</el-table-column> </vxe-column>
<el-table-column prop="createTime" label="创建时间" min-width="180" /> <vxe-column field="createTime" title="创建时间" width="150" />
<el-table-column label="操作" width="190" fixed="right"> <vxe-column title="操作" width="190" fixed="right">
<template #default="{ row }"> <template #default="{ row }">
<el-button <el-button
v-perms="['admin:system:role:edit']" v-perms="['admin:system:role:edit']"
@@ -58,8 +60,8 @@
删除 删除
</el-button> </el-button>
</template> </template>
</el-table-column> </vxe-column>
</el-table> </vxe-table>
</div> </div>
<div class="flex justify-end mt-4"> <div class="flex justify-end mt-4">
<pagination v-model="pager" @change="getLists" /> <pagination v-model="pager" @change="getLists" />
server/service/systemService/adminService.go
+1 -1
View File
@@ -179,7 +179,7 @@ func (adminSrv systemAuthAdminService) List(page request.PageReq, listReq system
if listReq.Nickname != "" { if listReq.Nickname != "" {
adminModel = adminModel.Where("nickname like ?", "%"+listReq.Nickname+"%") adminModel = adminModel.Where("nickname like ?", "%"+listReq.Nickname+"%")
} }
if listReq.Role >= 0 { if listReq.Role > 0 {
adminModel = adminModel.Where("role = ?", listReq.Role) adminModel = adminModel.Where("role = ?", listReq.Role)
} }
// 总数 // 总数