From 01f2b0503dd82ba5cf6edb4f5ccd833e21eebff7 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Fri, 11 Apr 2025 15:26:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/Home/HomeLeft/OverviewNext.vue | 4 +++-
src/views/Home/useMapAggregation/useMapAggregation.js | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/views/Home/HomeLeft/OverviewNext.vue b/src/views/Home/HomeLeft/OverviewNext.vue
index 9c40d6c..51da4f8 100644
--- a/src/views/Home/HomeLeft/OverviewNext.vue
+++ b/src/views/Home/HomeLeft/OverviewNext.vue
@@ -26,7 +26,7 @@
@mouseout="changeIndexBack(index)"
>
<div class="name">
- <img class="imageicon" src="/src/assets/images/home/homeLeft/overviewnext-way.png" alt="" />
+ <img class="imageicon" :src="overviewnextWay" alt="" />
<!-- <img class="yjzx-img" width="10" height="10" src="@/assets/images/home/homeLeft/table-zx.png" alt="" /> -->
<img width="13" height="15" src="../../../assets/images/home/homeLeft/table-icon.png" alt="" />
{{ item.nickname }}
@@ -56,6 +56,8 @@
import { selectDevicePage } from '@/api/home/machineNest.js'
import { useStore } from 'vuex'
+import overviewnextWay from '@/assets/images/home/homeLeft/overviewnext-way.png'
+
const store = useStore()
const isMore = ref(true)
diff --git a/src/views/Home/useMapAggregation/useMapAggregation.js b/src/views/Home/useMapAggregation/useMapAggregation.js
index 53ccd4a..5c01a11 100644
--- a/src/views/Home/useMapAggregation/useMapAggregation.js
+++ b/src/views/Home/useMapAggregation/useMapAggregation.js
@@ -359,7 +359,9 @@
alphaPower: 1.3
})
- entity.polygon.extrudedHeight = (entity.properties.childrenNum._value || 1) * 500
+ const randomInt = Math.floor(Math.random() * 5) + 1
+
+ entity.polygon.extrudedHeight = (entity.properties.childrenNum._value || randomInt) * 500
entity.polygon.material = material
entity.polygon.outline = false // 显示边框
--
Gitblit v1.9.3