From 8f0adc13ec98481a8c96a9352c67bd798144d2c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Mon, 1 Jul 2024 10:09:03 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/business/tenant/index.vue | 22 +++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/ruoyi-ui/src/views/business/tenant/index.vue b/ruoyi-ui/src/views/business/tenant/index.vue
index 407366c..7f34c20 100644
--- a/ruoyi-ui/src/views/business/tenant/index.vue
+++ b/ruoyi-ui/src/views/business/tenant/index.vue
@@ -219,9 +219,14 @@
               <el-input v-model="form.contactAddress" placeholder="请输入联系人地址"/>
             </el-form-item>
           </el-col>
+          <el-col span="12">
+            <el-form-item label="首页标题" prop="tenantBoardTopic">
+              <el-input v-model="form.tenantBoardTopic" placeholder="请输入首页标题"/>
+            </el-form-item>
+          </el-col>
           <el-col span="12">
             <el-form-item label="监控平台显示" prop="contactAddress">
-              <el-select v-model="form.tenantField" placeholder="请选择">
+              <el-select v-model="form.tenantField" placeholder="请选择" clearable>
                 <el-option
                   label="图片"
                   value="1">
@@ -242,7 +247,8 @@
             <el-form-item label="首页图片" prop="tenantBoardPic">
               <el-upload
                 class="avatar-uploader"
-                action="https://jsonplaceholder.typicode.com/posts/"
+                :action="uploadImgUrl"
+                :headers="headers"
                 :show-file-list="false"
                 :on-success="handleAvatarSuccess"
                 :before-upload="beforeAvatarUpload">
@@ -269,11 +275,16 @@
 <script>
 import {addTenant, delTenant, getTenant, listTenant, updateTenant} from "@/api/business/tenant";
 
+import {getToken} from "@/utils/auth";
 export default {
   name: "Tenant",
   dicts: ['hw_tenant_industry', 'hw_tenant_type'],
   data() {
     return {
+      uploadImgUrl: process.env.VUE_APP_BASE_API + "/file/upload", // 上传的图片服务器地址
+      headers: {
+        Authorization: "Bearer " + getToken(),
+      },
       // 遮罩层
       loading: true,
       // 选中数组
@@ -464,19 +475,20 @@ export default {
       this.industryVisible = tenantType === this.TENANT_TYPE_ENTERPRISE;
     },
     handleAvatarSuccess(res, file) {
-      this.form.tenantBoardPic = URL.createObjectURL(file.raw);
+      this.form.tenantBoardPic = res.data.url;
     },
     beforeAvatarUpload(file) {
       const isJPG = file.type === 'image/jpeg';
+      const isJPG1 = file.type === 'image/png';
       const isLt2M = file.size / 1024 / 1024 < 2;
 
-      if (!isJPG) {
+      if (!(isJPG || isJPG1)) {
         this.$message.error('上传头像图片只能是 JPG 格式!');
       }
       if (!isLt2M) {
         this.$message.error('上传头像图片大小不能超过 2MB!');
       }
-      return isJPG && isLt2M;
+      return (isJPG || isJPG1) && isLt2M;
     }
   }
 };