:wq

erge branch 'master' of http://gitlab.91isoft.com:90/hikvision/web-project

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/AnnualParamPage.vue

 <script setup>
-import {computed, onBeforeMount, onMounted, reactive, ref} from "vue";
+import { computed, onBeforeMount, onMounted, reactive, ref } from "vue";
 import {
   getAnnualParam,
   alterAnnualParam,
@@ -105,11 +105,11 @@ function handleSearch() {
   }
 } // 处理查询
 function onReviseSubmit() {
-  if(reviseForm.value.hasOwnProperty('supplyName')){
+  if (reviseForm.value.hasOwnProperty('supplyName')) {
     delete reviseForm.value.supplyName
   }
-  if(reviseForm.value.year.length > 4){
-    reviseForm.value.year = reviseForm.value.year.slice(6,10)
+  if (reviseForm.value.year.length > 4) {
+    reviseForm.value.year = reviseForm.value.year.slice(6, 10)
   }
   alterAnnualParam(reviseForm.value).then(res => {
     if (res.success) {
@@ -140,6 +140,11 @@ function onAddSubmit() { // 提交新增
       return
     }
   })
+<<<<<<< HEAD
+  console.log('>>>>>>>>==', addForm.value)
+  console.log('========>>>>', addForm.value.year)
+=======
+>>>>>>> 8120e1a2dd4dd697b8b05c4827e818ba500b15a4
   addAnnualParam(addForm.value).then(res => {
     if (res.success) {
       getData()
@@ -166,7 +171,7 @@ function handleClose() {
   addWindowOpen.value = false
   resetInput()
 } // 关闭弹窗
-onBeforeMount(()=>{
+onBeforeMount(() => {
   getData()
   getOrganizationStructure()
 })
@@ -243,7 +248,7 @@ function getSupply() {
         supplyId: sec_item.supplyId,
         supplyName: sec_item.supplyName,
       }
-      supplyData.value.push({...temp})
+      supplyData.value.push({ ...temp })
     })
   })
 } // 根据组织结构获取供热站数据
@@ -255,10 +260,10 @@ function getOrganizationStructure() {
     ElMessage.error('接口异常，获取数据失败.')
   })
 } // 获取组织结构
-function showSupplyName(id){
+function showSupplyName(id) {
   let supplyName = ""
-  supplyData.value.forEach(item=>{
-    if(item.supplyId === id){
+  supplyData.value.forEach(item => {
+    if (item.supplyId === id) {
       supplyName = item.supplyName
     }
   })
@@ -286,7 +291,7 @@ function showSupplyName(id){
         <el-table-column label="节能类型" sortable :sort-method="customSort" prop="energyType" />
         <el-table-column label="供热站名称">
           <template #default="scope">
-            {{showSupplyName(scope.row.supplyId)}}
+            {{ showSupplyName(scope.row.supplyId) }}
           </template>
         </el-table-column>
         <el-table-column label="年度" sortable prop="year" />
@@ -328,7 +333,8 @@ function showSupplyName(id){
             <el-col :span="8" col-label>供热站：</el-col>
             <el-col :span="16" col-value>
               <el-select placeholder="请选择供热站" size="small" v-model="reviseForm.supplyId" style="width: 370px">
-                <el-option v-for="item in supplyData" :key="item.supplyId" :value="item.supplyId" :label="item.supplyName" />
+                <el-option v-for="item in supplyData" :key="item.supplyId" :value="item.supplyId"
+                  :label="item.supplyName" />
               </el-select>
             </el-col>
           </el-row>
@@ -393,7 +399,8 @@ function showSupplyName(id){
             <el-col :span="8" col-label>供热站：</el-col>
             <el-col :span="16" col-value>
               <el-select placeholder="请选择供热站" size="small" v-model="addForm.supplyId" style="width: 370px">
-                <el-option v-for="item in supplyData" :key="item.supplyId" :value="item.supplyId" :label="item.supplyName" />
+                <el-option v-for="item in supplyData" :key="item.supplyId" :value="item.supplyId"
+                  :label="item.supplyName" />
               </el-select>
             </el-col>
           </el-row>

src/views/SchedulingPage/InstantHeatPage.vue

@@ -117,10 +117,10 @@ const rules = reactive({
     { pattern: /^([0-9]\d{0,1}|100$)(\.\d{1,4})?$/, "message": "请输入正确的百分比格式", trigger: "blur" }
   ],
   timeoutMin: [
-    { pattern: /^(\d{1,5})(\.[0-9]{1,4})?$/, "message": "判断时间必须是1-10位实数", trigger: "blur" }
+    { pattern: /^(\d{1,10})$/, "message": "判断时间必须是1-10位正整数", trigger: "blur" }
   ],
   tempRegulation: [
-    { pattern: /^(-?\d{1,5})(\.[0-9]{1,4})?$/, message: "请输入正确的调节温度最大值", trigger: "blur" }
+    { pattern: /^(-?\d{1,10})(\.[0-9]{1,4})?$/, message: "请输入正确的调节温度最大值", trigger: "blur" }
   ],
   description: [
     { pattern: /^.{1,50}$/, "message": "备注必须是1-50位字符", trigger: "blur" }
@@ -137,15 +137,16 @@ const getInstanceHeat = () => {
     }
   })
 }
-const onSave = () => {
-  http.post("/api/Scheduling/BizInstantaneousHeat/Update", { ...List.value }, false).then((res) => {
-    if (res.success) {
-      ElMessage.success(res.message)
-      getInstanceHeat()
-    }
-  }).catch((error) => {
-    console.log(error)
-  })
+const onSave = async () => {
+  await formRef.value.validate()
+  await  http.post("/api/Scheduling/BizInstantaneousHeat/Update", { ...List.value }, false).then((res) => {
+      if (res.success) {
+        ElMessage.success(res.message)
+        getInstanceHeat()
+      }
+    }).catch((error) => {
+      console.log(error)
+    })
 }
 onMounted(() => {
   getInstanceHeat()