From 2e62d31a66188c76477ba674f5791389ca81e5a2 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 21 Jul 2020 20:09:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E5=BC=80=E5=A7=8B=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TemplateComponent/BaseInfoComponent.vue   | 20 ++++++++++++++++---
 frontend/src/i18n/en-US.js                    |  1 +
 frontend/src/i18n/zh-CN.js                    |  1 +
 frontend/src/i18n/zh-TW.js                    |  1 +
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/BaseInfoComponent.vue b/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/BaseInfoComponent.vue
index 74251da2f8..d7a615c622 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/BaseInfoComponent.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/BaseInfoComponent.vue
@@ -19,12 +19,12 @@
         <el-col :span="12">
           <span>{{$t('report.test_start_time')}}：</span>
           <span v-if="!isReport">{{reportInfo.startTime}}</span>
-          <el-date-picker v-if="isReport" size="mini" type="date" :placeholder="$t('commons.select_date')" v-model="reportInfo.startTime"/>
+          <el-date-picker @change="startTimeChange" v-if="isReport" size="mini" type="date" :placeholder="$t('commons.select_date')" v-model="reportInfo.startTime"/>
         </el-col>
         <el-col :span="12">
           <span>{{$t('report.test_end_time')}}：</span>
           <span v-if="!isReport">{{reportInfo.endTime}}</span>
-          <el-date-picker v-if="isReport" size="mini" type="date" :placeholder="$t('commons.select_date')" v-model="reportInfo.endTime"/>
+          <el-date-picker @change="endTimeChange" v-if="isReport" size="mini" type="date" :placeholder="$t('commons.select_date')" v-model="reportInfo.endTime"/>
         </el-col>
       </el-row>
 
@@ -55,7 +55,7 @@
               principal: 'Michael',
               executors: ['Michael','Tom','Jiessie'],
               startTime: '2020-6-18',
-              endTime: '2020-6-18'
+              endTime: '2020-6-19'
             }
           }
         },
@@ -63,6 +63,20 @@
           type: Boolean,
           default: true
         }
+      },
+      methods: {
+        startTimeChange(value) {
+          if (!!this.reportInfo.endTime && this.reportInfo.endTime - this.reportInfo.startTime < 0) {
+            this.reportInfo.startTime = undefined;
+            this.$warning(this.$t('commons.date.data_time_error'));
+          }
+        },
+        endTimeChange(value) {
+          if (!!this.reportInfo.startTime && this.reportInfo.endTime - this.reportInfo.startTime < 0) {
+            this.reportInfo.endTime = undefined;
+            this.$warning(this.$t('commons.date.data_time_error'));
+          }
+        }
       }
     }
 </script>
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 1ab5889bb4..ce7208f3a1 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -114,6 +114,7 @@ export default {
       start_date_time: 'Start date and time',
       end_date_time: 'End date time',
       range_separator: "To",
+      data_time_error: "Start date cannot be later than the end date",
     },
     trigger_mode: {
       name: "Trigger Mode",
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 5f76a7225c..577c7cd9bd 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -114,6 +114,7 @@ export default {
       start_date_time: '开始日期时间',
       end_date_time: '结束日期时间',
       range_separator: "至",
+      data_time_error: "开始日期不能大于结束日期",
     },
     trigger_mode: {
       name: "触发方式",
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 71b22b71d7..22a1fe96e6 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -112,6 +112,7 @@ export default {
       start_date_time: '開始日期時間',
       end_date_time: '結束日期時間',
       range_separator: "至",
+      data_time_error: "開始日期不能大於結束日期",
     },
     trigger_mode: {
       name: "觸發方式",