Merge branch 'master' of ssh://gitlab.91isoft.com:10022/hikvision/web-project

src/views/SchedulingPage/AnnualParamPage.vue

@@ -235,13 +235,15 @@ function onReviseSubmit() {
       for (let item of dataBackup.value) {
         if (String(item.year).trim() === String(reviseForm.value.year).trim()) {
           if (String(item.energyType).trim() === String(reviseForm.value.energyType).trim()) {
+            if(String(item.supplyId).trim() === String(reviseForm.value.supplyId).trim()){
               if (item.paramId !== reviseForm.value.paramId) {
-              ElMessage.error('该年该类型已存在.')
+                ElMessage.error('该年该类型下已存在相同供热站.')
                 return
               }
             }
           }
         }
+      }
       alterAnnualParam(reviseForm.value).then(res => {
         if (res.success) {
           handleClose()
@@ -307,12 +309,14 @@ function onAddSubmit() { // 提交新增
       for (let item of dataBackup.value) {
         if (String(item.year).trim() === String(addForm.value.year).trim()) {
           if (String(item.energyType).trim() === String(addForm.value.energyType).trim()) {
-            ElMessage.error('该年该类型已存在.')
+            if(String(item.supplyId).trim() === String(addForm.value.supplyId).trim()){
+              ElMessage.error('该年该类型下已存在相同供热站.')
               addSaveBtnLoading.value = false
               return
             }
           }
         }
+      }
       addAnnualParam(addForm.value).then(res => {
         if (res.success) {
           handleClose()

src/views/SchedulingPage/PhenomenonPage.vue

@@ -57,7 +57,7 @@ function search() {
   if (!searchKey.value) {
     getData()
   } else {
-    data.value = dataBackup.value.filter(item => item.phenomenonName.includes(searchKey.value))
+    data.value = dataBackup.value.filter(item => String(item.phenomenonName).trim().includes(searchKey.value))
   }
 }
 

src/views/SchedulingPage/weatherManageSub/AddWindow.vue

@@ -72,17 +72,17 @@ function handleConfirm() {
         addSaveBtnLoading.value = false
         return
       }
-      if(Number(addData.value.sort) < 0){
+      if(Number(addData.value.sort) < 0 || Number(addData.value.sort) > 10){
         ElMessage({
-          message: '排序不能小于0',
+          message: '排序不能小于0或大于10',
           type: 'error',
         })
         addSaveBtnLoading.value = false
         return
       }
-      if(Number(addData.value.timeoutMin) < 0){
+      if(Number(addData.value.timeoutMin) < 0 || Number(addData.value.timeoutMin) > 1440){
         ElMessage({
-          message: '自动验证循环时间不能小于0',
+          message: '自动验证循环时间不能小于0或大于1440',
           type: 'error',
         })
         addSaveBtnLoading.value = false

src/views/SchedulingPage/weatherManageSub/ReviseWindow.vue

@@ -138,16 +138,16 @@ function handleConfirm() {
         })
         return
       }
-      if (Number(reviseData.value.sort) < 0) {
+      if (Number(reviseData.value.sort) < 0 || Number(reviseData.value.sort) > 10) {
         ElMessage({
-          message: '排序不能小于0',
+          message: '排序不能小于0或大于10',
           type: 'error',
         })
         return
       }
-      if (Number(reviseData.value.timeoutMin) < 0) {
+      if (Number(reviseData.value.timeoutMin) < 0 || Number(reviseData.value.timeoutMin) > 1440) {
         ElMessage({
-          message: '自动验证循环时间不能小于0',
+          message: '自动验证循环时间不能小于0或大于1440',
           type: 'error',
         })
         return
@@ -168,8 +168,8 @@ function handleConfirm() {
             )
           }
         }
-        emit('onConfirm', reviseData.value)
       }
+      emit('onConfirm', reviseData.value)
     }
   })
 }