diff --git a/src/views/assets/handle.vue b/src/views/assets/handle.vue index 7bf3124..1d79a59 100644 --- a/src/views/assets/handle.vue +++ b/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 => ( + {i.lands?.name || i.house?.name} + )) + return ( +
+ { + tags.slice(0, 1) + } + + 1 ? "inline" : "none", + }}>更多 +
+ { + tags + } +
+
+
+ ) + } + }) this.table.unshift({ prop: "id", width: 60, diff --git a/src/views/assets/handleSign.vue b/src/views/assets/handleSign.vue index 215eed3..875b70f 100644 --- a/src/views/assets/handleSign.vue +++ b/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") { diff --git a/src/views/dataShow/map.vue b/src/views/dataShow/map.vue index 6002336..5e726d3 100644 --- a/src/views/dataShow/map.vue +++ b/src/views/dataShow/map.vue @@ -2,7 +2,7 @@
- +
@@ -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 }) diff --git a/src/views/dataShow/tooltip.vue b/src/views/dataShow/tooltip.vue index d718347..2dbbddb 100644 --- a/src/views/dataShow/tooltip.vue +++ b/src/views/dataShow/tooltip.vue @@ -9,6 +9,7 @@