报告优化

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

@@ -83,13 +83,19 @@
           <el-col :span="12" class="Layout_space_between task-bot">
             <span class="from-name">
               <span class="test-details">开发人员：</span>
-              <span v-for="(item, index) in details.devObject" :key="index">{{ item.name }}</span>
+              <span v-for="(item, index) in details.devObject" :key="index">
+                {{ item.name }}
+                <span v-if="index < details.devObject.length - 1">,</span>
+              </span>
             </span>
           </el-col>
           <el-col :span="12" class="Layout_space_between task-bot">
             <span class="from-namer">
               <span class="test-details">测试人员：</span>
-              <span v-for="(item, index) in details.testerObject" :key="index">{{ item.name }}</span>
+              <span v-for="(item, index) in details.testerObject" :key="index">
+                {{ item.name }}
+                <span v-if="index < details.testerObject.length - 1">,</span>
+              </span>
             </span>
           </el-col>
         </el-row>
@@ -354,6 +360,7 @@ export default {
     vertical-align: middle;
     background: #409eff;
     border-radius: 1px;
+    margin-right: 5px;
   }
 
   .task-bot {

src/views/reportManagement/ReleaseReport/newReleaeTemplate.vue

@@ -9,23 +9,23 @@
 
     <el-form ref="fromCreateData" :model="from">
 
-      <div style=" margin-bottom: 10px;">
+      <div v-if="!releaseType" style=" margin-bottom: 10px;">
         <span style="color: #f56b6c">*</span>
-        <span class="backStyle"> 关联任务</span>
-      </div>
+        <span class="backStyle"> 关联任务</span><br>
 
-      <el-select v-model="from.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>
+        <el-select v-model="from.taskIds" filterable remote reserve-keyword placeholder="🔍 请输入任务名称或ID" :remote-method="remoteMethod" style="width: 30%;margin-top: 10px;" 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>
-        <span>{{ item.name }}</span>
-        <i class="el-icon-circle-close didi-hover" @click="delete_task(item)" />
+        <div v-for="(item, index) in tasksDetailList" :key="index" class="Layout_space_between report-taskList">
+          <span>{{ item.taskIdSting }}</span>
+          <span>{{ item.name }}</span>
+          <i class="el-icon-circle-close didi-hover" @click="delete_task(item)" />
+        </div>
       </div>
 
       <el-form-item v-if="releaseType" label="模版名称" prop="moduleName" :rules="[{ required: true, message: '模版名称不能为空', trigger: 'change'}]"><br>
@@ -87,11 +87,13 @@
       <el-row class="from-margin">
         <el-col :span="12" class="Layout_space_between">
           <span class="from-name">开发人员： </span>
-          <searchTeam :value.sync="from.developer" :clearable="true" :multiple="true" :disabled="releaseType" :placeholder="'请输入姓名或邮箱前缀'" :size="'small'" style="width: 100%;" />
+          <search-people :value.sync="from.developer" :clearable="true" :multiple="true" :size="'small'" :disabled="releaseType" style="width: 100%;" />
+          <!-- <searchTeam :value.sync="from.developer" :clearable="true" :multiple="true" :disabled="releaseType" :size="'small'" style="width: 100%;" /> -->
         </el-col>
         <el-col :span="12" class="Layout_space_between">
           <span class="from-namer"> 测试人员：</span>
-          <searchTeam :value.sync="from.tester" :clearable="true" :multiple="true" :disabled="releaseType" :placeholder="'请输入姓名或邮箱前缀'" :size="'small'" style="width: 100%;" />
+          <search-people :value.sync="from.tester" :clearable="true" :multiple="true" :size="'small'" :disabled="releaseType" style="width: 100%;" />
+          <!-- <searchTeam :value.sync="from.tester" :clearable="true" :multiple="true" :disabled="releaseType" :placeholder="'请输入姓名或邮箱前缀'" :size="'small'" style="width: 100%;" /> -->
         </el-col>
       </el-row>
       <normal-area id="report-template" :value.sync="fromData.content" :height="500" />
@@ -103,7 +105,7 @@
 
 <script>
 import '@/styles/PublicStyle/index.scss' // 公共css
-import searchTeam from '@/components/select/searchTeam' // 人员搜索
+import searchPeople from '@/components/select/searchPeople' // 人员select
 import normalArea from '@/components/input/normalArea' // 富文本
 import 'tinymce/plugins/table'// 插入表格插件
 import { taskList } from '@/api/taskIndex'
@@ -114,7 +116,7 @@ import { getContainImgHTMLNode } from '@/utils/handleTinymce' // 富文本本图
 export default {
   components: {
     normalArea,
-    searchTeam,
+    searchPeople,
     iconDisplay
   },
   props: {

src/views/reportManagement/ReleaseReport/releaePreview.vue

@@ -64,10 +64,20 @@
 
       <el-row class="Above">
         <el-col :span="12" class="Layout_space_between">
-          <span class="parent-style">开发人员：{{ fromCreateData.developer }}</span>
+          <div class="parent-style">开发人员：
+            <span v-for="(item, index) in fromCreateData.devObject" :key="index">
+              {{ item.name }}
+              <span v-if="index < fromCreateData.devObject.length - 1">,</span>
+            </span>
+          </div>
         </el-col>
-        <el-col :span="12" class="Layout_space_between">
-          <span class="parent-style">测试人员：{{ fromCreateData.tester }}</span>
+        <el-col :span="12" class="Layout_space_start">
+          <div class="parent-style">测试人员：
+            <span v-for="(item, index) in fromCreateData.testerObject" :key="index">
+              {{ item.name }}
+              <span v-if="index < fromCreateData.testerObject.length - 1">,</span>
+            </span>
+          </div>
         </el-col>
       </el-row>
       <div v-html="fromCreateData.content" />

src/views/reportManagement/Testing/TestingPreview.vue

@@ -60,7 +60,12 @@
           <span class="parent-style">CodeReview：{{ fromCreateData.isCodeReview === 0 ? '否' : '是' }}</span>
         </el-col>
         <el-col v-if="fromCreateData.isCodeReview === 1" :span="12" class="Layout_space_between">
-          <span v-for="(item, index) in fromCreateData.codeReviewExecutorObject" :key="index" class="parent-style">执行人：{{ item.name }}</span>
+          <div class="parent-style">执行人：
+            <span v-for="(item, index) in fromCreateData.codeReviewExecutorObject" :key="index">
+              {{ item.name }}
+              <span v-if="index < fromCreateData.codeReviewExecutorObject.length - 1">,</span>
+            </span>
+          </div>
         </el-col>
       </el-row>
       <div class="backStyle">需求列表</div>

src/views/reportManagement/Testing/components/deliverDetails.vue

@@ -55,10 +55,19 @@
 
         <el-row>
           <el-col :span="12" class="Layout_space_between task-bot">
-            <span class="from-name">CodeReview：{{ details.isCodeReview === 0 ? '否' : '是' }}</span>
+            <span class="from-name">
+              <span class="test-details">CodeReview：</span>
+              {{ details.isCodeReview === 0 ? '否' : '是' }}
+            </span>
           </el-col>
           <el-col v-show="details.isCodeReview === 1" :span="12" class="Layout_space_between task-bot">
-            <span class="from-namer"><span class="test-details">执行人：</span>{{ details.codeReviewExecutor }}</span>
+            <div class="from-namer">
+              <span class="test-details">执行人：</span>
+              <span v-for="(item, index) in details.codeReviewExecutorObject" :key="index">
+                {{ item.name }}
+                <span v-if="index < details.codeReviewExecutorObject.length - 1">,</span>
+              </span>
+            </div>
           </el-col>
         </el-row>
         <div class="title">需求列表</div>

src/views/reportManagement/Testing/newTestingTemplate.vue

@@ -3,23 +3,23 @@
   <div class="report-container">
     <el-form ref="fromCreateData" :model="from">
 
-      <div style=" margin-bottom: 10px;">
+      <div v-if="!releaseType" style=" margin-bottom: 10px;">
         <span style="color: #f56b6c">*</span>
-        <span class="backStyle"> 关联任务</span>
-      </div>
+        <span class="backStyle"> 关联任务</span><br>
 
-      <el-select v-model="from.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>
+        <el-select v-model="from.taskIds" filterable remote reserve-keyword placeholder="🔍 请输入任务名称或ID" :remote-method="remoteMethod" style="width: 30%; margin-top: 15px;" 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>
-        <span>{{ item.name }}</span>
-        <i class="el-icon-circle-close didi-hover" @click="delete_task(item)" />
+        <div v-for="(item, index) in tasksDetailList" :key="index" class="Layout_space_between report-taskList">
+          <span>{{ item.taskIdSting }}</span>
+          <span>{{ item.name }}</span>
+          <i class="el-icon-circle-close didi-hover" @click="delete_task(item)" />
+        </div>
       </div>
 
       <el-form-item v-if="releaseType" label="模版名称" prop="moduleName" :rules="[{ required: true, message: '模版名称不能为空', trigger: 'change'}]"><br>
@@ -97,7 +97,7 @@
         </el-col>
         <el-col v-if="from.isCodeReview === 1" :span="12" class="Layout_space_between">
           <span class="from-namer"><span style="color: red;">*</span>执行人：</span>
-          <searchTeam :value.sync="from.codeReviewExecutor" :clearable="true" :multiple="true" :size="'small'" :placeholder="'请输入姓名或邮箱前缀'" :disabled="releaseType" style="width: 100%;" />
+          <search-people :value.sync="from.codeReviewExecutor" :clearable="true" :multiple="true" :size="'small'" :disabled="releaseType" style="width: 100%;" />
         </el-col>
       </el-row>
     </el-form>
@@ -129,7 +129,7 @@
 
 <script>
 import '@/styles/PublicStyle/index.scss' // 公共css
-import searchTeam from '@/components/select/searchTeam' // 人员搜索
+import searchPeople from '@/components/select/searchPeople' // 人员select
 import normalArea from '@/components/input/normalArea' // 富文本
 import 'tinymce/plugins/table'// 插入表格插件
 import { taskList } from '@/api/taskIndex'
@@ -140,7 +140,7 @@ import { getContainImgHTMLNode } from '@/utils/handleTinymce' // 富文本本图
 export default {
   components: {
     normalArea,
-    searchTeam
+    searchPeople
   },
   props: {
     templateId: { type: [String, Number, Object], default: null }, // 模版id

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

@@ -9,8 +9,8 @@
       <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 :id="'line-echarts' + randomId" style="margin-top:10px;" class="line-echarts" />
     <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" />
@@ -155,7 +155,7 @@ export default {
         createEndTime: `${date} 23:59:59`, // 当天的结束时间
         taskIds: this.taskid_arr // 任务id list
       }
-      const res = await bugGetReportSumData(data) // 获取缺陷统计
+      const res = await bugGetReportSumData({ taskIds: this.taskid_arr }) // 获取缺陷统计
       if (res.code === 200) {
         this.tableList = []
         this.tableList.push(res.data)