From 8e2a22cf6101a5122640e8eeccd83d2e1a732b3c Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Thu, 5 Dec 2024 14:37:50 +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/api/device/error/errorData.ts    | 75 ++++++++++++-------
 .../machine/device/components/devicePopup.vue | 10 +--
 frontend/src/views/machine/device/index.vue   |  4 +-
 .../components/errorStandardPopup.vue         | 23 +++++-
 4 files changed, 76 insertions(+), 36 deletions(-)

diff --git a/frontend/src/api/device/error/errorData.ts b/frontend/src/api/device/error/errorData.ts
index 3d4f5c3..b13d2fa 100644
--- a/frontend/src/api/device/error/errorData.ts
+++ b/frontend/src/api/device/error/errorData.ts
@@ -32,175 +32,200 @@ const errordata = ref<ErrorSystem.ErrorSystemList[]>([
 
     const errordetail = ref<ErrorSystem.Error_detail[]>([
       {
-           measured: '电压偏差',
+           col1: '电压偏差',
+           col2: '电压偏差',
            deviceLevel: 'A', 
            measurementType:'电压',
            condition: '10%~150%标称电压', 
            maxErrorValue: '±0.1%Un' 
       },
       {
-           measured: '频率偏差', 
+          col1:'频率偏差',
+          col2: '频率偏差',
            deviceLevel: 'A', 
            measurementType:'频率',
            condition: '42.5~57.5 Hz', 
            maxErrorValue: '±0.01Hz' 
       },
       {
-         measured: '三相不平衡度', 
+          col1:'三相不平衡度',
+          col2: '三相不平衡度',
          deviceLevel: 'A', 
          measurementType:'电压',
          condition: '0.5%~5%', 
          maxErrorValue: '±0.15%' 
       },
       {
-        measured: '三相不平衡度', 
+          col1:'三相不平衡度',
+          col2: '三相不平衡度',
         deviceLevel: 'A', 
         measurementType:'电压',
         condition: '5%（不包含）~ 40%', 
         maxErrorValue: '±0.3%' 
      },
      {
-      measured: '三相不平衡度', 
+         col1:'三相不平衡度',
+         col2: '三相不平衡度',
       deviceLevel: 'A', 
       measurementType:'电流',
       condition: '', 
       maxErrorValue: '±1%' 
       },
       {
-        measured: '电压波动/电压幅值', 
+          col1:'电压波动',
+          col2: '电压幅值',
         deviceLevel: 'A', 
         measurementType:'电压',
         condition: '', 
         maxErrorValue: '±0.2%Un' 
       },
       {
-        measured: '电压波动/持续时间', 
+          col1:'电压波动',
+          col2: '持续时间',
         deviceLevel: 'A', 
         measurementType:'时间',
         condition: '', 
         maxErrorValue: '±1周波' 
       },
       {
-        measured: '闪变', 
+          col1:'闪变',
+          col2: '闪变',
         deviceLevel: 'A', 
         measurementType:'短时间闪变',
         condition: 'Pst：0.2~10', 
         maxErrorValue: '±5%' 
       },
       {
-        measured: '谐波和间谐波', 
+          col1:'谐波和间谐波',
+          col2: '谐波和间谐波',
         deviceLevel: 'A', 
         measurementType:'电压',
         condition: 'Uh≥1%Un', 
         maxErrorValue: '±5%Uh' 
       },
       {
-        measured: '谐波和间谐波', 
+          col1:'谐波和间谐波',
+          col2: '谐波和间谐波',
         deviceLevel: 'A', 
         measurementType:'电压',
         condition: 'Uh＜1%Un', 
         maxErrorValue: '±0.05%Un' 
       },
       {
-        measured: '谐波和间谐波', 
+          col1:'谐波和间谐波',
+          col2: '谐波和间谐波',
         deviceLevel: 'A', 
         measurementType:'电流',
         condition: 'In≥3%In', 
         maxErrorValue: '±5%Ih' 
       },
       {
-        measured: '谐波和间谐波', 
+          col1:'谐波和间谐波',
+          col2: '谐波和间谐波',
         deviceLevel: 'A', 
         measurementType:'电流',
         condition: 'In＜3%In', 
         maxErrorValue: '±0.15%In' 
       },
       {
-        measured: '谐波和间谐波', 
+          col1:'谐波和间谐波',
+          col2: '谐波和间谐波',
         deviceLevel: 'A', 
         measurementType:'相角',
         condition: '', 
         maxErrorValue: 'h≤5,±1°*h' 
       },
       {
-        measured: '谐波和间谐波', 
+          col1:'谐波和间谐波',
+          col2: '谐波和间谐波',
         deviceLevel: 'A', 
         measurementType:'相角',
         condition: '', 
         maxErrorValue: 'h>5,±5°' 
       },
       {
-        measured: '谐波和间谐波', 
+          col1:'谐波和间谐波',
+          col2: '谐波和间谐波',
         deviceLevel: 'A', 
         measurementType:'功率',
         condition: 'Ph≥150W', 
         maxErrorValue: '±1%Ph' 
       },
       {
-        measured: '谐波和间谐波', 
+          col1:'谐波和间谐波',
+          col2: '谐波和间谐波',
         deviceLevel: 'A', 
         measurementType:'功率',
         condition: 'Ph＜150W', 
         maxErrorValue: '±1.5W' 
       },
       {
-        measured: '高频次谐波', 
+          col1:'高频次谐波',
+          col2: '高频次谐波',
         deviceLevel: 'A', 
         measurementType:'电压',
         condition: 'Uh≥1%Un', 
         maxErrorValue: '±5%Uh' 
       },
       {
-        measured: '高频次谐波', 
+          col1:'高频次谐波',
+          col2: '高频次谐波',
         deviceLevel: 'A', 
         measurementType:'电压',
         condition: 'Uh＜1%Un', 
         maxErrorValue: '±0.05%Un' 
       },
       {
-        measured: '高频次谐波', 
+          col1:'高频次谐波',
+          col2: '高频次谐波',
         deviceLevel: 'A', 
         measurementType:'电流',
         condition: 'In≥3%In', 
         maxErrorValue: '±5%Ih' 
       },
       {
-        measured: '高频次谐波', 
+          col1:'高频次谐波',
+          col2: '高频次谐波',
         deviceLevel: 'A', 
         measurementType:'电流',
         condition: 'In＜3%In', 
         maxErrorValue: '±0.15%In' 
       },
       {
-        measured: '功率', 
+          col1:'功率',
+          col2: '功率',
         deviceLevel: 'A', 
         measurementType:'功率',
         condition: '', 
         maxErrorValue: '±0.5%' 
       },
       {
-        measured: '电流', 
+          col1:'电流',
+          col2: '电流',
         deviceLevel: 'A', 
         measurementType:'电流',
         condition: 'I≥0.05In', 
         maxErrorValue: '±0.5%' 
       },
       {
-        measured: '电流', 
+          col1:'电流',
+          col2: '电流',
         deviceLevel: 'A', 
         measurementType:'电流',
         condition: '0.01In≤I＜0.05In', 
         maxErrorValue: '±1%' 
       },
       {
-        measured: '电压暂降、电压暂升和短时中断/电压幅值', 
+        col1: '电压暂降、电压暂升和短时中断',
+          col2: '电压幅值',
         deviceLevel: 'A', 
         measurementType:'电压',
         condition: '', 
         maxErrorValue: '±0.2%Un' 
       },
       {
-        measured: '电压暂降、电压暂升和短时中断/持续时间', 
+        col1: '电压暂降、电压暂升和短时中断',
+        col2: '持续时间',
         deviceLevel: 'A', 
         measurementType:'时间',
         condition: '', 
diff --git a/frontend/src/views/machine/device/components/devicePopup.vue b/frontend/src/views/machine/device/components/devicePopup.vue
index 00b8d48..0c97c14 100644
--- a/frontend/src/views/machine/device/components/devicePopup.vue
+++ b/frontend/src/views/machine/device/components/devicePopup.vue
@@ -40,7 +40,7 @@
                           
                         <el-row  :gutter="24" >
                             <el-col :span="8">
-                                <el-form-item label='生产厂商'  prop='manufacturer' :label-width="100">
+                                <el-form-item label='设备厂家'  prop='manufacturer' :label-width="100">
                                     <el-select v-model="formContent.manufacturer"  clearable placeholder="请选择生产厂商">
                                     <el-option
                                     v-for="item in dictStore.getDictData('Dev_Manufacturers')"
@@ -52,18 +52,18 @@
                                 </el-form-item>           
                             </el-col>
                             <el-col :span="8">
-                                <el-form-item label="生产日期" prop="createDate" :label-width="100">
+                                <el-form-item label="出厂日期" prop="createDate" :label-width="100">
                                     <el-date-picker
                                         v-model="formContent.createDate" 
-                                        placeholder="请选择生产日期"
+                                        placeholder="请选择出厂日期"
                                         :disabled-date="disabledDate"
                                         />
                                 
                                 </el-form-item>           
                             </el-col>
                             <el-col :span="8">
-                                <el-form-item label="出厂编号" prop="createId" :label-width="100">
-                                    <el-input v-model="formContent.createId" placeholder="请输入出厂编号"/>
+                                <el-form-item label="设备序列号" prop="createId" :label-width="100">
+                                    <el-input v-model="formContent.createId" placeholder="请输入设备序列号"/>
                                 </el-form-item>            
                             </el-col>
                         </el-row>
diff --git a/frontend/src/views/machine/device/index.vue b/frontend/src/views/machine/device/index.vue
index 95442a4..afcc6ce 100644
--- a/frontend/src/views/machine/device/index.vue
+++ b/frontend/src/views/machine/device/index.vue
@@ -80,7 +80,7 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
   },
   {
     prop: 'createDate',
-    label: '生产日期',
+    label: '出厂日期',
     minWidth: 200,
     search: {
       span: 2,
@@ -116,7 +116,7 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
   },
   {
     prop: 'manufacturer',
-    label: '生产厂商',
+    label: '设备厂家',
     enum: dictStore.getDictData('Dev_Manufacturers'),
     search: { el: 'select', props: { filterable: true }, order: 1 },
     fieldNames: { label: 'name', value: 'id' },
diff --git a/frontend/src/views/machine/errorSystem/components/errorStandardPopup.vue b/frontend/src/views/machine/errorSystem/components/errorStandardPopup.vue
index 0a817be..f98be54 100644
--- a/frontend/src/views/machine/errorSystem/components/errorStandardPopup.vue
+++ b/frontend/src/views/machine/errorSystem/components/errorStandardPopup.vue
@@ -4,13 +4,17 @@
     <div class="table-container">
         <el-table :data="errorData" 
                   height="500" 
-                  :header-cell-style="{ textAlign: 'center',backgroundColor: '#003078',color: '#fff' } " 
+                  :header-cell-style="rowClass"
                   :cell-style="{ textAlign: 'center' }" 
                   style="width: 100%"
                   :span-method="spanMethod" 
                   border
-                  class="custom-table">
-          <el-table-column prop="measured" label="被测量" />
+                  class="custom-table"
+                  >
+          <el-table-column label="被测量">
+            <el-table-column prop="col1"/>
+            <el-table-column prop="col2"/>
+          </el-table-column>
           <el-table-column prop="deviceLevel" label="检测装置级别" />
           <el-table-column prop="measurementType" label="测量类型" />
           <el-table-column prop="condition" label="测量条件" />
@@ -57,6 +61,17 @@ interface SpanMethodProps {
   columnIndex: number
 }
 
+ const rowClass = ({row, column, rowIndex, columnIndex}) => {
+   let res = {
+     textAlign: 'center', backgroundColor: '#003078', color: '#fff'
+   }
+   if (rowIndex === 1) {
+     res = {...res, display: 'none'}
+     return res
+   }
+   return res
+ }
+
 const spanMethod = ({
   row,
   column,
@@ -65,7 +80,7 @@ const spanMethod = ({
 }: SpanMethodProps) => {
  
   if (columnIndex === 0  ) { // 检查是否为第一列
-    
+
     if (rowIndex === 2 ||rowIndex === 21) { // 检查是否为第三行
       return {
         rowspan: 2, // 合并行数