样式调整

2024-12-05 21:33:52 +08:00
parent b1c9375873
commit 9c0b9a7c93
11 changed files with 315 additions and 175 deletions
--- a/frontend/src/views/home/components/channelsTest.vue
+++ b/frontend/src/views/home/components/channelsTest.vue
@@ -6,7 +6,7 @@

        <div class="right-title">
          <!-- <div>系数校准表</div> -->
-          <div>当前源输出为：Ua=Ub=Uc=57.74V Ia=Ib=Ic=1A； 电压误差为：±0.1Un%； 电流误差为：±0.5%</div>
+          <div>{{ outputDsc }}</div>
          <div>
            <span style="  font-size: 18px;font-weight: 600;">
              设备已合格 <span style="color: #67C23A">{{ qualified }}</span> 台/共 <span style="color: green">{{ total }}</span>
@@ -20,13 +20,13 @@
        <div class="right-content">
          <el-tabs type="border-card">
            <el-empty description="暂无数据，等待检测开始" v-if="activeIndex === 0" />
-            <el-tab-pane label="被检设备1" v-if="activeIndex > 0">
+            <el-tab-pane label="240001" v-if="activeIndex > 0">
              <channelsTestTable :tableData="tableData1"></channelsTestTable>
            </el-tab-pane>
-            <el-tab-pane label="被检设备2" v-if="activeIndex > 1">
+            <el-tab-pane label="240002" v-if="activeIndex > 1">
              <template #label>
                <span class="custom-tabs-label">
-                  <span>被检设备2</span>
+                  <span>240002</span>
                  <el-icon>
                    <Failed />
                  </el-icon>
@@ -34,9 +34,12 @@
              </template>
              <channelsTestTable :tableData="tableData2"></channelsTestTable>
            </el-tab-pane>
-            <el-tab-pane label="被检设备3" v-if="activeIndex > 2">
+            <el-tab-pane label="240003" v-if="activeIndex > 2">
              <channelsTestTable :tableData="tableData3"></channelsTestTable>
            </el-tab-pane>
+            <el-tab-pane label="240004" v-if="activeIndex > 3">
+              <channelsTestTable :tableData="tableData4"></channelsTestTable>
+            </el-tab-pane>
          </el-tabs>

        </div>
@@ -50,8 +53,9 @@
 import { SuccessFilled, Failed } from '@element-plus/icons-vue'

 const activeIndex = ref(0)
-const activeTotalNum = ref(3)
+const activeTotalNum = ref(4)
 const qualified = ref(0)
+const outputDsc = ref('电压误差为：±0.1Un%； 电流误差为：±0.5%')
 const total = ref(0)

 const activities = [
@@ -87,7 +91,7 @@ const tableData1 = ref([
  {
    id: '1',
    updateTime: '2024-10-10 10:30:00',
-    deviceName: '被检设备1',
+    deviceName: '240001',
    MonitorIdx: 1,
    Ua: 1.0003,
    Ub: 1.0003,
@@ -100,7 +104,7 @@ const tableData1 = ref([
  {
    id: '2',
    updateTime: '2024-10-10 10:30:00',
-    deviceName: '被检设备1',
+    deviceName: '240001',
    MonitorIdx: 2,
    Ua: 1.0003,
    Ub: 1.0003,
@@ -113,7 +117,7 @@ const tableData1 = ref([
  {
    id: '3',
    updateTime: '2024-10-10 10:30:00',
-    deviceName: '被检设备1',
+    deviceName: '240001',
    MonitorIdx: 3,
    Ua: 1.0003,
    Ub: 1.0003,
@@ -126,7 +130,7 @@ const tableData1 = ref([
  {
    id: '4',
    updateTime: '2024-10-10 10:30:00',
-    deviceName: '被检设备1',
+    deviceName: '240001',
    MonitorIdx: 4,
    Ua: 1.0003,
    Ub: 1.0003,
@@ -141,7 +145,7 @@ const tableData2 = ref([
  {
    id: '1',
    updateTime: '2024-10-10 10:30:00',
-    deviceName: '被检设备2',
+    deviceName: '240002',
    MonitorIdx: 1,
    Ua: 1.0003,
    Ub: 1.0003,
@@ -154,7 +158,7 @@ const tableData2 = ref([
  {
    id: '2',
    updateTime: '2024-10-10 10:30:00',
-    deviceName: '被检设备2',
+    deviceName: '240002',
    MonitorIdx: 2,
    Ua: 1.0003,
    Ub: 1.0003,
@@ -167,7 +171,7 @@ const tableData2 = ref([
  {
    id: '3',
    updateTime: '2024-10-10 10:30:00',
-    deviceName: '被检设备2',
+    deviceName: '240002',
    MonitorIdx: 3,
    Ua: 1.0003,
    Ub: 1.0003,
@@ -180,7 +184,7 @@ const tableData2 = ref([
  {
    id: '4',
    updateTime: '2024-10-10 10:30:00',
-    deviceName: '被检设备2',
+    deviceName: '240002',
    MonitorIdx: 4,
    Ua: 1.0003,
    Ub: 1.0003,
@@ -195,7 +199,7 @@ const tableData3 = ref([
  {
    id: '1',
    updateTime: '2024-10-10 10:30:00',
-    deviceName: '被检设备3',
+    deviceName: '240003',
    MonitorIdx: 1,
    Ua: 1.0003,
    Ub: 1.0003,
@@ -208,7 +212,7 @@ const tableData3 = ref([
  {
    id: '2',
    updateTime: '2024-10-10 10:30:00',
-    deviceName: '被检设备3',
+    deviceName: '240003',
    MonitorIdx: 2,
    Ua: 1.0003,
    Ub: 1.0003,
@@ -221,7 +225,7 @@ const tableData3 = ref([
  {
    id: '3',
    updateTime: '2024-10-10 10:30:00',
-    deviceName: '被检设备3',
+    deviceName: '240003',
    MonitorIdx: 3,
    Ua: 1.0003,
    Ub: 1.0003,
@@ -234,7 +238,61 @@ const tableData3 = ref([
  {
    id: '4',
    updateTime: '2024-10-10 10:30:00',
-    deviceName: '被检设备3',
+    deviceName: '240003',
+    MonitorIdx: 4,
+    Ua: 1.0003,
+    Ub: 1.0003,
+    Uc: 0.0096,
+    Ia: 1.0003,
+    Ib: 1.0003,
+    Ic: 1.0008,
+    Result: '合格',
+  },
+])
+const tableData4 = ref([
+  {
+    id: '1',
+    updateTime: '2024-10-10 10:30:00',
+    deviceName: '240004',
+    MonitorIdx: 1,
+    Ua: 1.0003,
+    Ub: 1.0003,
+    Uc: 0.0096,
+    Ia: 1.0003,
+    Ib: 1.0003,
+    Ic: 1.0008,
+    Result: '合格',
+  },
+  {
+    id: '2',
+    updateTime: '2024-10-10 10:30:00',
+    deviceName: '240004',
+    MonitorIdx: 2,
+    Ua: 1.0003,
+    Ub: 1.0003,
+    Uc: 0.0096,
+    Ia: 1.0003,
+    Ib: 1.0003,
+    Ic: 1.0008,
+    Result: '合格',
+  },
+  {
+    id: '3',
+    updateTime: '2024-10-10 10:30:00',
+    deviceName: '240004',
+    MonitorIdx: 3,
+    Ua: 1.0003,
+    Ub: 1.0003,
+    Uc: 0.0096,
+    Ia: 1.0003,
+    Ib: 1.0003,
+    Ic: 1.0008,
+    Result: '合格',
+  },
+  {
+    id: '4',
+    updateTime: '2024-10-10 10:30:00',
+    deviceName: '240004',
    MonitorIdx: 4,
    Ua: 1.0003,
    Ub: 1.0003,
@@ -264,7 +322,10 @@ watch(testStatus, function (newValue, oldValue) {
    let timer = setInterval(() => {
      if (activeIndex.value < activeTotalNum.value) {
        activeIndex.value++
-        qualified.value = activeIndex.value
+        if(activeIndex.value > 1)
+        qualified.value = activeIndex.value -1;//演示效果，实际运行时使用后端传来的真实数据即可
+        else
+        qualified.value = activeIndex.value;
      }
      else if (activeIndex.value === activeTotalNum.value) {
        clearInterval(timer)
@@ -279,60 +340,15 @@ watch(testStatus, function (newValue, oldValue) {
    }, 1000);
  }
 })
-// watch(activeIndex, function (newValue, oldValue) {

-// if(activeIndex.value === 1)
-// {
-//   activities.value.length = 0;
-//   activities.value.push({
-//     content: '开始检测',
-//     timestamp: '2018-04-12 20:46',
-//     size: 'large',
-//     color: '#0bbd87',
-//     icon: SuccessFilled,
-//   });
-// }
-// if(activeIndex.value === 2)
-// {
-//   activities.value.push({
-//     content: 'GPS上送时刻',
-//     timestamp: '2018-04-03 20:46',
-//     color: '#0bbd87',
-//     icon: SuccessFilled,
-//     size: 'large',
-//   });
-// }
-// if(activeIndex.value === 3)
-// {
-//   activities.value.push({
-//     content: '设备最早上送时刻',
-//     timestamp: '2018-04-03 20:46',
-//     color: '#0bbd87',
-//     icon: SuccessFilled,
-//     size: 'large',
-//   });
+watch(activeIndex, function (newValue, oldValue) {

-//   deviceOperatorData.value.length = 0;
-//   deviceOperatorData.value = deviceData.value;
-// }
-// if(activeIndex.value > 3)
-// {
-//   activities.value.push({
-//     content: '设备最晚上送时刻',
-//     timestamp: '2018-04-03 20:46',
-//     color: '#0bbd87',
-//     icon: SuccessFilled,
-//     size: 'large',
-//   });
-//   activities.value.push({
-//     content: '检测结束',
-//     timestamp: '2018-04-03 20:46',
-//     color: '#0bbd87',
-//     icon: SuccessFilled,
-//     size: 'large',
-//   });
-// }
-// })
+if(activeIndex.value === 1)
+{
+  outputDsc.value = "电压误差为：±0.1Un%； 电流误差为：±0.5%；当前源输出为：Ua=Ub=Uc=57.74V Ia=Ib=Ic=1A";
+}
+
+})

 const emit = defineEmits(['update:testStatus']);
 //监听sn