diff --git a/src/views/system/logger/loginlog.vue b/src/views/system/logger/loginLog.vue similarity index 100% rename from src/views/system/logger/loginlog.vue rename to src/views/system/logger/loginLog.vue diff --git a/src/views/system/logger/operlog.vue b/src/views/system/logger/operLog.vue similarity index 100% rename from src/views/system/logger/operlog.vue rename to src/views/system/logger/operLog.vue diff --git a/src/views/system/tenant/columns.ts b/src/views/system/tenant/columns.ts index 76c788a..b4d8abc 100644 --- a/src/views/system/tenant/columns.ts +++ b/src/views/system/tenant/columns.ts @@ -19,13 +19,26 @@ export const columns = [ label: '租户编码', prop: 'code', }, + { + label: '租户图片', + prop: 'image', + render(record) { + return h(ElAvatar, { + size: 48, + src: record.row.image, + shape: 'square', + fit: 'fill', + }); + }, + width: 100, + }, { label: '统一社会信用代码', prop: 'license', width: 160, }, { - label: '用户限额', + label: '租户限额', prop: 'number', }, { diff --git a/src/views/system/tenant/edit.vue b/src/views/system/tenant/edit.vue index e486cb5..8562de0 100644 --- a/src/views/system/tenant/edit.vue +++ b/src/views/system/tenant/edit.vue @@ -2,6 +2,21 @@ +
+ + + + + +
@@ -92,6 +107,7 @@ import { getRoleAllList } from '@/api/system/role'; import { getDeptList } from '@/api/system/dept'; import { getLevelAllList } from '@/api/system/level'; import { getPositionAllList } from '@/api/system/position'; +import UploadImg from "@/components/Upload/Image.vue"; import {buildTree } from "@/utils/auth"; import { FormInstance } from "element-plus"; @@ -115,6 +131,7 @@ const formData = reactive({ id: 0, code:'', name: '', + image:'', license: "", contactUser: "", contactMobile: '', diff --git a/src/views/system/user/columns.ts b/src/views/system/user/columns.ts index cb61e83..ca88cf2 100644 --- a/src/views/system/user/columns.ts +++ b/src/views/system/user/columns.ts @@ -13,12 +13,12 @@ export const columns = [ { label: '登录账号', prop: 'username', - width: 100, + width: 150, }, { label: '用户姓名', prop: 'realname', - width: 100, + width: 150, }, { label: '头像',