Browse Source

视频诊断任务-开始结束时间多次选定bug修复

humingshi-7@163.com 11 months ago
parent
commit
271b7d247a
1 changed files with 12 additions and 32 deletions
  1. 12 32
      src/views/iot/diagnoseMission/dialog.addMission.vue

+ 12 - 32
src/views/iot/diagnoseMission/dialog.addMission.vue

@@ -87,8 +87,8 @@ export default {
       isEdit: false,
       formDataRules: {
         name: [{required: true, message: "请输入任务名称", trigger: 'blur'}],
-        beginTime: [{required: true, message: "请输入开始时间", trigger: 'blur'}],
-        endTime: [{required: true, message: "请输入结束时间", trigger: 'blur'}],
+        beginTime: [{required: true, message: "请输入开始时间" }],
+        endTime: [{required: true, message: "请输入结束时间" }],
         cycle: [
           {required: true, message: '请输入诊断周期', trigger: 'blur'},
           {validator: this.validatePort, trigger: 'blur'}
@@ -163,43 +163,23 @@ export default {
       });
     },
     startDateChanged(time) {
-      console.info(this.formData.beginTime+"--start--"+this.formData.endTime);
-      if (this.isTimeBefore(this.formData.endTime,this.formData.beginTime)) {
+      const now = dayjs();
+      const today = now.format("YYYY-MM-DD");
+      const endTimeStr = today + " "+ this.formData.endTime;
+      const beginTimeStr = today + " "+ this.formData.beginTime;
+      if (dayjs(endTimeStr).isBefore(dayjs(beginTimeStr))) {
         this.formData.endTime = this.formData.beginTime;
-        console.info(this.formData.beginTime+"==start=="+this.formData.endTime);
       }
     },
     endDateChanged(time) {
-      console.info(this.formData.beginTime+"--end--"+this.formData.endTime);
-      if (this.isTimeBefore(this.formData.endTime,this.formData.beginTime)) {
+      const now = dayjs();
+      const today = now.format("YYYY-MM-DD");
+      const endTimeStr = today + " "+ this.formData.endTime;
+      const beginTimeStr = today + " "+ this.formData.beginTime;
+      if (dayjs(endTimeStr).isBefore(dayjs(beginTimeStr))) {
         this.formData.beginTime = this.formData.endTime;
-        console.info(this.formData.beginTime+"==end=="+this.formData.endTime);
       }
     },
-    isTimeBefore(endTime,beginTime){
-      const partEnd = endTime.split(':');
-      const partBegin = beginTime.split(':');
-
-      const hoursEnd = parseInt(partEnd[0],10);
-      const hoursBegin = parseInt(partBegin[0],10);
-      const minutesEnd = parseInt(partEnd[1],10);
-      const minutesBegin = parseInt(partBegin[1],10);
-      const secondsEnd = parseInt(partEnd[2],10);
-      const secondsBegin = parseInt(partBegin[2],10);
-
-      if(hoursEnd < hoursBegin){
-         return true;
-      }else if(hoursEnd === hoursBegin){
-          if(minutesEnd < minutesBegin){
-              return true;
-          }else if(minutesEnd === minutesBegin){
-              if(secondsEnd < secondsBegin){
-                  return true;
-               }
-          }
-      }
-      return false;
-    },
 
     validatePort(rule, value, callback) {
       if (!value) {