Commit 72406351 authored by 裴文涛's avatar 裴文涛

气象干预排序,验证时间字段增加输入限制,年度参数调整限制,天气工况查询Bug修复

parent 890795eb
...@@ -235,9 +235,11 @@ function onReviseSubmit() { ...@@ -235,9 +235,11 @@ function onReviseSubmit() {
for (let item of dataBackup.value) { for (let item of dataBackup.value) {
if (String(item.year).trim() === String(reviseForm.value.year).trim()) { if (String(item.year).trim() === String(reviseForm.value.year).trim()) {
if (String(item.energyType).trim() === String(reviseForm.value.energyType).trim()) { if (String(item.energyType).trim() === String(reviseForm.value.energyType).trim()) {
if (item.paramId !== reviseForm.value.paramId) { if(String(item.supplyId).trim() === String(reviseForm.value.supplyId).trim()){
ElMessage.error('该年该类型已存在.') if (item.paramId !== reviseForm.value.paramId) {
return ElMessage.error('该年该类型下已存在相同供热站.')
return
}
} }
} }
} }
...@@ -307,9 +309,11 @@ function onAddSubmit() { // 提交新增 ...@@ -307,9 +309,11 @@ function onAddSubmit() { // 提交新增
for (let item of dataBackup.value) { for (let item of dataBackup.value) {
if (String(item.year).trim() === String(addForm.value.year).trim()) { if (String(item.year).trim() === String(addForm.value.year).trim()) {
if (String(item.energyType).trim() === String(addForm.value.energyType).trim()) { if (String(item.energyType).trim() === String(addForm.value.energyType).trim()) {
ElMessage.error('该年该类型已存在.') if(String(item.supplyId).trim() === String(addForm.value.supplyId).trim()){
addSaveBtnLoading.value = false ElMessage.error('该年该类型下已存在相同供热站.')
return addSaveBtnLoading.value = false
return
}
} }
} }
} }
......
...@@ -57,7 +57,7 @@ function search() { ...@@ -57,7 +57,7 @@ function search() {
if (!searchKey.value) { if (!searchKey.value) {
getData() getData()
} else { } 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))
} }
} }
......
...@@ -72,17 +72,17 @@ function handleConfirm() { ...@@ -72,17 +72,17 @@ function handleConfirm() {
addSaveBtnLoading.value = false addSaveBtnLoading.value = false
return return
} }
if(Number(addData.value.sort) < 0){ if(Number(addData.value.sort) < 0 || Number(addData.value.sort) > 10){
ElMessage({ ElMessage({
message: '排序不能小于0', message: '排序不能小于0或大于10',
type: 'error', type: 'error',
}) })
addSaveBtnLoading.value = false addSaveBtnLoading.value = false
return return
} }
if(Number(addData.value.timeoutMin) < 0){ if(Number(addData.value.timeoutMin) < 0 || Number(addData.value.timeoutMin) > 1440){
ElMessage({ ElMessage({
message: '自动验证循环时间不能小于0', message: '自动验证循环时间不能小于0或大于1440',
type: 'error', type: 'error',
}) })
addSaveBtnLoading.value = false addSaveBtnLoading.value = false
......
...@@ -138,16 +138,16 @@ function handleConfirm() { ...@@ -138,16 +138,16 @@ function handleConfirm() {
}) })
return return
} }
if (Number(reviseData.value.sort) < 0) { if (Number(reviseData.value.sort) < 0 || Number(reviseData.value.sort) > 10) {
ElMessage({ ElMessage({
message: '排序不能小于0', message: '排序不能小于0或大于10',
type: 'error', type: 'error',
}) })
return return
} }
if (Number(reviseData.value.timeoutMin) < 0) { if (Number(reviseData.value.timeoutMin) < 0 || Number(reviseData.value.timeoutMin) > 1440) {
ElMessage({ ElMessage({
message: '自动验证循环时间不能小于0', message: '自动验证循环时间不能小于0或大于1440',
type: 'error', type: 'error',
}) })
return return
...@@ -168,8 +168,8 @@ function handleConfirm() { ...@@ -168,8 +168,8 @@ function handleConfirm() {
) )
} }
} }
emit('onConfirm', reviseData.value)
} }
emit('onConfirm', reviseData.value)
} }
}) })
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment