Merge branch 'all-v4-fjc' into 'all-v4'

All v4 fjc

See merge request skyeye/skyeye_frontend/skyeye-admin!265

src/views/page-config/ConfigEdit.vue

@@ -206,6 +206,10 @@
   /** ------------- */
 
   const handleAvatarSuccess = (e) => {
+    if (e.code !== 200) {
+      ElMessage.error(e.data);
+      return;
+    }
     bgImg.value = e.data;
     hasBg.value = true;
     addBg();

src/views/system/tenant/tenant.vue

@@ -29,28 +29,34 @@
 
       <el-table :data="tenantTable" class="tenant-info-table" row-key="id" default-expand-all>
         <el-table-column prop="tenantName" label="租户名称" />
-        <el-table-column prop="tenantCode" label="租户编码" />
-        <el-table-column label="状态">
+        <el-table-column prop="tenantCode" label="租户编码" align="center" />
+        <el-table-column label="状态" align="center">
           <template #default="scope">
-            <div class="">
+            <!-- <div class="">
               {{ TENANT_STATUS_LABEL[scope.row.isDisabled] }}
-            </div>
+            </div> -->
+
+            <el-tag v-if="scope.row.isDisabled === 0" type="success">启用</el-tag>
+            <el-tag v-else type="danger">禁用</el-tag>
           </template>
         </el-table-column>
-        <el-table-column prop="startTime" label="生效时间" />
-        <el-table-column prop="endTime" label="失效时间" />
+        <el-table-column prop="startTime" label="生效时间" align="center" />
+        <el-table-column prop="endTime" label="失效时间" align="center" />
         <el-table-column align="center" width="200" label="操作">
           <template #default="scope">
             <div class="operations">
               <div
-                v-if="scope.row.parentId === 0 || scope.row.parentId === null"
+                v-if="scope.row.parentId === -1 || scope.row.parentId === null"
                 class="add-next-level"
                 @click="openAddTenantDrawer('add', scope.row)"
               >
                 添加下一级
               </div>
 
-              <div v-if="scope.row.parentId === 0 || scope.row.parentId === null" class="separator">
+              <div
+                v-if="scope.row.parentId === -1 || scope.row.parentId === null"
+                class="separator"
+              >
                 |
               </div>
 
@@ -83,7 +89,7 @@
 
 <script lang="ts" setup>
   import { reactive, ref, onMounted } from 'vue';
-  import { ElInput, ElButton, ElIcon, ElTable, ElTableColumn } from 'element-plus';
+  import { ElInput, ElButton, ElIcon, ElTable, ElTableColumn, ElTag } from 'element-plus';
   import { ElMessageBox, ElMessage } from 'element-plus';
   import { FileAddOutlined, SearchOutlined } from '@vicons/antd';
   import {
@@ -156,7 +162,7 @@
     }
     // 添加父租户
     else {
-      tenantForm.parentId = 0; //0表示顶层父租户
+      tenantForm.parentId = -1; //-1表示顶层父租户
       tenantForm.parentName = '顶级租户';
     }
   }