优化

src/views/projectManage/taskList/components/reportList.vue

@@ -229,8 +229,7 @@ import TestReport from '@/views/reportManagement/components/TestingReport' //
 import DailyReport from '@/views/reportManagement/components/DailyReport' // 日报
 import ReleaseReport from '@/views/reportManagement/components/ReleaseReport' // 准出
 import { dailyReportDelete, projectTestReportDelete } from '@/api/testPresentetion' // 日报
-import { launchTestUpdate } from '@/api/InterfaceReport'
-import { reportdelivertestList, reportreleaseList, dailyReportListV2 } from '@/api/reportTemplate'
+import { reportdelivertestList, reportreleaseList, dailyReportListV2, reportdelivertestUpdate } from '@/api/reportTemplate'
 export default {
   components: {
     TestReport,
@@ -252,6 +251,7 @@ export default {
       launchRepulseInfo: '', // 打回原因
       CallBackStatus: '', // 打回状态
       CallBackId: '', // 打回id
+      reportData: {},
       titName: '', // 打回title
       Str: '', // 打回操作名称
       requireName: '', // 归属需求name
@@ -364,16 +364,21 @@ export default {
     },
     async passOrBackSend() { // 提测打回
       this.dialog_testData = false
-      const launchTestInfo = { status: this.CallBackStatus, id: this.CallBackId, launchRepulseInfo: this.launchRepulseInfo }
       const userData = { id: '', ename: this.userInformation, name: this.userNames }
-      const objData = { launchTestInfo: launchTestInfo, user: userData }
       if (this.Str === '通过' || this.Str === '打回') {
-        const res = await launchTestUpdate(objData)
+        const data = {
+          id: this.reportData.id,
+          moduleId: this.reportData.moduleId,
+          bizId: this.reportData.bizId,
+          taskIds: [this.taskId],
+          reportName: this.reportData.reportName,
+          returnReason: this.reportData.reason,
+          status: this.Str === '打回' ? 2 : this.Str === '通过' ? 1 : ''
+        }
+        const res = await reportdelivertestUpdate(data)
         if (res.code === 200) {
           this.getTest()
           this.$message({ message: res.msg, type: 'success', offset: 150 })
-        } else {
-          this.$message({ message: res.msg, type: 'error', offset: 150 })
         }
       } else if (this.Str === '删除') {
         const res = await launchTestDelete(userData, this.CallBackId)
@@ -413,6 +418,7 @@ export default {
       }
     },
     back(e, ele, data) { // 提测报告
+      this.reportData = data
       this.dataStatus ? this.requireName = data.reportName : this.requireName = data.name
       this.CallBackStatus = e
       this.CallBackId = ele

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

@@ -36,7 +36,7 @@
       <el-table-column prop="creatorList" label="提报人" align="center" min-width="90" show-overflow-tooltip />
       <el-table-column prop="assignerList" label="责任人" align="center" min-width="90" show-overflow-tooltip />
       <el-table-column prop="currentHandlerList" label="修复人" align="center" min-width="90" show-overflow-tooltip />
-      <el-table-column prop="date" label="备注（Hole原因等）" align="center" min-width="150" />
+      <el-table-column prop="date" label="备注（hold原因等）" align="center" min-width="150" />
     </el-table>
   </div>
 </template>
@@ -86,7 +86,7 @@ export default {
           title: { text: '新增缺陷趋势图', x: 'center', textStyle: { fontSize: 14, fontStyle: 'normal', fontWeight: 'normal' }},
           tooltip: { axisPointer: { type: 'shadow' }},
           grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true },
-          xAxis: [{ type: 'category', data: res.bugDisByDate.xAxis ? res.bugDisByDate.xAxis : ['星期一', '星期二', '星期三', '星期四', '星期五', '星期六', '星期七'], axisTick: { alignWithLabel: true }}],
+          xAxis: [{ type: 'category', data: res.bugDisByDate.xAxis ? res.bugDisByDate.xAxis : ['未知', '未知', '未知', '未知', '未知', '未知', '未知'], axisTick: { alignWithLabel: true }}],
           yAxis: [{ type: 'value', axisLine: { show: false }, axisTick: { show: false }, splitLine: { show: true, lineStyle: { type: 'dashed' }}}],
           series: res.bugDisByDate.yAxis[0].data <= 0 ? [{ name: '直接访问', type: 'line', smooth: true, data: [0, 0, 0, 0, 0, 0, 0] }] : data
         })
@@ -103,7 +103,7 @@ export default {
           title: { text: '缺陷责任人分布', x: 'center', textStyle: { fontSize: 14, fontStyle: 'normal', fontWeight: 'normal' }},
           tooltip: { axisPointer: { type: 'shadow' }},
           grid: { left: '3%', right: '4%', bottom: '3%', containLabel: true },
-          xAxis: [{ type: 'category', data: res.bugDisByMember.xAxis[0] ? res.bugDisByMember.xAxis : ['P0', 'P1', 'P2', 'P3'], axisTick: { alignWithLabel: true }}],
+          xAxis: [{ type: 'category', data: res.bugDisByMember.xAxis[0] ? res.bugDisByMember.xAxis : ['未知', '未知', '未知', '未知'], axisTick: { alignWithLabel: true }}],
           yAxis: [{ type: 'value', axisLine: { show: false }, axisTick: { show: false }, splitLine: { show: true, lineStyle: { type: 'dashed' }}}],
           series: res.bugDisByMember.yAxis[0].data <= 0 ? [{ name: '无数据', type: 'bar', barWidth: '20px', data: [0, 0, 0, 0] }] : lineShow
         })