From fabab0a577d68fa9a4d771517db90eb1853d635e Mon Sep 17 00:00:00 2001
From: fengerli <528575642@qq.com>
Date: Sat, 11 Oct 2025 10:47:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A7=E5=88=B6=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=BF=EF=BC=8C=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/controlCenter/controlPanel/components/map.vue | 2 +-
 src/views/controlCenter/controlPanel/index.vue          | 6 +++---
 src/views/controlCenter/delivery/index.vue              | 6 +++---
 src/views/controlCenter/historyjectory/index.vue        | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/controlCenter/controlPanel/components/map.vue b/src/views/controlCenter/controlPanel/components/map.vue
index cd4bd9e..b96a2a6 100644
--- a/src/views/controlCenter/controlPanel/components/map.vue
+++ b/src/views/controlCenter/controlPanel/components/map.vue
@@ -222,7 +222,7 @@ onUnmounted(() => {
 }
 
 .amap-container {
-  height: calc(100vh - 22vh);
+  height: calc(100vh - 25vh);
   border-radius: 4px;
   overflow: hidden;
   width: 100%;
diff --git a/src/views/controlCenter/controlPanel/index.vue b/src/views/controlCenter/controlPanel/index.vue
index ed6e08b..9345e2e 100644
--- a/src/views/controlCenter/controlPanel/index.vue
+++ b/src/views/controlCenter/controlPanel/index.vue
@@ -82,7 +82,7 @@
         </transition>
         <el-card class="Maplist">
           <div v-if="isListView" key="list">
-            <el-table v-loading="loading" border :data="deviceList" @selection-change="handleSelectionChange">
+            <el-table v-loading="loading" border :data="deviceList" @selection-change="handleSelectionChange"  height="calc(100vh - 310px)">
               <el-table-column type="selection" width="50" align="center" :selectable="isSelectable" />
               <el-table-column label="设备名称" align="center" prop="deviceName" />
               <el-table-column label="设备图片" align="center" prop="devicePic">
@@ -575,7 +575,7 @@ const forceAlarm = async () => {
 }
 
 .Maplist {
- height: calc(100vh - 24vh);
-  overflow: auto;
+ //height: calc(100vh - 24vh);
+  //overflow: auto;
 }
 </style>
diff --git a/src/views/controlCenter/delivery/index.vue b/src/views/controlCenter/delivery/index.vue
index c9766e4..ff2d693 100644
--- a/src/views/controlCenter/delivery/index.vue
+++ b/src/views/controlCenter/delivery/index.vue
@@ -58,7 +58,7 @@
         </transition>
         <el-card class="Maplist">
           <div>
-            <el-table v-loading="loading" border :data="deviceList" @selection-change="handleSelectionChange">
+            <el-table v-loading="loading" border :data="deviceList" @selection-change="handleSelectionChange" height="calc(100vh - 400px)">
               <el-table-column type="selection" width="50" align="center" />
               <el-table-column label="设备名称" align="center" prop="deviceName" />
               <el-table-column label="设备型号" align="center" prop="deviceType" />
@@ -299,7 +299,7 @@ height: calc(100vh - 8vh);
 }
 
 .Maplist {
-  height: calc(100vh - 24vh);
-  overflow: auto;
+ height: calc(100vh - 24vh);
+ // overflow: auto;
 }
 </style>
diff --git a/src/views/controlCenter/historyjectory/index.vue b/src/views/controlCenter/historyjectory/index.vue
index 33b3267..5a95423 100644
--- a/src/views/controlCenter/historyjectory/index.vue
+++ b/src/views/controlCenter/historyjectory/index.vue
@@ -58,7 +58,7 @@
         </transition>
         <el-card class="Maplist">
           <div>
-            <el-table v-loading="loading" border :data="deviceList" @selection-change="handleSelectionChange">
+            <el-table v-loading="loading" border :data="deviceList" @selection-change="handleSelectionChange" height="calc(100vh - 400px)">
               <el-table-column type="selection" width="50" align="center" />
               <el-table-column label="设备名称" align="center" prop="deviceName" />
               <el-table-column label="设备型号" align="center" prop="deviceType" />
@@ -308,6 +308,6 @@ height: calc(100vh - 8vh);
 
 .Maplist {
  height: calc(100vh - 24vh);
-  overflow: auto;
+  // overflow: auto;
 }
 </style>