From ea1a697131b2dc41d2e6bd41bc8aac1dfe32cfe4 Mon Sep 17 00:00:00 2001
From: liqi <1174845810@qq.com>
Date: Sun, 13 Apr 2025 19:49:54 +0800
Subject: [PATCH] 1

---
 src/assets/css/index.scss                    |  1 -
 src/views/contentData/RightSidebar/index.vue | 28 ++++++++++++++++++--
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/assets/css/index.scss b/src/assets/css/index.scss
index 6b44e89..f36d871 100644
--- a/src/assets/css/index.scss
+++ b/src/assets/css/index.scss
@@ -357,7 +357,6 @@ body {
       padding: 0 40px;
       .device-status {
         width: 95%;
-        height: 40%;
         margin-left: 10%;
         margin-top: 15%;
         display: flex;
diff --git a/src/views/contentData/RightSidebar/index.vue b/src/views/contentData/RightSidebar/index.vue
index 35c69ad..e9828ab 100644
--- a/src/views/contentData/RightSidebar/index.vue
+++ b/src/views/contentData/RightSidebar/index.vue
@@ -30,7 +30,7 @@
           @click="handleTitleClick(true, 'all')"
         />
       </div>
-      <ul>
+      <ul :style="ulStyle">
         <li
           v-for="(item, index) in positionData"
           :key="index"
@@ -73,10 +73,34 @@ export default {
       deviceStatus: [],
       positionData: [],
       isContracted: false,
-      lastPositionsHash: null // 初始化为 null，避免首次误判
+      lastPositionsHash: null, // 初始化为 null，避免首次误判
+      deviceStatusHeight: 0
     };
   },
+  computed: {
+    ulStyle() {
+      const totalHeight = 829; // 总高度
+      const titleHeight = 50; // 调整为实际标题高度
+      const contractHeight = 80; // 调整为实际按钮高度
+      const marginTop = 0; // 移除额外间距
+      const availableHeight =
+        totalHeight -
+        this.deviceStatusHeight -
+        titleHeight -
+        contractHeight -
+        marginTop;
+      return {
+        height: `${availableHeight}px`,
+        overflowY: "auto",
+        marginTop: "0px" // 确保无间距
+      };
+    }
+  },
   watch: {
+    deviceStatus(newVal) {
+      const rows = Math.ceil(newVal.length / 3);
+      this.deviceStatusHeight = rows * 136;
+    },
     "homeData.positions": {
       handler(newPositions) {
         newPositions = newPositions || [];