解决冲突

src/views/SchedulingPage/weatherManageSub/ReviseWindow.vue

@@ -52,44 +52,38 @@ const rules = reactive({
   ],
   diffPercentage: [ // 自动偏差百分比
     {required: true, message: '请输入正确数值'},
-    { pattern: /[0-9]{1,10}/, "message": "请输入正确数值", trigger: "blur" }
+    {pattern: /[0-9]{1,10}/, "message": "请输入正确数值", trigger: "blur"}
   ],
   wind: [ // 风速
     {required: true, message: '请输入正确数值'},
-    { pattern: /[0-9]{1,10}/, "message": "请输入正确数值", trigger: "blur" }
+    {pattern: /[0-9]{1,10}/, "message": "请输入正确数值", trigger: "blur"}
   ],
   illumination: [
     {required: true, message: '请输入正确数值'},
-    { pattern: /[0-9]{1,10}/, "message": "请输入正确数值", trigger: "blur" }
+    {pattern: /[0-9]{1,10}/, "message": "请输入正确数值", trigger: "blur"}
   ],
   sort: [
     {required: true, message: '请输入正确数值'},
-    { pattern: /[0-9]{1,10}/, "message": "请输入正确数值", trigger: "blur" }
+    {pattern: /[0-9]{1,10}/, "message": "请输入正确数值", trigger: "blur"}
   ],
   timeoutMin: [ // 验证时间
     {required: true, message: '请输入正确数值'},
-    { pattern: /[0-9]{1,10}/, "message": "请输入正确数值", trigger: "blur" }
+    {pattern: /[0-9]{1,10}/, "message": "请输入正确数值", trigger: "blur"}
   ],
   temperature: [
     {required: true, message: '请输入正确的温度'},
-    { pattern: /^(-?\d{1,11})(\.[0-9]{1,4})?$/, message: "请输入正确的温度", trigger: "blur" }
+    {pattern: /^(-?\d{1,11})(\.[0-9]{1,4})?$/, message: "请输入正确的温度", trigger: "blur"}
   ],
   tempRegulation: [
     {required: true, message: '请输入正确数值'},
-    { pattern: /^(-?\d{1,11})(\.[0-9]{1,4})?$/, message: "请输入正确数值", trigger: "blur" }
+    {pattern: /^(-?\d{1,11})(\.[0-9]{1,4})?$/, message: "请输入正确数值", trigger: "blur"}
   ]
 })
 watchEffect(() => {
-<<<<<<< HEAD
   // reviseData.value = {...props.data}
-  props.data.transfers = []
-  props.data.updateNullFields = ''
   reviseData.value = cloneDeep(props.data) // 深拷贝数据
   console.log("props.data===>", props.data);
   console.log(reviseData.value);
-=======
-  reviseData.value = props.data // 深拷贝数据
->>>>>>> 44482294a0f0e141cfad6fc71ae5bd19c87d6aed
 })
 const inputStyle = {
   color: 'black',
@@ -108,6 +102,7 @@ const switchingisAuto = computed({
   }
 })  // 可写计算属性,手动、自动模式切换
 function onOpen() {
+  reviseData.value.transfers = []
   reviseData.value.updateNullFields = ""
 }
 
@@ -115,42 +110,42 @@ function handleConfirm() {
   reviseData.value.transfers = []
   formRef.value.validate(async valid => {
     if (valid) {
-      if(Number(reviseData.value.temperature) > 45 || Number(reviseData.value.temperature) < -30){
+      if (Number(reviseData.value.temperature) > 45 || Number(reviseData.value.temperature) < -30) {
         ElMessage({
           message: '温度不能大于45度或小于-30度',
           type: 'error',
         })
         return
       }
-      if(Number(reviseData.value.wind) > 17 || Number(reviseData.value.wind) <= 0){
+      if (Number(reviseData.value.wind) > 17 || Number(reviseData.value.wind) <= 0) {
         ElMessage({
           message: '风速不能大于17或小于等于0',
           type: 'error',
         })
         return
       }
-      if(Number(reviseData.value.illumination) > 5000 || Number(reviseData.value.illumination) <= 0){
+      if (Number(reviseData.value.illumination) > 5000 || Number(reviseData.value.illumination) <= 0) {
         ElMessage({
           message: '光照不能大于5000或小于等于0',
           type: 'error',
         })
         return
       }
-      if(Number(reviseData.value.diffPercentage) > 100 || Number(reviseData.value.diffPercentage) <= 0){
+      if (Number(reviseData.value.diffPercentage) > 100 || Number(reviseData.value.diffPercentage) <= 0) {
         ElMessage({
           message: '自动偏差百分比不能大于100或小于等于0',
           type: 'error',
         })
         return
       }
-      if(Number(reviseData.value.sort) < 0){
+      if (Number(reviseData.value.sort) < 0) {
         ElMessage({
           message: '排序不能小于0',
           type: 'error',
         })
         return
       }
-      if(Number(reviseData.value.timeoutMin) < 0){
+      if (Number(reviseData.value.timeoutMin) < 0) {
         ElMessage({
           message: '自动验证循环时间不能小于0',
           type: 'error',
@@ -173,37 +168,18 @@ function handleConfirm() {
             )
           }
         }
-<<<<<<< HEAD
         formRef.value.validate(valid => {
           if (valid) {
             emit('onConfirm', reviseData.value)
           }
         })
-      })
-=======
-      } else {
-        delete reviseData.value.supplyId
       }
-      reviseData.value.isAuto = reviseData.value.isAuto === '自动模式' ? true : false;
-      reviseData.value.isFixed = reviseData.value.isFixed === '固定模式' ? true : false;
-      console.log('修改数据', reviseData.value)
-      emit('onConfirm', reviseData.value)
->>>>>>> 44482294a0f0e141cfad6fc71ae5bd19c87d6aed
     }
   })
 }
 
-<<<<<<< HEAD
-// 重置表单
-const reset = () => {
-  const form = unref(formRef)
-  form.resetFields()
-}
-function onClose(){
-  reset()
-=======
+
 function onClose() {
->>>>>>> 44482294a0f0e141cfad6fc71ae5bd19c87d6aed
   emit('onCancel')
 }