From 9423a2f0a2f4ede81c3470a27a654447b954143f Mon Sep 17 00:00:00 2001
From: zhujiyan <17812234322@163.com>
Date: Tue, 15 Oct 2024 19:39:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=95=B0=E6=8D=AE=E5=86=BB?=
 =?UTF-8?q?=E7=BB=93=E5=9B=BE=E8=A1=A8=E6=BB=9A=E5=8A=A8=EF=BC=8C=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E8=A1=A8=E6=A0=BC=E5=8C=BA=E5=9F=9F=E6=BB=9A=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../govern/device/control/tabs/realtime.vue   | 82 ++-----------------
 1 file changed, 6 insertions(+), 76 deletions(-)

diff --git a/src/views/govern/device/control/tabs/realtime.vue b/src/views/govern/device/control/tabs/realtime.vue
index 63641c8..d9500fb 100644
--- a/src/views/govern/device/control/tabs/realtime.vue
+++ b/src/views/govern/device/control/tabs/realtime.vue
@@ -21,80 +21,6 @@
                 <div class="right_charts"><MyEchart ref="pieChart6" :options="echartsDataA3"></MyEchart></div>
             </div>
         </div>
-        <div class="view_bot" style="display: none">
-            <div class="view_bot_tables">
-                <!-- 表格数据 -->
-                <div v-if="tableData.length != 0">
-                    <!-- div设计table -->
-                    <div class="table_container">
-                        <div class="table" v-for="(item, index) in columnsDataTop" :key="index">
-                            <div class="table_info">
-                                <!-- 单层表头 -->
-                                <div class="thead">
-                                    <div class="thead_top">
-                                        {{ item[0].showName ? item[0].showName : '' }}({{ item[0].unit }})
-                                    </div>
-                                    <div class="thead_bot">
-                                        <div class="thead_bot_cell" v-for="(vv, key) in item" :key="key">
-                                            {{ vv.phase == 'M' ? '' : vv.phase + '相 ' }}
-                                        </div>
-                                    </div>
-                                </div>
-                                <!-- 有合并表头的数据 -->
-                                <div class="tbody">
-                                    <div class="tbody_cell" v-for="(vv, key) in item" :key="key">
-                                        {{
-                                            tableData.find(item => {
-                                                return item.anotherName == vv.showName && item.phase == vv.phase
-                                            })?.statisticalData
-                                                ? tableData.find(item => {
-                                                      return item.anotherName == vv.showName && item.phase == vv.phase
-                                                  })?.statisticalData
-                                                : '/'
-                                        }}
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-
-                    <div class="table_container">
-                        <div class="table" v-for="(item, index) in columnsDataBot" :key="index">
-                            <div class="table_info">
-                                <!-- 单层表头 -->
-                                <div class="thead">
-                                    <div class="thead_top">
-                                        {{ item[0].showName ? item[0].showName : '' }}({{ item[0].unit }})
-                                    </div>
-                                    <div class="thead_bot">
-                                        <div class="thead_bot_cell" v-for="(vv, key) in item" :key="key">
-                                            {{ vv.phase == 'M' ? '' : vv.phase + '相 ' }}
-                                        </div>
-                                    </div>
-                                </div>
-                                <!-- 有合并表头的数据 -->
-                                <div class="tbody">
-                                    <div class="tbody_cell" v-for="(vv, key) in item" :key="key">
-                                        {{
-                                            tableData.find((item: any) => {
-                                                return item.anotherName == vv.showName && item.phase == vv.phase
-                                            })?.statisticalData
-                                                ? tableData.find((item: any) => {
-                                                      return item.anotherName == vv.showName && item.phase == vv.phase
-                                                  })?.statisticalData
-                                                : '/'
-                                        }}
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div v-else style="border: 1px solid #eee">
-                    <el-empty description="暂无数据" />
-                </div>
-            </div>
-        </div>
         <div class="view_bot">
             <vxe-table
                 border
@@ -663,9 +589,9 @@ onMounted(() => {
 .view {
     width: 100%;
     height: 100%;
-    padding-bottom: 200px;
     box-sizing: border-box;
-    overflow: auto;
+    display: flex;
+    flex-direction: column;
     .view_top {
         width: 100%;
         height: auto;
@@ -718,6 +644,10 @@ onMounted(() => {
     .view_bot {
         min-height: 300px;
         margin: 10px 0 20px 0;
+        overflow: auto !important;
+        flex: 1 !important;
+        padding-bottom: 200px !important;
+        box-sizing: border-box !important;
         .view_bot_tables {
             margin-bottom: 10px;
             height: auto;