8。16

src/views/assets/handle.vue

@@ -567,6 +567,38 @@ export default {
             )
           );
         });
+
+      this.table.unshift( {
+        label: "资产",
+        prop: 'assets',
+        width: 300,
+        align: 'left',
+        customFn: row => {
+          let tags = row.asset_handles_to_assets?.map(i => (
+            <Tag color="success" style="background: rgb(65, 100, 227) !important;">{i.lands?.name || i.house?.name}</Tag>
+          ))
+          return (
+            <div>
+              {
+                tags.slice(0, 1)
+              }
+              <el-popover title="地块名称" width={200}>
+                <el-link slot="reference"
+                         type="primary"
+                         style={{
+                           "word-break": "keep-all",
+                           display: tags.length > 1 ? "inline" : "none",
+                         }}>更多</el-link>
+                <div slot="default">
+                  {
+                    tags
+                  }
+                </div>
+              </el-popover>
+            </div>
+          )
+        }
+      })
       this.table.unshift({
         prop: "id",
         width: 60,

src/views/assets/handleSign.vue

@@ -793,7 +793,8 @@ export default {
           ...item.ORIGINAL_DATA,
           id: item.id,
           xianzhuang: item._zichanshengyumianji == 0 ? 1 : 2,
-          shijimianji: item._zichanshengyumianji
+          shijimianji: item._zichanshengyumianji,
+          fenlei: 1
         })))
         //变更保存日志
         // if (this.type === "change") {

src/views/dataShow/map.vue

@@ -2,7 +2,7 @@
   <div style="width: 100%;height: 100%">
     <div id="map">
     </div>
-    <tooltip ref="tooltip" class="tooltip-table" :info="params" :style="{ left: mapTooltipPos.x + 'px', top: mapTooltipPos.y + 'px' }"></tooltip>
+    <tooltip ref="tooltip" class="tooltip-table" :info="params" :area="areaName" :style="{ left: mapTooltipPos.x + 'px', top: mapTooltipPos.y + 'px' }"></tooltip>
   </div>
 </template>
 
@@ -19,6 +19,7 @@ export default {
   },
   data() {
     return {
+      areaName: "",
       areas: new Map([
         [1,"宜兴市"],
         [2,"惠山区"],
@@ -53,7 +54,7 @@ export default {
           backgroundColor: {
             image: require('@/assets/point.png')
           },
-        }
+        },
       },
       params: [],
       mapTooltip: "",
@@ -72,6 +73,7 @@ export default {
       this.chart.on("click", params => {
         this.mapTooltipPos.x = params.event.offsetX;
         this.mapTooltipPos.y = params.event.offsetY;
+        this.areaName = params.name;
         this.params = params?.data?.originalData;
         this.$refs.tooltip.show()
       })
@@ -101,6 +103,10 @@ export default {
           type: 'map3D', // map、map3D
           map: 'wuxi', // 注册的地图名称
           name: "无锡",
+          // viewControl: {
+          //   alpha: 54,// 倾斜角度
+          //   beta: 20
+          // },
           label: {
             // 标签的相关设置
             show: false, // (地图上的城市名称)是否显示标签 [ default: false ]
@@ -170,7 +176,7 @@ export default {
           data: this.labelData.map(v => {
             v.label = this.label;
             v.emphasis = {
-              label: this.label
+              label: this.label,
             }
             return v
           })

src/views/dataShow/tooltip.vue

@@ -9,6 +9,7 @@
 <script>
 export default {
   props: {
+    area: String,
     info: {
       type: Array,
       default: () => []
@@ -23,6 +24,10 @@ export default {
         {
           key: "name",
           title: "资产名称",
+          minWidth: 180,
+          renderHeader: (h, { row }) => {
+            return h('span', `【${this.area}】资产名称`)
+          },
           render: (h,{ row }) => {
             return h('span',{
               style: {
@@ -46,7 +51,7 @@ export default {
         {
           key: 'show',
           title: '查看',
-          width: 110,
+          width: 100,
           render: (h,{ row }) => {
             return h('Button', {
               style: {
@@ -119,7 +124,7 @@ export default {
 
 <style scoped lang="scss">
 .table {
-  width: 400px;
+  width: 420px;
   border-radius: 20px;
 }
 

src/views/lease/sign.vue

@@ -523,18 +523,39 @@ export default {
                         width: 0,
                         fixed: "left",
                         align: "left",
+                        customFn: row => {
+                          let temp = !!row.land_id;
+                          let findId = row.land_id || row.house_id;
+                          return (
+                            <span>{ temp ? item.land?.find(i => i.id === findId)?.name : item.houses?.find(i => i.id === findId)?.name }</span>
+                          )
+                        }
                       },
                       {
                         prop: "zuoluo",
                         label: "坐落",
                         width: 0,
                         align: "left",
+                        customFn: row => {
+                          let temp = !!row.land_id;
+                          let findId = row.land_id || row.house_id;
+                          return (
+                            <span>{ temp ? item.land?.find(i => i.id === findId)?.zuoluo : item.houses?.find(i => i.id === findId)?.zuoluo }</span>
+                          )
+                        }
                       },
                       {
                         prop: "shijimianji",
                         label: "实际面积（m²）",
                         width: 0,
                         align: "center",
+                        customFn: row => {
+                          let temp = !!row.land_id;
+                          let findId = row.land_id || row.house_id;
+                          return (
+                            <span>{ temp ? item.land?.find(i => i.id === findId)?.shijimianji : item.houses?.find(i => i.id === findId)?.shijimianji }</span>
+                          )
+                        }
                       },
                       {
                         prop: "chuzumianji",