微调

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

@@ -21,7 +21,7 @@
         <el-form-item label="源参数类型" :label-width="100" prop="sourceParamType">
           <el-input v-model="formContent.sourceParamType" autocomplete="off"/>
         </el-form-item>
-        <el-form-item v-show="displayPid && displayPid!== '0'" label="源参数值" :label-width="100"
+        <el-form-item  label="源参数值" :label-width="100"
                       prop="sourceParamValue">
           <el-input v-model="formContent.sourceParamValue" autocomplete="off"/>
         </el-form-item>
@@ -42,7 +42,7 @@
 </template>
 
 <script setup lang="ts">
-import {defineEmits, reactive, watch} from 'vue'
+import {computed, defineEmits, reactive, watch} from 'vue'
 import {dialogSmall} from "@/utils/elementBind"
 import {TestSource} from "@/api/device/interface/testSource"
 import {ElMessage, FormItemRule} from "element-plus"
@@ -56,11 +56,14 @@ const emit = defineEmits(['get-parameter'])
 // 计算属性，用于控制显示的 pid
 const displayPid = computed({
   get: () => {
+  
     return formContent.pId === '0' ? '' : formContent.pId;
   },
   set: (value) => {
+   
     formContent.pId = value;
   }
+  
 });
 
 // 树形节点配置
@@ -95,13 +98,14 @@ const rules: reactive<Record<string, Array<FormItemRule>>> = reactive({
   sort: [{required: true, message: '排序必填！', trigger: 'blur'}]
 })
 
-watch(() => formContent.pId, (newVal, oldVal) => {
-  if (newVal !== '0') {
-    rules.sourceParamValue = [{required: true, message: '源参数值必填！', trigger: 'blur'}]
-  } else {
-    rules.sourceParamValue = []
-  }
-})
+// watch(() => formContent.pId, (newVal, oldVal) => {
+
+//   if (newVal !== '0') {
+//     rules.sourceParamValue = [{required: true, message: '源参数值必填！', trigger: 'blur'}]
+//   } else {
+//     rules.sourceParamValue = []
+//   }
+// })
 
 let dialogTitle = computed(() => {
   return titleType.value === 'add' ? '新增源参数' : '编辑源参数'

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

@@ -1,16 +1,16 @@
 <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-dialog :title="dialogTitle" v-model='dialogVisible' @close="close" v-bind="dialogBig" >
+    <div height="800">
+      <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-form-item label="检测源名称" prop="name" >
               <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-form-item label="源型号" prop="devType" >
+              <el-select v-model='formContent.devType' placeholder="请选择源型号">
                 <el-option
                     v-for="item in dictStore.getDictData(dictTypeCode)"
                     :key="item.id"
@@ -21,7 +21,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="标准源" prop="type" :label-width="100">
+            <el-form-item label="标准源" prop="type">
               <el-select v-model='formContent.type' placeholder="请选择检测源类型">
                 <el-option
                     v-for="item in dictStore.getDictData('Pq_Source_Type')"

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

@@ -67,7 +67,7 @@
     },
     {
       prop: 'devType',
-      label: '设备类型',
+      label: '源型号',
       enum: dictStore.getDictData('S_Dev_Type_'+dictStore.getDictData('Pattern').find(item=>item.name=== modeStore.currentMode)?.code),
       fieldNames: { label: 'name', value: 'id' },
       search: { el: 'select' },