瞬时热量+报警参数-输入格式

src/views/AlarmPage/AlarmStatusPage.vue

@@ -580,20 +580,20 @@ const formRef = ref()
 addParams.value = {}
 const rules = reactive({
   topMost: [
-    { pattern: /^(\d{1,5})(\.[0-9]{1,4})?$/, "message": "上上限值是 1-10位实数", trigger: "blur" }
+    { pattern: /^(\d{1,10})(\.[0-9]{1,4})?$/, "message": "上上限值长度超出范围", trigger: "blur" }
   ],
   upper: [
-    { pattern: /^(\d{1,5})(\.[0-9]{1,4})?$/, "message": "上限值是 1-10位实数", trigger: "blur" }
+    { pattern: /^(\d{1,10})(\.[0-9]{1,4})?$/, "message": "上限值长度超出范围", trigger: "blur" }
   ],
   lower: [
-    { pattern: /^(\d{1,5})(\.[0-9]{1,4})?$/, "message": "下限值是 1-10位实数", trigger: "blur" }
+    { pattern: /^(\d{1,10})(\.[0-9]{1,4})?$/, "message": "下限值长度超出范围", trigger: "blur" }
 
   ],
   downMost: [
-    { pattern: /^(\d{1,5})(\.[0-9]{1,4})?$/, "message": "下下限值是 1-10位实数", trigger: "blur" }
+    { pattern: /^(\d{1,10})(\.[0-9]{1,4})?$/, "message": "下下限值长度超出范围", trigger: "blur" }
   ],
   alarmPlan: [
-    { pattern: /^.{1,50}$/, "message": "报警预案是 1-50位字符", trigger: "blur" }
+    { pattern: /^.{1,50}$/, "message": "报警预案必须是1-50位字符", trigger: "blur" }
   ]
 });
 
@@ -720,7 +720,7 @@ const selectAfterParams = (row) => {
 // 点击添加按钮要根据参数所属不同的类型和设备进行传参
 // 修改亦如此
 
-const onAdd = () => {
+const onAdd = async () => {
   // console.log("!!!!!!!", addParams.value);
   // 提交添加或修改-以上至少有一个选项有值
   if (addParams.value.topMost || addParams.value.upper || addParams.value.lower || addParams.value.downMost) {
@@ -735,7 +735,8 @@ const onAdd = () => {
         addParams.value.gatherType = 1
       }
 
-      http.post("api/alarm/para/pipesave", { ...addParams.value }, false).then((res) => {
+      await formRef.value.validate()
+      await http.post("api/alarm/para/pipesave", { ...addParams.value }, false).then((res) => {
         if (res.success) {
           ElMessage.success(res.message)
           delete addParams.value.pipeId
@@ -753,7 +754,8 @@ const onAdd = () => {
     } else if (newType.value === 2) {
       addParams.value.boilerParaBaseId = newRow.value
       addParams.value.boilerId = dept.value
-      http.post("api/alarm/para/boilersave", { ...addParams.value }, false).then((res) => {
+      await formRef.value.validate()
+      await http.post("api/alarm/para/boilersave", { ...addParams.value }, false).then((res) => {
         if (res.success) {
           ElMessage.success(res.message)
           delete addParams.value.boilerParaBaseId
@@ -770,7 +772,8 @@ const onAdd = () => {
     } else if (newType.value === 3) {
       addParams.value.transParaBaseId = newRow.value
       addParams.value.unitId = dept.value
-      http.post("api/alarm/para/transsave", { ...addParams.value }, false).then((res) => {
+      await formRef.value.validate()
+      await http.post("api/alarm/para/transsave", { ...addParams.value }, false).then((res) => {
         if (res.success) {
           ElMessage.success(res.message)
           delete addParams.value.transParaBaseId

src/views/SchedulingPage/InstantHeatPage.vue

@@ -117,7 +117,7 @@ const rules = reactive({
     { pattern: /^([0-9]\d{0,1}|100$)(\.\d{1,4})?$/, "message": "请输入正确的百分比格式", trigger: "blur" }
   ],
   timeoutMin: [
-    { pattern: /^(\d{1,10})(\.[0-9]{1,4})?$/, "message": "判断时间必须是1-10位实数", trigger: "blur" }
+    { pattern: /^(\d{1,10})$/, "message": "判断时间必须是1-10位正整数", trigger: "blur" }
   ],
   tempRegulation: [
     { pattern: /^(-?\d{1,10})(\.[0-9]{1,4})?$/, message: "请输入正确的调节温度最大值", trigger: "blur" }