样式

src/views/dashboard/index.vue

@@ -2,7 +2,9 @@
   <div style="padding: 20px;">
     <el-row :gutter="20">
       <el-col :span="24">
-        <Card style="margin-bottom: 20px" :padding="20">
+        <Card style="margin-bottom: 20px">
+          <el-row :gutter="20">
+            <el-col :span="12">
               <div class="card-title">
                 <div class="title-icon">
                   <i class="el-icon-s-claim"></i>
@@ -58,7 +60,9 @@
                   ></Page>
                 </div>
               </div>
-          <div class="card-title" style="margin-top: 20px;">
+            </el-col>
+            <el-col :span="12">
+              <div class="card-title">
                 <div class="title-icon">
                   <i class="el-icon-s-claim"></i>
                 </div>
@@ -103,6 +107,8 @@
                   ></Page>
                 </div>
               </div>
+            </el-col>
+          </el-row>
         </Card>
       </el-col>
 

src/views/lease/component/imports.vue

@@ -174,7 +174,7 @@ export default {
         const workbook = XLSX.read(data, { type: 'array', cellDates: true, defval: "" });
 
         const worksheet = workbook.Sheets[workbook.SheetNames[0]];
-        const merges = Array.from(new Set(worksheet['!merges'].map(i => JSON.stringify({ rs: i.s.r-2 , re: i.e.r-2 })))).map(JSON.parse)
+        const merges = Array.from(new Set(worksheet['!merges']?.map(i => JSON.stringify({ rs: i.s.r-2 , re: i.e.r-2 })))).map(JSON.parse)
         const jsonData = XLSX.utils.sheet_to_json(worksheet, { header: 1, defval: "" });
         const headers = jsonData.splice(0, 1)[0]
         const list = jsonData.slice(1)

src/views/lease/index.vue

@@ -666,12 +666,12 @@ export default {
       this.table.unshift( {
         label: "资产",
         prop: 'assets',
-        width: 300,
+        width: 320,
         align: 'left',
         customFn: row => {
           let tags = row.id_leases_to_assets_lease_id_relation?.slice(0,1)?.map(i => {
             let asset = i.house_id ? row.houses.find(j => j.id === i.house_id) : row.land.find(j => j.id === i.land_id)
-            return (<Tag color="success" style="background: rgb(65, 100, 227) !important;">{(i.land_id ? '【土地】' : '【房产】')+(asset?.name || i.name || " ")}</Tag>)
+            return (<Tag color="success" style="background: rgb(65, 100, 227) !important;">{(i.land_id ? '【土地】' : '【房产】')+(asset?.name || i.name || " ")}-{ i.xiangxiweizhi }</Tag>)
 
           })
           return (
@@ -679,10 +679,12 @@ export default {
               {
                 tags.slice(0, 1)
               }
+              <br></br>
               <el-popover title="资产" width={600}>
                 <el-link slot="reference"
                          type="primary"
                          style={{
+                           "font-size": "13px",
                            "word-break": "keep-all",
                            display: tags.length > 0 ? "inline" : "none",
                          }}>更多</el-link>