From d6af35828d30e3cbb21ea2e83ce45167999720a6 Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Wed, 4 Dec 2024 19:54:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/authority/role/index.vue   |   2 +-
 frontend/src/views/authority/user/index.vue   |   2 +-
 .../machine/device/components/devicePopup.vue |  28 +-
 frontend/src/views/machine/device/index.vue   |  18 +-
 .../src/views/machine/errorSystem/index.vue   |  10 +-
 .../src/views/machine/testScript/index.vue    |   6 +-
 .../testSource/components/parameterTable.vue  |   2 +-
 .../testSource/components/testSourcePopup.vue |   6 +-
 .../src/views/machine/testSource/index.vue    |   2 +-
 .../system/dictionary/dictData/index.vue      |   2 +-
 .../dictionary/dictPq/components/pqPopup.vue  | 641 +++++++++++-------
 .../views/system/dictionary/dictPq/index.vue  |   2 +-
 .../system/dictionary/dictType/index.vue      |   2 +-
 13 files changed, 437 insertions(+), 286 deletions(-)

diff --git a/frontend/src/views/authority/role/index.vue b/frontend/src/views/authority/role/index.vue
index 9c9c85f..fb7eff8 100644
--- a/frontend/src/views/authority/role/index.vue
+++ b/frontend/src/views/authority/role/index.vue
@@ -9,7 +9,7 @@
       <!-- 表格 header 按钮 -->
       <template #tableHeader='scope'>
         <el-button v-auth.role="'add'" type='primary' :icon='CirclePlus' @click="openDrawer('新增角色')">新增</el-button>
-                <el-button v-auth.role="'batchDelete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
+                <el-button v-auth.role="'delete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
                    @click='batchDelete(scope.selectedListIds)'>
           批量删除
         </el-button>
diff --git a/frontend/src/views/authority/user/index.vue b/frontend/src/views/authority/user/index.vue
index 20a1a94..87d1729 100644
--- a/frontend/src/views/authority/user/index.vue
+++ b/frontend/src/views/authority/user/index.vue
@@ -9,7 +9,7 @@
         <!-- 表格 header 按钮 -->
         <template #tableHeader='scope'>
           <el-button  v-auth.user="'add'" type='primary' :icon='CirclePlus' @click="openDialog('add')">新增</el-button>
-          <el-button  v-auth.user="'batchDelete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
+          <el-button  v-auth.user="'delete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
                      @click='batchDelete(scope.selectedListIds)'>
             批量删除
           </el-button>
diff --git a/frontend/src/views/machine/device/components/devicePopup.vue b/frontend/src/views/machine/device/components/devicePopup.vue
index f980abb..e2f0cc0 100644
--- a/frontend/src/views/machine/device/components/devicePopup.vue
+++ b/frontend/src/views/machine/device/components/devicePopup.vue
@@ -3,7 +3,7 @@
         <el-tabs type="border-card">
             <el-tab-pane label="设备台账信息">
                 <div >
-                    <el-form   :model='formContent' ref='dialogFormRef' :rules='rules' :disabled="false">
+                    <el-form :model='formContent' ref='dialogFormRef' :rules='rules' :disabled="false">
                         <el-divider >设备信息</el-divider>
                         <el-row  :gutter="24" >
                             <el-col :span="8">
@@ -53,7 +53,7 @@
                             </el-col>
                             <el-col :span="8">
                                 <el-form-item label="生产日期" prop="createDate" :label-width="100">
-                                    <el-date-picker 
+                                    <el-date-picker
                                         v-model="formContent.createDate" 
                                         placeholder="请选择生产日期"
                                         :disabled-date="disabledDate"
@@ -62,8 +62,8 @@
                                 </el-form-item>           
                             </el-col>
                             <el-col :span="8">
-                                <el-form-item label="出厂编号" prop="createId" placeholder="请输入出厂编号" :label-width="100">
-                                    <el-input v-model="formContent.createId" />
+                                <el-form-item label="出厂编号" prop="createId" :label-width="100">
+                                    <el-input v-model="formContent.createId" placeholder="请输入出厂编号"/>
                                 </el-form-item>            
                             </el-col>
                         </el-row>
@@ -155,20 +155,20 @@
                                 </el-form-item>           
                         </el-col>
                         <el-col :span="8" v-if="IsPasswordShow">
-                                <el-form-item label='识别码'  prop='series' clearable placeholder="请输入识别码" :label-width="100">
-                                    <el-input v-model='formContent.series'  show-password/>
+                                <el-form-item label='识别码'  prop='series' clearable :label-width="100">
+                                    <el-input v-model='formContent.series' placeholder="请输入识别码" show-password/>
                                 </el-form-item>           
                         </el-col>
                         <el-col :span="8" v-if="IsPasswordShow">
-                                <el-form-item label='密钥'  prop='devKey' clearable placeholder="请输入密钥" :label-width="100">
-                                    <el-input v-model='formContent.devKey'  show-password/>
+                                <el-form-item label='密钥'  prop='devKey' clearable :label-width="100">
+                                    <el-input v-model='formContent.devKey' placeholder="请输入密钥" show-password/>
                                 </el-form-item>           
                         </el-col>
                         </el-row>
                         <el-row  :gutter="24" v-if="DevIsShow">
                             <el-col :span="8">
-                                <el-form-item label='样品编号'  prop='sampleID' clearable placeholder="请输入样品编号" :label-width="100">
-                                    <el-input v-model='formContent.sampleID' />
+                                <el-form-item label='样品编号'  prop='sampleID' clearable :label-width="100">
+                                    <el-input v-model='formContent.sampleID' placeholder="请输入样品编号" />
                                 </el-form-item>           
                             </el-col>
                             <el-col :span="8">
@@ -251,12 +251,12 @@ const disabledDate = (time: Date) => {
       devVolt:57.74,
       devCurr:1,
       manufacturer: '',
-      createDate: '',
+      createDate: dayjs().format('YYYY-MM-DD'),
       createId: '', 
       hardwareVersion: '',
       softwareVersion: '',
       protocol: 'MMS',
-      ip: '',
+      ip: '192.168.1.200',
       port: 102,
       encryptionFlag: 1,
       reCheckNum:0,
@@ -277,12 +277,12 @@ const disabledDate = (time: Date) => {
         devVolt:57.74,
         devCurr:1,
         manufacturer: '',
-        createDate: '',
+        createDate: dayjs().format('YYYY-MM-DD'),
         createId: '', 
         hardwareVersion: '',
         softwareVersion: '',
         protocol: 'MMS',
-        ip: '',
+        ip: '192.168.1.200',
         port: 102,
         encryptionFlag: 1,
         reCheckNum:0,
diff --git a/frontend/src/views/machine/device/index.vue b/frontend/src/views/machine/device/index.vue
index f91d34a..9c16532 100644
--- a/frontend/src/views/machine/device/index.vue
+++ b/frontend/src/views/machine/device/index.vue
@@ -10,7 +10,7 @@
       <template #tableHeader='scope'>
         <el-button v-auth.device="'add'" type='primary' :icon='CirclePlus' @click="openDialog('add')">新增</el-button>
         <el-button v-auth.device="'export'" type='primary' :icon='Upload' plain @click='downloadFile()'>导出</el-button>
-        <el-button v-auth.device="'import'" type='primary' :icon='Download' plain @click='importFile()'>导入</el-button>
+        <el-button v-auth.device="'import'" type='primary' :icon='Download' plain @click='importFile()' v-if='modeStore.currentMode === "比对式"'>导入</el-button>
         <el-button v-auth.device="'delete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
                    @click='batchDelete(scope.selectedListIds)'>
           批量删除
@@ -69,19 +69,19 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
     prop: 'name',
     label: '设备名称',
     search: { el: 'input' },
-    minWidth: 200,
+    minWidth: 180,
   },
   {
     prop: 'devType',
     label: '设备类型',
-    minWidth: 200,
+    minWidth: 180,
     enum: dictStore.getDictData('Dev_Type'),
     fieldNames: { label: 'name', value: 'id' },
   },
   {
     prop: 'createDate',
     label: '生产日期',
-    minWidth: 200,
+    minWidth: 180,
     search: {
       span: 2,
       render: () => {
@@ -120,7 +120,7 @@ const columns = reactive<ColumnProps<Device.ResPqDev>[]>([
     enum: dictStore.getDictData('Dev_Manufacturers'),
     search: { el: 'select', props: { filterable: true }, order: 1 },
     fieldNames: { label: 'name', value: 'id' },
-    minWidth: 200,
+    minWidth: 190,
   },
   { prop: 'operation', label: '操作', fixed: 'right', width: 200 },
 ])
@@ -162,10 +162,10 @@ const downloadFile = async () => {
     searchParam.searchBeginTime = startDate.value;
     searchParam.searchEndTime = endDate.value;
 
-    ElMessageBox.confirm('确认导出被检设备?', '温馨提示', { type: 'warning' }).then(() =>
-    useDownload(exportPqDev,'被检设备导出数据', proTable.value?.searchParam, false,'.xlsx'),
-
-  )
+    ElMessageBox.confirm('确认导出被检设备?', '温馨提示', { type: 'warning' }).then(() =>{
+      const patternId  = dictStore.getDictData('Pattern').find(item=>item.name=== modeStore.currentMode)?.id//获取数据字典中对应的id
+      useDownload(exportPqDev,'被检设备导出数据', {...proTable.value?.searchParam,pattern:patternId}, false,'.xlsx')
+    })
 }
 
 //导入设备
diff --git a/frontend/src/views/machine/errorSystem/index.vue b/frontend/src/views/machine/errorSystem/index.vue
index e641f35..6e134f4 100644
--- a/frontend/src/views/machine/errorSystem/index.vue
+++ b/frontend/src/views/machine/errorSystem/index.vue
@@ -15,9 +15,9 @@
       </template>
        <!-- 表格操作 -->
        <template #operation='scope'>
-          <el-button type='primary' link :icon='View' @click="openDialog('view', scope.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>
+          <el-button v-auth.device="'view'" type='primary' link :icon='View' @click="openDialog('view', scope.row)">查看</el-button>
+          <el-button v-auth.device="'edit'" type='primary' link :icon='EditPen' @click="openDialog('edit', scope.row)">编辑</el-button>
+          <el-button v-auth.device="'delete'" type='primary' link :icon='Delete' @click='handleDelete(scope.row)'>删除</el-button>
         </template>
     </ProTable>
   </div>
@@ -74,9 +74,9 @@ const columns = ref<ColumnProps<ErrorSystem.ErrorSystemList>[]>([
 // 打开 drawer(新增、编辑)
 const openDialog = (titleType: string, row: Partial<ErrorSystem.ErrorSystemList> = {}) => {
   if(titleType == 'view'){
-    errorStandardPopup.value?.open(row.name, row)
+    //errorStandardPopup.value?.open(row.name, row)
   }else{
-    errorSystemPopup.value?.open(titleType, row)
+    //errorSystemPopup.value?.open(titleType, row)
   }
 
  
diff --git a/frontend/src/views/machine/testScript/index.vue b/frontend/src/views/machine/testScript/index.vue
index 6d33d01..716e49b 100644
--- a/frontend/src/views/machine/testScript/index.vue
+++ b/frontend/src/views/machine/testScript/index.vue
@@ -9,7 +9,7 @@
       <!-- 表格 header 按钮 -->
       <template #tableHeader='scope'>
         <el-button v-auth.testScript="'add'" type='primary' :icon='CirclePlus' @click="openDialog('add')">新增</el-button>
-        <el-button v-auth.testScript="'batchDelete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
+        <el-button v-auth.testScript="'delete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
                    @click='batchDelete(scope.selectedListIds)'>
           批量删除
         </el-button>
@@ -112,9 +112,9 @@ const columns = reactive<ColumnProps<TestScript.ResTestScript>[]>([
 // 打开 drawer(新增、编辑)
 const openDialog = (titleType: string, row: Partial<TestScript.ResTestScript> = {}) => {
   if(modeStore.currentMode == '比对式'){
-    comparisonPopup.value?.open(titleType, row)
+    //comparisonPopup.value?.open(titleType, row)
   }else{
-    testScriptPopup.value?.open(titleType, row)
+    //testScriptPopup.value?.open(titleType, row)
   }
   
  
diff --git a/frontend/src/views/machine/testSource/components/parameterTable.vue b/frontend/src/views/machine/testSource/components/parameterTable.vue
index b54dc8a..e9e4f5e 100644
--- a/frontend/src/views/machine/testSource/components/parameterTable.vue
+++ b/frontend/src/views/machine/testSource/components/parameterTable.vue
@@ -13,7 +13,7 @@
       <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'
+        <el-button v-auth.testSource="'delete'" type='danger' :icon='Delete'
                    plain :disabled='!scope.isSelected' @click='batchDelete(scope.selectedListIds)'>
           批量删除
         </el-button>
diff --git a/frontend/src/views/machine/testSource/components/testSourcePopup.vue b/frontend/src/views/machine/testSource/components/testSourcePopup.vue
index b62eb57..8cdc2b8 100644
--- a/frontend/src/views/machine/testSource/components/testSourcePopup.vue
+++ b/frontend/src/views/machine/testSource/components/testSourcePopup.vue
@@ -5,7 +5,7 @@
         <el-row :gutter="24">
           <el-col :span="8">
             <el-form-item label="检测源名称" prop="name" >
-              <el-input v-model='formContent.name' placeholder="检测源类型+设备类型简称+数字"/>
+              <el-input v-model='formContent.name' placeholder="源类型+源型号+数字"/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -21,8 +21,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="标准源" prop="type">
-              <el-select v-model='formContent.type' placeholder="请选择检测源类型">
+            <el-form-item label="源类型" prop="type">
+              <el-select v-model='formContent.type' placeholder="请选择源类型">
                 <el-option
                     v-for="item in dictStore.getDictData('Pq_Source_Type')"
                     :key="item.id"
diff --git a/frontend/src/views/machine/testSource/index.vue b/frontend/src/views/machine/testSource/index.vue
index f9fb96c..e0186f1 100644
--- a/frontend/src/views/machine/testSource/index.vue
+++ b/frontend/src/views/machine/testSource/index.vue
@@ -9,7 +9,7 @@
         <!-- 表格 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' 
+          <el-button v-auth.testSource="'delete'" type='danger' :icon='Delete'
                       plain :disabled='!scope.isSelected' @click='batchDelete(scope.selectedListIds)'>
             批量删除
           </el-button>
diff --git a/frontend/src/views/system/dictionary/dictData/index.vue b/frontend/src/views/system/dictionary/dictData/index.vue
index 1bfb75c..7672001 100644
--- a/frontend/src/views/system/dictionary/dictData/index.vue
+++ b/frontend/src/views/system/dictionary/dictData/index.vue
@@ -9,7 +9,7 @@
         <template #tableHeader="scope">
           <el-button v-auth.dict="'show_add'" type="primary" :icon="CirclePlus" @click="openDialog('add')">新增</el-button>
           <el-button v-auth.dict="'show_export'" type='primary' :icon='Download' plain @click="downloadFile">导出</el-button>
-          <el-button v-auth.dict="'show_batchDelete'" type="danger" :icon="Delete" plain :disabled="!scope.isSelected"
+          <el-button v-auth.dict="'show_delete'" type="danger" :icon="Delete" plain :disabled="!scope.isSelected"
                      @click="batchDelete(scope.selectedListIds)">
             批量删除
           </el-button>
diff --git a/frontend/src/views/system/dictionary/dictPq/components/pqPopup.vue b/frontend/src/views/system/dictionary/dictPq/components/pqPopup.vue
index 9464a13..eff7a39 100644
--- a/frontend/src/views/system/dictionary/dictPq/components/pqPopup.vue
+++ b/frontend/src/views/system/dictionary/dictPq/components/pqPopup.vue
@@ -1,269 +1,420 @@
 <template>
-    <el-dialog v-model='dialogVisible' :title='dialogTitle' v-bind='dialogMiddle' @close="close">
-        <el-form :model='formContent' ref='dialogFormRef' :rules='rules' class='form-two'>
-          <el-divider >基础数据</el-divider>
+  <el-dialog v-model='dialogVisible' :title='dialogTitle' v-bind="dialogBig" @close="close">
+    <el-form :model='formContent' ref='dialogFormRef' :rules='rules'>
+
+      <el-divider>基础数据</el-divider>
+
+      <el-row :gutter="24">
+        <el-col :span="8">
           <el-form-item label='数据模型' :label-width='140' prop='dataType'>
-            <el-select v-model="formContent.dataType"  clearable placeholder="请选择数据模型">
-            <el-option
-              v-for="item in dictStore.getDictData('Cs_Data_Type')"
-              :key="item.id"
-              :label="item.name"
-              :value="item.code"
-            />
-          </el-select>
+            <el-select v-model="formContent.dataType" clearable placeholder="请选择数据模型">
+              <el-option
+                  v-for="item in dictStore.getDictData('Cs_Data_Type')"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.code"
+              />
+            </el-select>
           </el-form-item>
+        </el-col>
+        <el-col :span="8">
           <el-form-item label='指标名称' :label-width='140' prop='name'>
-            <el-input v-model='formContent.name' placeholder='请输入' autocomplete='off' />
-          </el-form-item>
-          <el-form-item label='别名' :label-width='140' prop='otherName'>
-            <el-input v-model='formContent.otherName' placeholder='请输入' autocomplete='off' />
-          </el-form-item>
-          <el-form-item label='显示名称' :label-width='140' prop='showName'>
-            <el-input v-model='formContent.showName' placeholder='请输入' autocomplete='off' />
+            <el-input v-model='formContent.name' placeholder='请输入指标名称' autocomplete='off'/>
           </el-form-item>
+        </el-col>
+        <el-col :span="8">
           <el-form-item label='相别' :label-width='140' prop='phase'>
-            <el-select v-model="formContent.phase"  clearable placeholder="请选择相别">
-            <el-option
-              v-for="item in dictStore.getDictData('phase')"
-              :key="item.id"
-              :label="item.name"
-              :value="item.code"
-            />
-          </el-select>
+            <el-select v-model="formContent.phase" clearable placeholder="请选择相别">
+              <el-option
+                  v-for="item in dictStore.getDictData('phase')"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.code"
+              />
+            </el-select>
           </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item label='显示名称' :label-width='140' prop='showName'>
+            <el-input v-model='formContent.showName' placeholder='请输入显示名称' autocomplete='off'/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label='别名' :label-width='140' prop='otherName'>
+            <el-input v-model='formContent.otherName' placeholder='请输入别名' autocomplete='off'/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
           <el-form-item label='单位' :label-width='140' prop='unit'>
-            <el-input v-model='formContent.unit' placeholder='请输入单位' autocomplete='off' />
+            <el-select v-model="formContent.unit" clearable placeholder="请选择单位">
+              <el-option v-for="item in dictStore.getDictData('Unit_Type')" :key="item.id" :label="item.name"
+                         :value="item.code"/>
+            </el-select>
           </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="24">
+        <el-col :span="8">
           <el-form-item label='指标数据类型' :label-width='140' prop='type'>
-            <el-input v-model='formContent.type' placeholder='请输入指标数据类型' autocomplete='off' />
+            <el-select v-model="formContent.type" clearable placeholder="请选择指标数据类型">
+              <el-option
+                  :label="'Number'"
+                  :value="'Number'"
+              />
+              <el-option
+                  :label="'Float'"
+                  :value="'Float'"
+              />
+              <el-option
+                  :label="'Enum'"
+                  :value="'Enum'"
+              />
+            </el-select>
           </el-form-item>
+        </el-col>
+        <el-col :span="8">
           <el-form-item label='次数' :label-width='140'>
             <el-row :gutter="20">
               <el-col :span="11">
-                <el-input v-model="formContent.harmStart" placeholder="请输入起始次数" autocomplete="off" />
+                <el-input v-model="formContent.harmStart" placeholder="起始次数" autocomplete="off"/>
               </el-col>
-              <el-col :span="2" class="text-center" style="line-height: 32px;">-</el-col>
+              <el-col :span="2">-</el-col>
               <el-col :span="11">
-                <el-input v-model="formContent.harmEnd" placeholder="请输入结束次数" autocomplete="off" />
+                <el-input v-model="formContent.harmEnd" placeholder="结束次数" autocomplete="off"/>
               </el-col>
             </el-row>
           </el-form-item>
+        </el-col>
+        <el-col :span="8">
           <el-form-item label='数据统计类型' :label-width='140' prop='statMethod'>
-            <el-select v-model="selectedStatMethods" multiple   placeholder="请选择数据统计类型">
+            <el-select v-model="selectedStatMethods" multiple placeholder="请选择数据统计类型">
               <el-option
-              v-for="item in dictStore.getDictData('Stat_Method')"
-              :key="item.value"
-              :label="item.name"
-              :value="item.code"
-            />
-          </el-select>
+                  v-for="item in dictStore.getDictData('Stat_Method')"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.code"
+              />
+            </el-select>
           </el-form-item>
-          <el-form-item label='系统类别' :label-width='140' prop='systemType'>
-            <el-input v-model='formContent.systemType' placeholder='请输入' autocomplete='off' />
-          </el-form-item>
-          <el-form-item label='报表数据来源' :label-width='140' prop='resourcesId'>
-            <el-select v-model="formContent.resourcesId"  clearable placeholder="请选择报表数据来源">
-            <el-option
-              v-for="item in dictStore.getDictData('Data_Day')"
-              :key="item.id"
-              :label="item.name"
-              :value="item.code"
-            />
-          </el-select>
-          </el-form-item>
-          <el-form-item label='数据表表名' :label-width='140' prop='classId'>
-            <el-select v-model="formContent.classId"  clearable placeholder="请选择数据表表名">
-            <el-option
-              v-for="item in dictStore.getDictData('Data')"
-              :key="item.id"
-              :label="item.name"
-              :value="item.code"
-            />
-          </el-select>
-          </el-form-item>
-          <el-form-item label='限值字段名称' :label-width='140' prop='limitName'>
-            <el-input v-model='formContent.limitName' placeholder='请输入限值字段名称' autocomplete='off' />
-          </el-form-item>
-          <el-form-item label='限值表名' :label-width='140' prop='limitTable'>
-            <el-input v-model='formContent.limitTable' placeholder='请输入限值表名' autocomplete='off' />
-          </el-form-item>
-          <el-form-item label='超标判断方式' :label-width='140' prop='formula'>
-            <el-select v-model="formContent.formula"  clearable placeholder="请选择超标判断方式">
-            <el-option
-              v-for="item in dictStore.getDictData('Limit_Value_Judgment')"
-              :key="item.id"
-              :label="item.name"
-              :value="item.code"
-            />
-          </el-select>
-          </el-form-item>
-          <el-form-item label='排序' :label-width='140'>
-            <el-input-number v-model='formContent.sort' :min='1' :max='999' />
-          </el-form-item>
-          <el-divider >拓展数据</el-divider>
-          <el-form-item label='参数缺省值' :label-width='140' prop='defaultValue'>
-            <el-input v-model='formContent.defaultValue' placeholder='请输入参数缺省值' autocomplete='off' />
-          </el-form-item>
-          <el-form-item label='事件类别' :label-width='140' prop='eventType'>
-            <el-input v-model='formContent.eventType' placeholder='请输入事件类别' autocomplete='off' />
-          </el-form-item>
-          <el-form-item label='设置最大值' :label-width='140' prop='maxNum'>
-            <el-input-number v-model='formContent.maxNum'  controls-position="right" style="width: 300px;"/>
-          </el-form-item>
-          <el-form-item label='设置最小值' :label-width='140' prop='minNum'>
-            <el-input-number v-model='formContent.minNum'  controls-position="right" style="width: 300px;"/>
-          </el-form-item>
-          <el-form-item label='枚举序列' :label-width='140' prop='setValue'>
-            <el-input v-model='formContent.setValue' placeholder='请输入枚举序列' autocomplete='off' />
-          </el-form-item>
-          <el-form-item label='字符串长度上限' :label-width='140' prop='strlen'>
-            <el-input-number v-model='formContent.strlen'  controls-position="right" style="width: 300px;"/>
-          </el-form-item>
-          <el-form-item label='上送规则' :label-width='140' prop='tranRule'>
-            <el-input v-model='formContent.tranRule' placeholder='请输入上送规则' autocomplete='off' />
-          </el-form-item>
-          <el-form-item label='当前值' :label-width='140' prop='curSts'>
-            <el-input v-model='formContent.curSts' placeholder='请输入当前值' autocomplete='off' />
-          </el-form-item>
-          <el-form-item label='二次值转一次值公式' :label-width='140' prop='primaryFormula'>
-            <el-input v-model='formContent.primaryFormula' placeholder='请输入公式' autocomplete='off' />
-          </el-form-item>
-          <el-form-item label="是否可远程控制" :label-width="140">
-            <el-radio-group v-model="formContent.ctlSts" >
-              <el-radio label="是" :value="1"></el-radio>
-              <el-radio label="否" :value="0"></el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="是否存储" :label-width="140">
-            <el-radio-group v-model="formContent.storeFlag" >
-              <el-radio label="是" :value="1"></el-radio>
-              <el-radio label="否" :value="0"></el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="数据是否上送" :label-width="140">
-            <el-radio-group v-model="formContent.tranFlag" >
-              <el-radio label="是" :value="1"></el-radio>
-              <el-radio label="否" :value="0"></el-radio>
-            </el-radio-group>
-          </el-form-item>
-         
-        </el-form>
-     
-      <template #footer>
-        <div class='dialog-footer'>
-          <el-button @click='close()'>取消</el-button>
-          <el-button type='primary' @click='save()'>
-            保存
-          </el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </template>
-  <script setup lang='ts'>
-  import { dialogMiddle } from '@/utils/elementBind'
-  import { type Dict } from '@/api/system/dictionary/interface'
-  import { ElMessage, type FormItemRule } from 'element-plus'
-  import { addDictPq, updateDictPq } from '@/api/system/dictionary/dictPq'
-  import { computed, type Ref, ref } from 'vue';
-  import { useDictStore } from '@/stores/modules/dict'
-  const dictStore = useDictStore()
-  const selectedStatMethods = ref<string[]>([])
-  // 定义弹出组件元信息
-  const dialogFormRef = ref()
-  function useMetaInfo() {
-    const dialogVisible = ref(false)
-    const titleType = ref('add')
-    const formContent = ref<Dict.ResDictPq>({
-      id: '',
-      name: '',
-      phase: '',
-      sort: 100,
-      dataType: '',
-      state: 1,
-      classId: '',
-    })
-    return { dialogVisible, titleType, formContent }
-  }
-  
-  const { dialogVisible, titleType, formContent } = useMetaInfo()
-  // 清空formContent
-  const resetFormContent = () => {
-    formContent.value = {
-      id: '',
-      name: '',
-      phase: '',
-      sort: 100,
-      dataType: '',
-      state: 1,
-      classId: '',
-    }
-  }
-  
-  let dialogTitle = computed(() => {
-    return titleType.value === 'add' ? '新增字典' : '编辑字典'
-  })
-  
-  // 定义表单校验规则
-  const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
-    dataType: [{ required: true, message: '数据模型必选！', trigger: 'change' }],
-    name: [{ required: true, message: '指标名称必填！', trigger: 'blur' }],
-    phase: [{ required: true, message: '相别必选！', trigger: 'change' }],
-    classId: [{ required: true, message: '数据库表名必选！', trigger: 'change' }],
-  })
-  
-  // 关闭弹窗
-  const close = () => {
-    dialogVisible.value = false
-    // 清空dialogForm中的值
-    resetFormContent()
-    // 重置表单
-    dialogFormRef.value?.resetFields()
-    selectedStatMethods.value = []
-  }
-  
-  // 保存数据
-  const save = () => {
-    try {
-        dialogFormRef.value?.validate(async (valid: boolean) => {
-        if (valid) {
-          formContent.value.statMethod = selectedStatMethods.value.join(',')
-          if (formContent.value.id) {
-            await updateDictPq(formContent.value);
-          } else {
-            await addDictPq(formContent.value);
-          }
-          ElMessage.success({ message: `${dialogTitle.value}成功！` })
-          close()
-          // 刷新表格
-          await props.refreshTable!()
-        }
-      })
-    } catch (err) {
-      console.error('验证过程中出现错误', err)
-    }
-  }
-  
-  // 打开弹窗，可能是新增，也可能是编辑
-  const open = (sign: string, data: Dict.ResDictPq) => {
-    // 重置表单
-    dialogFormRef.value?.resetFields()
-    titleType.value = sign
-    dialogVisible.value = true
-    selectedStatMethods.value = data.statMethod ? data.statMethod.split(',') : []
-    if (data.id) {
-      formContent.value = { ...data }
-    } else {
-      resetFormContent()
-    }
-  }
-  
-  // 对外映射
-  defineExpose({ open })
-  const props = defineProps<{
-    refreshTable: (() => Promise<void>) | undefined;
-  }>()
-  
+        </el-col>
+      </el-row>
 
-  
-  </script>
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item label='系统类别' :label-width='140' prop='systemType'>
+            <el-input v-model='formContent.systemType' placeholder='请输入系统类别' autocomplete='off'/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label='报表数据来源' :label-width='140' prop='resourcesId'>
+            <el-select v-model="formContent.resourcesId" clearable placeholder="请选择报表数据来源">
+              <el-option
+                  v-for="item in dictStore.getDictData('Data_Day')"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.code"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label='数据表表名' :label-width='140' prop='classId'>
+            <el-select v-model="formContent.classId" clearable placeholder="请选择数据表表名">
+              <el-option
+                  v-for="item in dictStore.getDictData('Data')"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.code"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item label='限值字段名称' :label-width='140' prop='limitName'>
+            <el-input v-model='formContent.limitName' placeholder='请输入限值字段名称' autocomplete='off'/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label='限值表名' :label-width='140' prop='limitTable'>
+            <el-input v-model='formContent.limitTable' placeholder='请输入限值表名' autocomplete='off'/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label='超标判断方式' :label-width='140' prop='formula'>
+            <el-select v-model="formContent.formula" clearable placeholder="请选择超标判断方式">
+              <el-option
+                  v-for="item in dictStore.getDictData('Limit_Value_Judgment')"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.code"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label='排序' :label-width='140'>
+            <el-input-number v-model='formContent.sort' :min='1' :max='999'/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-divider>拓展数据</el-divider>
+
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item label='参数缺省值' :label-width='140' prop='defaultValue'>
+            <el-input v-model='formContent.defaultValue' placeholder='请输入参数缺省值' autocomplete='off'/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label='事件类别' :label-width='140' prop='eventType'>
+            <el-input v-model='formContent.eventType' placeholder='请输入事件类别' autocomplete='off'/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label='设置最大值' :label-width='140' prop='maxNum'>
+            <el-input-number v-model='formContent.maxNum' controls-position="right" style="width: 300px;"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item label='设置最小值' :label-width='140' prop='minNum'>
+            <el-input-number v-model='formContent.minNum' controls-position="right" style="width: 300px;"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label='枚举序列' :label-width='140' prop='setValue'>
+            <el-input v-model='formContent.setValue' placeholder='请输入枚举序列' autocomplete='off'/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label='字符串长度上限' :label-width='140' prop='strlen'>
+            <el-input-number v-model='formContent.strlen' controls-position="right" style="width: 300px;"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item label='上送规则' :label-width='140' prop='tranRule'>
+            <el-input v-model='formContent.tranRule' placeholder='请输入上送规则' autocomplete='off'/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label='当前值' :label-width='140' prop='curSts'>
+            <el-input v-model='formContent.curSts' placeholder='请输入当前值' autocomplete='off'/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label='二次值转一次值公式' :label-width='140' prop='primaryFormula'>
+            <el-input v-model='formContent.primaryFormula' placeholder='请输入公式' autocomplete='off'/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item label="是否可远程控制" :label-width="140">
+            <el-radio-group v-model="formContent.ctlSts">
+              <el-radio label="是" :value="1"></el-radio>
+              <el-radio label="否" :value="0"></el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="是否存储" :label-width="140">
+            <el-radio-group v-model="formContent.storeFlag">
+              <el-radio label="是" :value="1"></el-radio>
+              <el-radio label="否" :value="0"></el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="数据是否上送" :label-width="140">
+            <el-radio-group v-model="formContent.tranFlag">
+              <el-radio label="是" :value="1"></el-radio>
+              <el-radio label="否" :value="0"></el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+    </el-form>
+
+    <template #footer>
+      <div class='dialog-footer'>
+        <el-button @click='close()'>取消</el-button>
+        <el-button type='primary' @click='save()'>
+          保存
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+<script setup lang='ts'>
+import {dialogBig} from '@/utils/elementBind'
+import {type Dict} from '@/api/system/dictionary/interface'
+import {ElMessage, type FormItemRule} from 'element-plus'
+import {addDictPq, updateDictPq} from '@/api/system/dictionary/dictPq'
+import {computed, type Ref, ref} from 'vue';
+import {useDictStore} from '@/stores/modules/dict'
+
+const dictStore = useDictStore()
+const selectedStatMethods = ref<string[]>([])
+// 定义弹出组件元信息
+const dialogFormRef = ref()
+
+function useMetaInfo() {
+  const dialogVisible = ref(false)
+  const titleType = ref('add')
+  const formContent = reactive<Dict.ResDictPq>({
+    id: '',
+    dataType: '',
+    name: '',
+    otherName: '',
+    showName: '',
+    phase: '',
+    unit: '',
+    type: 'Number',
+    harmStart: '',
+    harmEnd: '',
+    systemType: '',
+    resourcesId: '',
+    classId: '',
+    limitName: '',
+    limitTable: '',
+    formula: '',
+    sort: 100,
+    defaultValue: '',
+    eventType: '',
+    maxNum: '',
+    minNum: '',
+    setValue: '',
+    strlen: '',
+    tranRule: '',
+    curSts: '',
+    primaryFormula: '',
+    ctlSts: 0,
+    storeFlag: 0,
+    tranFlag: 0,
+    state: 1,
+  })
+  return {dialogVisible, titleType, formContent}
+}
+
+const {dialogVisible, titleType, formContent} = useMetaInfo()
+// 清空formContent
+const resetFormContent = () => {
+  Object.assign(formContent, {
+    id: '',
+    dataType: '',
+    name: '',
+    otherName: '',
+    showName: '',
+    phase: '',
+    unit: '',
+    type: 'Number',
+    harmStart: '',
+    harmEnd: '',
+    systemType: '',
+    resourcesId: '',
+    classId: '',
+    limitName: '',
+    limitTable: '',
+    formula: '',
+    sort: 100,
+    defaultValue: '',
+    eventType: '',
+    maxNum: '',
+    minNum: '',
+    setValue: '',
+    strlen: '',
+    tranRule: '',
+    curSts: '',
+    primaryFormula: '',
+    ctlSts: 0,
+    storeFlag: 0,
+    tranFlag: 0,
+    state: 1,
+  })
+}
+
+let dialogTitle = computed(() => {
+  return titleType.value === 'add' ? '新增字典' : '编辑字典'
+})
+
+// 定义表单校验规则
+const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
+  dataType: [{required: true, message: '数据模型必选！', trigger: 'change'}],
+  name: [{required: true, message: '指标名称必填！', trigger: 'blur'}],
+  phase: [{required: true, message: '相别必选！', trigger: 'change'}],
+  classId: [{required: true, message: '数据库表名必选！', trigger: 'change'}],
+})
+
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  // 清空dialogForm中的值
+  resetFormContent()
+  // 重置表单
+  dialogFormRef.value?.resetFields()
+  selectedStatMethods.value = []
+}
+
+// 保存数据
+const save = () => {
+  try {
+    dialogFormRef.value?.validate(async (valid: boolean) => {
+      if (valid) {
+        formContent.statMethod = selectedStatMethods.value.join(',')
+        if (formContent.id) {
+          await updateDictPq(formContent);
+        } else {
+          await addDictPq(formContent);
+        }
+        ElMessage.success({message: `${dialogTitle.value}成功！`})
+        close()
+        // 刷新表格
+        await props.refreshTable!()
+      }
+    })
+  } catch (err) {
+    console.error('验证过程中出现错误', err)
+  }
+}
+
+// 打开弹窗，可能是新增，也可能是编辑
+const open = (sign: string, data: Dict.ResDictPq) => {
+  // 重置表单
+  dialogFormRef.value?.resetFields()
+  titleType.value = sign
+  dialogVisible.value = true
+  selectedStatMethods.value = data.statMethod ? data.statMethod.split(',') : []
+  if (data.id) {
+    Object.assign(formContent, {...data})
+  } else {
+    resetFormContent()
+  }
+}
+
+// 对外映射
+defineExpose({open})
+const props = defineProps<{
+  refreshTable: (() => Promise<void>) | undefined;
+}>()
+
+
+</script>
  
\ No newline at end of file
diff --git a/frontend/src/views/system/dictionary/dictPq/index.vue b/frontend/src/views/system/dictionary/dictPq/index.vue
index 6542dad..6a4b4e5 100644
--- a/frontend/src/views/system/dictionary/dictPq/index.vue
+++ b/frontend/src/views/system/dictionary/dictPq/index.vue
@@ -7,7 +7,7 @@
     >
       <template #tableHeader='scope'>
         <el-button v-auth.dictPq="'add'" type='primary' :icon='CirclePlus' @click="openDialog('add')">新增</el-button>
-        <el-button v-auth.dictPq="'batchDelete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
+        <el-button v-auth.dictPq="'delete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
                    @click='batchDelete(scope.selectedListIds)'>
           批量删除
         </el-button>
diff --git a/frontend/src/views/system/dictionary/dictType/index.vue b/frontend/src/views/system/dictionary/dictType/index.vue
index 03fc6ec..d639c1a 100644
--- a/frontend/src/views/system/dictionary/dictType/index.vue
+++ b/frontend/src/views/system/dictionary/dictType/index.vue
@@ -8,7 +8,7 @@
       <template #tableHeader='scope'>
         <el-button v-auth.dict="'add'" type='primary' :icon='CirclePlus' @click="openDialog('add')">新增</el-button>
         <el-button v-auth.dict="'export'" type='primary' :icon='Download' plain @click='downloadFile()'>导出</el-button>
-        <el-button v-auth.dict="'batchDelete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
+        <el-button v-auth.dict="'delete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
                    @click='batchDelete(scope.selectedListIds)'>
           批量删除
         </el-button>

From e5d4aae846f5d47b56bc603a804f86a6242a911d Mon Sep 17 00:00:00 2001
From: sjl <1716605279@qq.com>
Date: Wed, 4 Dec 2024 20:00:04 +0800
Subject: [PATCH 2/2] =?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/views/authority/role/index.vue   |   2 +-
 frontend/src/views/authority/user/index.vue   |   2 +-
 frontend/src/views/demo/proTable/index.vue    |   2 +-
 .../machine/device/components/monitorTab.vue  |   2 +-
 frontend/src/views/machine/device/index.vue   |   2 +-
 .../components/errorStandardPopup.vue         |  27 +-
 .../components/errorSystemDetailTable.vue     |   4 +-
 .../src/views/machine/errorSystem/index.vue   |   2 +-
 .../src/views/machine/testScript/index.vue    |   2 +-
 .../testSource/components/parameterTable.vue  |   2 +-
 .../src/views/machine/testSource/index.vue    |   2 +-
 frontend/src/views/plan/planList/index.vue    |   2 +-
 .../system/dictionary/dictData/index.vue      |   2 +-
 .../dictionary/dictPq/components/pqPopup.vue  | 641 +++++++++++-------
 .../views/system/dictionary/dictPq/index.vue  |   2 +-
 .../system/dictionary/dictType/index.vue      |   2 +-
 16 files changed, 414 insertions(+), 284 deletions(-)

diff --git a/frontend/src/views/authority/role/index.vue b/frontend/src/views/authority/role/index.vue
index 9c9c85f..62b6463 100644
--- a/frontend/src/views/authority/role/index.vue
+++ b/frontend/src/views/authority/role/index.vue
@@ -11,7 +11,7 @@
         <el-button v-auth.role="'add'" type='primary' :icon='CirclePlus' @click="openDrawer('新增角色')">新增</el-button>
                 <el-button v-auth.role="'batchDelete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
                    @click='batchDelete(scope.selectedListIds)'>
-          批量删除
+          删除
         </el-button>
       </template>
       <!-- 表格操作 -->
diff --git a/frontend/src/views/authority/user/index.vue b/frontend/src/views/authority/user/index.vue
index 20a1a94..0dacb54 100644
--- a/frontend/src/views/authority/user/index.vue
+++ b/frontend/src/views/authority/user/index.vue
@@ -11,7 +11,7 @@
           <el-button  v-auth.user="'add'" type='primary' :icon='CirclePlus' @click="openDialog('add')">新增</el-button>
           <el-button  v-auth.user="'batchDelete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
                      @click='batchDelete(scope.selectedListIds)'>
-            批量删除
+          删除
           </el-button>
         </template>
         <!-- 表格操作 -->
diff --git a/frontend/src/views/demo/proTable/index.vue b/frontend/src/views/demo/proTable/index.vue
index 3598bb1..260fa07 100644
--- a/frontend/src/views/demo/proTable/index.vue
+++ b/frontend/src/views/demo/proTable/index.vue
@@ -12,7 +12,7 @@
         <el-button type='primary' :icon='Download' plain @click='downloadFile'>导出用户数据</el-button>
         <el-button type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
                    @click='batchDelete(scope.selectedListIds)'>
-          批量删除用户
+          删除用户
         </el-button>
       </template>
       <!-- 表格操作 -->
diff --git a/frontend/src/views/machine/device/components/monitorTab.vue b/frontend/src/views/machine/device/components/monitorTab.vue
index b2deb88..42229f0 100644
--- a/frontend/src/views/machine/device/components/monitorTab.vue
+++ b/frontend/src/views/machine/device/components/monitorTab.vue
@@ -10,7 +10,7 @@
           <!-- 表格 header 按钮 -->
           <template #tableHeader='scope'>
             <el-button type='primary' :icon='CirclePlus'>新增</el-button>
-            <el-button type='danger' :icon='Delete' plain :disabled='!scope.isSelected'>批量删除</el-button>
+            <el-button type='danger' :icon='Delete' plain :disabled='!scope.isSelected'>删除</el-button>
           </template>
           <!-- 表格操作 -->
           <template #operation>
diff --git a/frontend/src/views/machine/device/index.vue b/frontend/src/views/machine/device/index.vue
index f91d34a..30621f4 100644
--- a/frontend/src/views/machine/device/index.vue
+++ b/frontend/src/views/machine/device/index.vue
@@ -13,7 +13,7 @@
         <el-button v-auth.device="'import'" type='primary' :icon='Download' plain @click='importFile()'>导入</el-button>
         <el-button v-auth.device="'delete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
                    @click='batchDelete(scope.selectedListIds)'>
-          批量删除
+          删除
         </el-button>
       </template>
       <!-- 表格操作 -->
diff --git a/frontend/src/views/machine/errorSystem/components/errorStandardPopup.vue b/frontend/src/views/machine/errorSystem/components/errorStandardPopup.vue
index 3b25486..0a817be 100644
--- a/frontend/src/views/machine/errorSystem/components/errorStandardPopup.vue
+++ b/frontend/src/views/machine/errorSystem/components/errorStandardPopup.vue
@@ -65,6 +65,7 @@ const spanMethod = ({
 }: SpanMethodProps) => {
  
   if (columnIndex === 0  ) { // 检查是否为第一列
+    
     if (rowIndex === 2 ||rowIndex === 21) { // 检查是否为第三行
       return {
         rowspan: 2, // 合并行数
@@ -92,7 +93,7 @@ const spanMethod = ({
       };
     }
   }
-  if (columnIndex === 1  ){
+  if (columnIndex === 1 || columnIndex === 2){
     if (rowIndex === 2 
         || rowIndex === 8|| rowIndex === 10|| rowIndex === 12|| rowIndex === 14
         || rowIndex === 16|| rowIndex === 18
@@ -122,29 +123,7 @@ const spanMethod = ({
   //       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,
-      };
-    }
-  }
- 
-      
+  } 
 };
 
     // 关闭弹窗
diff --git a/frontend/src/views/machine/errorSystem/components/errorSystemDetailTable.vue b/frontend/src/views/machine/errorSystem/components/errorSystemDetailTable.vue
index 98fb287..a3784ef 100644
--- a/frontend/src/views/machine/errorSystem/components/errorSystemDetailTable.vue
+++ b/frontend/src/views/machine/errorSystem/components/errorSystemDetailTable.vue
@@ -1,7 +1,7 @@
 <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>
+                <el-button :icon='Delete' type="danger"  plain :disabled='!multipleSelection.length' @click="deleteSelectedRows">删除</el-button>
     </div>
       <div class="table-container">
             <el-table :data="tableData"  
@@ -125,7 +125,7 @@
 const options: Ref<CascaderOption[]> = ref([]); // 修改这里
 
 onMounted(async () => {
-  const dictCode = ''; // 替换为实际需要的字典代码
+  const dictCode = '误差体系指标项'; // 替换为实际需要的字典代码
   const resDictTree: Dict.ResDictTree = {
     name: dictCode,
     id: '',
diff --git a/frontend/src/views/machine/errorSystem/index.vue b/frontend/src/views/machine/errorSystem/index.vue
index e641f35..9b664df 100644
--- a/frontend/src/views/machine/errorSystem/index.vue
+++ b/frontend/src/views/machine/errorSystem/index.vue
@@ -10,7 +10,7 @@
         <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>
        <!-- 表格操作 -->
diff --git a/frontend/src/views/machine/testScript/index.vue b/frontend/src/views/machine/testScript/index.vue
index 6d33d01..93f3b95 100644
--- a/frontend/src/views/machine/testScript/index.vue
+++ b/frontend/src/views/machine/testScript/index.vue
@@ -11,7 +11,7 @@
         <el-button v-auth.testScript="'add'" type='primary' :icon='CirclePlus' @click="openDialog('add')">新增</el-button>
         <el-button v-auth.testScript="'batchDelete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
                    @click='batchDelete(scope.selectedListIds)'>
-          批量删除
+          删除
         </el-button>
       </template>
       <!-- 表格操作 -->
diff --git a/frontend/src/views/machine/testSource/components/parameterTable.vue b/frontend/src/views/machine/testSource/components/parameterTable.vue
index b54dc8a..22daccb 100644
--- a/frontend/src/views/machine/testSource/components/parameterTable.vue
+++ b/frontend/src/views/machine/testSource/components/parameterTable.vue
@@ -15,7 +15,7 @@
         </el-button>
         <el-button v-auth.testSource="'batchDelete'" type='danger' :icon='Delete'
                    plain :disabled='!scope.isSelected' @click='batchDelete(scope.selectedListIds)'>
-          批量删除
+          删除
         </el-button>
       </template>
       <!-- 表格操作 -->
diff --git a/frontend/src/views/machine/testSource/index.vue b/frontend/src/views/machine/testSource/index.vue
index f9fb96c..979c4fd 100644
--- a/frontend/src/views/machine/testSource/index.vue
+++ b/frontend/src/views/machine/testSource/index.vue
@@ -11,7 +11,7 @@
           <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>
         <!-- 表格操作 -->
diff --git a/frontend/src/views/plan/planList/index.vue b/frontend/src/views/plan/planList/index.vue
index 8b5d098..c60ab0e 100644
--- a/frontend/src/views/plan/planList/index.vue
+++ b/frontend/src/views/plan/planList/index.vue
@@ -14,7 +14,7 @@
         </el-button>
         <el-button type='primary' :icon='CirclePlus' @click='openAddDialog'>新增</el-button>
         <el-button type='danger' :icon='Delete' plain :disabled='!scope.isSelected'>
-          批量删除
+          删除
         </el-button>
         <input type='file' style='display: none' ref='fileInput' @change='handleFiles'>
       </template>
diff --git a/frontend/src/views/system/dictionary/dictData/index.vue b/frontend/src/views/system/dictionary/dictData/index.vue
index 1bfb75c..37ef229 100644
--- a/frontend/src/views/system/dictionary/dictData/index.vue
+++ b/frontend/src/views/system/dictionary/dictData/index.vue
@@ -11,7 +11,7 @@
           <el-button v-auth.dict="'show_export'" type='primary' :icon='Download' plain @click="downloadFile">导出</el-button>
           <el-button v-auth.dict="'show_batchDelete'" type="danger" :icon="Delete" plain :disabled="!scope.isSelected"
                      @click="batchDelete(scope.selectedListIds)">
-            批量删除
+            删除
           </el-button>
         </template>
 
diff --git a/frontend/src/views/system/dictionary/dictPq/components/pqPopup.vue b/frontend/src/views/system/dictionary/dictPq/components/pqPopup.vue
index 9464a13..eff7a39 100644
--- a/frontend/src/views/system/dictionary/dictPq/components/pqPopup.vue
+++ b/frontend/src/views/system/dictionary/dictPq/components/pqPopup.vue
@@ -1,269 +1,420 @@
 <template>
-    <el-dialog v-model='dialogVisible' :title='dialogTitle' v-bind='dialogMiddle' @close="close">
-        <el-form :model='formContent' ref='dialogFormRef' :rules='rules' class='form-two'>
-          <el-divider >基础数据</el-divider>
+  <el-dialog v-model='dialogVisible' :title='dialogTitle' v-bind="dialogBig" @close="close">
+    <el-form :model='formContent' ref='dialogFormRef' :rules='rules'>
+
+      <el-divider>基础数据</el-divider>
+
+      <el-row :gutter="24">
+        <el-col :span="8">
           <el-form-item label='数据模型' :label-width='140' prop='dataType'>
-            <el-select v-model="formContent.dataType"  clearable placeholder="请选择数据模型">
-            <el-option
-              v-for="item in dictStore.getDictData('Cs_Data_Type')"
-              :key="item.id"
-              :label="item.name"
-              :value="item.code"
-            />
-          </el-select>
+            <el-select v-model="formContent.dataType" clearable placeholder="请选择数据模型">
+              <el-option
+                  v-for="item in dictStore.getDictData('Cs_Data_Type')"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.code"
+              />
+            </el-select>
           </el-form-item>
+        </el-col>
+        <el-col :span="8">
           <el-form-item label='指标名称' :label-width='140' prop='name'>
-            <el-input v-model='formContent.name' placeholder='请输入' autocomplete='off' />
-          </el-form-item>
-          <el-form-item label='别名' :label-width='140' prop='otherName'>
-            <el-input v-model='formContent.otherName' placeholder='请输入' autocomplete='off' />
-          </el-form-item>
-          <el-form-item label='显示名称' :label-width='140' prop='showName'>
-            <el-input v-model='formContent.showName' placeholder='请输入' autocomplete='off' />
+            <el-input v-model='formContent.name' placeholder='请输入指标名称' autocomplete='off'/>
           </el-form-item>
+        </el-col>
+        <el-col :span="8">
           <el-form-item label='相别' :label-width='140' prop='phase'>
-            <el-select v-model="formContent.phase"  clearable placeholder="请选择相别">
-            <el-option
-              v-for="item in dictStore.getDictData('phase')"
-              :key="item.id"
-              :label="item.name"
-              :value="item.code"
-            />
-          </el-select>
+            <el-select v-model="formContent.phase" clearable placeholder="请选择相别">
+              <el-option
+                  v-for="item in dictStore.getDictData('phase')"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.code"
+              />
+            </el-select>
           </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item label='显示名称' :label-width='140' prop='showName'>
+            <el-input v-model='formContent.showName' placeholder='请输入显示名称' autocomplete='off'/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label='别名' :label-width='140' prop='otherName'>
+            <el-input v-model='formContent.otherName' placeholder='请输入别名' autocomplete='off'/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
           <el-form-item label='单位' :label-width='140' prop='unit'>
-            <el-input v-model='formContent.unit' placeholder='请输入单位' autocomplete='off' />
+            <el-select v-model="formContent.unit" clearable placeholder="请选择单位">
+              <el-option v-for="item in dictStore.getDictData('Unit_Type')" :key="item.id" :label="item.name"
+                         :value="item.code"/>
+            </el-select>
           </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="24">
+        <el-col :span="8">
           <el-form-item label='指标数据类型' :label-width='140' prop='type'>
-            <el-input v-model='formContent.type' placeholder='请输入指标数据类型' autocomplete='off' />
+            <el-select v-model="formContent.type" clearable placeholder="请选择指标数据类型">
+              <el-option
+                  :label="'Number'"
+                  :value="'Number'"
+              />
+              <el-option
+                  :label="'Float'"
+                  :value="'Float'"
+              />
+              <el-option
+                  :label="'Enum'"
+                  :value="'Enum'"
+              />
+            </el-select>
           </el-form-item>
+        </el-col>
+        <el-col :span="8">
           <el-form-item label='次数' :label-width='140'>
             <el-row :gutter="20">
               <el-col :span="11">
-                <el-input v-model="formContent.harmStart" placeholder="请输入起始次数" autocomplete="off" />
+                <el-input v-model="formContent.harmStart" placeholder="起始次数" autocomplete="off"/>
               </el-col>
-              <el-col :span="2" class="text-center" style="line-height: 32px;">-</el-col>
+              <el-col :span="2">-</el-col>
               <el-col :span="11">
-                <el-input v-model="formContent.harmEnd" placeholder="请输入结束次数" autocomplete="off" />
+                <el-input v-model="formContent.harmEnd" placeholder="结束次数" autocomplete="off"/>
               </el-col>
             </el-row>
           </el-form-item>
+        </el-col>
+        <el-col :span="8">
           <el-form-item label='数据统计类型' :label-width='140' prop='statMethod'>
-            <el-select v-model="selectedStatMethods" multiple   placeholder="请选择数据统计类型">
+            <el-select v-model="selectedStatMethods" multiple placeholder="请选择数据统计类型">
               <el-option
-              v-for="item in dictStore.getDictData('Stat_Method')"
-              :key="item.value"
-              :label="item.name"
-              :value="item.code"
-            />
-          </el-select>
+                  v-for="item in dictStore.getDictData('Stat_Method')"
+                  :key="item.value"
+                  :label="item.name"
+                  :value="item.code"
+              />
+            </el-select>
           </el-form-item>
-          <el-form-item label='系统类别' :label-width='140' prop='systemType'>
-            <el-input v-model='formContent.systemType' placeholder='请输入' autocomplete='off' />
-          </el-form-item>
-          <el-form-item label='报表数据来源' :label-width='140' prop='resourcesId'>
-            <el-select v-model="formContent.resourcesId"  clearable placeholder="请选择报表数据来源">
-            <el-option
-              v-for="item in dictStore.getDictData('Data_Day')"
-              :key="item.id"
-              :label="item.name"
-              :value="item.code"
-            />
-          </el-select>
-          </el-form-item>
-          <el-form-item label='数据表表名' :label-width='140' prop='classId'>
-            <el-select v-model="formContent.classId"  clearable placeholder="请选择数据表表名">
-            <el-option
-              v-for="item in dictStore.getDictData('Data')"
-              :key="item.id"
-              :label="item.name"
-              :value="item.code"
-            />
-          </el-select>
-          </el-form-item>
-          <el-form-item label='限值字段名称' :label-width='140' prop='limitName'>
-            <el-input v-model='formContent.limitName' placeholder='请输入限值字段名称' autocomplete='off' />
-          </el-form-item>
-          <el-form-item label='限值表名' :label-width='140' prop='limitTable'>
-            <el-input v-model='formContent.limitTable' placeholder='请输入限值表名' autocomplete='off' />
-          </el-form-item>
-          <el-form-item label='超标判断方式' :label-width='140' prop='formula'>
-            <el-select v-model="formContent.formula"  clearable placeholder="请选择超标判断方式">
-            <el-option
-              v-for="item in dictStore.getDictData('Limit_Value_Judgment')"
-              :key="item.id"
-              :label="item.name"
-              :value="item.code"
-            />
-          </el-select>
-          </el-form-item>
-          <el-form-item label='排序' :label-width='140'>
-            <el-input-number v-model='formContent.sort' :min='1' :max='999' />
-          </el-form-item>
-          <el-divider >拓展数据</el-divider>
-          <el-form-item label='参数缺省值' :label-width='140' prop='defaultValue'>
-            <el-input v-model='formContent.defaultValue' placeholder='请输入参数缺省值' autocomplete='off' />
-          </el-form-item>
-          <el-form-item label='事件类别' :label-width='140' prop='eventType'>
-            <el-input v-model='formContent.eventType' placeholder='请输入事件类别' autocomplete='off' />
-          </el-form-item>
-          <el-form-item label='设置最大值' :label-width='140' prop='maxNum'>
-            <el-input-number v-model='formContent.maxNum'  controls-position="right" style="width: 300px;"/>
-          </el-form-item>
-          <el-form-item label='设置最小值' :label-width='140' prop='minNum'>
-            <el-input-number v-model='formContent.minNum'  controls-position="right" style="width: 300px;"/>
-          </el-form-item>
-          <el-form-item label='枚举序列' :label-width='140' prop='setValue'>
-            <el-input v-model='formContent.setValue' placeholder='请输入枚举序列' autocomplete='off' />
-          </el-form-item>
-          <el-form-item label='字符串长度上限' :label-width='140' prop='strlen'>
-            <el-input-number v-model='formContent.strlen'  controls-position="right" style="width: 300px;"/>
-          </el-form-item>
-          <el-form-item label='上送规则' :label-width='140' prop='tranRule'>
-            <el-input v-model='formContent.tranRule' placeholder='请输入上送规则' autocomplete='off' />
-          </el-form-item>
-          <el-form-item label='当前值' :label-width='140' prop='curSts'>
-            <el-input v-model='formContent.curSts' placeholder='请输入当前值' autocomplete='off' />
-          </el-form-item>
-          <el-form-item label='二次值转一次值公式' :label-width='140' prop='primaryFormula'>
-            <el-input v-model='formContent.primaryFormula' placeholder='请输入公式' autocomplete='off' />
-          </el-form-item>
-          <el-form-item label="是否可远程控制" :label-width="140">
-            <el-radio-group v-model="formContent.ctlSts" >
-              <el-radio label="是" :value="1"></el-radio>
-              <el-radio label="否" :value="0"></el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="是否存储" :label-width="140">
-            <el-radio-group v-model="formContent.storeFlag" >
-              <el-radio label="是" :value="1"></el-radio>
-              <el-radio label="否" :value="0"></el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="数据是否上送" :label-width="140">
-            <el-radio-group v-model="formContent.tranFlag" >
-              <el-radio label="是" :value="1"></el-radio>
-              <el-radio label="否" :value="0"></el-radio>
-            </el-radio-group>
-          </el-form-item>
-         
-        </el-form>
-     
-      <template #footer>
-        <div class='dialog-footer'>
-          <el-button @click='close()'>取消</el-button>
-          <el-button type='primary' @click='save()'>
-            保存
-          </el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </template>
-  <script setup lang='ts'>
-  import { dialogMiddle } from '@/utils/elementBind'
-  import { type Dict } from '@/api/system/dictionary/interface'
-  import { ElMessage, type FormItemRule } from 'element-plus'
-  import { addDictPq, updateDictPq } from '@/api/system/dictionary/dictPq'
-  import { computed, type Ref, ref } from 'vue';
-  import { useDictStore } from '@/stores/modules/dict'
-  const dictStore = useDictStore()
-  const selectedStatMethods = ref<string[]>([])
-  // 定义弹出组件元信息
-  const dialogFormRef = ref()
-  function useMetaInfo() {
-    const dialogVisible = ref(false)
-    const titleType = ref('add')
-    const formContent = ref<Dict.ResDictPq>({
-      id: '',
-      name: '',
-      phase: '',
-      sort: 100,
-      dataType: '',
-      state: 1,
-      classId: '',
-    })
-    return { dialogVisible, titleType, formContent }
-  }
-  
-  const { dialogVisible, titleType, formContent } = useMetaInfo()
-  // 清空formContent
-  const resetFormContent = () => {
-    formContent.value = {
-      id: '',
-      name: '',
-      phase: '',
-      sort: 100,
-      dataType: '',
-      state: 1,
-      classId: '',
-    }
-  }
-  
-  let dialogTitle = computed(() => {
-    return titleType.value === 'add' ? '新增字典' : '编辑字典'
-  })
-  
-  // 定义表单校验规则
-  const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
-    dataType: [{ required: true, message: '数据模型必选！', trigger: 'change' }],
-    name: [{ required: true, message: '指标名称必填！', trigger: 'blur' }],
-    phase: [{ required: true, message: '相别必选！', trigger: 'change' }],
-    classId: [{ required: true, message: '数据库表名必选！', trigger: 'change' }],
-  })
-  
-  // 关闭弹窗
-  const close = () => {
-    dialogVisible.value = false
-    // 清空dialogForm中的值
-    resetFormContent()
-    // 重置表单
-    dialogFormRef.value?.resetFields()
-    selectedStatMethods.value = []
-  }
-  
-  // 保存数据
-  const save = () => {
-    try {
-        dialogFormRef.value?.validate(async (valid: boolean) => {
-        if (valid) {
-          formContent.value.statMethod = selectedStatMethods.value.join(',')
-          if (formContent.value.id) {
-            await updateDictPq(formContent.value);
-          } else {
-            await addDictPq(formContent.value);
-          }
-          ElMessage.success({ message: `${dialogTitle.value}成功！` })
-          close()
-          // 刷新表格
-          await props.refreshTable!()
-        }
-      })
-    } catch (err) {
-      console.error('验证过程中出现错误', err)
-    }
-  }
-  
-  // 打开弹窗，可能是新增，也可能是编辑
-  const open = (sign: string, data: Dict.ResDictPq) => {
-    // 重置表单
-    dialogFormRef.value?.resetFields()
-    titleType.value = sign
-    dialogVisible.value = true
-    selectedStatMethods.value = data.statMethod ? data.statMethod.split(',') : []
-    if (data.id) {
-      formContent.value = { ...data }
-    } else {
-      resetFormContent()
-    }
-  }
-  
-  // 对外映射
-  defineExpose({ open })
-  const props = defineProps<{
-    refreshTable: (() => Promise<void>) | undefined;
-  }>()
-  
+        </el-col>
+      </el-row>
 
-  
-  </script>
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item label='系统类别' :label-width='140' prop='systemType'>
+            <el-input v-model='formContent.systemType' placeholder='请输入系统类别' autocomplete='off'/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label='报表数据来源' :label-width='140' prop='resourcesId'>
+            <el-select v-model="formContent.resourcesId" clearable placeholder="请选择报表数据来源">
+              <el-option
+                  v-for="item in dictStore.getDictData('Data_Day')"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.code"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label='数据表表名' :label-width='140' prop='classId'>
+            <el-select v-model="formContent.classId" clearable placeholder="请选择数据表表名">
+              <el-option
+                  v-for="item in dictStore.getDictData('Data')"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.code"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item label='限值字段名称' :label-width='140' prop='limitName'>
+            <el-input v-model='formContent.limitName' placeholder='请输入限值字段名称' autocomplete='off'/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label='限值表名' :label-width='140' prop='limitTable'>
+            <el-input v-model='formContent.limitTable' placeholder='请输入限值表名' autocomplete='off'/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label='超标判断方式' :label-width='140' prop='formula'>
+            <el-select v-model="formContent.formula" clearable placeholder="请选择超标判断方式">
+              <el-option
+                  v-for="item in dictStore.getDictData('Limit_Value_Judgment')"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.code"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="24">
+        <el-col :span="24">
+          <el-form-item label='排序' :label-width='140'>
+            <el-input-number v-model='formContent.sort' :min='1' :max='999'/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-divider>拓展数据</el-divider>
+
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item label='参数缺省值' :label-width='140' prop='defaultValue'>
+            <el-input v-model='formContent.defaultValue' placeholder='请输入参数缺省值' autocomplete='off'/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label='事件类别' :label-width='140' prop='eventType'>
+            <el-input v-model='formContent.eventType' placeholder='请输入事件类别' autocomplete='off'/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label='设置最大值' :label-width='140' prop='maxNum'>
+            <el-input-number v-model='formContent.maxNum' controls-position="right" style="width: 300px;"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item label='设置最小值' :label-width='140' prop='minNum'>
+            <el-input-number v-model='formContent.minNum' controls-position="right" style="width: 300px;"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label='枚举序列' :label-width='140' prop='setValue'>
+            <el-input v-model='formContent.setValue' placeholder='请输入枚举序列' autocomplete='off'/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label='字符串长度上限' :label-width='140' prop='strlen'>
+            <el-input-number v-model='formContent.strlen' controls-position="right" style="width: 300px;"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item label='上送规则' :label-width='140' prop='tranRule'>
+            <el-input v-model='formContent.tranRule' placeholder='请输入上送规则' autocomplete='off'/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label='当前值' :label-width='140' prop='curSts'>
+            <el-input v-model='formContent.curSts' placeholder='请输入当前值' autocomplete='off'/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label='二次值转一次值公式' :label-width='140' prop='primaryFormula'>
+            <el-input v-model='formContent.primaryFormula' placeholder='请输入公式' autocomplete='off'/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="24">
+        <el-col :span="8">
+          <el-form-item label="是否可远程控制" :label-width="140">
+            <el-radio-group v-model="formContent.ctlSts">
+              <el-radio label="是" :value="1"></el-radio>
+              <el-radio label="否" :value="0"></el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="是否存储" :label-width="140">
+            <el-radio-group v-model="formContent.storeFlag">
+              <el-radio label="是" :value="1"></el-radio>
+              <el-radio label="否" :value="0"></el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="数据是否上送" :label-width="140">
+            <el-radio-group v-model="formContent.tranFlag">
+              <el-radio label="是" :value="1"></el-radio>
+              <el-radio label="否" :value="0"></el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+    </el-form>
+
+    <template #footer>
+      <div class='dialog-footer'>
+        <el-button @click='close()'>取消</el-button>
+        <el-button type='primary' @click='save()'>
+          保存
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+<script setup lang='ts'>
+import {dialogBig} from '@/utils/elementBind'
+import {type Dict} from '@/api/system/dictionary/interface'
+import {ElMessage, type FormItemRule} from 'element-plus'
+import {addDictPq, updateDictPq} from '@/api/system/dictionary/dictPq'
+import {computed, type Ref, ref} from 'vue';
+import {useDictStore} from '@/stores/modules/dict'
+
+const dictStore = useDictStore()
+const selectedStatMethods = ref<string[]>([])
+// 定义弹出组件元信息
+const dialogFormRef = ref()
+
+function useMetaInfo() {
+  const dialogVisible = ref(false)
+  const titleType = ref('add')
+  const formContent = reactive<Dict.ResDictPq>({
+    id: '',
+    dataType: '',
+    name: '',
+    otherName: '',
+    showName: '',
+    phase: '',
+    unit: '',
+    type: 'Number',
+    harmStart: '',
+    harmEnd: '',
+    systemType: '',
+    resourcesId: '',
+    classId: '',
+    limitName: '',
+    limitTable: '',
+    formula: '',
+    sort: 100,
+    defaultValue: '',
+    eventType: '',
+    maxNum: '',
+    minNum: '',
+    setValue: '',
+    strlen: '',
+    tranRule: '',
+    curSts: '',
+    primaryFormula: '',
+    ctlSts: 0,
+    storeFlag: 0,
+    tranFlag: 0,
+    state: 1,
+  })
+  return {dialogVisible, titleType, formContent}
+}
+
+const {dialogVisible, titleType, formContent} = useMetaInfo()
+// 清空formContent
+const resetFormContent = () => {
+  Object.assign(formContent, {
+    id: '',
+    dataType: '',
+    name: '',
+    otherName: '',
+    showName: '',
+    phase: '',
+    unit: '',
+    type: 'Number',
+    harmStart: '',
+    harmEnd: '',
+    systemType: '',
+    resourcesId: '',
+    classId: '',
+    limitName: '',
+    limitTable: '',
+    formula: '',
+    sort: 100,
+    defaultValue: '',
+    eventType: '',
+    maxNum: '',
+    minNum: '',
+    setValue: '',
+    strlen: '',
+    tranRule: '',
+    curSts: '',
+    primaryFormula: '',
+    ctlSts: 0,
+    storeFlag: 0,
+    tranFlag: 0,
+    state: 1,
+  })
+}
+
+let dialogTitle = computed(() => {
+  return titleType.value === 'add' ? '新增字典' : '编辑字典'
+})
+
+// 定义表单校验规则
+const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
+  dataType: [{required: true, message: '数据模型必选！', trigger: 'change'}],
+  name: [{required: true, message: '指标名称必填！', trigger: 'blur'}],
+  phase: [{required: true, message: '相别必选！', trigger: 'change'}],
+  classId: [{required: true, message: '数据库表名必选！', trigger: 'change'}],
+})
+
+// 关闭弹窗
+const close = () => {
+  dialogVisible.value = false
+  // 清空dialogForm中的值
+  resetFormContent()
+  // 重置表单
+  dialogFormRef.value?.resetFields()
+  selectedStatMethods.value = []
+}
+
+// 保存数据
+const save = () => {
+  try {
+    dialogFormRef.value?.validate(async (valid: boolean) => {
+      if (valid) {
+        formContent.statMethod = selectedStatMethods.value.join(',')
+        if (formContent.id) {
+          await updateDictPq(formContent);
+        } else {
+          await addDictPq(formContent);
+        }
+        ElMessage.success({message: `${dialogTitle.value}成功！`})
+        close()
+        // 刷新表格
+        await props.refreshTable!()
+      }
+    })
+  } catch (err) {
+    console.error('验证过程中出现错误', err)
+  }
+}
+
+// 打开弹窗，可能是新增，也可能是编辑
+const open = (sign: string, data: Dict.ResDictPq) => {
+  // 重置表单
+  dialogFormRef.value?.resetFields()
+  titleType.value = sign
+  dialogVisible.value = true
+  selectedStatMethods.value = data.statMethod ? data.statMethod.split(',') : []
+  if (data.id) {
+    Object.assign(formContent, {...data})
+  } else {
+    resetFormContent()
+  }
+}
+
+// 对外映射
+defineExpose({open})
+const props = defineProps<{
+  refreshTable: (() => Promise<void>) | undefined;
+}>()
+
+
+</script>
  
\ No newline at end of file
diff --git a/frontend/src/views/system/dictionary/dictPq/index.vue b/frontend/src/views/system/dictionary/dictPq/index.vue
index 6542dad..f641a3c 100644
--- a/frontend/src/views/system/dictionary/dictPq/index.vue
+++ b/frontend/src/views/system/dictionary/dictPq/index.vue
@@ -9,7 +9,7 @@
         <el-button v-auth.dictPq="'add'" type='primary' :icon='CirclePlus' @click="openDialog('add')">新增</el-button>
         <el-button v-auth.dictPq="'batchDelete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
                    @click='batchDelete(scope.selectedListIds)'>
-          批量删除
+          删除
         </el-button>
       </template>
 
diff --git a/frontend/src/views/system/dictionary/dictType/index.vue b/frontend/src/views/system/dictionary/dictType/index.vue
index 03fc6ec..62af3d7 100644
--- a/frontend/src/views/system/dictionary/dictType/index.vue
+++ b/frontend/src/views/system/dictionary/dictType/index.vue
@@ -10,7 +10,7 @@
         <el-button v-auth.dict="'export'" type='primary' :icon='Download' plain @click='downloadFile()'>导出</el-button>
         <el-button v-auth.dict="'batchDelete'" type='danger' :icon='Delete' plain :disabled='!scope.isSelected'
                    @click='batchDelete(scope.selectedListIds)'>
-          批量删除
+          删除
         </el-button>
       </template>