需求统计新功能增加

src/api/statisticsApi/requireStatistics.js

@@ -1,6 +1,14 @@
 import request from '@/utils/request'
 import { TeamManagement } from '@/apiConfig/api'
 
+// 趋势图的动态title枚举
+export function getRequireCountTitleEnum(data) {
+  return request({
+    url: TeamManagement + '/requirement/getRequireCountTitleEnum',
+    method: 'post',
+    data
+  })
+}
 // 需求累计数据
 export function getSummary(data) {
   return request({

src/views/projectManage/requirement/list/index.vue

@@ -17,7 +17,7 @@
           <el-form :model="searchForm" class="Layout">
             <div class="Layout_flex_end" style="padding-left:15px">
               <div class="queryName">需求名称</div>
-              <el-input v-model="requirementName" size="small" clearable style="width:72% !important;" placeholder="请搜索标题或ID" @change="getTableData()" />
+              <el-input v-model="requirementName" size="small" clearable style="width:72% !important;" placeholder="请搜索标题或ID或望岳ID" @change="getTableData()" />
             </div>
             <div class="Layout">
               <div class="queryName marginLeft">需求状态</div>

src/views/projectManage/taskList/taskIndex.vue

@@ -23,7 +23,7 @@
           <el-form :model="form_task" class="flex_start">
             <div class="Layout">
               <div class="queryName">任务名称</div>
-              <el-input v-model="form_task.name" size="small" clearable style="width:77% !important;" placeholder="请输入标题或ID" @change="get_taskList()" />
+              <el-input v-model="form_task.name" size="small" clearable style="width:77% !important;" placeholder="请输入标题或ID或望岳ID" @change="get_taskList()" />
             </div>
             <div class="Layout marginLeft">
               <div class="queryName">负责人</div>

src/views/quality/requireStatistics.vue

@@ -106,14 +106,8 @@
     </el-header>
     <el-main class="charts-main">
       <el-tabs v-model="activeTab" class="tab-change" @tab-click="onSubmit">
-        <el-tab-pane name="1">
-          <span slot="label" class="tab-item">累计新增</span>
-        </el-tab-pane>
-        <el-tab-pane name="3">
-          <span slot="label" class="tab-item">累计PRD评审通过</span>
-        </el-tab-pane>
-        <el-tab-pane name="2">
-          <span slot="label" class="tab-item">累计上线</span>
+        <el-tab-pane v-for="item in countTitle" :key="'countTitle'+item.code" :name="item.code+''">
+          <span slot="label" class="tab-item">{{ item.msg }}</span>
         </el-tab-pane>
       </el-tabs>
       <div class="chart-item">
@@ -173,6 +167,7 @@ moment.locale('zh-cn')
 import { settingQueryBizRqmtOrntList } from '@/api/requirement'
 import { teamQueryTeamInfoList } from '@/api/configure'
 import {
+  getRequireCountTitleEnum,
   getSummary,
   getCumulativeFlowDiagram,
   getRequireCountTrend,
@@ -213,6 +208,7 @@ export default {
         { code: 2, label: '月' },
         { code: 3, label: '年' }
       ],
+      countTitle: [], // 趋势图的动态title
       teamOptions: [], // 团队列表
       chartForm: {}, // 筛选表单
       stratAndEnd: [], // 开始结束日期
@@ -288,6 +284,7 @@ export default {
       if (this.activeTab === '2' && this.distributeStatus === 1) {
         this.distributeStatus = 2
       }
+      this.getRequireCountTitleEnum()
       this.getSummary()
       this.getCumulativeFlowDiagram()
       this.getRequireCountTrend()
@@ -322,6 +319,13 @@ export default {
       this.stratAndEnd = [startDate, endDate]
       this.onSubmit()
     },
+    async getRequireCountTitleEnum() { // 趋势图的动态title枚举
+      const res = await getRequireCountTitleEnum({ bizId: Number(localStorage.getItem('bizId')) })
+      if (res.code === 200) {
+        this.countTitle = res.data
+        console.log(this.countTitle)
+      }
+    },
     async getRequireDirection() { // 需求方向列表
       const res = await settingQueryBizRqmtOrntList(Number(localStorage.getItem('bizId')))
       if (res.code === 200) {

src/views/workbench/components/statisticsSection.vue

@@ -8,7 +8,7 @@
             <div v-for="(item,index) in statisticsList" :key="title+'-statistics-'+index" class="data-item" :class="{'active': clickItem === index }" @click="changeData(item.idList,item.label);clickItem=index">
               <label>
                 {{ item.label }}
-                <template v-if="(title === '需求' || title ==='任务')&& index<5">
+                <template v-if="(title === '需求' || title ==='任务') && index<7">
                   <el-tooltip class="item" effect="dark" :content="tips[title][index]" placement="top">
                     <i class="el-icon-info" />
                   </el-tooltip>
@@ -98,14 +98,18 @@ export default {
           '已过交付日期，状态仍未变更为“已上线”的需求数量（不包含当前状态为hold的需求）。',
           '交付日期在本周内的需求数量（不包含当前状态为hold的需求）。',
           '交付日期在本周，且状态仍未变更为“已上线”的需求数量（不包含当前状态为hold的需求）。',
-          '交付日期在下周的需求数量（不包含当前状态为hold的需求）。'
+          '最近一次变更状态为“已上线”是在本周，且当前状态为“已上线”或“已完成”的需求',
+          '交付日期在下周的需求数量（不包含当前状态为hold的需求）。',
+          '当前状态为“已上线”或“已完成”的需求'
         ],
         '任务': [
           '交付日期为今天，且状态仍未变更为“已上线”的任务数量（不包含当前状态为hold的任务）。',
           '已过交付日期，状态仍未变更为“已上线”的任务数量（不包含当前状态为hold的任务）。',
           '交付日期在本周内的任务数量（不包含当前状态为hold的任务）。',
           '交付日期在本周，且状态仍未变更为“已上线”的任务数量（不包含当前状态为hold的任务）。',
-          '交付日期在下周任务数量（不包含当前状态为hold的任务）。'
+          '最近一次变更状态为“已上线”是在本周，且当前状态为“已上线”的任务',
+          '交付日期在下周任务数量（不包含当前状态为hold的任务）。',
+          '当前状态为“已上线”的任务'
         ]
       },
       clickItem: 0
@@ -239,7 +243,7 @@ export default {
     display: grid;
     grid-template-columns: repeat(2,188px);
     grid-column-gap: 30px;
-    grid-template-rows: repeat(3,111px);
+    grid-template-rows: repeat(4,80px);
     grid-row-gap: 20px;
   }
   .data-item {
@@ -249,7 +253,7 @@ export default {
     display: grid;
     grid-template-rows: repeat(2,50%);
     align-items: center;
-    padding: 5px 0 5px 11px;
+    padding: 0 0 5px 11px;
     label {
       font-weight: 400;
       color: #666666;