From e1bc2f4fb404744b633a646436adc5ad3dbb1bd9 Mon Sep 17 00:00:00 2001
From: sjl <1716605279@qq.com>
Date: Mon, 28 Oct 2024 13:41:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E8=AF=AF=E5=B7=AE=E4=BD=93?=
 =?UTF-8?q?=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/api/error/errorData.ts           | 91 +++++++++++++++----
 frontend/src/api/error/interface/index.ts     |  2 +-
 .../components/ErrorStandardDialog.vue        | 79 +++++++++++++++-
 3 files changed, 151 insertions(+), 21 deletions(-)

diff --git a/frontend/src/api/error/errorData.ts b/frontend/src/api/error/errorData.ts
index 7c63e0c..30e1dda 100644
--- a/frontend/src/api/error/errorData.ts
+++ b/frontend/src/api/error/errorData.ts
@@ -30,122 +30,177 @@ const errordata = ref<ErrorSystem.ErrorSystemList[]>([
 
     const errordetail = ref<ErrorSystem.ErrorSystemDetail[]>([
       {
-           measured: '电压',
+           measured: '电压偏差',
            deviceLevel: 'A', 
+           measurementType:'电压',
            condition: '10%~150%标称电压', 
            maxErrorValue: '±0.1%Un' 
       },
       {
-           measured: '频率', 
+           measured: '频率偏差', 
            deviceLevel: 'A', 
+           measurementType:'频率',
            condition: '42.5~57.5 Hz', 
            maxErrorValue: '±0.01Hz' 
       },
       {
-         measured: '电压三相不平衡度', 
+         measured: '三相不平衡度', 
          deviceLevel: 'A', 
+         measurementType:'电压',
          condition: '0.5%~5%', 
          maxErrorValue: '±0.15%' 
       },
       {
-        measured: '电压三相不平衡度', 
+        measured: '三相不平衡度', 
         deviceLevel: 'A', 
+        measurementType:'电压',
         condition: '5%（不包含）~ 40%', 
         maxErrorValue: '±0.3%' 
      },
      {
-      measured: '电流三相不平衡度', 
+      measured: '三相不平衡度', 
       deviceLevel: 'A', 
+      measurementType:'电流',
       condition: '', 
       maxErrorValue: '±1%' 
       },
       {
-        measured: '短时闪变', 
+        measured: '电压波动幅值', 
         deviceLevel: 'A', 
+        measurementType:'电压',
+        condition: '', 
+        maxErrorValue: '±0.2%Un' 
+      },
+      {
+        measured: '电压波动持续时间', 
+        deviceLevel: 'A', 
+        measurementType:'时间',
+        condition: '', 
+        maxErrorValue: '±1周波' 
+      },
+      {
+        measured: '闪变', 
+        deviceLevel: 'A', 
+        measurementType:'短时间闪变',
         condition: 'Pst：0.2~10', 
         maxErrorValue: '±5%' 
       },
       {
-        measured: '谐波电压', 
+        measured: '谐波和间谐波', 
         deviceLevel: 'A', 
+        measurementType:'电压',
         condition: 'Uh≥1%Un', 
         maxErrorValue: '±5%Uh' 
       },
       {
-        measured: '谐波电压', 
+        measured: '谐波和间谐波', 
         deviceLevel: 'A', 
+        measurementType:'电压',
         condition: 'Uh＜1%Un', 
         maxErrorValue: '±0.05%Un' 
       },
       {
-        measured: '谐波电流', 
+        measured: '谐波和间谐波', 
         deviceLevel: 'A', 
+        measurementType:'电流',
         condition: 'In≥3%In', 
         maxErrorValue: '±5%Ih' 
       },
       {
-        measured: '谐波电流', 
+        measured: '谐波和间谐波', 
         deviceLevel: 'A', 
+        measurementType:'电流',
         condition: 'In＜3%In', 
         maxErrorValue: '±0.15%In' 
       },
       {
-        measured: '谐波功率', 
+        measured: '谐波和间谐波', 
         deviceLevel: 'A', 
+        measurementType:'相角',
+        condition: '', 
+        maxErrorValue: 'h≤5,±1°*h' 
+      },
+      {
+        measured: '谐波和间谐波', 
+        deviceLevel: 'A', 
+        measurementType:'相角',
+        condition: '', 
+        maxErrorValue: 'h>5,±5°' 
+      },
+      {
+        measured: '谐波和间谐波', 
+        deviceLevel: 'A', 
+        measurementType:'功率',
         condition: 'Ph≥150W', 
         maxErrorValue: '±1%Ph' 
       },
       {
-        measured: '谐波功率', 
+        measured: '谐波和间谐波', 
         deviceLevel: 'A', 
+        measurementType:'功率',
         condition: 'Ph＜150W', 
         maxErrorValue: '±1.5W' 
       },
       {
-        measured: '间谐波电压', 
+        measured: '高频次谐波', 
         deviceLevel: 'A', 
+        measurementType:'电压',
         condition: 'Uh≥1%Un', 
         maxErrorValue: '±5%Uh' 
       },
       {
-        measured: '间谐波电压', 
+        measured: '高频次谐波', 
         deviceLevel: 'A', 
+        measurementType:'电压',
         condition: 'Uh＜1%Un', 
         maxErrorValue: '±0.05%Un' 
       },
       {
-        measured: '间谐波电流', 
+        measured: '高频次谐波', 
         deviceLevel: 'A', 
+        measurementType:'电流',
         condition: 'In≥3%In', 
         maxErrorValue: '±5%Ih' 
       },
       {
-        measured: '间谐波电流', 
+        measured: '高频次谐波', 
         deviceLevel: 'A', 
+        measurementType:'电流',
         condition: 'In＜3%In', 
         maxErrorValue: '±0.15%In' 
       },
+      {
+        measured: '功率', 
+        deviceLevel: 'A', 
+        measurementType:'功率',
+        condition: '', 
+        maxErrorValue: '±0.5%' 
+      },
       {
         measured: '电流', 
         deviceLevel: 'A', 
+        measurementType:'电流',
         condition: 'I≥0.05In', 
         maxErrorValue: '±0.5%' 
       },
       {
         measured: '电流', 
         deviceLevel: 'A', 
+        measurementType:'电流',
         condition: '0.01In≤I＜0.05In', 
         maxErrorValue: '±1%' 
       },
       {
-        measured: '暂态幅值', 
+        measured: '暂态电压幅值', 
         deviceLevel: 'A', 
+        measurementType:'电压',
         condition: '', 
         maxErrorValue: '±0.2%Un' 
       },
       {
-        measured: '暂态时间', 
+        measured: '暂态持续时间', 
         deviceLevel: 'A', 
+        measurementType:'时间',
         condition: '', 
         maxErrorValue: '±1周波' 
       },
diff --git a/frontend/src/api/error/interface/index.ts b/frontend/src/api/error/interface/index.ts
index 24df056..be6f9d2 100644
--- a/frontend/src/api/error/interface/index.ts
+++ b/frontend/src/api/error/interface/index.ts
@@ -15,7 +15,7 @@ export namespace ErrorSystem  {
       export interface ErrorSystemDetail {
           measured: string;//被测量
           deviceLevel: string;//检测装置级别
-          measurementType?: string;//测量类型
+          measurementType: string;//测量类型
           condition: string;//测量条件
           maxErrorValue: string;//最大误差
       }
diff --git a/frontend/src/views/machine/errorSystem/components/ErrorStandardDialog.vue b/frontend/src/views/machine/errorSystem/components/ErrorStandardDialog.vue
index a55f921..992a473 100644
--- a/frontend/src/views/machine/errorSystem/components/ErrorStandardDialog.vue
+++ b/frontend/src/views/machine/errorSystem/components/ErrorStandardDialog.vue
@@ -1,8 +1,9 @@
 <template>
   <el-dialog  :title="dialogTitle" :model-value="visible" @close="handleCancel" v-bind="dialogBig">
-    <el-table :data="errorData" style="width: 100%" :span-method="spanMethod" border>
+    <el-table :data="errorData" :header-cell-style="{ textAlign: 'center' } " :cell-style="{ textAlign: 'center' }" style="width: 100%" :span-method="spanMethod" border class="custom-table">
       <el-table-column prop="measured" label="被测量" />
       <el-table-column prop="deviceLevel" label="检测装置级别" />
+      <el-table-column prop="measurementType" label="测量类型" />
       <el-table-column prop="condition" label="测量条件" />
       <el-table-column prop="maxErrorValue" label="最大误差" />
     </el-table>
@@ -15,6 +16,8 @@
  import type { ColumnProps } from '@/components/ProTable/interface'
  import type { ErrorSystem } from '@/api/error/interface'
  import errorDataList from '@/api/error/errorData'
+ import type { TableColumnCtx } from 'element-plus'
+
  const errorData = errorDataList.errordetail
 
  // 表格配置项
@@ -31,6 +34,10 @@ const columns = reactive<ColumnProps<ErrorSystem.ErrorSystemDetail>[]>([
    prop: 'condition',
    label: '测量条件',
  },
+ {
+   prop: 'measurementType',
+   label: '测量类型',
+ },
  {
    prop: 'maxErrorValue',
    label: '最大误差',
@@ -38,6 +45,72 @@ const columns = reactive<ColumnProps<ErrorSystem.ErrorSystemDetail>[]>([
 ])
 
 
+interface SpanMethodProps {
+  row: ErrorSystem.ErrorSystemDetail
+  column: TableColumnCtx<ErrorSystem.ErrorSystemDetail>
+  rowIndex: number
+  columnIndex: number
+}
+
+const spanMethod = ({
+  row,
+  column,
+  rowIndex,
+  columnIndex,
+}: SpanMethodProps) => {
+  if (columnIndex === 0  ) { // 检查是否为第一列
+    if (rowIndex === 2 || rowIndex === 21) { // 检查是否为第三行
+      return {
+        rowspan: 2, // 合并行数
+        colspan: 1,  // 单元格列数
+      };
+    }else if (rowIndex === 8) { // 
+      return {
+        rowspan: 8, 
+        colspan: 1,
+      };
+    } 
+    else if (rowIndex === 16) { // 
+      return {
+        rowspan: 4, 
+        colspan: 1,
+      };
+    } 
+    else if (rowIndex === 3 || rowIndex === 9 || rowIndex === 10|| rowIndex === 11
+            || rowIndex === 12|| rowIndex === 13|| rowIndex === 14|| rowIndex === 15
+            || rowIndex === 17 || rowIndex === 18|| rowIndex === 19
+            || rowIndex === 22) { // 检查是否为第四行
+      return {
+        rowspan: 0, // 不显示该单元格
+        colspan: 0,
+      };
+    }
+  }
+  else if(columnIndex === 2) { // 检查是否为第三列
+    if (rowIndex === 2 
+        || rowIndex === 8|| rowIndex === 10|| rowIndex === 12|| rowIndex === 14
+        || rowIndex === 16|| rowIndex === 18
+        || rowIndex === 21) { 
+      return {
+        rowspan: 2, 
+        colspan: 1,
+      };
+    } 
+    else if (rowIndex === 3
+            || rowIndex === 9|| rowIndex === 11|| rowIndex === 13|| rowIndex === 15
+            || rowIndex === 17|| rowIndex === 19
+            || rowIndex === 22) { // 检查是否为第四行
+      return {
+        rowspan: 0, // 不显示该单元格
+        colspan: 0,
+      };
+    }
+  }
+ 
+      
+};
+
+
  const props = defineProps<{
    visible: boolean;
    dialogTitle: string;
@@ -72,4 +145,6 @@ const columns = reactive<ColumnProps<ErrorSystem.ErrorSystemDetail>[]>([
 
  
  </script>
- 
+ <style>
+
+ </style>