Merge branch 'http_test' of git.xiaojukeji.com:jacklijiajia/thoth-frontend into http_test

src/views/reportManagement/Testing/newTestingTemplate.vue

@@ -189,7 +189,7 @@ export default {
         this.from.deliverTestActualTime = from.deliverTestActualTime // 实际提测时间
         this.$set(this.from, 'followVersion', from.followVersion) // 是否跟版1 跟版 2 不跟版
         this.$set(this.from, 'isCodeReview', from.isCodeReview) // 是否code review 0：否 1：是
-        this.$set(this.from, 'involveAppIds', Number(from.involveAppIds)) // 跟版客户端
+        this.$set(this.from, 'involveAppIds', from.involveAppIds) // 跟版客户端
         this.from.codeReviewExecutor = from.codeReviewExecutor ? from.codeReviewExecutor.split() : '' // 执行人
       }
     },
@@ -205,7 +205,7 @@ export default {
         this.from.deliverTestActualTime = from.deliverTestActualTime // 实际提测时间
         this.$set(this.from, 'followVersion', from.followVersion) // 是否跟版1 跟版 2 不跟版
         this.$set(this.from, 'isCodeReview', from.isCodeReview) // 是否code review 0：否 1：是
-        this.$set(this.from, 'involveAppIds', Number(from.involveAppIds)) // 跟版客户端
+        this.$set(this.from, 'involveAppIds', from.involveAppIds) // 跟版客户端
         this.from.codeReviewExecutor = from.codeReviewExecutor ? from.codeReviewExecutor.split() : '' // 执行人
       }
       const res2 = await reportdelivertestGetRequiresByTaskIds({ taskIds: val })

src/views/reportManagement/components/DailyReport.vue

@@ -273,6 +273,9 @@ export default {
 
     handleClose() {
       this.dialogDaliy = false
+      this.showOne = false // 隐藏第一步
+      this.newDailyTemplate = false // 隐藏第二步
+      this.dailyPreview = false // 展示第三部
       this.$emit('getList')
     }
   }

src/views/reportManagement/components/ReleaseReport.vue

@@ -264,6 +264,9 @@ export default {
 
     handleClose() {
       this.dialogDaliy = false
+      this.showOne = false // 隐藏第一步
+      this.newDailyTemplate = false // 隐藏第二步
+      this.dailyPreview = false // 展示第三部
       this.$emit('getList')
     }
   }

src/views/reportManagement/testPresentation.vue

@@ -114,9 +114,9 @@
       </span>
     </el-dialog>
 
-    <TestingReport v-if="dialogVisible1" ref="TestReport" />
+    <TestingReport v-if="dialogVisible1" ref="TestReport" @getList="getList" />
     <DailyReport v-if="dialogDaily" ref="DailyReport" @getList="getList" />
-    <ReleaseReport v-if="dialogClient" ref="ClientReport" />
+    <ReleaseReport v-if="dialogClient" ref="ClientReport" @getList="getList" />
 
     <el-dialog :title="title" :visible.sync="reportDaily" class="public_task" width="70%" :close-on-click-modal="false">
       <div class="blueStripe" />