误差体系

frontend/src/views/machine/device/components/devicePopup.vue

@@ -319,8 +319,14 @@ const disabledDate = (time: Date) => {
     manufacturer: [{ required: true, message: '生产厂家必选！', trigger: 'change' }],
     encryptionFlag: [{ required: true, message: '是否加密必选！', trigger: 'change' }],
     protocol: [{ required: true, message: '通讯协议必选！', trigger: 'change' }],
-    series: [],
-    devKey: []
+    // series: [],
+    // devKey: []
+    series : [
+      { required: true, message: '请输入识别码', trigger: 'blur' }
+    ],
+    devKey : [
+      { required: true, message: '请输入密钥', trigger: 'blur' }
+    ],
 })
   
   // 关闭弹窗
@@ -335,7 +341,7 @@ const disabledDate = (time: Date) => {
   
   // 保存数据
   const save = () => {
-    try {
+    try {      
         dialogFormRef.value?.validate(async (valid: boolean) => {
 
             if (formContent.value.encryptionFlag === 1) {
@@ -353,7 +359,17 @@ const disabledDate = (time: Date) => {
           if (formContent.value.id) {
                 await updatePqDev(formContent.value);
                 ElMessage.success({ message: `${dialogTitle.value}成功！` })
-            } else {
+            } else {  
+                // 新增需要把设备模式转成字典ID
+                const patternItem = dictStore.getDictData('Pattern').find(item => item.name === formContent.value.pattern);
+                if (patternItem) {
+                    formContent.value.pattern = patternItem.id;
+                }
+                 // 新增需要把通讯协议转成字典ID
+                 const protocolItem = dictStore.getDictData('Protocol').find(item => item.name === formContent.value.protocol);
+                if (protocolItem) {
+                    formContent.value.protocol = protocolItem.id;
+                }
               await addPqDev(formContent.value);
               ElMessage.success({ message: `${dialogTitle.value}成功！` })
                 
@@ -373,8 +389,6 @@ const disabledDate = (time: Date) => {
 // 打开弹窗，可能是新增，也可能是编辑
 const open = (sign: string, data: Device.ResPqDev,currentMode: string) => {
     mode.value = currentMode
-    // 重置表单
-    dialogFormRef.value?.resetFields()
     titleType.value = sign
     dialogVisible.value = true
 
@@ -397,30 +411,23 @@ const open = (sign: string, data: Device.ResPqDev,currentMode: string) => {
     resetFormContent()
     handleEncryptionChange(1)
   }
+
+  // 重置表单
+  dialogFormRef.value?.resetFields()
 }
   const handleEncryptionChange = (value: number) => {
     // 根据是否加密来显示或隐藏识别码和密钥
-
     if(value === 1){
         IsPasswordShow.value = true
-        rules.value.series = [
-      { required: true, message: '请输入识别码', trigger: 'blur' }
-    ];
-    rules.value.devKey = [
-      { required: true, message: '请输入密钥', trigger: 'blur' }
-    ];
+        
     }else
     {
-        IsPasswordShow.value = false
-        formContent.value.series = ''
-        formContent.value.devKey = ''
-        rules.value.series = [];
-        rules.value.devKey = [];
+         IsPasswordShow.value = false
+        // formContent.value.series = ''
+        // formContent.value.devKey = ''
+        // rules.value.series = [];
+        // rules.value.devKey = [];
     }
-    
-    // 如果选择"是"，则显示；否则隐藏
-    dialogFormRef.value?.clearValidate(); // 清除验证状态
-
 }
 
 // 对外映射