diff --git a/src/views/dataShow/leftBottom.vue b/src/views/dataShow/leftBottom.vue index e7cbf95..bdc9cfa 100644 --- a/src/views/dataShow/leftBottom.vue +++ b/src/views/dataShow/leftBottom.vue @@ -50,15 +50,15 @@ export default { { text: "土地资产", num: 99966, - unit: "亩", + unit: "平方米", tag: "land", icon: "tudi" }, { - text: "房屋资产", + text: "汇总数据", num: 8888, - unit: "平方", - tag: "house", + unit: "", + tag: "static", icon: "fangwu" } ] @@ -78,9 +78,8 @@ export default { case "land": total += lands.reduce((a,b) => a + parseFloat(b.dengjimianji ?? 0),0) return total.toFixed(2); - case "house": - total += houses.reduce((a,b) => a + parseFloat(b.dengjimianji ?? 0),0) - return total.toFixed(2); + case "static": + return `土地 ${lands.length}处,房产 ${houses.length}处`; default: return total.toFixed(2); } diff --git a/src/views/lease/plan.vue b/src/views/lease/plan.vue index 71e7037..6a9194b 100644 --- a/src/views/lease/plan.vue +++ b/src/views/lease/plan.vue @@ -589,26 +589,26 @@ export default { let tags = [ ...row?.land?.map((i) => ( - {i.name} + {i.name} ) ), ...row?.houses?.map((i) => ( - {i.name} + {i.name} ) ), ] return (
{ - tags.slice(0, 2) + tags.slice(0, 1) } 2 ? "inline" : "none", + display: tags.length > 1 ? "inline" : "none", }}>更多
{