From 14db9af5ba9954267d659651c28a626d748b5a52 Mon Sep 17 00:00:00 2001
From: z_yu <1534695664@qq.com>
Date: Fri, 29 Jul 2022 10:33:45 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=B7=B3=E8=BD=AC=20?=
 =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E9=AB=98=E5=BA=A6=E8=87=AA=E9=80=82=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home.vue                          | 18 ++++++++++++------
 src/views/storeManage/warehouse3D/index.vue |  3 +++
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/views/home.vue b/src/views/home.vue
index 6454b2d..f673624 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -59,7 +59,7 @@
           </div>
         </el-col>
       </el-row>
-      <el-row :gutter="20" style="margin-bottom:20px;height:276px;">
+      <el-row :gutter="20" style="margin-bottom:20px;height: calc(50vh - 231px);">
         <el-col :xs="24" :sm="24" :lg="8">
           <!-- 待办事项 -->
           <div class="container-wrap">
@@ -136,7 +136,7 @@
           </div>
         </el-col>
       </el-row>
-      <el-row :gutter="20" style="height:302px;">
+      <el-row :gutter="20" style="height: calc(50vh - 231px);">
         <el-col :xs="24" :sm="24" :lg="8">
           <!-- 档案借阅 -->
           <div class="container-wrap">
@@ -242,8 +242,13 @@ export default {
     getData() {
       this.tableData = data1.rows
     },
-    changeActiveTab() {
-      this.$router.push({ path: '/storeManage/warehouse3D' })
+    changeActiveTab(id) {
+      this.$router.push({
+        name: 'warehouse3D',
+        params: {
+          roomId: id
+        }
+      })
     }
   }
 }
@@ -264,9 +269,10 @@ export default {
   // }
 
   .chart-wrapper {
+    height: calc(100% - 40px);
     // background: #fff;
-    padding: 16px 16px 0;
-    margin-bottom: 32px;
+    // padding: 16px 16px 0;
+    // margin-bottom: 32px;
   }
 }
 @media (max-width: 1024px) {
diff --git a/src/views/storeManage/warehouse3D/index.vue b/src/views/storeManage/warehouse3D/index.vue
index a020a77..d44bcd0 100644
--- a/src/views/storeManage/warehouse3D/index.vue
+++ b/src/views/storeManage/warehouse3D/index.vue
@@ -66,6 +66,9 @@ export default {
   created() {
     console.log(1111)
     this.initWebSocket()
+    if (this.$route.params.roomId) {
+      this.activeIndex = this.$route.params.roomId
+    }
   },
   methods: {
     handleMessageEvent(event) {