微调

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

@@ -10,7 +10,7 @@
                 class="form-three"
             >
                 <el-form-item label="设备类型" prop="devType">
-                    <el-select v-model="formContent.devType" placeholder="请选择源型号">
+                    <el-select v-model="formContent.devType" placeholder="请选择源设备类型">
                         <el-option
                             v-for="item in dictStore.getDictData(dictTypeCode)"
                             :key="item.id"
@@ -29,6 +29,24 @@
                         />
                     </el-select>
                 </el-form-item>
+                <el-form-item label="最大电压" prop="maxVoltage">
+                    <el-input-number
+                        v-model="formContent.maxVoltage"
+                        :min="0"
+                        :precision="2"
+                        :step="0.1"
+                        style="width: 100%"
+                    />
+                </el-form-item>
+                <el-form-item label="最大电流" prop="maxCurrent">
+                    <el-input-number
+                        v-model="formContent.maxCurrent"
+                        :min="0"
+                        :precision="2"
+                        :step="0.1"
+                        style="width: 100%"
+                    />
+                </el-form-item>
             </el-form>
         </div>
 
@@ -40,7 +58,7 @@
         />
         <template #footer>
             <div>
-                <el-button :disabled="tableIsDisable" @click="close()">取 消</el-button>
+                <el-button :disabled="tableIsDisable" @click="close()">取消</el-button>
                 <el-button :disabled="tableIsDisable" type="primary" @click="save()">保存</el-button>
             </div>
         </template>
@@ -49,12 +67,12 @@
 
 <script lang="ts" setup name="ErrorSystemDialog">
 import { ElMessage, type FormItemRule } from 'element-plus'
-import { computed, Ref, ref } from 'vue'
+import { computed, ref, type Ref } from 'vue'
 import { dialogBig } from '@/utils/elementBind'
 import { addTestSource, getTestSourceById, updateTestSource } from '@/api/device/testSource/index'
-import { useDictStore } from '@/stores/modules/dict'
 import { type TestSource } from '@/api/device/interface/testSource'
-// 定义弹出组件元信息
+import { useDictStore } from '@/stores/modules/dict'
+
 const dialogFormRef = ref()
 const dictStore = useDictStore()
 const mode = ref()
@@ -71,13 +89,15 @@ function useMetaInfo() {
         parameter: '',
         type: '',
         devType: '',
+        maxVoltage: undefined,
+        maxCurrent: undefined,
         state: 1
     })
     return { dialogVisible, titleType, formContent }
 }
 
 const { dialogVisible, titleType, formContent } = useMetaInfo()
-// 清空formContent
+
 const resetFormContent = () => {
     formContent.value = {
         id: '',
@@ -85,11 +105,13 @@ const resetFormContent = () => {
         parameter: '',
         type: '',
         devType: '',
+        maxVoltage: undefined,
+        maxCurrent: undefined,
         state: 1
     }
 }
 
-let dialogTitle = computed(() => {
+const dialogTitle = computed(() => {
     switch (titleType.value) {
         case 'add':
             tableIsDisable.value = false
@@ -101,45 +123,52 @@ let dialogTitle = computed(() => {
             tableIsDisable.value = true
             return '查看检测源'
         default:
-            return '' // 默认情况，可选
+            return ''
     }
 })
 
-let dictTypeCode = computed(() => {
+const dictTypeCode = computed(() => {
     return 'S_Dev_Type_' + dictStore.getDictData('Pattern').find(item => item.id === modeId.value)?.code
 })
-// 定义规则
+
+const validateNonNegative = (label: string) => {
+    return (_rule: FormItemRule, value: number | undefined, callback: (error?: Error) => void) => {
+        if (value != null && value < 0) {
+            callback(new Error(`${label} cannot be negative`))
+            return
+        }
+        callback()
+    }
+}
+
 const rules: Ref<Record<string, Array<FormItemRule>>> = ref({
-    name: [{ required: true, message: '检测源名称必填！', trigger: 'blur' }],
+    name: [{ required: true, message: '检测源名称必填', trigger: 'blur' }],
     devType: [{ required: true, message: '请选择一项设备类型', trigger: 'change' }],
-    type: [{ required: true, message: '请选择一项检测源类型', trigger: 'change ' }]
+    type: [{ required: true, message: '请选择一项检测源类型', trigger: 'change' }],
+    maxVoltage: [{ validator: validateNonNegative('最大电压'), trigger: 'change' }],
+    maxCurrent: [{ validator: validateNonNegative('最大电流'), trigger: 'change' }]
 })
 
-// 关闭弹窗
 const close = () => {
     dialogVisible.value = false
-    // 清空dialogForm中的值
     resetFormContent()
-    // 重置表单
     dialogFormRef.value?.resetFields()
     parameterTable.value?.clearData()
 }
 
-// 保存数据
 const save = () => {
     try {
         dialogFormRef.value?.validate(async (valid: boolean) => {
             if (valid) {
                 if (formContent.value.id) {
                     await updateTestSource(formContent.value)
-                    ElMessage.success({ message: `${dialogTitle.value}成功！` })
+                    ElMessage.success({ message: `${dialogTitle.value}成功` })
                 } else {
                     await addTestSource(formContent.value)
-                    ElMessage.success({ message: `${dialogTitle.value}成功！` })
+                    ElMessage.success({ message: `${dialogTitle.value}成功` })
                 }
                 close()
-                // 刷新表格
-                await props.refreshTable!()
+                await props.refreshTable?.()
             }
         })
     } catch (err) {
@@ -147,7 +176,6 @@ const save = () => {
     }
 }
 
-// 打开弹窗，可能是新增，也可能是编辑
 const open = async (sign: string, data: TestSource.ResTestSource, currentMode: string) => {
     titleType.value = sign
     dialogVisible.value = true
@@ -155,13 +183,25 @@ const open = async (sign: string, data: TestSource.ResTestSource, currentMode: s
     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
+        const sourceData = (result?.data ?? {}) as Partial<TestSource.ResTestSource>
+        formContent.value = {
+            id: sourceData.id ?? data.id,
+            pattern: sourceData.pattern ?? modeId.value,
+            parameter: sourceData.parameter ?? '',
+            type: sourceData.type ?? '',
+            devType: sourceData.devType ?? '',
+            maxVoltage: sourceData.maxVoltage ?? undefined,
+            maxCurrent: sourceData.maxCurrent ?? undefined,
+            state: sourceData.state ?? 1,
+            name: sourceData.name,
+            createBy: sourceData.createBy,
+            createTime: sourceData.createTime,
+            updateBy: sourceData.updateBy,
+            updateTime: sourceData.updateTime
         }
     } else {
         resetFormContent()
     }
-    // 重置表单
     dialogFormRef.value?.resetFields()
 }
 
@@ -169,7 +209,6 @@ const changeParameter = (parameterArr: any) => {
     formContent.value.parameter = JSON.stringify(parameterArr)
 }
 
-// 对外映射
 defineExpose({ open })
 const props = defineProps<{
     refreshTable: (() => Promise<void>) | undefined