From 0a5bef14077747808bfc4515f7f9cc995b10e25d Mon Sep 17 00:00:00 2001
From: zhujiyan <17812234322@163.com>
Date: Tue, 27 Aug 2024 18:46:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/home/components/table.vue |   6 +-
 frontend/src/views/home/tabs/dashboard.vue   | 136 ++++++++++---------
 2 files changed, 72 insertions(+), 70 deletions(-)

diff --git a/frontend/src/views/home/components/table.vue b/frontend/src/views/home/components/table.vue
index eb85c3f..21e27b2 100644
--- a/frontend/src/views/home/components/table.vue
+++ b/frontend/src/views/home/components/table.vue
@@ -50,7 +50,7 @@ import {
   CirclePlus,
   Delete,
   EditPen,
-  Download, 
+  Download,
   Upload,
   View,
   Refresh,
@@ -61,8 +61,8 @@ const router = useRouter();
 const value1 = ref("");
 const value2 = ref("");
 const tableHeight = ref(0);
-console.log(window.innerHeight,"+++++++++");
-tableHeight.value = window.innerHeight-700;
+console.log(window.innerHeight, "+++++++++");
+tableHeight.value = window.innerHeight - 730;
 
 // 跳转详情页
 const toDetail = () => {
diff --git a/frontend/src/views/home/tabs/dashboard.vue b/frontend/src/views/home/tabs/dashboard.vue
index d21cdbd..3b1e37a 100644
--- a/frontend/src/views/home/tabs/dashboard.vue
+++ b/frontend/src/views/home/tabs/dashboard.vue
@@ -6,6 +6,75 @@
     </div>
     <!-- <span class="new_span">测试scss颜色</span> -->
     <div class="right_container">
+
+            <!-- 功能选择 -->
+            <div class="container_function">
+        <!-- <div class="function_title"><p>功能选择</p></div> -->
+        <div class="function_main">
+          <div
+            class="function_item"
+            :class="
+              item.checked ? 'function_item checked_function' : 'function_item'
+            "
+            v-for="(item, index) in tabsList"
+            :key="index"
+            @click="handleCheckFunction(index)"
+          >
+            <div class="item_img">
+              <img :src="item.img" alt="" />
+            </div>
+            <div class="item_text">
+              <p>{{ item.label }}</p>
+            </div>
+          </div>
+        </div>
+      </div>
+      <!-- 饼图 -->
+      <div class="container_charts">
+        <div class="charts_info">
+          <pie
+            :customData="{
+              title: '检测状态',
+              textAlign: 'right',
+            }"
+            :legendData="{
+              icon: 'circle',
+              left: 'left',
+            }"
+            :chartsData="chartsData1"
+            ref="pieRef1"
+          ></pie>
+        </div>
+        <div class="charts_info">
+          <pie
+            :customData="{
+              title: '检测结果',
+              textAlign: 'right',
+            }"
+            :legendData="{
+              icon: 'circle',
+              left: 'left',
+            }"
+            :chartsData="chartsData2"
+            ref="pieRef2"
+          ></pie>
+        </div>
+        <div class="charts_info">
+          <pie
+            :customData="{
+              title: '报告状态',
+              textAlign: 'right',
+            }"
+            :legendData="{
+              icon: 'circle',
+              left: 'left',
+            }"
+            :chartsData="chartsData3"
+            ref="pieRef3"
+          ></pie>
+        </div>
+      </div>
+
       <!-- 筛选条件 -->
       <div class="container_title">
         <el-form :model="form" label-width="80px" :inline="true">
@@ -105,73 +174,6 @@
           </el-form-item>
         </el-form>
       </div>
-      <!-- 饼图 -->
-      <div class="container_charts">
-        <div class="charts_info">
-          <pie
-            :customData="{
-              title: '检测状态',
-              textAlign: 'right',
-            }"
-            :legendData="{
-              icon: 'circle',
-              left: 'left',
-            }"
-            :chartsData="chartsData1"
-            ref="pieRef1"
-          ></pie>
-        </div>
-        <div class="charts_info">
-          <pie
-            :customData="{
-              title: '检测结果',
-              textAlign: 'right',
-            }"
-            :legendData="{
-              icon: 'circle',
-              left: 'left',
-            }"
-            :chartsData="chartsData2"
-            ref="pieRef2"
-          ></pie>
-        </div>
-        <div class="charts_info">
-          <pie
-            :customData="{
-              title: '报告状态',
-              textAlign: 'right',
-            }"
-            :legendData="{
-              icon: 'circle',
-              left: 'left',
-            }"
-            :chartsData="chartsData3"
-            ref="pieRef3"
-          ></pie>
-        </div>
-      </div>
-            <!-- 功能选择 -->
-            <div class="container_function">
-        <!-- <div class="function_title"><p>功能选择</p></div> -->
-        <div class="function_main">
-          <div
-            class="function_item"
-            :class="
-              item.checked ? 'function_item checked_function' : 'function_item'
-            "
-            v-for="(item, index) in tabsList"
-            :key="index"
-            @click="handleCheckFunction(index)"
-          >
-            <div class="item_img">
-              <img :src="item.img" alt="" />
-            </div>
-            <div class="item_text">
-              <p>{{ item.label }}</p>
-            </div>
-          </div>
-        </div>
-      </div>
       <!-- 列表数据 -->
       <div class="container_table">
         <Table></Table>