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

解决冲突

parent 7cde7539
...@@ -71,7 +71,7 @@ function onSubmit() { ...@@ -71,7 +71,7 @@ function onSubmit() {
bindData.value.isAuto = bindData.value.isAuto === '自动模式' ? true : false; bindData.value.isAuto = bindData.value.isAuto === '自动模式' ? true : false;
bindData.value.isFixed = bindData.value.isFixed === '固定模式' ? true : false; bindData.value.isFixed = bindData.value.isFixed === '固定模式' ? true : false;
bindData.value.updateNullFields = "" bindData.value.updateNullFields = ""
emit('onConfirm', bindData.value) emit('onConfirm', bindData.value)gi
}else { }else {
ElMessage.error('请选择供热站') ElMessage.error('请选择供热站')
} }
......
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