Browse Source

报警设置,状态默认为启用,提交时排除无效的条件表达式

chenwen 2 years ago
parent
commit
4952044ce1
1 changed files with 8 additions and 3 deletions
  1. 8 3
      src/pages/alarm/AlarmDefine.vue

+ 8 - 3
src/pages/alarm/AlarmDefine.vue

@@ -109,7 +109,7 @@
 			alarmSource:null,
 			alarmGrade:null,
 			alarmMode:[],
-			usingIf:null,
+			usingIf:true,
 			alarmDesc:null,
 			expressDesc:null,
 			alarmExpress:null,
@@ -176,7 +176,7 @@
 	
 	const initForm=(initData)=>{
 		if(!initData){
-			let [alarmId,alarmSource,alarmGrade,usingIf,alarmDesc,expressDesc,alarmMode,conditions]=[null,null,null,null,null,null,[],[{param:null,symbol:null,val:null}]]
+			let [alarmId,alarmSource,alarmGrade,usingIf,alarmDesc,expressDesc,alarmMode,conditions]=[null,null,null,true,null,null,[],[{param:null,symbol:null,val:null}]]
 			Object.assign(formModel,{alarmId,alarmSource,alarmGrade,usingIf,alarmDesc,expressDesc,alarmMode,conditions})
 		}
 		else{
@@ -194,11 +194,16 @@
 			return false
 		}
 		formData.expressDesc=""
+		let validCondition=[]
 		formData.conditions.forEach((item,index)=>{
+			if(!item.param||item.param==""||!item.symbol||item.symbol==""||!item.val||item.va==""){
+				return true
+			}
+			validCondition.push(item)
 			formData.expressDesc+=`${index==0?'当':'且'}${item.label}${item.symbol}${item.val}`
 		})
 		
-		formData.alarmExpress=JSON.stringify(formData.conditions)
+		formData.alarmExpress=validCondition.length>0?JSON.stringify(validCondition):null
 		
 		delete formData.conditions