Merge branch 'master' of http://192.168.1.22:3000/frontend/pqs-9100_client

# Conflicts:
#	frontend/src/views/machine/errorSystem/components/errorStandardPopup.vue

frontend/src/views/machine/errorSystem/components/errorStandardPopup.vue

@@ -0,0 +1,150 @@
+<template>
+  <el-dialog  :title="dialogTitle" :model-value="visible" @close="handleCancel" v-bind="dialogBig">
+    <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>
+   </el-dialog>
+</template>
+ 
+ <script lang="ts" setup name="IndicatorTypeDialog">
+ import { defineProps, defineEmits, reactive,watch,ref,computed } from 'vue';
+ import { dialogBig} from '@/utils/elementBind'
+ import type { ColumnProps } from '@/components/ProTable/interface'
+ import type { ErrorSystem } from '@/api/device/interface/error'
+ import errorDataList from '@/api/device/error/errorData'
+ import type { TableColumnCtx } from 'element-plus'
+
+ const errorData = errorDataList.errordetail
+
+ // 表格配置项
+const columns = reactive<ColumnProps<ErrorSystem.Error_detail>[]>([
+ {
+   prop: 'measured',
+   label: '被测量',
+ },
+ {
+   prop: 'deviceLevel',
+   label: '检测装置级别',
+ },
+ {
+   prop: 'condition',
+   label: '测量条件',
+ },
+ {
+   prop: 'measurementType',
+   label: '测量类型',
+ },
+ {
+   prop: 'maxErrorValue',
+   label: '最大误差',
+ },
+])
+
+
+interface SpanMethodProps {
+  row: ErrorSystem.Error_detail
+  column: TableColumnCtx<ErrorSystem.Error_detail>
+  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;
+   
+   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>
+ <style>
+
+ </style>

frontend/src/views/machine/errorSystem/components/errorSystemDetailTable.vue

@@ -0,0 +1,189 @@
+<template>
+     <div class="dialog-footer">
+                <el-button :icon='CirclePlus' type="primary" @click="openAddDialog">新增</el-button>
+                <el-button :icon='Delete' type="danger"  plain :disabled='!multipleSelection.length' @click="deleteSelectedRows">批量删除</el-button>
+    </div>
+      <div class="table-container">
+            <el-table :data="tableData"  
+                  :header-cell-style="{ textAlign: 'center',backgroundColor: '#003078',color: '#fff' } " 
+                  :cell-style="{ textAlign: 'center' }" 
+                  style="width: 100%"  
+                  @selection-change="handleSelectionChange" >
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column prop="nextId" label="序号" width="60" />
+                    <el-table-column prop="type" label="电能质量检测指标类型" width="181">
+                        <template #default="{ row }">
+                            <el-select v-model="row.type" placeholder="选择指标类型" >
+                                <el-option v-for="item in dictStore.getDictData('Error_Value_Type')"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"/>
+                            </el-select>
+                            </template>
+                    </el-table-column>
+                    <el-table-column label="起止范围" >
+                        <el-table-column label="起始">
+                            <template #default="{ row }">
+                                <el-row type="flex">
+                                    <el-col :span="14">
+                                        <el-select v-model="row.startFlag" placeholder="选择起始值" style="width: 70px;">
+                                            <el-option label="无" :value="2"></el-option>
+                                            <el-option label=">=" :value="1"></el-option>
+                                            <el-option label=">" :value="0"></el-option>
+                                        </el-select>
+                                    </el-col>
+                                    <el-col :span="10">
+                                        <el-input v-model= "row.startValue" style="width: 70px;"
+                                        />
+                                    </el-col>
+                                </el-row>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="结束">
+                            <template #default="{ row }">
+                                <el-row type="flex" >
+                                    <el-col :span="14">
+                                        <el-select v-model="row.endFlag" placeholder="选择结束值" style="width: 70px;">
+                                            <el-option label="无" :value="2"></el-option>
+                                            <el-option label="<=" :value="1"></el-option>
+                                            <el-option label="<" :value="0"></el-option>
+                                        </el-select>
+                                    </el-col>
+                                    <el-col :span="10">
+                                        <el-input v-model= "row.endValue" style="width: 70px;"/>
+                                    </el-col>
+                                </el-row>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="单位" width="115">
+                            <template #default="{ row }">
+                            <el-select v-model="row.conditionType" placeholder="选择单位">
+                                <el-option
+                                v-for="item in dictStore.getDictData('Condition_Type')"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                                />
+                            </el-select>
+                            </template>
+                        </el-table-column>
+                    </el-table-column>
+                    <el-table-column  label="最大误差">
+                        <el-table-column prop="maxErrorValue" label="最大误差值" width="100">
+                            <template #default="{ row }">
+                                <el-input v-model= "row.maxErrorValue" style="width: 70px;"/>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="误差类型">
+                            <template #default="{ row }">
+                            <el-select v-model="row.errorValueType" placeholder="选择误差类型">
+                                <el-option
+                                 v-for="item in dictStore.getDictData('Error_Value_Type')"
+                                :key="item.id"
+                                :label="item.name"
+                                :value="item.id"
+                                />
+                            </el-select>
+                            </template>
+                        </el-table-column>
+                    </el-table-column>
+                    <el-table-column label="操作" width="150">
+                    <template  #default="{ row }">
+                        <el-button type="primary" link :icon='CopyDocument' @click="copyRow(row)">复制</el-button>
+                        <el-button  type='primary' link :icon='Delete'  @click="deleteRow(row)">删除</el-button>
+                    </template>
+                    </el-table-column>
+            </el-table>
+        </div>
+</template>
+
+<script setup lang="ts">
+  import { type ErrorSystem } from '@/api/device/interface/error';
+  import { useDictStore, } from '@/stores/modules/dict'
+  import {CirclePlus, Delete, EditPen,CopyDocument} from '@element-plus/icons-vue'
+import { FormItemRule } from 'element-plus';
+  import { onMounted, type PropType, Ref, ref, watch } from 'vue';
+  import { defineEmits } from 'vue';
+import ProTable from '@/components/ProTable/index.vue'
+  const emit = defineEmits(['updateTableData']);
+  const multipleSelection = ref<number[]>([])
+  const dictStore = useDictStore()
+  const props = defineProps({
+    tableData: {
+    type: Array as PropType<ErrorSystem.ErrorSystemDetail[]>,
+    default: () => []
+  }
+});
+
+// 监听 props.tableData 的变化，确保每次数据变化时都重新设置 nextId
+watch(() => props.tableData, (newTableData) => {
+  for (let i = 0; i < newTableData.length; i++) {
+    newTableData[i].nextId = i + 1;
+  }
+}, { immediate: true });
+
+    // 定义规则
+    const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
+      type: [{ required: true, message: '误差体系名称必填！', trigger: 'blur' }],
+  
+}); 
+
+ //选中
+   const handleSelectionChange = (selection: ErrorSystem.ErrorSystemDetail[]) => {
+    multipleSelection.value = selection.map(row => row.nextId); // 更新选中的行
+  };
+  //新增
+  const openAddDialog = () => {
+    const newRow = {
+    nextId: props.tableData.length + 1,
+    id: '',
+    errorSysId: "",
+    type: "",
+    maxErrorValue: 0,
+    errorValueType: ""
+  };
+  emit('updateTableData', [...props.tableData, newRow]);
+};
+  
+const copyRow = (row: ErrorSystem.ErrorSystemDetail) => {
+  // 深拷贝行数据
+  const newRow = { ...row };
+  const maxNextId = Math.max(...props.tableData.map(item => item.nextId), 0);
+  newRow.nextId = maxNextId + 1;
+  emit('updateTableData', [...props.tableData, newRow]);
+};
+//删除行
+const deleteRow = (row:ErrorSystem.ErrorSystemDetail) => {
+  const index = props.tableData.indexOf(row);
+  if (index !== -1) {
+    const newTableData = [...props.tableData];
+    newTableData.splice(index, 1);
+    emit('updateTableData', newTableData);
+  }
+};
+//批量删除选中行
+const deleteSelectedRows = () => {
+    const newTableData = props.tableData.filter(row => !multipleSelection.value.includes(row.nextId));
+    multipleSelection.value = []; // 清空已选择的行
+  emit('updateTableData', newTableData);
+};
+
+
+</script>
+
+<style scoped>
+.dialog-footer {
+    display: flex;
+    justify-content: flex-start;
+    margin-bottom: 10px; /* 调整这里的值以增加或减少间距 */
+}
+
+.el-table th, .el-table td {
+  text-align: center; /* 所有单元格文字居中 */
+}
+.table-container {
+  max-height: 400px; /* 根据需要调整高度 */
+  overflow-y: auto; /* 允许垂直滚动 */
+  overflow-x: hidden; /* 隐藏水平滚动条 */
+}
+</style>

frontend/src/views/machine/errorSystem/components/errorSystemPopup.vue

@@ -0,0 +1,204 @@
+<template>
+    <el-dialog  :title="dialogTitle" v-model='dialogVisible' @close="close" v-bind="dialogBig">
+        <el-tabs type="border-card">
+            <el-tab-pane label="基础信息">
+                <div class="form-grid">
+                    <el-form :model="formContent" ref='dialogFormRef' :rules='rules'>
+                        <el-row  :gutter="24" >
+                            <el-col :span="8">
+                                <el-form-item label="误差体系名称" prop="name" :label-width="110">
+                                    <el-input v-model='formContent.name' placeholder="标准号+年份+设备等级"/>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item  label="参照标准名称" prop="standardName" :label-width="110">
+                                    <el-input  v-model='formContent.standardName'/>
+                                </el-form-item>
+                            </el-col>
+                            <el-col :span="8">
+                                <el-form-item label="发布时间" prop="standardTime" :label-width="110">
+                                    <el-input v-model="formContent.standardTime" />
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                        <el-row  :gutter="24" >
+                            <el-col :span="8">
+                                <el-form-item label="适用设备等级" prop="devLevel" :label-width="110">
+                                    <el-select v-model='formContent.devLevel' placeholder="请选择设备等级">
+                                        <el-option
+                                                v-for="item in dictStore.getDictData('Dev_Level')"
+                                                :key="item.id"
+                                                :label="item.name"
+                                                :value="item.id"
+                                            />
+                                    </el-select>
+                                </el-form-item>
+                            </el-col>
+                            
+                            <el-col :span="8">
+                                <el-form-item label="状态" prop="enable" :label-width="110">
+                                    <el-select v-model='formContent.enable' placeholder="请选择状态">
+                                        <el-option label="启用" :value="1"></el-option>
+                                        <el-option label="不启用" :value="0"></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
+                    </el-form>
+                </div>
+            </el-tab-pane>
+        </el-tabs>
+        <ErrorSystemDetailTable :tableData="tableData"  @updateTableData="handleTableDataUpdate"/>
+        <template #footer>
+            <div >
+                <el-button @click='close()'>取 消</el-button>
+                <el-button type="primary" @click='save()'>保存</el-button>
+            </div>
+        </template>
+    </el-dialog>
+
+
+</template>
+  
+  <script lang="ts" setup name="ErrorSystemDialog">
+  import{ElMessage, type FormInstance,type FormItemRule}from'element-plus'
+  import { defineProps, defineEmits, reactive,watch,ref, Ref, computed } from 'vue';
+  import { dialogBig} from '@/utils/elementBind'
+  import { addPqErrSys,updatePqErrSys,getPqErrSysListById} from '@/api/device/error/index'
+  import {CirclePlus, Delete, EditPen,FolderOpened,CopyDocument} from '@element-plus/icons-vue'
+  import { useDictStore } from '@/stores/modules/dict'
+  import { type ErrorSystem } from '@/api/device/interface/error';
+  import ErrorSystemDetailTable from '@/views/machine/errorSystem/components/errorSystemDetailTable.vue';
+  // 定义弹出组件元信息
+  const dialogFormRef = ref()
+  const dictStore = useDictStore()
+  const tableData = ref<ErrorSystem.ErrorSystemDetail[]>([]);
+
+    const handleTableDataUpdate = (newTableData: ErrorSystem.ErrorSystemDetail[]) => {
+        tableData.value = newTableData;
+    };
+
+  function useMetaInfo() {
+    const dialogVisible = ref(false)
+    const titleType = ref('add')
+    const formContent = ref<ErrorSystem.ErrorSystemList>({
+        id: '',
+        name: '',
+        standardName: '',
+        standardTime: '',
+        devLevel: '',
+        enable: 1,
+        state:1,
+        pqErrSysDtlsList:[]
+    })
+    return { dialogVisible, titleType, formContent }
+  }
+  
+  const { dialogVisible, titleType, formContent } = useMetaInfo()
+  // 清空formContent
+  const resetFormContent = () => {
+    formContent.value = {
+        id: '',
+        name: '',
+        standardName: '',
+        standardTime: '',
+        devLevel: '',
+        enable: 1,
+        state:1,
+        pqErrSysDtlsList:[]
+    }
+  }
+  
+  let dialogTitle = computed(() => {
+    return titleType.value === 'add' ? '新增误差体系' : '编辑误差体系'
+  })
+
+    // 定义规则
+    const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
+    name: [{ required: true, message: '误差体系名称必填！', trigger: 'blur' }],
+    standardName: [{ required: true, message: '参照标准名称必填！', trigger: 'blur' }],
+    standardTime: [{ required: true, message: '标准推行时间必填！', trigger: 'blur' }],
+    devLevel:[{ required: true, message: '请选择一项设备等级', trigger: 'change' },],
+    enable:[{ required: true, message: '请选择一项状态', trigger: 'change '},]
+});    
+
+
+    // 关闭弹窗
+    const close = () => {
+        dialogVisible.value = false
+        // 清空dialogForm中的值
+        resetFormContent()
+        // 重置表单
+        dialogFormRef.value?.resetFields()
+    }
+  
+    // 保存数据
+    const save = () => {
+        try {      
+            dialogFormRef.value?.validate(async (valid: boolean) => {
+            if (valid) {
+                formContent.value.pqErrSysDtlsList = tableData.value
+                if (formContent.value.id) {
+                    await updatePqErrSys(formContent.value);
+                    ElMessage.success({ message: `${dialogTitle.value}成功！` })
+                } else {  
+                    await addPqErrSys(formContent.value);
+                    ElMessage.success({ message: `${dialogTitle.value}成功！` })    
+                }            
+                close()
+                // 刷新表格
+                await props.refreshTable!()       
+
+            }
+        })
+    } catch (err) {
+        console.error('验证过程中出现错误', err)
+    }
+    }
+
+
+// 打开弹窗，可能是新增，也可能是编辑
+const open = async (sign: string, data: ErrorSystem.ErrorSystemList) => {
+  titleType.value = sign
+  dialogVisible.value = true
+  if (data.id) {
+    const result = await getPqErrSysListById(data);
+    if (result && result.data) {
+      formContent.value = result.data as ErrorSystem.ErrorSystemList;
+      
+      tableData.value = formContent.value.pqErrSysDtlsList || []
+    }
+  } else {
+    resetFormContent()
+  }
+  // 重置表单
+  dialogFormRef.value?.resetFields()
+}
+
+
+// 对外映射
+defineExpose({ open })
+const props = defineProps<{
+  refreshTable: (() => Promise<void>) | undefined;
+}>()
+</script>
+<style>
+.form-grid {
+    display: flex;
+    flex-direction: row; /* 横向排列 */
+    flex-wrap: wrap; /* 允许换行 */
+}
+.form-grid .el-form-item {
+    flex: 1 1 30%; /* 控件宽度 */
+    margin-right: 20px; /* 控件间距 */
+}
+.form-grid .el-form-item:last-child {
+    margin-right: 0; /* 最后一个控件不需要右边距 */
+}
+.el-tabs {
+    margin-bottom: 20px; /* 添加底部边距 */
+}
+
+
+</style>
+  

frontend/src/views/machine/errorSystem/index.vue

@@ -3,148 +3,93 @@
     <ProTable
       ref='proTable'
       :columns='columns'
-      :data='errorData'
-      type='selection'
-      @selection-change="handleSelectionChange" 
+      :request-api='getPqErrSysList'
     >
       <!-- 表格 header 按钮 -->
-      <template #tableHeader>
-        <el-button type='primary' :icon='CirclePlus' @click="openAddDialog">新增</el-button>
-          <el-button type='danger' :icon='Delete' plain :disabled='!multipleSelection.length'
-                     >
-            批量删除
-          </el-button>
+      <template #tableHeader='scope'>
+        <el-button type='primary' :icon='CirclePlus' @click="openDialog('add')">新增</el-button>
+        <el-button v-auth.device="'delete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
+                   @click='batchDelete(scope.selectedListIds)'>
+          批量删除
+        </el-button>
       </template>
        <!-- 表格操作 -->
        <template #operation='scope'>
-          <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>
+          <el-button type='primary' link :icon='View'>查看</el-button>
+          <el-button type='primary' link :icon='EditPen' @click="openDialog('edit', scope.row)">编辑</el-button>
+          <el-button type='primary' link :icon='Delete' @click='handleDelete(scope.row)'>删除</el-button>
         </template>
     </ProTable>
-
-       <!-- 新增/编辑误差体系对话框 -->
-       <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>
+
+  <ErrorSystemPopup :refresh-table='proTable?.getTableList' ref='errorSystemPopup' />
+  <ErrorStandardPopup :refresh-table='proTable?.getTableList' ref='errorStandardPopup' />
 </template>
 
 <script setup lang="ts" name='useProTable'>
 import ProTable from '@/components/ProTable/index.vue'
-import type { ColumnProps } from '@/components/ProTable/interface'
+import type { ColumnProps, ProTableInstance } from '@/components/ProTable/interface'
 import { CirclePlus, Delete,EditPen,View} from '@element-plus/icons-vue'
-import errorDataList from '@/api/device/error/errorData'
 import { reactive,ref } from 'vue'
+import { useHandleData } from '@/hooks/useHandleData'
+import ErrorSystemPopup from '@/views/machine/errorSystem/components/errorSystemPopup.vue'
+import ErrorStandardPopup from '@/views/machine/errorSystem/components/errorStandardPopup.vue'
 import type { ErrorSystem } from '@/api/device/interface/error'
-import ErrorSystemDialog from "@/views/machine/errorSystem/components/ErrorSystemDialog.vue"; // 导入子组件
-import ErrorStandardDialog from "@/views/machine/errorSystem/components/ErrorStandardDialog.vue"; // 导入子组件
 import { useDictStore } from '@/stores/modules/dict'
+import { getPqErrSysList, deletePqErrSys} from '@/api/device/error/index'
 const dictStore = useDictStore()
-let multipleSelection = ref<string[]>([])
-const errorData = errorDataList.errordata
-const dialogFormVisible = ref(false)
-const dialogTitle = ref('新增误差体系')
-const dialogForm = ref<ErrorSystem.ErrorSystemList>({
-      id: '',
-      name: '',
-      standard_Name:'',
-      standard_Time:'',
-      dev_Level:'',
-      enable:1,
-      state:1,     
-});
-
-
-
-const detail_dialogFormVisible = ref(false)
-const detail_dialogTitle = ref('Q/GDW 10650.2-2021 误差体系')
-const detail_dialogForm = ref<ErrorSystem.Error_detail>({
-                              measured: '',//被测量
-                              deviceLevel: '',//检测装置级别
-                              measurementType:'',
-                              condition: '',//测量条件
-                              maxErrorValue: '',//最大误差     
-});
-
+// ProTable 实例
+const proTable = ref<ProTableInstance>()
+const errorSystemPopup = ref()
+const errorStandardPopup = ref()
 // 表格配置项
 const columns = ref<ColumnProps<ErrorSystem.ErrorSystemList>[]>([
   { type: 'selection', fixed: 'left', width: 70 },
-  {
-    prop: 'id',
-    label: '序号',
-    width: 70,
-  },
+  { type: 'index', fixed: 'left', width: 70, label: '序号' },
   {
     prop: 'name',
     label: '误差体系名称',
   },
   {
-    prop: 'standard_Name',
+    prop: 'standardName',
     label: '参照标准名称',
   },
   {
-    prop: 'standard_Time',
+    prop: 'standardTime',
     label: '标准实施年份',
     width: 200,
     search: { el: 'input' },
   },
   {
-    prop: 'dev_Level',
+    prop: 'devLevel',
     label: '适用设备等级',
     width: 120,
-    enum: dictStore.getDictData('errorLevel'),
+    enum: dictStore.getDictData('Dev_Level'),
     search: { el: 'select', props: { filterable: true } },
-    fieldNames: { label: 'label', value: 'code' },
+    fieldNames: { label: 'name', value: 'id' },
   },
   { prop: 'operation', label: '操作', fixed: 'right' ,width: 250,},
 ])
 
-// 打开编辑对话框
-const openEditDialog = (errorSystem: ErrorSystem.ErrorSystemList) => {
-  errorSystem.standard_Time ='2024'
-  dialogForm.value = {...errorSystem};
-  dialogTitle.value = '编辑误差体系';
-  dialogFormVisible.value = true; // 打开对话框
-};
-
-const openAddDialog = () => {
-  dialogForm.value = {
-      id: '',
-      name: '',
-      standard_Name:'',
-      standard_Time:'',
-      dev_Level:'',
-      
-      state:0, 
-  };
-  dialogTitle.value = '新增误差体系';
-  dialogFormVisible.value = true; // 打开对话框
-};
-
-//选中
- // 处理选择变化
- const handleSelectionChange = (selection:ErrorSystem.ErrorSystemList[]) => {
-    multipleSelection.value = selection.map(row => row.id); // 更新选中的行
-    
-  };
-
-
-const handleRowClick = (errorSystem: ErrorSystem.ErrorSystemList) =>{
-  detail_dialogTitle.value = errorSystem.name;
-  detail_dialogFormVisible.value = true; // 显示对话框
+// 打开 drawer(新增、编辑)
+const openDialog = (titleType: string, row: Partial<ErrorSystem.ErrorSystemList> = {}) => {
+  errorSystemPopup.value?.open(titleType, row)
 }
+
+
+// 批量删除设备
+const batchDelete = async (id: string[]) => {
+  await useHandleData(deletePqErrSys, id, '删除所选误差体系')
+  proTable.value?.clearSelection()
+  proTable.value?.getTableList()
+}
+
+// 删除设备
+const handleDelete = async (params: ErrorSystem.ErrorSystemList) => {
+  await useHandleData(deletePqErrSys, [params.id], `删除【${params.name}】误差体系`)
+  proTable.value?.getTableList()
+}
+
 </script>
 
 <style scoped>

frontend/src/views/machine/testSource/components/parameterPopup.vue

@@ -0,0 +1,13 @@
+<template>
+    <div>
+
+    </div>
+</template>
+
+<script setup lang="ts">
+
+</script>
+
+<style scoped>
+
+</style>

frontend/src/views/machine/testSource/components/parameterTable.vue

@@ -0,0 +1,116 @@
+<template>
+  <div class='table-box'>
+    <ProTable
+      ref='proTable'
+      :columns='columns'
+      :pagination="false"
+      :toolButton="false"
+      :data="tableData"
+      :row-key="id"
+    >
+      <!-- 表格 header 按钮 -->
+      <template #tableHeader='scope'>
+        <el-button v-auth.testSource="'add'" type='primary' :icon='CirclePlus' @click="openDialog('add')">新增</el-button>
+        <el-button v-auth.testSource="'batchDelete'" type='danger' :icon='Delete' 
+                   plain :disabled='!scope.isSelected' @click='batchDelete(scope.selectedListIds)'>
+          批量删除
+        </el-button>
+      </template>
+      <!-- 表格操作 -->
+      <template #operation='scope'>
+        <el-button type="primary" link :icon='CopyDocument' @click="copyRow(row)">复制</el-button>
+        <el-button type='primary' link :icon='EditPen' @click="openDialog('edit', scope.row)">编辑</el-button>
+        <el-button type='primary' link :icon='Delete' @click='handleDelete(scope.row)'>删除</el-button>
+      </template>
+    </ProTable>
+    
+  </div>
+  <ParameterPopup :refresh-table='getTableList' ref='parameterPopup' />
+</template>
+  
+  <script setup lang='tsx' name='useRole'>
+  import { type TestSource } from '@/api/device/interface/testSource'
+  import { useHandleData } from '@/hooks/useHandleData'
+  import ProTable from '@/components/ProTable/index.vue'
+  import type{  ProTableInstance, ColumnProps } from '@/components/ProTable/interface'
+  import { CirclePlus, Delete, EditPen, Share, Download, Upload, View, Refresh,CopyDocument } from '@element-plus/icons-vue'
+  import { useDictStore } from '@/stores/modules/dict'
+  import ParameterPopup from '@/views/machine/testSource/components/parameterPopup.vue';
+  import { onMounted, reactive, ref, watch } from 'vue'
+  const parameterPopup = ref()
+  const dictStore = useDictStore()
+  // ProTable 实例
+  const proTable = ref<ProTableInstance>()
+  const tableData = ref<any[]>([])
+  const props = defineProps<{
+  data: TestSource.ResTestSource | null;
+}>();
+  
+  onMounted(() => {
+    getTableList();
+})
+
+watch(() => props.data, (newData) => {
+  if (newData) {
+    getTableList();
+  }
+})
+
+  const getTableList = () => {
+    if (props.data) {
+      // 处理传递过来的数据
+      let newParams = props.data.parameter ? JSON.parse(props.data.parameter) : {};
+        // 确保 newParams 是一个数组
+      if (!Array.isArray(newParams)) {
+        newParams = [newParams];
+      }
+      const apiData = newParams;
+      tableData.value = apiData;
+  } 
+};
+
+
+const columns = reactive<ColumnProps<any>[]>([
+  { type: 'selection', fixed: 'left', width: 70 },
+  { type: 'index', fixed: 'left', width: 70, label: '序号' },
+  {
+    prop: 'sourceParamType',
+    label: '参数类型',
+    minWidth: 180,
+  },
+  {
+    prop: 'sourceParamDesc',
+    label: '参数描述',
+    minWidth: 220,
+  },
+  {
+    prop: 'value',
+    label: '值',
+    minWidth: 150,
+  },
+  { prop: 'operation', label: '操作', fixed: 'right', width: 250 },
+])
+  
+
+// 打开 drawer(新增、编辑)
+const openDialog = (titleType: string, row: Partial<TestSource.ResTestSource> = {}) => {
+    parameterPopup.value?.open(titleType)
+}
+
+
+// 批量删除设备
+const batchDelete = async (id: string[]) => {
+  
+  proTable.value?.clearSelection()
+  proTable.value?.getTableList()
+}
+
+// 删除设备
+const handleDelete = async (params: TestSource.ResTestSource) => {
+ console.log(tableData.value )
+  tableData.value = tableData.value.filter(item => item.id !== params.id);
+  console.log(tableData.value )
+}
+  
+  </script>
+  

frontend/src/views/machine/testSource/components/testSourcePopup.vue

@@ -0,0 +1,167 @@
+<template>
+    <el-dialog  :title="dialogTitle" v-model='dialogVisible' @close="close" v-bind="dialogBig">
+        <div class="form-grid">
+            <el-form :model="formContent" ref='dialogFormRef' :rules='rules'>
+                <el-row  :gutter="24" >
+                    <el-col :span="8">
+                        <el-form-item label="检测源名称" prop="name" :label-width="100">
+                            <el-input v-model='formContent.name' placeholder="检测源类型+设备类型简称+数字"/>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item  label="设备类型" prop="devType" :label-width="100">
+                            <el-select v-model='formContent.devType' placeholder="请选择设备类型">
+                                        <el-option
+                                                v-for="item in dictStore.getDictData('PqSource_Dev_Type')"
+                                                :key="item.id"
+                                                :label="item.name"
+                                                :value="item.id"
+                                            />
+                                    </el-select>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="标准源" prop="type" :label-width="100">
+                            <el-select v-model='formContent.type' placeholder="请选择检测源类型">
+                                        <el-option
+                                                v-for="item in dictStore.getDictData('Pq_Source_Type')"
+                                                :key="item.id"
+                                                :label="item.name"
+                                                :value="item.id"
+                                            />
+                                    </el-select>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+        </div>
+                
+        <ParameterTable :data="formContent"/>
+        <template #footer>
+            <div >
+                <el-button @click='close()'>取 消</el-button>
+                <el-button type="primary" @click='save()'>保存</el-button>
+            </div>
+        </template>
+    </el-dialog>
+
+
+</template>
+  
+  <script lang="ts" setup name="ErrorSystemDialog">
+  import{ElMessage, type FormInstance,type FormItemRule}from'element-plus'
+  import { defineProps, defineEmits, reactive,watch,ref, Ref, computed } from 'vue';
+  import { dialogBig} from '@/utils/elementBind'
+  import { addTestSource,updateTestSource,getTestSourceById} from '@/api/device/testSource/index'
+  import {CirclePlus, Delete, EditPen,FolderOpened,CopyDocument} from '@element-plus/icons-vue'
+  import { useDictStore } from '@/stores/modules/dict'
+  import { type TestSource } from '@/api/device/interface/testSource';
+  import ParameterTable from '@/views/machine/testSource/components/parameterTable.vue';
+  // 定义弹出组件元信息
+  const dialogFormRef = ref()
+  const dictStore = useDictStore()
+  const mode = ref()
+  const modeId = ref()
+
+
+  function useMetaInfo() {
+    const dialogVisible = ref(false)
+    const titleType = ref('add')
+    const formContent = ref<TestSource.ResTestSource>({
+        id: '',
+        name: '',
+        pattern: modeId.value,
+        parameter:'',
+        type: '',
+        devType: '',
+        state:1,
+    })
+    return { dialogVisible, titleType, formContent }
+  }
+  
+  const { dialogVisible, titleType, formContent } = useMetaInfo()
+  // 清空formContent
+  const resetFormContent = () => {
+    formContent.value = {
+        id: '',
+        name: '',
+        pattern: modeId.value,
+        parameter:'',
+        type: '',
+        devType: '',
+        state:1,
+    }
+  }
+  
+  let dialogTitle = computed(() => {
+    return titleType.value === 'add' ? '新增检测源' : '编辑检测源'
+  })
+
+    // 定义规则
+    const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
+    name: [{ required: true, message: '检测源名称必填！', trigger: 'blur' }],
+    devType:[{ required: true, message: '请选择一项设备类型', trigger: 'change' },],
+    type:[{ required: true, message: '请选择一项检测源类型', trigger: 'change '},]
+});    
+
+
+    // 关闭弹窗
+    const close = () => {
+        dialogVisible.value = false
+        // 清空dialogForm中的值
+        resetFormContent()
+        // 重置表单
+        dialogFormRef.value?.resetFields()
+    }
+  
+    // 保存数据
+    const save = () => {
+        try {      
+            dialogFormRef.value?.validate(async (valid: boolean) => {
+            if (valid) {
+                if (formContent.value.id) {
+                    await updateTestSource(formContent.value);
+                    ElMessage.success({ message: `${dialogTitle.value}成功！` })
+                } else {  
+                    await addTestSource(formContent.value);
+                    ElMessage.success({ message: `${dialogTitle.value}成功！` })    
+                }            
+                close()
+                // 刷新表格
+                await props.refreshTable!()       
+
+            }
+        })
+    } catch (err) {
+        console.error('验证过程中出现错误', err)
+    }
+    }
+
+// 打开弹窗，可能是新增，也可能是编辑
+const open = async (sign: string, data: TestSource.ResTestSource,currentMode: string) => {
+  titleType.value = sign
+  dialogVisible.value = true
+  mode.value = currentMode
+  modeId.value = dictStore.getDictData('Pattern').find(item => item.name === currentMode)?.id;
+  if (data.id) {
+    const result = await getTestSourceById(data);
+    if (result && result.data) {
+      formContent.value = result.data as TestSource.ResTestSource;
+    }
+  } else {
+    resetFormContent()
+  }
+  // 重置表单
+  dialogFormRef.value?.resetFields()
+}
+
+
+// 对外映射
+defineExpose({ open })
+const props = defineProps<{
+  refreshTable: (() => Promise<void>) | undefined;
+}>()
+</script>
+<style>
+</style>
+  

frontend/src/views/machine/testSource/index.vue

@@ -4,81 +4,59 @@
         ref='proTable'
         :columns='columns'
         :request-api="getTableList"
-        :init-param="initParam"
-        :data-callback="dataCallback"
      >
         <!-- :data='testSourceData'  如果要显示静态数据，就切换该配置-->
         <!-- 表格 header 按钮 -->
         <template #tableHeader='scope'>
-          <el-button type='primary' :icon='CirclePlus' >新增</el-button>
-          <el-button type='primary' :icon='Download' plain >导出数据</el-button>
-          <el-button type='danger' :icon='Delete' plain :disabled='!scope.isSelected'>
+          <el-button v-auth.testSource="'add'" type='primary' :icon='CirclePlus' @click="openDialog('add')">新增</el-button>
+          <el-button v-auth.testSource="'batchDelete'" type='danger' :icon='Delete' 
+                      plain :disabled='!scope.isSelected' @click='batchDelete(scope.selectedListIds)'>
             批量删除
           </el-button>
         </template>
         <!-- 表格操作 -->
         <template #operation='scope'>
-          <el-button type='primary' link :icon='View' >查看</el-button>
-          <el-button type='primary' link :icon='EditPen' >编辑</el-button>
-          <el-button type='primary' link :icon='Delete' >删除</el-button>
+          <el-button v-auth.testSource="'edit'" type='primary' link :icon='EditPen' @click="openDialog('edit', scope.row)">编辑</el-button>
+          <el-button v-auth.testSource="'delete'"  type='primary' link :icon='Delete' @click='handleDelete(scope.row)'>删除</el-button>
       </template>
   
       </ProTable>
     </div>
-  
+    <TestSourcePopup :refresh-table='proTable?.getTableList' ref='testSourcePopup' />
+
   </template>
   
   <script setup lang='tsx' name='useRole'>
-  import { TestSource } from '@/api/device/interface/testSource'
+  import { type TestSource } from '@/api/device/interface/testSource'
   import { useHandleData } from '@/hooks/useHandleData'
   import { useDownload } from '@/hooks/useDownload'
   import { useAuthButtons } from '@/hooks/useAuthButtons'
   import ProTable from '@/components/ProTable/index.vue'
   import ImportExcel from '@/components/ImportExcel/index.vue'
-  import { ProTableInstance, ColumnProps } from '@/components/ProTable/interface'
-  
+  import type{  ProTableInstance, ColumnProps } from '@/components/ProTable/interface'
   import { CirclePlus, Delete, EditPen, Share, Download, Upload, View, Refresh } from '@element-plus/icons-vue'
-  import testSourceDataList from '@/api/device/testSource/testSourceData'
   import { useDictStore } from '@/stores/modules/dict'
+  import TestSourcePopup from './components/testSourcePopup.vue'
    import {
-    getTestSourceList,
-  } from '@/api/device/testSource/testSource'
-  
+    getTestSourceList,deleteTestSource,
+  } from '@/api/device/testSource/index'
+  import { reactive, ref } from 'vue'
+  import { useModeStore } from '@/stores/modules/mode'; // 引入模式 store
+  const testSourcePopup = ref()
   const dictStore = useDictStore()
-  
-  // const testSourceData = testSourceDataList
+  const modeStore = useModeStore();
   // ProTable 实例
   const proTable = ref<ProTableInstance>()
   
-  // 如果表格需要初始化请求参数，直接定义传给 ProTable (之后每次请求都会自动带上该参数，此参数更改之后也会一直带上，改变此参数会自动刷新表格数据)
-  const initParam = reactive({ pattern: 1 })//表示当前用户选择的是模拟式测试，后期要读取pinia中的数据 TODO...
-
-  // dataCallback 是对于返回的表格数据做处理，如果你后台返回的数据不是 list && total 这些字段，可以在这里进行处理成这些字段
-  // 或者直接去 hooks/useTable.ts 文件中把字段改为你后端对应的就行
-  const dataCallback = (data: any) => {
-    return {
-      list: data.list,
-      total: data.total,
-      pageNum: data.pageNum,
-      pageSize: data.pageSize,
-    }
-  }
-  
-  // 如果你想在请求之前对当前请求参数做一些操作，可以自定义如下函数：params 为当前所有的请求参数（包括分页），最后返回请求列表接口
-  // 默认不做操作就直接在 ProTable 组件上绑定	:requestApi="getUserList"
   const getTableList = (params: any) => {
-    let newParams = JSON.parse(JSON.stringify(params))
-    newParams.createTime && (newParams.startTime = newParams.createTime[0])
-    newParams.createTime && (newParams.endTime = newParams.createTime[1])
-    delete newParams.createTime
-    return getTestSourceList(newParams)
-  }
-  
-  // 页面按钮权限（按钮权限既可以使用 hooks，也可以直接使用 v-auth 指令，指令适合直接绑定在按钮上，hooks 适合根据按钮权限显示不同的内容）
-  const { BUTTONS } = useAuthButtons()
-  
+  let newParams = JSON.parse(JSON.stringify(params))
+  const patternId  = dictStore.getDictData('Pattern').find(item=>item.name=== modeStore.currentMode)?.id//获取数据字典中对应的id
+  newParams.pattern = patternId
+  return getTestSourceList(newParams)
+}
+
   // 表格配置项
-  const columns = reactive<ColumnProps<TestSource.TestSourceBO>[]>([
+  const columns = reactive<ColumnProps<TestSource.ResTestSource>[]>([
     { type: 'selection', fixed: 'left', width: 70 },
     { type: 'index', fixed: 'left', width: 70, label: '序号' },
     {
@@ -90,22 +68,41 @@
     {
       prop: 'devType',
       label: '设备类型',
-      enum: dictStore.getDictData('testSourceDevType'),
-      fieldNames: { label: 'label', value: 'id' },
+      enum: dictStore.getDictData('PqSource_Dev_Type'),
+      fieldNames: { label: 'name', value: 'id' },
       search: { el: 'select' },
       minWidth: 220,
     },
     {
       prop: 'type',
       label: '源类型',
-      enum: dictStore.getDictData('testSourceType'),
-      fieldNames: { label: 'label', value: 'id' },
+      enum: dictStore.getDictData('Pq_Source_Type'),
+      fieldNames: { label: 'name', value: 'id' },
       search: { el: 'select' },
       minWidth: 150,
     },
     { prop: 'operation', label: '操作', fixed: 'right', width: 250 },
   ])
   
+
+// 打开 drawer(新增、编辑)
+const openDialog = (titleType: string, row: Partial<TestSource.ResTestSource> = {}) => {
+  testSourcePopup.value?.open(titleType, row,modeStore.currentMode)
+}
+
+
+// 批量删除设备
+const batchDelete = async (id: string[]) => {
+  await useHandleData(deleteTestSource, id, '删除所选检测源')
+  proTable.value?.clearSelection()
+  proTable.value?.getTableList()
+}
+
+// 删除设备
+const handleDelete = async (params: TestSource.ResTestSource) => {
+  await useHandleData(deleteTestSource, [params.id], `删除【${params.name}】检测源`)
+  proTable.value?.getTableList()
+}
   
   </script>
   

frontend/src/views/plan/planList/components/moreButtons.vue

@@ -31,7 +31,7 @@
   <script lang="ts" setup>
   import { ElMessage } from 'element-plus'
   import { ArrowDown } from '@element-plus/icons-vue'
-  import ErrorStandardDialog from '@/views/machine/errorSystem/components/ErrorStandardDialog.vue' // 导入子组件
+  import ErrorStandardDialog from '@/views/machine/errorSystem/components/errorStandardPopup.vue' // 导入子组件
 import type { ErrorSystem } from '@/api/error/interface'
   
   const detail_dialogFormVisible = ref(false)

frontend/src/views/plan/planList/index.vue

@@ -107,7 +107,7 @@ import { useDictStore } from '@/stores/modules/dict'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import type { Action } from 'element-plus'
 import type { ErrorSystem } from '@/api/error/interface'
-import ErrorStandardDialog from '@/views/machine/errorSystem/components/ErrorStandardDialog.vue' // 导入子组件
+import ErrorStandardDialog from '@/views/machine/errorSystem/components/errorStandardPopup.vue' // 导入子组件
 
 
 const dictStore = useDictStore()