From fb6cce17e5b67a7b688cbd129ecdd5cc0e8140af Mon Sep 17 00:00:00 2001
From: zjl <xx@163.com>
Date: Mon, 2 Sep 2024 18:47:04 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=A7=9F=E6=88=B7?=
 =?UTF-8?q?=E5=A4=B4=E5=83=8F=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/tenant/columns.ts | 15 ++++++++++++++-
 src/views/system/tenant/edit.vue   | 17 +++++++++++++++++
 src/views/system/user/columns.ts   |  4 ++--
 3 files changed, 33 insertions(+), 3 deletions(-)

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 @@
   <el-dialog v-model="props.visible" :title="props.tenantId ? '编辑' : '新增'" width="800" :close-on-click-modal="false"
     :before-close="dialogClose">
     <el-form ref="formRef" :model="formData" label-width="140px">
+      <div class="flex">
+        <el-form-item
+            label="租户图片"
+            prop="image"
+            :rules="{ required: true,message: '请上传租户图片', trigger: 'change' }"
+        >
+            <UploadImg @changeFileName="(name)=>formData.imageImgName=name"
+                       :fileType=" ['image/jpeg', 'image/png', 'image/jpg', 'image/gif']"
+                       name="tenant"
+                       :fileSize="200"
+                       v-model:image-url="formData.image">
+              <template v-slot:tip>支持扩展名: jpg png jpeg;文件大小不超过200M</template>
+            </UploadImg>
+        </el-form-item>
+      </div>
       <div class="flex">
         <el-form-item label="名称" prop="name" class="flex-1"
           :rules="{ required: true, message: '请输入名称', trigger: 'blur' }">
@@ -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: '头像',

From f20d117f32594b68fa9fddbcc1bd1512db1ed5a9 Mon Sep 17 00:00:00 2001
From: zjl <zjl@163.com>
Date: Mon, 2 Sep 2024 22:33:53 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/logger/{loginlog.vue => loginLog2.vue} | 0
 src/views/system/logger/{operlog.vue => operLog2.vue}   | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename src/views/system/logger/{loginlog.vue => loginLog2.vue} (100%)
 rename src/views/system/logger/{operlog.vue => operLog2.vue} (100%)

diff --git a/src/views/system/logger/loginlog.vue b/src/views/system/logger/loginLog2.vue
similarity index 100%
rename from src/views/system/logger/loginlog.vue
rename to src/views/system/logger/loginLog2.vue
diff --git a/src/views/system/logger/operlog.vue b/src/views/system/logger/operLog2.vue
similarity index 100%
rename from src/views/system/logger/operlog.vue
rename to src/views/system/logger/operLog2.vue

From 47dd9672af9330a4ec3569d8fc7f0226f11ba218 Mon Sep 17 00:00:00 2001
From: zjl <zjl@163.com>
Date: Mon, 2 Sep 2024 22:34:19 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/logger/{loginLog2.vue => loginLog.vue} | 0
 src/views/system/logger/{operLog2.vue => operLog.vue}   | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename src/views/system/logger/{loginLog2.vue => loginLog.vue} (100%)
 rename src/views/system/logger/{operLog2.vue => operLog.vue} (100%)

diff --git a/src/views/system/logger/loginLog2.vue b/src/views/system/logger/loginLog.vue
similarity index 100%
rename from src/views/system/logger/loginLog2.vue
rename to src/views/system/logger/loginLog.vue
diff --git a/src/views/system/logger/operLog2.vue b/src/views/system/logger/operLog.vue
similarity index 100%
rename from src/views/system/logger/operLog2.vue
rename to src/views/system/logger/operLog.vue