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

All v4 fjc

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

src/types/scene-layout/type.ts

@@ -5,6 +5,7 @@ export interface CompanyInfoList {
 export interface LayoutInfoList extends CompanyInfoList {
   layout: string;
   imgUrl: string;
+  shopList: string;
 }
 
 export interface CompanyLayoutInfoList {

src/views/page-config/component/BasicLayoutList.vue

@@ -15,7 +15,12 @@
         <el-card v-for="layout in layoutList" :key="layout.id" shadow="hover" class="layout-cards">
           <div class="layout-card" @click="handleClickCompany(layout.id, layout.name)">
             <div v-if="layout.layout">
-              <MapContainerSmall ref="mapContainerRef" :bg-image-url="layout.layout" class="content-pic" />
+              <MapContainerSmall
+                ref="mapContainerRef"
+                :bg-image-url="layout.layout"
+                :show-shops="layout.shopList"
+                class="content-pic"
+              />
             </div>
 
             <div v-else>
@@ -26,8 +31,8 @@
           <template #footer>
             <span class="footer--default">{{ layout.name }}</span>
             <div class="icons">
-              <el-image v-if="layout.layout" :src="preview" :preview-src-list="[layout.layout]" hide-on-click-modal
-                fit="cover" />
+              <!-- <el-image v-if="layout.layout" :src="preview" :preview-src-list="[layout.layout]" hide-on-click-modal
+                fit="cover" /> -->
 
               <img :src="edit" @click="handleClickCompany(layout.id, layout.name)" />
             </div>
@@ -127,7 +132,11 @@ const getLayoutInfoImg = (layoutType: LayoutConfigType.scene | LayoutConfigType.
           } catch {
             img = ''
           }
-          layoutList.value.find((company) => company.id === companyWithLayout.targetId)!.layout = img
+          const curCompany = layoutList.value.find(
+            (company) => company.id === companyWithLayout.targetId,
+          );
+          curCompany!.layout = img;
+          curCompany!.shopList = JSON.parse(companyWithLayout.layout).shopList;
         });
       });
       break;

src/views/system/tenant/tenant.vue

@@ -28,8 +28,8 @@
       </el-button>
 
       <el-table :data="tenantTable" class="tenant-info-table" row-key="id" default-expand-all>
-        <el-table-column prop="tenantCode" align="center" label="租户编码" />
         <el-table-column prop="tenantName" align="center" width="200" label="租户名称" />
+        <el-table-column prop="tenantCode" align="center" label="租户编码" />
         <el-table-column align="center" width="100" label="状态">
           <template #default="scope">
             <div class="">
@@ -42,7 +42,11 @@
         <el-table-column align="center" label="操作">
           <template #default="scope">
             <div class="operations">
-              <el-button type="primary" @click="openAddTenantDrawer('add', scope.row)">
+              <el-button
+                v-if="scope.row.parentId === 0 || scope.row.parentId === null"
+                type="primary"
+                @click="openAddTenantDrawer('add', scope.row)"
+              >
                 添加下一级
               </el-button>
               <el-button type="primary" @click="openAddTenantDrawer('edit', scope.row)">