From b923b7c35d6c7756e6838e4bee8bbae371af47f0 Mon Sep 17 00:00:00 2001
From: GYYM <704080176@qq.com>
Date: Thu, 12 Dec 2024 13:23:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A5=BC=E5=9B=BE=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=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/tabs/dashboard.vue | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/frontend/src/views/home/tabs/dashboard.vue b/frontend/src/views/home/tabs/dashboard.vue
index 72dd2da..880d419 100644
--- a/frontend/src/views/home/tabs/dashboard.vue
+++ b/frontend/src/views/home/tabs/dashboard.vue
@@ -37,7 +37,7 @@
             <pie
               :customData="{
                 title: '设备检测状态',
-                textAlign: 'right',
+                textAlign: 'center',
               }"
               :legendData="{
                 icon: 'circle',
@@ -51,7 +51,7 @@
             <pie
               :customData="{
                 title: '设备检测结果',
-                textAlign: 'right',
+                textAlign: 'center',
               }"
               :legendData="{
                 icon: 'circle',
@@ -65,7 +65,7 @@
             <pie
               :customData="{
                 title: '设备报告状态',
-                textAlign: 'right',
+                textAlign: 'center',
                 label: {
                   normal: {
                     position: 'inner',
@@ -598,15 +598,17 @@ onUnmounted(() => {
     .container_charts {
       width: 100%;
       //min-height: 180px !important;
-      height:90%;
+      height:100%;
       background-color: #eee;
       display: flex;
       justify-content: space-between;
       margin-bottom: 10px;
 
       .charts_info {
+        margin-top: 5px;
+        border-radius: 4px;
         flex: none;
-        width: 33.4%;
+        width: 33.1%;
         height: 100% !important;
         background-color: #fff;
         // border-radius: 4px;

From 53b4616a872955afac4cce01765ab0420a2b24da Mon Sep 17 00:00:00 2001
From: GYYM <704080176@qq.com>
Date: Fri, 13 Dec 2024 08:56:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/home/components/test.vue   | 212 ++++--------------
 .../src/views/home/components/timeTest.vue    |   7 +-
 2 files changed, 50 insertions(+), 169 deletions(-)

diff --git a/frontend/src/views/home/components/test.vue b/frontend/src/views/home/components/test.vue
index 028ffe7..15887d5 100644
--- a/frontend/src/views/home/components/test.vue
+++ b/frontend/src/views/home/components/test.vue
@@ -51,178 +51,77 @@
               </template> -->
             </el-table-column>
 
-            <el-table-column label="被检通道1" :min-width="minwidth" align="center">
-              <template #header>
-                <span>被检通道1</span>
-                 <el-tooltip content = "240001被检通道1" placement="top" style="align-items: bottom;">
-                  <el-icon><InfoFilled  /></el-icon>
-                </el-tooltip>
-              </template>
-              <template #default="scope">
-              <!-- <el-tooltip content = "info" placement="top">
-                <i class="el-icon-info"></i>
-              </el-tooltip> -->
-              <el-tooltip :content="scope.row.resultType1==='info' ? '暂无数据' : '点击查看详情'" placement="top">
-                <el-button
-                :disabled = "scope.row.resultType1=='info'"
-                :type="scope.row.resultType1"
-                size="small"
-                @click="handleClick(scope.row)"
-              >
-                {{ scope.row.resultValue1 }}
-              </el-button>
-            </el-tooltip>
-              
-            </template>
-            </el-table-column>
-            <el-table-column label="被检通道2" :min-width="minwidth" align="center">
-              <template #header>
-                <span>被检通道2</span>
-                 <el-tooltip content = "240001被检通道2" placement="top">
-                  <el-icon><InfoFilled  /></el-icon>
-                </el-tooltip>
-              </template>
-              <template #default="scope">
-                <el-tooltip :content="scope.row.resultType2==='info' ? '暂无数据' : '点击查看详情'" placement="top">
+            <el-table-column v-for="(item, index) in monitorList" :key="index" :label="item.label" :min-width="minwidth" align="center">
+              <!-- <template #default="scope">
+                <el-tooltip :content="scope.row.resultType1==='info' ? '暂无数据' : '点击查看详情'" placement="top">
                   <el-button
-                  :disabled = "scope.row.resultType2=='info'"
-                  :type="scope.row.resultType2"
+                  :disabled = "scope.row.resultType1=='info'"
+                  :type="scope.row.resultType1"
                   size="small"
                   @click="handleClick(scope.row)"
                 >
-                  {{ scope.row.resultValue2 }}
+                  {{ scope.row.resultValue1 }}
                 </el-button>
-                </el-tooltip>
-
-              </template>
-            </el-table-column>
-            <el-table-column label="被检通道3" :min-width="minwidth" align="center">
-              <template #header>
-                <span>被检通道3</span>
-                 <el-tooltip content = "240001被检通道3" placement="top">
-                  <el-icon><InfoFilled  /></el-icon>
-                </el-tooltip>
-              </template>
+              </el-tooltip>
+              </template> -->
+            <el-table-column prop="Ua" label="通道1" align="center">
               <template #default="scope">
-                <el-tooltip :content="scope.row.resultType3==='info' ? '暂无数据' : '点击查看详情'" placement="top">
+                <el-tooltip :content="scope.row.resultType1==='info' ? '暂无数据' : '点击查看详情'" placement="top">
                   <el-button
-                  :disabled = "scope.row.resultType3=='info'"
-                  :type="scope.row.resultType3"
+                  :disabled = "scope.row.resultType1=='info'"
+                  :type="scope.row.resultType1"
                   size="small"
                   @click="handleClick(scope.row)"
                 >
-                  {{ scope.row.resultValue3 }}
+                  {{ scope.row.resultValue1 }}
                 </el-button>
-                </el-tooltip>
-
+              </el-tooltip>
               </template>
             </el-table-column>
-            <el-table-column label="被检通道4" :min-width="minwidth" align="center">
-              <template #header>
-                <span>被检通道4</span>
-                 <el-tooltip content = "240001被检通道4" placement="top">
-                  <el-icon><InfoFilled  /></el-icon>
-                </el-tooltip>
-              </template>
-                            <template #default="scope">
-                              <el-tooltip :content="scope.row.resultType4==='info' ? '暂无数据' : '点击查看详情'" placement="top">
-                                <el-button
-                  :disabled = "scope.row.resultType4=='info'"
-                  :type="scope.row.resultType4"
+            <el-table-column prop="Ub" label="通道2" align="center">
+              <template #default="scope">
+                <el-tooltip :content="scope.row.resultType1==='info' ? '暂无数据' : '点击查看详情'" placement="top">
+                  <el-button
+                  :disabled = "scope.row.resultType1=='info'"
+                  :type="scope.row.resultType1"
                   size="small"
                   @click="handleClick(scope.row)"
                 >
-                  {{ scope.row.resultValue4 }}
+                  {{ scope.row.resultValue1 }}
                 </el-button>
-                              </el-tooltip>
-
+              </el-tooltip>
               </template>
             </el-table-column>
-            <el-table-column p label="被检通道5" :min-width="minwidth" align="center">
-              <template #header>
-                <span>被检通道5</span>
-                 <el-tooltip content = "240002被检通道1" placement="top">
-                  <el-icon><InfoFilled  /></el-icon>
-                </el-tooltip>
-              </template>
-                            <template #default="scope">
-                              <el-tooltip :content="scope.row.resultType5==='info' ? '暂无数据' : '点击查看详情'" placement="top">
-                                <el-button
-                  :disabled = "scope.row.resultType5=='info'"
-                  :type="scope.row.resultType5"
+            <el-table-column prop="Uc" label="通道3" align="center">
+              <template #default="scope">
+                <el-tooltip :content="scope.row.resultType1==='info' ? '暂无数据' : '点击查看详情'" placement="top">
+                  <el-button
+                  :disabled = "scope.row.resultType1=='info'"
+                  :type="scope.row.resultType1"
                   size="small"
                   @click="handleClick(scope.row)"
                 >
-                  {{ scope.row.resultValue5 }}
+                  {{ scope.row.resultValue1 }}
                 </el-button>
-                              </el-tooltip>
-
+              </el-tooltip>
               </template>
             </el-table-column>
-            <el-table-column label="被检通道6" :min-width="minwidth" align="center">
-              <template #header>
-                <span>被检通道6</span>
-                 <el-tooltip content = "240002被检通道2" placement="top">
-                  <el-icon><InfoFilled  /></el-icon>
-                </el-tooltip>
-              </template>
-                            <template #default="scope">
-                              <el-tooltip :content="scope.row.resultType6==='info' ? '暂无数据' : '点击查看详情'" placement="top">
-                                <el-button
-                  tip
-                  :disabled = "scope.row.resultType6=='info'"
-                  :type="scope.row.resultType6"
+            <el-table-column prop="Ux" label="通道4" align="center">
+              <template #default="scope">
+                <el-tooltip :content="scope.row.resultType1==='info' ? '暂无数据' : '点击查看详情'" placement="top">
+                  <el-button
+                  :disabled = "scope.row.resultType1=='info'"
+                  :type="scope.row.resultType1"
                   size="small"
                   @click="handleClick(scope.row)"
                 >
-                  {{ scope.row.resultValue6 }}
+                  {{ scope.row.resultValue1 }}
                 </el-button>
-                              </el-tooltip>
-
+              </el-tooltip>
               </template>
             </el-table-column>
-            <el-table-column label="被检通道7" :min-width="minwidth" align="center">
-              <template #header>
-                <span>被检通道7</span>
-                 <el-tooltip content = "240002被检通道3" placement="top">
-                  <el-icon><InfoFilled  /></el-icon>
-                </el-tooltip>
-              </template>
-                            <template #default="scope">
-                              <el-tooltip :content="scope.row.resultType7==='info' ? '暂无数据' : '点击查看详情'" placement="top">
-                                <el-button
-                  :disabled = "scope.row.resultType7=='info'"
-                  :type="scope.row.resultType7"
-                  size="small"
-                  @click="handleClick(scope.row)"
-                >
-                  {{ scope.row.resultValue7 }}
-                </el-button>
-                              </el-tooltip>
-
-              </template>
-            </el-table-column>
-            <el-table-column label="被检通道8" :min-width="minwidth" align="center">
-              <template #header>
-                <span>被检通道8</span>
-                 <el-tooltip content = "240002被检通道4" placement="top">
-                  <el-icon><InfoFilled  /></el-icon>
-                </el-tooltip>
-              </template>
-                            <template #default="scope">
-                              <el-tooltip :content="scope.row.resultType8==='info' ? '暂无数据' : '点击查看详情'" placement="top">
-                                <el-button
-                  :disabled = "scope.row.resultType8=='info'"
-                  :type="scope.row.resultType8"
-                  size="small"
-                  @click="handleClick(scope.row)"
-                >
-                  {{ scope.row.resultValue8 }}
-                </el-button>
-                              </el-tooltip>
-
-              </template>
             </el-table-column>
+           
             <!-- <el-table-column  v-for="(item, index) in monitorList" :key="index"  :prop="item.prop" :label="item.label">
           </el-table-column> -->
         </el-table>
@@ -266,53 +165,33 @@ const monitorList = ref([
     deviceID: '1',
     deviceName: '被检设备1',
     monitorIdx: 1,
-    label:'被检设备1通道1',
+    label:'240001',
     prop: 'Result1',
   },
   {
     deviceID: '1',
     deviceName: '被检设备1',
     monitorIdx: 2,
-    label:'被检设备1通道2',
+    label:'240002',
     prop: 'Result2',
   },
   {
     deviceID: '2',
     deviceName: '被检设备2',
     monitorIdx: 1,
-    label:'被检设备2通道1',
+    label:'240003',
     prop: 'Result3',
   },
   {
     deviceID: '2',
     deviceName: '被检设备2',
     monitorIdx: 2,
-    label:'被检设备2通道2',
+    label:'240004',
     prop: 'Result4',
   }
 ])
-const tableData1= [
-  {
-    date: '2016-05-03',
-    name: 'Tom',
-    address: 'No. 189, Grove St, Los Angeles',
-  },
-  {
-    date: '2016-05-02',
-    name: 'Tom',
-    address: 'No. 189, Grove St, Los Angeles',
-  },
-  {
-    date: '2016-05-04',
-    name: 'Tom',
-    address: 'No. 189, Grove St, Los Angeles',
-  },
-  {
-    date: '2016-05-01',
-    name: 'Tom',
-    address: 'No. 189, Grove St, Los Angeles',
-  },
-]
+
+
 const scrollContainer = ref<HTMLElement | null>(null); // 声明 scrollContainer
 
 const scrollToBottom = () => {
@@ -2143,6 +2022,7 @@ const startTimer = () => {
             clearInterval(timer.value)
             timer.value = null;
             ts.value = 'success'
+            scrollToBottom();
         }
 
   }, 2000);
diff --git a/frontend/src/views/home/components/timeTest.vue b/frontend/src/views/home/components/timeTest.vue
index c888d9e..6ac7ffe 100644
--- a/frontend/src/views/home/components/timeTest.vue
+++ b/frontend/src/views/home/components/timeTest.vue
@@ -35,7 +35,7 @@
             </span>
             <div class="error-dsc">
               <div class="green-div"></div>
-              <span style=" color: #67C23A; font-size: 16px;font-weight: 600;">
+              <span style=" color: #606266; font-size: 16px;font-weight: 600;">
               守时误差≤1000ms
             </span>
 
@@ -76,7 +76,8 @@
                     </el-tooltip>
                   </template> -->
                   <template #default="scope">
-                    <el-tag :type="scope.row.Result === '合格' ? 'success' : 'danger'">{{ scope.row.Result }}</el-tag>
+                    <el-tag v-if="scope.row.Result === '不合格'" type="danger">{{ scope.row.Result }}</el-tag>
+                    <span v-if="scope.row.Result != '不合格'">{{scope.row.Result}}</span>
                   </template>
           </el-table-column>
           </el-table>
@@ -355,7 +356,7 @@ watch(ts, function (newValue, oldValue) {
   width: 20px;
   height: 14px;
   border-radius: 4px;
-  background-color: #67C23A;
+  background-color: #606266;
   margin-left: 5px;
   margin-right: 5px;
 }