优化

src/views/projectManage/projectList/components/needsList.vue

@@ -123,6 +123,7 @@ export default {
       const modifier = localStorage.getItem('username')
       const res = await updateRequirementStatus({ id: e.id, status: e.status, modifier: modifier })
       if (res.code === 200) {
+        this.getNeedsList()
         this.$message({ message: '修改成功', type: 'success', offset: 150 })
       }
     },

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

@@ -221,6 +221,7 @@ export default {
         const taskInfoDO = e
         const resTask = await taskUpdate({ taskInfoDO, user })
         if (resTask.code === 200) {
+          this.get_allTask()
           this.$message({ message: '修改成功', type: 'success', offset: 150 })
         }
       }

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

@@ -222,6 +222,7 @@ export default {
         const resTask = await taskUpdate({ taskInfoDO, user })
         if (resTask.code === 200) {
           this.$emit('update')
+          this.get_allTask()
           this.$message({ message: '修改成功', type: 'success', offset: 150 })
         }
       }

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

@@ -230,7 +230,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 { reportdelivertestGetByTaskId, reportreleaseGetByTaskId, dailyReportGetByTaskIdV2, reportdelivertestUpdate } from '@/api/reportTemplate'
+import { reportdelivertestGetByTaskId, reportreleaseGetByTaskId, dailyReportGetByTaskIdV2, reportdelivertestUpdate, reportdelivertestCheckStatus } from '@/api/reportTemplate'
 export default {
   components: {
     TestReport,
@@ -439,9 +439,13 @@ export default {
           break
         case 3:
           data.taskIds = [Number(this.taskId)]
-          this.dialogTest = true
-          this.$nextTick(() => {
-            this.$refs.TestReport.init(4, data)
+          reportdelivertestCheckStatus([this.taskId]).then(res => {
+            if (res.code === 200) {
+              this.dialogTest = true
+              this.$nextTick(() => {
+                this.$refs.TestReport.init(4, data)
+              })
+            }
           })
           break
         case 4:

src/views/reportManagement/Testing/TestingPreview.vue

@@ -136,7 +136,7 @@ export default {
     async reportdelivertestGetRequiresByTaskIds(val) {
       const res2 = await reportdelivertestGetRequiresByTaskIds({ taskIds: val })
       if (res2.code === 200) {
-        this.tableData = res2.data.list
+        this.tableData = res2.data
       }
     },
 

src/views/reportManagement/Testing/newTestingTemplate.vue

@@ -59,7 +59,7 @@
         </el-col>
         <el-col v-if="from.followVersion === 1" :span="12" class="Layout_flex_start">
           <span class="from-namer">跟版客户端</span>
-          <el-select v-model="from.involveApp" filterable remote size="small" :disabled="releaseType" clearable placeholder="请选择" style="width: -webkit-fill-available;">
+          <el-select v-model="from.involveAppIds" filterable remote multiple size="small" :disabled="releaseType" clearable placeholder="请选择" style="width: -webkit-fill-available;">
             <el-option v-for="item in appClient" :key="item.code" :label="item.msg" :value="item.code" />
           </el-select>
         </el-col>
@@ -189,8 +189,8 @@ 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.from.codeReviewExecutor = from.codeReviewExecutor ? from.codeReviewExecutor.split() : '' // 执行人
-        this.$set(this.from, 'involveApp', Number(from.involveApp)) // 跟版客户端
       }
     },
 
@@ -205,12 +205,12 @@ 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, 'involveApp', Number(from.involveApp)) // 跟版客户端
+        this.$set(this.from, 'involveAppIds', Number(from.involveAppIds)) // 跟版客户端
         this.from.codeReviewExecutor = from.codeReviewExecutor ? from.codeReviewExecutor.split() : '' // 执行人
       }
       const res2 = await reportdelivertestGetRequiresByTaskIds({ taskIds: val })
       if (res2.code === 200) {
-        this.tableData = res.data.list
+        this.tableData = res2.data
       }
     },
 
@@ -255,7 +255,7 @@ export default {
               data.devActualTimeStart = this.from.devActualTimeStart[0] // 实际开发开始时间
               data.devActualTimeEnd = this.from.devActualTimeStart[1] // 实际开发结束时间
             }
-            data.involveApp = this.from.involveApp // 跟版客户端
+            data.involveAppIds = this.from.involveAppIds // 跟版客户端
             data.followVersion = this.from.followVersion // 是否跟版1 跟版 2 不跟版
             data.isCodeReview = this.from.isCodeReview // 是否code review 0：否 1：是
             data.codeReviewExecutor = this.from.codeReviewExecutor ? this.from.codeReviewExecutor.toString() : '' // 执行人
@@ -282,7 +282,7 @@ export default {
               data.devActualTimeStart = this.from.devActualTimeStart[0] // 实际开发开始时间
               data.devActualTimeEnd = this.from.devActualTimeStart[1] // 实际开发结束时间
             }
-            data.involveApp = this.from.involveApp // 跟版客户端
+            data.involveAppIds = this.from.involveAppIds // 跟版客户端
             data.followVersion = this.from.followVersion // 是否跟版1 跟版 2 不跟版
             data.isCodeReview = this.from.isCodeReview // 是否code review 0：否 1：是
             data.codeReviewExecutor = this.from.codeReviewExecutor ? this.from.codeReviewExecutor.toString() : '' // 执行人

src/views/reportManagement/components/DailyReport.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialogDaliy" width="70vw" class="public_task report-dialog" :title="reportHome ? '测试日报' : `创建测试日报模版`" :close-on-click-modal="false" :destroy-on-close="true" :before-close="handleClose">
+  <el-dialog :visible.sync="dialogDaliy" width="70vw" class="public_task report-dialog" :title="reportHome ? '测试日报' : `${tipName}测试日报模版`" :close-on-click-modal="false" :destroy-on-close="true" :before-close="handleClose">
     <div v-if="reportHome" class="blueStripe" />
     <i v-if="!reportHome" class="el-icon-arrow-left report-return didi-hover" @click="reportReturn" />
 
@@ -107,6 +107,7 @@ export default {
       dialogDaliy: false,
       showOne: true,
       active: 1,
+      tipName: '创建',
       daily_taskIds: [] // 选择的任务ID
     }
   },
@@ -198,11 +199,13 @@ export default {
     open_new_template(val) { // 点击新建模版
       val ? this.templateId = val.id : this.templateId = null
       if (this.templateId === null) {
+        this.tipName = '创建'
         this.reportTamplate = true // 编辑区域
         this.reportHome = false // 步骤条
         this.showOne = false // 模版选择
       } else {
         if (val.creator === localStorage.getItem('username')) {
+          this.tipName = '编辑'
           this.reportTamplate = true // 编辑区域
           this.reportHome = false // 步骤条
           this.showOne = false // 模版选择

src/views/reportManagement/components/ReleaseReport.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialogDaliy" width="70vw" class="public_task report-dialog" :title="reportHome ? '准出报告' : `创建准出报告模版`" :close-on-click-modal="false" :destroy-on-close="true" :before-close="handleClose">
+  <el-dialog :visible.sync="dialogDaliy" width="70vw" class="public_task report-dialog" :title="reportHome ? '准出报告' : `${tipName}准出报告模版`" :close-on-click-modal="false" :destroy-on-close="true" :before-close="handleClose">
     <div v-if="reportHome" class="blueStripe" />
     <i v-if="!reportHome" class="el-icon-arrow-left report-return didi-hover" @click="reportReturn" />
 
@@ -93,6 +93,7 @@ export default {
       templateId: '', // 模版id
       modelId: '', // 下一步选择的模版id
       selectTemplate: [],
+      tipName: '创建',
       fromData: {
         radio: 0
       },
@@ -188,11 +189,13 @@ export default {
       const set_up = val !== undefined ? { set_up: val.id } : ''
       val !== undefined ? this.templateId = set_up : this.templateId = '新建模版'
       if (this.templateId === '新建模版') {
+        this.tipName = '创建'
         this.reportTamplate = true // 编辑区域
         this.reportHome = false // 步骤条
         this.showOne = false // 模版选择
       } else {
         if (val.creator === localStorage.getItem('username')) {
+          this.tipName = '编辑'
           this.reportTamplate = true // 编辑区域
           this.reportHome = false // 步骤条
           this.showOne = false // 模版选择

src/views/reportManagement/components/TestingReport.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog :visible.sync="dialogDaliy" width="70vw" class="public_task report-dialog" :title="reportHome ? '提测报告' : `创建提测报告模版`" :close-on-click-modal="false" :destroy-on-close="true" :before-close="handleClose">
+  <el-dialog :visible.sync="dialogDaliy" width="70vw" class="public_task report-dialog" :title="reportHome ? '提测报告' : `${tipName}提测报告模版`" :close-on-click-modal="false" :destroy-on-close="true" :before-close="handleClose">
     <div v-if="reportHome" class="blueStripe" />
     <i v-if="!reportHome" class="el-icon-arrow-left report-return didi-hover" @click="reportReturn" />
 
@@ -92,6 +92,7 @@ export default {
       templateId: {}, // 模版id
       modelId: '', // 下一步选择的模版id
       selectTemplate: [], // 模版option
+      tipName: '创建',
       fromData: {
         radio: 1
       },
@@ -191,11 +192,13 @@ export default {
       const repot_up = val !== undefined ? { repot_up: val.id } : ''
       val !== undefined ? this.templateId = repot_up : this.templateId = '新建模版'
       if (this.templateId === '新建模版') {
+        this.tipName = '创建'
         this.reportTamplate = true // 编辑区域
         this.reportHome = false // 步骤条
         this.showOne = false // 模版选择
       } else {
         if (val.creator === localStorage.getItem('username')) {
+          this.tipName = '编辑'
           this.reportTamplate = true // 编辑区域
           this.reportHome = false // 步骤条
           this.showOne = false // 模版选择

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

@@ -54,18 +54,18 @@ export default {
   watch: {
     details: {
       handler(newV) {
-        console.log(newV, 'newV')
         if (newV.statusString) {
+          if (newV.statusString === '已发送') {
+            const data = JSON.parse(newV.dataInfo)
+            this.setReportData(data)
+            return false
+          }
           if (newV.taskIds) {
             this.taskid_arr = newV.taskIds
             newV.taskIds.map(item => {
               this.bugGetReportSumData(item)
             })
           }
-          if (newV.statusString === '已发送') {
-            const data = JSON.parse(newV.dataInfo)
-            this.setReportData(data)
-          }
         } else if (newV[0]) {
           this.taskid_arr = JSON.parse(JSON.stringify(newV))
           this.taskid_arr.map(item => {
@@ -94,6 +94,8 @@ export default {
     setReportData(val) {
       this.tableList = [val.bugSum]
       this.report_bugList = val.bugHighPri
+      this.DataByPri = val.todayNewCount
+      this.PriData = val.highPriCount
 
       const data3 = val.bugDisByDate.yAxis.map(item => ({
         ...item,