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] =?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 @@
-->
-
-
- 被检通道1
-
-
-
-
-
-
-
-
- {{ scope.row.resultValue1 }}
-
-
-
-
-
-
-
- 被检通道2
-
-
-
-
-
-
+
+
+
-
+
- {{ scope.row.resultValue3 }}
+ {{ scope.row.resultValue1 }}
-
-
+
-
-
- 被检通道4
-
-
-
-
-
-
-
+
+
+
- {{ scope.row.resultValue4 }}
+ {{ scope.row.resultValue1 }}
-
-
+
-
-
- 被检通道5
-
-
-
-
-
-
-
+
+
+
- {{ scope.row.resultValue5 }}
+ {{ scope.row.resultValue1 }}
-
-
+
-
-
- 被检通道6
-
-
-
-
-
-
-
+
+
+
- {{ scope.row.resultValue6 }}
+ {{ scope.row.resultValue1 }}
-
-
+
-
-
- 被检通道7
-
-
-
-
-
-
-
- {{ scope.row.resultValue7 }}
-
-
-
-
-
-
-
- 被检通道8
-
-
-
-
-
-
-
- {{ scope.row.resultValue8 }}
-
-
-
-
+
@@ -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(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 @@
-
+
守时误差≤1000ms
@@ -76,7 +76,8 @@
-->
- {{ scope.row.Result }}
+ {{ scope.row.Result }}
+ {{scope.row.Result}}
@@ -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;
}