From 3d6285498aa43e11e14185729554d4fbaec55fcf Mon Sep 17 00:00:00 2001
From: sjl <1716605279@qq.com>
Date: Thu, 24 Oct 2024 09:38:12 +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

---
 .vscode/settings.json                         |   1 +
 frontend/src/api/error/errorData.ts           | 145 ++++++++++++++++--
 frontend/src/api/error/interface/index.ts     |  16 +-
 frontend/src/api/resource/resourceData.ts     |   4 +-
 .../components/Error standardDialog.vue       |  91 -----------
 .../components/ErrorStandardDialog.vue        |  72 +++++++++
 .../components/ErrorSystemDialog.vue          |  43 +++---
 .../components/IndicatorTypeDialog.vue        |  19 +--
 .../src/views/machine/errorSystem/index.vue   |  51 ++++--
 package.json                                  |   4 +-
 10 files changed, 287 insertions(+), 159 deletions(-)
 delete mode 100644 frontend/src/views/machine/errorSystem/components/Error standardDialog.vue
 create mode 100644 frontend/src/views/machine/errorSystem/components/ErrorStandardDialog.vue

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 9d8722b..0141266 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -2,6 +2,7 @@
     "cSpell.words": [
         "daterange",
         "errordata",
+        "errordetail",
         "logdata",
         "resourcedata",
         "resourcename",
diff --git a/frontend/src/api/error/errorData.ts b/frontend/src/api/error/errorData.ts
index ecfd166..7c63e0c 100644
--- a/frontend/src/api/error/errorData.ts
+++ b/frontend/src/api/error/errorData.ts
@@ -4,33 +4,152 @@ const errordata = ref<ErrorSystem.ErrorSystemList[]>([
       {
         'id': '1',
         'name': 'Q/GDW 1650.2- 2016',
+        'publishTime':'',
         'year':'2016',
         'level':'A级',
-        'details': [
-          { measured: '详细1-1', deviceLevel: '详细1-2', condition: '详细1-3', maxErrorValue: '详细1-4' },
-          { measured: '详细1-5', deviceLevel: '详细1-6', condition: '详细1-7', maxErrorValue: '详细1-8' },
-        ],
+        'state':'',
       },
       {
         'id': '2',
         'name': 'Q/GDW 10650.2 - 2021',
+        'publishTime':'',
         'year':'2021',
         'level':'A级',
-        'details': [
-          { measured: '详细1-1', deviceLevel: '详细1-2', condition: '详细1-3', maxErrorValue: '详细1-4' },
-          { measured: '详细1-5', deviceLevel: '详细1-6', condition: '详细1-7', maxErrorValue: '详细1-8' },
-        ],
+        'state':'',
       },
       {
         'id': '3',
         'name': 'GBT 19862 - 2016',
+        'publishTime':'',
         'year':'2016',
         'level':'A级',
-        'details': [
-          { measured: '详细1-1', deviceLevel: '详细1-2', condition: '详细1-3', maxErrorValue: '详细1-4' },
-          { measured: '详细1-5', deviceLevel: '详细1-6', condition: '详细1-7', maxErrorValue: '详细1-8' },
-        ],
+        'state':'',
+
       },
     ])
 
-    export default errordata
\ No newline at end of file
+    const errordetail = ref<ErrorSystem.ErrorSystemDetail[]>([
+      {
+           measured: '电压',
+           deviceLevel: 'A', 
+           condition: '10%~150%标称电压', 
+           maxErrorValue: '±0.1%Un' 
+      },
+      {
+           measured: '频率', 
+           deviceLevel: 'A', 
+           condition: '42.5~57.5 Hz', 
+           maxErrorValue: '±0.01Hz' 
+      },
+      {
+         measured: '电压三相不平衡度', 
+         deviceLevel: 'A', 
+         condition: '0.5%~5%', 
+         maxErrorValue: '±0.15%' 
+      },
+      {
+        measured: '电压三相不平衡度', 
+        deviceLevel: 'A', 
+        condition: '5%（不包含）~ 40%', 
+        maxErrorValue: '±0.3%' 
+     },
+     {
+      measured: '电流三相不平衡度', 
+      deviceLevel: 'A', 
+      condition: '', 
+      maxErrorValue: '±1%' 
+      },
+      {
+        measured: '短时闪变', 
+        deviceLevel: 'A', 
+        condition: 'Pst：0.2~10', 
+        maxErrorValue: '±5%' 
+      },
+      {
+        measured: '谐波电压', 
+        deviceLevel: 'A', 
+        condition: 'Uh≥1%Un', 
+        maxErrorValue: '±5%Uh' 
+      },
+      {
+        measured: '谐波电压', 
+        deviceLevel: 'A', 
+        condition: 'Uh＜1%Un', 
+        maxErrorValue: '±0.05%Un' 
+      },
+      {
+        measured: '谐波电流', 
+        deviceLevel: 'A', 
+        condition: 'In≥3%In', 
+        maxErrorValue: '±5%Ih' 
+      },
+      {
+        measured: '谐波电流', 
+        deviceLevel: 'A', 
+        condition: 'In＜3%In', 
+        maxErrorValue: '±0.15%In' 
+      },
+      {
+        measured: '谐波功率', 
+        deviceLevel: 'A', 
+        condition: 'Ph≥150W', 
+        maxErrorValue: '±1%Ph' 
+      },
+      {
+        measured: '谐波功率', 
+        deviceLevel: 'A', 
+        condition: 'Ph＜150W', 
+        maxErrorValue: '±1.5W' 
+      },
+      {
+        measured: '间谐波电压', 
+        deviceLevel: 'A', 
+        condition: 'Uh≥1%Un', 
+        maxErrorValue: '±5%Uh' 
+      },
+      {
+        measured: '间谐波电压', 
+        deviceLevel: 'A', 
+        condition: 'Uh＜1%Un', 
+        maxErrorValue: '±0.05%Un' 
+      },
+      {
+        measured: '间谐波电流', 
+        deviceLevel: 'A', 
+        condition: 'In≥3%In', 
+        maxErrorValue: '±5%Ih' 
+      },
+      {
+        measured: '间谐波电流', 
+        deviceLevel: 'A', 
+        condition: 'In＜3%In', 
+        maxErrorValue: '±0.15%In' 
+      },
+      {
+        measured: '电流', 
+        deviceLevel: 'A', 
+        condition: 'I≥0.05In', 
+        maxErrorValue: '±0.5%' 
+      },
+      {
+        measured: '电流', 
+        deviceLevel: 'A', 
+        condition: '0.01In≤I＜0.05In', 
+        maxErrorValue: '±1%' 
+      },
+      {
+        measured: '暂态幅值', 
+        deviceLevel: 'A', 
+        condition: '', 
+        maxErrorValue: '±0.2%Un' 
+      },
+      {
+        measured: '暂态时间', 
+        deviceLevel: 'A', 
+        condition: '', 
+        maxErrorValue: '±1周波' 
+      },
+    ])
+    
+    
+    export default {errordata,errordetail}
\ No newline at end of file
diff --git a/frontend/src/api/error/interface/index.ts b/frontend/src/api/error/interface/index.ts
index 5f3c9d6..e194a34 100644
--- a/frontend/src/api/error/interface/index.ts
+++ b/frontend/src/api/error/interface/index.ts
@@ -4,14 +4,18 @@ export namespace ErrorSystem  {
     export interface ErrorSystemList {
       id: string;//误差体系表Id
       name: string;//误差体系名称
+      publishTime:string;//发布时间
       year:string;//标准实施年份
       level:string;//使用设备等级
-      details?: Array<{
-        measured: string;//被测量
-        deviceLevel: string;//检测装置级别
-        condition: string;//测量条件
-        maxErrorValue: string;//最大误差
-      }>; // 详细信息
+      state:string;//状态
     }
 
+
+      // 查看详细误差体系
+      export interface ErrorSystemDetail {
+          measured: string;//被测量
+          deviceLevel: string;//检测装置级别
+          condition: string;//测量条件
+          maxErrorValue: string;//最大误差
+      }
   }
\ No newline at end of file
diff --git a/frontend/src/api/resource/resourceData.ts b/frontend/src/api/resource/resourceData.ts
index 6a543a4..ed15746 100644
--- a/frontend/src/api/resource/resourceData.ts
+++ b/frontend/src/api/resource/resourceData.ts
@@ -223,7 +223,7 @@ const resourcedata = ref<Resource.ResResourceList[]>([
         'name': '普通表格',
       
         'path':'/plan/planList/index',
-        'sort':71,
+        'sort':100,
         'type':'菜单',
         'remark':'检测计划描述',
         'route_Name':'route',
@@ -235,7 +235,7 @@ const resourcedata = ref<Resource.ResResourceList[]>([
         'name': '表格树',
      
         'path':'/plan/planList/index',
-        'sort':72,
+        'sort':100,
         'type':'菜单',
         'remark':'检测计划描述',
         'route_Name':'route',
diff --git a/frontend/src/views/machine/errorSystem/components/Error standardDialog.vue b/frontend/src/views/machine/errorSystem/components/Error standardDialog.vue
deleted file mode 100644
index f49b6aa..0000000
--- a/frontend/src/views/machine/errorSystem/components/Error standardDialog.vue	
+++ /dev/null
@@ -1,91 +0,0 @@
-<template >
-    <el-dialog :title="dialogTitle" :model-value="visible" @close="handleCancel" v-bind="dialogSmall" >
-        <el-form-item label="指标类型" prop="type">
-            <el-select
-                class='select'
-                placeholder='选择时间单位'
-            >
-            <!-- 采用 v-for 动态渲染 -->
-            <el-option
-                v-for="unit in typeList"
-                :key="unit.value"
-                :label="unit.label"
-                :value="unit.value"
-            ></el-option>
-            </el-select>                         
-        </el-form-item>
-        <template #footer>
-            <div class="dialog-footer">
-                <el-button @click="handleCancel">取 消</el-button>
-                <el-button type="primary" @click="handleSubmit">新增</el-button>
-            </div>
-        </template>
-    </el-dialog>
-</template>
-  
-  <script lang="ts" setup name="IndicatorTypeDialog">
-  import { defineProps, defineEmits, reactive,watch } from 'vue';
-  import { dialogSmall} from '@/utils/elementBind'
-  const props = defineProps<{
-    visible: boolean;
-    dialogTitle: string;
-    
-    formData: {
-      
-      id:string;
-      name: string;
-      path: string;
-      sort: number;
-      type: string;
-      remark: string;
-      route_Name: string;
-    };
-  }>();
-  
-  const typeList = [
-      { label: '电压', value: '电压' },
-      { label: '频率', value: '频率' },
-      { label: '电压三相不平衡度', value: '电压三相不平衡度' },
-      { label: '电流三相不平衡度', value: '电流三相不平衡度' },
-      { label: '电压波动', value: '电压波动' },
-      { label: '短时闪变', value: '短时闪变' },
-      { label: '谐波电压', value: '谐波电压' },
-      { label: '谐波电流', value: '谐波电流' },
-      { label: '谐波相角', value: '谐波相角' },
-      { label: '谐波功率', value: '谐波功率' },
-      { label: '间谐波电压', value: '间谐波电压' },
-      { label: '间谐波电流', value: '间谐波电流' },
-      { label: '功率', value: '功率' },
-      { label: '电流', value: '电流' },
-      { label: '暂态电压幅值', value: '暂态电压幅值' },
-      { label: '暂态持续时间', value: '暂态持续时间' },
-    ];
-
-  const rules = {
-          name :[
-            {require:true,trigger:"blur",message:"请填写菜单名称"}
-          ]
-  }
-  const emit = defineEmits<{
-    (e: 'update:visible', value: boolean): void;
-    (e: 'submit', data: any): void;
-  }>();
-  
-  const handleCancel = () => {
-    emit('update:visible', false); // 关闭对话框
-  };
-  
-  const handleSubmit = () => {
-    emit('submit', props.formData); // 提交表单数据
-    emit('update:visible', false); // 提交后关闭对话框
-  };
-  
-  // 当 props.visible 改变时，更新 formData
-  watch(() => props.visible, (newVal) => {
-    if (!newVal) {
-      // 这里可以重置表单数据，如果需要的话
-     
-    }
-  });
-  </script>
-  
diff --git a/frontend/src/views/machine/errorSystem/components/ErrorStandardDialog.vue b/frontend/src/views/machine/errorSystem/components/ErrorStandardDialog.vue
new file mode 100644
index 0000000..8368116
--- /dev/null
+++ b/frontend/src/views/machine/errorSystem/components/ErrorStandardDialog.vue
@@ -0,0 +1,72 @@
+<template>
+   <el-dialog  :title="dialogTitle" :model-value="visible" @close="handleCancel" v-bind="dialogBig">
+      <ProTable
+        ref='proTable'
+        :columns='columns'
+        :data='errorData'
+      />
+    </el-dialog>
+</template>
+  
+  <script lang="ts" setup name="IndicatorTypeDialog">
+  import { defineProps, defineEmits, reactive,watch,ref } from 'vue';
+  import { dialogBig} from '@/utils/elementBind'
+  import type { ColumnProps } from '@/components/ProTable/interface'
+  import type { ErrorSystem } from '@/api/error/interface'
+  import errorDataList from '@/api/error/errorData'
+  const errorData = errorDataList.errordetail
+
+  // 表格配置项
+const columns = reactive<ColumnProps<ErrorSystem.ErrorSystemDetail>[]>([
+  {
+    prop: 'measured',
+    label: '被测量',
+  },
+  {
+    prop: 'deviceLevel',
+    label: '检测装置级别',
+  },
+  {
+    prop: 'condition',
+    label: '测量条件',
+  },
+  {
+    prop: 'maxErrorValue',
+    label: '最大误差',
+  },
+])
+
+
+  const props = defineProps<{
+    visible: boolean;
+    dialogTitle: string;
+    
+    formData: {
+         measured: string, 
+         deviceLevel: string, 
+         condition: string, 
+         maxErrorValue: string 
+    };
+  }>();
+  
+
+  const emit = defineEmits<{
+    (e: 'update:visible', value: boolean): void;
+    (e: 'submit', data: any): void;
+  }>();
+  
+  const handleCancel = () => {
+    emit('update:visible', false); // 关闭对话框
+  };
+  
+
+  
+  // 当 props.visible 改变时，更新 formData
+  watch(() => props.visible, (newVal) => {
+    if (!newVal) {
+      // 这里可以重置表单数据，如果需要的话
+     
+    }
+  });
+  </script>
+  
diff --git a/frontend/src/views/machine/errorSystem/components/ErrorSystemDialog.vue b/frontend/src/views/machine/errorSystem/components/ErrorSystemDialog.vue
index ab38012..fed44d1 100644
--- a/frontend/src/views/machine/errorSystem/components/ErrorSystemDialog.vue
+++ b/frontend/src/views/machine/errorSystem/components/ErrorSystemDialog.vue
@@ -7,12 +7,12 @@
                         <el-row  :gutter="20" >
                             <el-col :span="10">
                                 <el-form-item label="误差体系名称" prop="name">
-                                    <el-input placeholder="标准号+年份+设备等级"/>
+                                    <el-input v-model='formData.name' placeholder="标准号+年份+设备等级"/>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="8">
                                 <el-form-item label="发布时间" prop="publishTime">
-                                    <el-input  />
+                                    <el-input v-model="formData.publishTime" />
                                 </el-form-item>
                             </el-col>
                             <el-col :span="6">
@@ -23,21 +23,21 @@
                         </el-row>
                         <el-row  :gutter="20" >
                             <el-col :span="10">
-                                <el-form-item label="适用设备等级" prop="type">
-                                    <el-select  placeholder="请选择设备等级">
+                                <el-form-item label="适用设备等级" prop="level">
+                                    <el-select v-model='formData.level' placeholder="请选择设备等级">
                                         <el-option label="A级" value="A级" />
                                         <el-option label="S级" value="S级" />
                                     </el-select>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="8">
-                                <el-form-item label="实施时间" prop="publishTime">
-                                    <el-input  />
+                                <el-form-item  label="实施时间" prop="year">
+                                    <el-input  v-model='formData.year'/>
                                 </el-form-item>
                             </el-col>
                             <el-col :span="6">
-                                <el-form-item label="状态" prop="type">
-                                    <el-select  placeholder="请选择状态">
+                                <el-form-item label="状态" prop="state">
+                                    <el-select v-model='formData.state' placeholder="请选择状态">
                                         <el-option label="启用" value="启用" />
                                         <el-option label="停用" value="停用" />
                                     </el-select>
@@ -53,12 +53,12 @@
                 <el-button :icon='Delete' type="danger" >批量删除</el-button>
         </div>
 
-        <el-table :data="tableData" style="width: 100%;text-align: center" >
+        <el-table :data="tableData"  style="width: 100%">
                 <el-table-column type="selection" width="55" />
                 <el-table-column prop="id" label="序号" width="60" />
                 <el-table-column prop="type" label="电能质量检测指标类型" width="200"/>
-                <el-table-column label="起止范围">
-                    <el-table-column label="起始">
+                <el-table-column label="起止范围"  style="text-align: center;">
+                    <el-table-column label="起始" style="text-align: center;">
                         <template #default="{ row }">
                             <el-row type="flex" align="middle">
                                 <el-col :span="16">
@@ -158,18 +158,19 @@
     dialogTitle: string;
     
     formData: {
-      
       id:string;
       name: string;
-      path: string;
-      sort: number;
-      type: string;
-      remark: string;
-      route_Name: string;
+      publishTime:string;
+      year: string;
+      level: string;
+      state: string;
     };
   }>();
   const dialogFormVisible = ref(false)
-  const dialogTitle = ref('新增检测指标误差项')
+  const dialogForm =ref({
+    type : '',
+  })
+  
   const errorTypeOptions = [
   { label: '绝对值-标称值', value: 'type1' },
   { label: '相对值-I类', value: 'type2' },
@@ -234,11 +235,6 @@ const errorEndOptions = [
   
 ]
 
-  const rules = {
-          name :[
-            {require:true,trigger:"blur",message:"请填写菜单名称"}
-          ]
-  }
   const emit = defineEmits<{
     (e: 'update:visible', value: boolean): void;
     (e: 'submit', data: any): void;
@@ -267,6 +263,7 @@ const errorEndOptions = [
   </script>
   
   <style scoped>
+  
 .form-grid {
     display: flex;
     flex-direction: row; /* 横向排列 */
diff --git a/frontend/src/views/machine/errorSystem/components/IndicatorTypeDialog.vue b/frontend/src/views/machine/errorSystem/components/IndicatorTypeDialog.vue
index f49b6aa..b6ffb30 100644
--- a/frontend/src/views/machine/errorSystem/components/IndicatorTypeDialog.vue
+++ b/frontend/src/views/machine/errorSystem/components/IndicatorTypeDialog.vue
@@ -3,7 +3,8 @@
         <el-form-item label="指标类型" prop="type">
             <el-select
                 class='select'
-                placeholder='选择时间单位'
+                placeholder='选择指标类型'
+                v-model="formData.type"
             >
             <!-- 采用 v-for 动态渲染 -->
             <el-option
@@ -24,24 +25,20 @@
 </template>
   
   <script lang="ts" setup name="IndicatorTypeDialog">
-  import { defineProps, defineEmits, reactive,watch } from 'vue';
+  import { defineProps, defineEmits, reactive,watch ,ref} from 'vue';
   import { dialogSmall} from '@/utils/elementBind'
+  const dialogTitle = ref('新增检测指标误差项')
   const props = defineProps<{
     visible: boolean;
-    dialogTitle: string;
-    
     formData: {
-      
-      id:string;
-      name: string;
-      path: string;
-      sort: number;
       type: string;
-      remark: string;
-      route_Name: string;
     };
   }>();
   
+  const formData = reactive({
+  type: ''
+});
+
   const typeList = [
       { label: '电压', value: '电压' },
       { label: '频率', value: '频率' },
diff --git a/frontend/src/views/machine/errorSystem/index.vue b/frontend/src/views/machine/errorSystem/index.vue
index f6f69ce..29bd876 100644
--- a/frontend/src/views/machine/errorSystem/index.vue
+++ b/frontend/src/views/machine/errorSystem/index.vue
@@ -16,19 +16,27 @@
       </template>
        <!-- 表格操作 -->
        <template #operation='scope'>
-          <el-button type='primary' link :icon='View'  @row-click="handleRowClick">查看</el-button>
+          <el-button type='primary' link :icon='View'  @click="handleRowClick(scope.row)">查看</el-button>
           <el-button type='primary' link :icon='EditPen' @click="openEditDialog(scope.row)">编辑</el-button>
           <el-button type='primary' link :icon='Delete' >删除</el-button>
         </template>
     </ProTable>
 
-            <!-- 新增/编辑资源对话框 -->
-            <ResourceDialog
+       <!-- 新增/编辑误差体系对话框 -->
+       <ErrorSystemDialog     
       :visible="dialogFormVisible"
       :formData="dialogForm"
        :dialogTitle="dialogTitle"
       @update:visible="dialogFormVisible = $event"
     />
+
+    <!-- 查看误差体系详细信息 -->
+    <ErrorStandardDialog     
+      :visible="detail_dialogFormVisible"
+      :formData="detail_dialogForm"
+       :dialogTitle="detail_dialogTitle"
+      @update:visible="detail_dialogFormVisible = $event"
+    />
   </div>
 </template>
 
@@ -39,16 +47,30 @@ import { CirclePlus, Delete,EditPen,View} from '@element-plus/icons-vue'
 import errorDataList from '@/api/error/errorData'
 import { reactive,ref } from 'vue'
 import type { ErrorSystem } from '@/api/error/interface'
-import ResourceDialog from "@/views/machine/errorSystem/components/ErrorSystemDialog.vue"; // 导入子组件
+import ErrorSystemDialog from "@/views/machine/errorSystem/components/ErrorSystemDialog.vue"; // 导入子组件
+import ErrorStandardDialog from "@/views/machine/errorSystem/components/ErrorStandardDialog.vue"; // 导入子组件
 let multipleSelection = ref<string[]>([])
-const errorData = errorDataList
+const errorData = errorDataList.errordata
 const dialogFormVisible = ref(false)
 const dialogTitle = ref('新增误差体系')
 const dialogForm = ref<ErrorSystem.ErrorSystemList>({
                               id: '',
                               name: '',
+                              publishTime: '',
                               year:'',     
-                              level:'',          
+                              level:'',   
+                              state: '',       
+});
+
+
+
+const detail_dialogFormVisible = ref(false)
+const detail_dialogTitle = ref('Q/GDW 10650.2-2021 误差体系')
+const detail_dialogForm = ref<ErrorSystem.ErrorSystemDetail>({
+                              measured: '',//被测量
+                              deviceLevel: '',//检测装置级别
+                              condition: '',//测量条件
+                              maxErrorValue: '',//最大误差     
 });
 
 // 表格配置项
@@ -79,23 +101,30 @@ const columns = reactive<ColumnProps<ErrorSystem.ErrorSystemList>[]>([
 ])
 
 // 打开编辑对话框
-const openEditDialog = (resource: ErrorSystem.ErrorSystemList) => {
- 
+const openEditDialog = (errorSystem: ErrorSystem.ErrorSystemList) => {
+  errorSystem.publishTime ='2024'
+  errorSystem.state = '启用';
+  dialogForm.value = {...errorSystem};
+  dialogTitle.value = '编辑误差体系';
+  dialogFormVisible.value = true; // 打开对话框
 };
 
 const openAddDialog = () => {
   dialogForm.value = {
     id: '',
     name: '',
+    publishTime: '',
     year: '',
     level: '',
+    state: '',
   };
+  dialogTitle.value = '新增误差体系';
   dialogFormVisible.value = true; // 打开对话框
 };
 
-
-const handleRowClick = (row: ErrorSystem.ErrorSystemList) =>{
-  
+const handleRowClick = (errorSystem: ErrorSystem.ErrorSystemList) =>{
+  detail_dialogTitle.value = errorSystem.name;
+  detail_dialogFormVisible.value = true; // 显示对话框
 }
 </script>
 
diff --git a/package.json b/package.json
index ab390fa..c01ed19 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
     "ee-core": "2.10.0",
     "electron-updater": "^5.3.0",
     "lodash": "^4.17.21",
-    "mqtt": "^5.10.1"
+    "mqtt": "^5.10.1",
+    "sass": "^1.80.4"
   }
 }
-