From 90c2e0d1f543727b1ca85ee0363f544148caa3be Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Fri, 8 May 2020 18:54:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8A=A5=E5=91=8A=E6=A8=A1?=
 =?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TemplateComponent/BaseInfoComponent.vue        | 14 ++++++++------
 .../TemplateComponent/TemplateComponent.vue        |  4 +++-
 .../components/TestCaseReportTemplateEdit.vue      |  4 ++--
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/frontend/src/business/components/settings/workspace/components/TemplateComponent/BaseInfoComponent.vue b/frontend/src/business/components/settings/workspace/components/TemplateComponent/BaseInfoComponent.vue
index e93b4240e9..6fa5236804 100644
--- a/frontend/src/business/components/settings/workspace/components/TemplateComponent/BaseInfoComponent.vue
+++ b/frontend/src/business/components/settings/workspace/components/TemplateComponent/BaseInfoComponent.vue
@@ -18,11 +18,13 @@
       <el-row type="flex" justify="space-between" class="select-time">
         <el-col :span="12">
           <span>开始时间：</span>
-          <el-date-picker size="mini" type="date" placeholder="选择日期" v-model="reportInfo.startTime"/>
+          <span v-if="!isReport">{{reportInfo.startTime}}</span>
+          <el-date-picker v-if="isReport" size="mini" type="date" placeholder="选择日期" v-model="reportInfo.startTime"/>
         </el-col>
         <el-col :span="12">
           <span>结束时间：</span>
-          <el-date-picker size="mini" type="date" placeholder="选择日期" v-model="reportInfo.endTime"/>
+          <span v-if="!isReport">{{reportInfo.endTime}}</span>
+          <el-date-picker v-if="isReport" size="mini" type="date" placeholder="选择日期" v-model="reportInfo.endTime"/>
         </el-col>
       </el-row>
 
@@ -44,10 +46,6 @@
     export default {
       name: "BaseInfoComponent",
       components: {CommonComponent},
-      data() {
-        return {
-        }
-      },
       props: {
         reportInfo: {
           type: Object,
@@ -60,6 +58,10 @@
               endTime: '2020-6-18'
             }
           }
+        },
+        isReport: {
+          type: Boolean,
+          default: true
         }
       }
     }
diff --git a/frontend/src/business/components/settings/workspace/components/TemplateComponent/TemplateComponent.vue b/frontend/src/business/components/settings/workspace/components/TemplateComponent/TemplateComponent.vue
index cb53ae4ba3..3a12127522 100644
--- a/frontend/src/business/components/settings/workspace/components/TemplateComponent/TemplateComponent.vue
+++ b/frontend/src/business/components/settings/workspace/components/TemplateComponent/TemplateComponent.vue
@@ -1,13 +1,15 @@
 <template>
   <div>
 
+    <!--模版-->
     <div v-if="!metric">
-      <base-info-component v-if="preview.id == 1"/>
+      <base-info-component :is-report="false" v-if="preview.id == 1"/>
       <test-result-component v-if="preview.id == 2"/>
       <test-result-chart-component v-if="preview.id == 3"/>
       <rich-text-component :preview="preview" v-if="preview.type != 'system'"/>
     </div>
 
+    <!--报告-->
     <div v-if="metric">
       <base-info-component :report-info="metric" v-if="preview.id == 1"/>
       <test-result-component :test-results="metric.moduleExecuteResult" v-if="preview.id == 2"/>
diff --git a/frontend/src/business/components/settings/workspace/components/TestCaseReportTemplateEdit.vue b/frontend/src/business/components/settings/workspace/components/TestCaseReportTemplateEdit.vue
index dc5835afb6..18a23f8ffc 100644
--- a/frontend/src/business/components/settings/workspace/components/TestCaseReportTemplateEdit.vue
+++ b/frontend/src/business/components/settings/workspace/components/TestCaseReportTemplateEdit.vue
@@ -244,10 +244,10 @@
           if (this.template.workspaceId) {
             param.workspaceId = localStorage.getItem(WORKSPACE_ID);
           }
-          if (this.metric.startTime) {
+          if (this.metric && this.metric.startTime) {
             param.startTime = this.metric.startTime.getTime();
           }
-          if (this.metric.endTime) {
+          if (this.metric && this.metric.endTime) {
             param.endTime = this.metric.endTime.getTime();
           }
         }