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

src/views/reportManagement/ReleaseReport/components/ResultPageyL.vue

@@ -249,8 +249,15 @@ export default {
       safeResult: ''
     }
   },
-  created() {
-    this.idGet()
+  watch: {
+    message: {
+      handler(newV) {
+        this.$nextTick(() => {
+          this.idGet(newV)
+        })
+      },
+      immediate: true
+    }
   },
   methods: {
     idGet() {

src/views/reportManagement/ReleaseReport/components/iconDisplay.vue

@@ -257,11 +257,12 @@ export default {
   }
 
   .title {
-  font-size:16px;
+  font-size:14px;
   font-family:PingFangSC-Medium;
   line-height:35px;
   margin-bottom: 10px;
   color:rgba(51,59,74,1);
   opacity:1;
+  font-weight: 700;
 }
 </style>

src/views/reportManagement/ReleaseReport/newReleaeTemplate.vue

@@ -350,8 +350,8 @@ export default {
     font-family:MicrosoftYaHei;
     line-height:19px;
     color:#333;
-     font-weight:500;
-    margin: 1% 0;
+    font-weight:700;
+    margin: 20px 0;
   }
 
 .report-container {

src/views/reportManagement/Testing/newTestingTemplate.vue

@@ -182,36 +182,15 @@ export default {
       if (res.code === 200) {
         const from = res.data
         this.from.id = from.id
-        this.from.sendCc = from.sendCc
-        this.from.sendTo = from.sendTo
         this.$set(this.from, 'reportName', from.reportName) // 报告名称
-        this.$set(this.fromCreateData, 'content', from.content) // 报告名称
-        this.$set(this.from, 'deliverTestPlanTime', from.deliverTestPlanTime) // 计划提测时间
-        this.$set(this.from, 'devPlanTimeStart', [from.devPlanTimeStart, from.devPlanTimeEnd]) // 计划开发时间
-        this.$set(this.from, 'devActualTimeStart', [from.devActualTimeStart, from.devActualTimeEnd]) // 实际开发时间
-        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', from.involveAppIds) // 跟版客户端
-        this.from.codeReviewExecutor = from.codeReviewExecutor ? from.codeReviewExecutor.split() : '' // 执行人
+        this.setFromData(from)
       }
     },
 
     async reportdelivertestInitReportRelease(val) { // 报告时间
       const res = await reportdelivertestInitReportRelease({ taskIds: val })
       if (res.code === 200) {
-        const from = res.data
-        this.from.sendCc = from.sendCc
-        this.from.sendTo = from.sendTo
-        this.$set(this.fromCreateData, 'content', from.content) // 报告名称
-        this.$set(this.from, 'deliverTestPlanTime', from.deliverTestPlanTime) // 计划提测时间
-        this.$set(this.from, 'devPlanTimeStart', [from.devPlanTimeStart, from.devPlanTimeEnd]) // 计划开发时间
-        this.$set(this.from, 'devActualTimeStart', [from.devActualTimeStart, from.devActualTimeEnd]) // 实际开发时间
-        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', from.involveAppIds) // 跟版客户端
-        this.from.codeReviewExecutor = from.codeReviewExecutor ? from.codeReviewExecutor.split() : '' // 执行人
+        this.setFromData(res.data)
       }
       const res2 = await reportdelivertestGetRequiresByTaskIds({ taskIds: val })
       if (res2.code === 200) {
@@ -219,6 +198,24 @@ export default {
       }
     },
 
+    setFromData(from) {
+      this.from.sendCc = from.sendCc
+      this.from.sendTo = from.sendTo
+      this.$set(this.fromCreateData, 'content', from.content) // 报告名称
+      from.deliverTestPlanTime ? this.$set(this.from, 'deliverTestPlanTime', from.deliverTestPlanTime) : '' // 计划提测时间
+      if (from.devPlanTimeStart) {
+        this.$set(this.from, 'devPlanTimeStart', [from.devPlanTimeStart, from.devPlanTimeEnd]) // 计划开发时间
+      }
+      if (from.devActualTimeStart) {
+        this.$set(this.from, 'devActualTimeStart', [from.devActualTimeStart, from.devActualTimeEnd]) // 实际开发时间
+      }
+      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', from.involveAppIds) // 跟版客户端
+      this.from.codeReviewExecutor = from.codeReviewExecutor ? from.codeReviewExecutor.split() : '' // 执行人
+    },
+
     async configShowTaskEnum() {
       const res = await configShowTaskEnum()
       if (res.code === 200) {
@@ -240,6 +237,7 @@ export default {
 
     // 创建提测报告
     reportreleaseCreate(val) {
+      console.log(val, '每次你就撒不出困境吧')
       this.$refs.fromCreateData.validate(async(valid) => {
         if (valid) {
           this.loading = true
@@ -351,7 +349,7 @@ export default {
     line-height:19px;
     margin: 1% 0;
     color: #333;
-    font-weight:500;
+    font-weight:700;
   }
 
 .report-container {

src/views/reportManagement/daily/components/testPresenyL.vue

@@ -52,8 +52,17 @@ export default {
       name: ''
     }
   },
+  watch: {
+    message: {
+      handler(newV) {
+        this.$nextTick(() => {
+          this.idGet(newV)
+        })
+      },
+      immediate: true
+    }
+  },
   mounted() {
-    this.idGet()
     const myChart = echarts.init(document.getElementById('lineShow'))
     const myChartA = echarts.init(document.getElementById('barShow'))
     window.addEventListener('resize', () => {