优化

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

@@ -20,6 +20,7 @@
             <template slot-scope="scope">
               <a v-if="dataStatus" href="javascript:void(0)" style="color:#20a0ff" @click="toReportView(scope.row, 2)">{{ scope.row.reportName }}</a>
               <a v-if="!dataStatus" href="javascript:void(0)" style="color:#20a0ff" @click="toReportView(scope.row, 2)">{{ scope.row.name }}</a>
+              {{ scope.row.returnReason }}
             </template>
           </el-table-column>
           <el-table-column label="状态" min-width="100" align="center">

src/views/reportManagement/Testing/newTestingTemplate.vue

@@ -187,10 +187,10 @@ export default {
         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, 'involveApp', from.involveApp) // 跟版客户端
         this.$set(this.from, 'followVersion', from.followVersion) // 是否跟版1 跟版 2 不跟版
         this.$set(this.from, 'isCodeReview', from.isCodeReview) // 是否code review 0：否 1：是
         this.from.codeReviewExecutor = from.codeReviewExecutor ? from.codeReviewExecutor.split() : '' // 执行人
+        this.$set(this.from, 'involveApp', Number(from.involveApp)) // 跟版客户端
       }
     },
 
@@ -203,9 +203,9 @@ export default {
         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, 'involveApp', from.involveApp) // 跟版客户端
         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.from.codeReviewExecutor = from.codeReviewExecutor ? from.codeReviewExecutor.split() : '' // 执行人
       }
       const res2 = await reportdelivertestGetRequiresByTaskIds({ taskIds: val })

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

@@ -9,13 +9,13 @@
       <el-table-column prop="Reopen" label="Reopen" align="center" min-width="100" />
       <el-table-column prop="Hold" label="Hold" align="center" min-width="100" />
     </el-table>
-    <div class="backStyle">今日新增缺陷（-个）</div>
+    <div class="backStyle">今日新增缺陷（ {{ DataByPri }} 个）</div>
     <div :id="'line-echarts' + randomId" class="line-echarts" />
     <div class="Layout_space_between">
       <div :id="'lineShow' + randomId" class="backTop" />
       <div :id="'barShow' + randomId" class="backTop" />
     </div>
-    <div class="backStyle">P0&P1缺陷列表（-个）</div>
+    <div class="backStyle">P0&P1缺陷列表（ {{ PriData || 0 }} 个）</div>
     <el-table :data="report_bugList" border size="mini" style="width: 100%" show-overflow-tooltip="true" :header-cell-style="{ backgroundColor: 'rgba(241,241,241,1)', color: 'rgba(51,59,74,1)', fontSize: '14px', fontWeight: '400'}">
       <el-table-column prop="bugId" label="缺陷ID" align="center" min-width="80" show-overflow-tooltip />
       <el-table-column prop="bugName" label="缺陷标题" align="center" min-width="100" show-overflow-tooltip>
@@ -46,6 +46,8 @@ export default {
       tableList: [], // 缺陷统计
       report_bugList: [], // P0&P1缺陷列表
       taskid_arr: [],
+      DataByPri: '',
+      PriData: '',
       randomId: Math.floor(Math.random() * 10)
     }
   },
@@ -163,6 +165,7 @@ export default {
       const res1 = await bugGetReportHighPriData(data) // 获取P0&P1缺陷列表
       if (res1.code === 200) {
         this.report_bugList = res1.data
+        this.PriData = res1.total
       }
 
       const res6 = await bugGetReportDisDataByDate({ taskIds: this.taskid_arr })
@@ -207,6 +210,7 @@ export default {
       }
       const res3 = await bugGetReportDisDataByPri(data) // 获取缺陷等级分布
       if (res3.code === 200) {
+        this.DataByPri = res3.total
         const data = res3.data.yaxis.map(item => ({
           ...item,
           type: 'bar',

src/views/reportManagement/daily/dailyTemplate.vue

@@ -8,13 +8,13 @@
         <span class="backStyle"> 关联任务</span>
       </div>
 
-      <el-select v-model="fromCreateData.taskIds" filterable remote reserve-keyword placeholder="请输入任务名称或ID" :remote-method="remoteMethod" style="width: 30%" size="small" @change="colseSelect">
+      <el-select v-model="fromCreateData.taskIds" filterable remote reserve-keyword placeholder="🔍 请输入任务名称或ID" :remote-method="remoteMethod" style="width: 30%" size="small" @change="colseSelect">
         <el-option v-for="item in tasksOptions" :key="item.id" :label="item.name" :value="item.id" @click.native="tasksChange(item)">
           <div class="Layout_space_between"><span>{{ item.name }}</span></div>
         </el-option>
       </el-select>
 
-      <div v-if="selectTask" class="taskError">任务名称不能为空</div>
+      <div v-if="selectTask" class="taskError">报告关联任务不能为空</div>
 
       <div v-for="(item, index) in tasksDetailList" :key="index" class="Layout_space_between report-taskList">
         <span>{{ item.taskIdSting }}</span>
@@ -183,6 +183,9 @@ export default {
   >>> .el-form-item {
     margin-bottom: 0px;
 }
+>>> .el-form-item__label {
+    color: #333;
+}
 }
 .parent-style {
   .report-taskList{
@@ -195,6 +198,7 @@ export default {
   }
 }
   .backStyle {
+     color: #333;
     font-size: 14px;
     font-weight: bold;
     border-radius: 4px;