Merge branch 'usecase_daily_0.0.2' of https://git.xiaojukeji.com/pu_qa_tool/thoth-frontend into usecase_daily_0.0.2

src/api/dataMarket.js

@@ -142,18 +142,18 @@ export function getRequirePeopleData(data) {
     data
   })
 }
-// 延期提测率：/dataMarket/efficiency/getDelayLaunchData
+// 延期提测率：/dataMarket/efficiency/getDelayLaunchDataDetail
 export function getDelayLaunchData(data) {
   return request({
-    url: TeamManagement + '/dataMarket/efficiency/getDelayLaunchData',
+    url: TeamManagement + '/dataMarket/efficiency/getDelayLaunchDataDetail',
     method: 'post',
     data
   })
 }
-// 延期准出率：/dataMarket/efficiency/getDelayReleaseData
+// 延期准出率：/dataMarket/efficiency/getDelayReleaseDataDetail
 export function getDelayReleaseData(data) {
   return request({
-    url: TeamManagement + '/dataMarket/efficiency/getDelayReleaseData',
+    url: TeamManagement + '/dataMarket/efficiency/getDelayReleaseDataDetail',
     method: 'post',
     data
   })

src/views/dataBigManage/components/drawerModal/drawerModalData.js

@@ -31,8 +31,7 @@ export const columns = {
       key: 'level',
       minWidth: 100,
       align: 'left',
-      type: 'slot',
-      slotName: 'returnReasonSlot'
+      type: 'level'
     },
     {
       label: '问题名称',
@@ -48,13 +47,13 @@ export const columns = {
     },
     {
       label: '改进方案',
-      key: 'statusString',
+      key: 'type',
       minWidth: 100,
       align: 'center'
     },
     {
       label: '发生时间',
-      key: 'statusString',
+      key: 'gmtCreate',
       minWidth: 100,
       align: 'center'
     }
@@ -85,9 +84,7 @@ export const columns = {
     }
   ],
   // 准出记录
-  releaseReportIdListColumns: [
-
-  ],
+  releaseReportIdListColumns: [],
   // 吞吐量： 需求
   requirementListColumns: [
     {
@@ -138,6 +135,31 @@ export const columns = {
       align: 'left'
     }
   ],
+  // 吞吐量： 任务
+  projectListColumns: [
+    {
+      label: '优先级',
+      key: 'priorityStr',
+      minWidth: 90,
+      align: 'left',
+      type: 'level'
+    },
+    {
+      label: '项目名称',
+      key: 'name',
+      align: 'left',
+      minWidth: 360,
+      type: 'topTitle',
+      topName: 'PROJECT',
+      topKey: 'id'
+    },
+    {
+      label: '状态',
+      key: 'status',
+      minWidth: 90,
+      align: 'left'
+    }
+  ],
   // 效率：
   efficiency: {
     // 需求周期

src/views/dataBigManage/components/drawerModal/index.vue

@@ -74,7 +74,7 @@ import {
   getDelayLaunchData, // 延期提测率
   getDelayReleaseData, // 延期准出率
   bugRepairData, // 缺陷24小时修复率
-  bugRepair2Datam, // 缺陷平均修复时长
+  bugRepair2Data, // 缺陷平均修复时长
   getStarFlowerList, // 线上问题：半浮层 列表
   getProjectList // 需求任务项目列表: 半浮层
 } from '@/api/dataMarket'
@@ -203,7 +203,7 @@ export default {
         this.sourceData = [
           {
             label: this.drawerData.label === '缺陷24小时修复率' ? '全部' : this.drawerData.label,
-            IdList: this.drawerData.IdList
+            IdList: this.drawerData.idList
           },
           ...this.drawerData.subCountList
         ]
@@ -215,17 +215,19 @@ export default {
         // console.log(this.drawerData)
         // console.log(this.drawerData.IdList)
         this.ids = this.drawerData.IdList.map(e => e)
+        console.log(this.ids)
       }
       if (this.headerTitle === '吞吐量') {
         this.drawerData.list.forEach(elm => {
-          if (elm.label === this.drawerData.activeLabel) {
+          if (elm.label === this.drawerData.activeLabel && elm.idList) {
             this.ids = elm.idList.map(e => e)
           }
         })
       }
       if (this.headerTitle === '效率') {
         // this.ids = [2049, 1662, 2050, 1644, 2051, 1657, 1670, 1715, 1728, 1692, 2048, 2052, 2047] // 提测报告
-        this.ids = this.drawerData.IdList.map(e => e) // 提测报告
+        console.log(this.drawerData)
+        this.ids = this.drawerData.idList.map(e => e) // 提测报告
       }
       // this.ids = this.drawerData.IdList.map(e => e)
       // this.ids = [14952, 15453, 15988, 16182, 17445, 17447, 17735, 18062, 18064, 18067, 19255, 19568, 19569, 19570, 19571, 19572, 19574, 19575, 19576, 19577, 19578, 19579, 19587, 19588, 19590, 19593, 19595, 19596, 19597, 19599, 19619, 19642, 19644, 19645, 19652, 19655, 19673, 19674, 19887, 19888, 19931, 19935, 19970, 20048, 20049, 20058, 20071, 20086, 20149, 20181, 20182, 20183, 20184, 20301, 20442, 20755, 20758, 20760, 20765, 20770, 20777, 20778, 20782, 20783, 20789, 20803, 20804, 20805, 20808, 20809, 20810, 20812, 20813, 20814, 20815, 20816, 20817, 20818, 20819, 20820, 20825, 20826, 20831, 20848, 20850, 20851]
@@ -336,6 +338,9 @@ export default {
         if (this.title.search(/任务/) > -1) {
           this.column = columns.taskListColumns.map(e => e)
         }
+        if (this.title.search(/项目/) > -1) {
+          this.column = columns.projectListColumns.map(e => e)
+        }
       }
       if (this.headerTitle === '效率') {
         let columnsKey = 'requirementColumns'
@@ -370,8 +375,11 @@ export default {
       if (index === 1) {
         if (this.headerTitle === '吞吐量') {
           this.timelineData.firstActive = value || 0
-          this.ids = this.sourceData[value || 0].IdList
-          this.title = name
+          console.log(this.sourceData)
+          if (this.sourceData[value || 0] && this.sourceData[value || 0].idList) {
+            this.ids = this.sourceData[value || 0].idList
+            this.title = name
+          }
         }
         if (this.headerTitle === '效率') {
           this.timelineData.firstActive = value || 0
@@ -395,6 +403,7 @@ export default {
     },
     // 设置列表数据
     setTableList() {
+      this.tableList = []
       if (this.headerTitle === '质量') {
         if (this.title.search(/新增缺陷|reopen/) > -1) {
           this.loading = true
@@ -411,11 +420,17 @@ export default {
       }
       if (this.headerTitle === '吞吐量') {
         if (this.title.search(/需求/) > -1) {
+          this.loading = true
           this.ids.length && this.getRequirementList()
         }
         if (this.title.search(/任务/) > -1) {
+          this.loading = true
           this.ids.length && this.getTaskList()
         }
+        if (this.title.search(/项目/) > -1) {
+          this.loading = true
+          this.ids.length && this.setProjectList()
+        }
       }
       if (this.headerTitle === '效率') {
         if (this.title === '需求周期') {
@@ -423,21 +438,27 @@ export default {
           this.setRequireAvgData()
         }
         if (this.title === '任务周期') {
+          this.loading = true
           this.setTaskData()
         }
         if (this.title === '需求人力') {
+          this.loading = true
           this.setRequirePeopleData()
         }
         if (this.title === '缺陷修复时长') {
+          this.loading = true
           this.setbugRepair2Data()
         }
         if (this.title === '缺陷24小时修复率') {
+          this.loading = true
           this.setbugRepairData()
         }
         if (this.title === '延期提测率') {
+          this.loading = true
           this.setDelayLaunchData()
         }
         if (this.title === '延期准出率') {
+          this.loading = true
           this.setDelayReleaseData()
         }
       }
@@ -496,7 +517,7 @@ export default {
       const paging = this.paging
       // {"ids":[14952,15453,15988,16182,17445,17447,17735,18062,18064,18067,18134,18137,18138,18140],"curIndex":2,"pageSize":10}
       const res = await getProjectList({
-        ids: this.ids,
+        idList: this.ids,
         curIndex: this.paging.curIndex,
         pageSize: 15
       })
@@ -547,14 +568,15 @@ export default {
       const params = {
         ...paging,
         title: this.timelineData.first[this.timelineData.firstActive],
-        ids: this.ids
+        ids: this.sourceData[0].IdList
       }
       delete params.pageTotal
       const res = await getRequireAvgData(params)
       if (res.code === 200) {
-        this.tableList = res.data.list
-        this.tableListOld = this.tableList.map(e => e)
-        paging.pageTotal = res.data.total
+        // this.tableList = res.data
+        this.tableListOld = res.data.length && res.data.map(e => e)
+        this.tableListPagination()
+        paging.pageTotal = this.tableListOld.length
         this.paging = { ...paging }
         this.loading = false
       }
@@ -566,14 +588,15 @@ export default {
       const params = {
         ...paging,
         title: this.timelineData.first[this.timelineData.firstActive],
-        ids: this.ids
+        ids: this.sourceData[0].IdList
       }
       delete params.pageTotal
       const res = await getTaskData(params)
       if (res.code === 200) {
-        this.tableList = res.data.list
-        this.tableListOld = this.tableList.map(e => e)
-        paging.pageTotal = res.data.total
+        // this.tableList = res.data
+        this.tableListOld = res.data.length && res.data.map(e => e)
+        this.tableListPagination()
+        paging.pageTotal = this.tableListOld.length
         this.paging = { ...paging }
         this.loading = false
       }
@@ -585,14 +608,15 @@ export default {
       const params = {
         ...paging,
         title: this.timelineData.first[this.timelineData.firstActive],
-        ids: this.ids
+        ids: this.sourceData[0].IdList
       }
       delete params.pageTotal
       const res = await getRequirePeopleData(params)
       if (res.code === 200) {
-        this.tableList = res.data.list
-        this.tableListOld = this.tableList.map(e => e)
-        paging.pageTotal = res.data.total
+        // this.tableList = res.data
+        this.tableListOld = res.data.length && res.data.map(e => e)
+        this.tableListPagination()
+        paging.pageTotal = this.tableListOld.length
         this.paging = { ...paging }
         this.loading = false
       }
@@ -600,18 +624,20 @@ export default {
     },
     // 缺陷平均修复时长
     async setbugRepair2Data() {
+      console.log(624, this.sourceData)
       const paging = this.paging
       const params = {
         ...paging,
         title: this.timelineData.first[this.timelineData.firstActive],
-        ids: this.ids
+        ids: this.sourceData[0].IdList
       }
       delete params.pageTotal
-      const res = await bugRepair2Datam(params)
+      const res = await bugRepair2Data(params)
       if (res.code === 200) {
-        this.tableList = res.data.list
-        this.tableListOld = this.tableList.map(e => e)
-        paging.pageTotal = res.data.total
+        // this.tableList = res.data
+        this.tableListOld = res.data.length && res.data.map(e => e)
+        this.tableListPagination()
+        paging.pageTotal = this.tableListOld.length
         this.paging = { ...paging }
         this.loading = false
       }
@@ -619,20 +645,20 @@ export default {
     },
     // 缺陷24小时修复率
     async setbugRepairData() {
-      const priorityList = [[0, 1, 2], [1, 2], [2, 3]]
+      const priorityList = [[0, 1, 2, 3], [0, 1], [2, 3]]
       const paging = this.paging
       const params = {
         // ...paging,
         title: this.timelineData.first[this.timelineData.firstActive],
         priorityList: priorityList[this.timelineData.secondActive],
-        ids: this.ids
+        ids: this.sourceData[0].IdList
       }
       delete params.pageTotal
       const res = await bugRepairData(params)
       if (res.code === 200) {
-        this.tableList = res.data.list
-        this.tableListOld = this.tableList.map(e => e)
-        paging.pageTotal = res.data.total
+        this.tableList = res.data
+        this.tableListOld = res.data.length && this.tableList.map(e => e)
+        paging.pageTotal = this.tableListOld.length
         this.paging = { ...paging }
         this.loading = false
       }
@@ -644,14 +670,15 @@ export default {
       const params = {
         ...paging,
         title: this.timelineData.first[this.timelineData.firstActive],
-        ids: this.ids
+        ids: this.sourceData[0].IdList
       }
       delete params.pageTotal
       const res = await getDelayLaunchData(params)
       if (res.code === 200) {
-        this.tableList = res.data.list
-        this.tableListOld = this.tableList.map(e => e)
-        paging.pageTotal = res.data.total
+        // this.tableList = res.data
+        this.tableListOld = res.data.length && res.data.map(e => e)
+        this.tableListPagination()
+        paging.pageTotal = this.tableListOld.length
         this.paging = { ...paging }
         this.loading = false
       }
@@ -663,14 +690,15 @@ export default {
       const params = {
         ...paging,
         title: this.timelineData.first[this.timelineData.firstActive],
-        ids: this.ids
+        ids: this.sourceData[0].IdList
       }
       delete params.pageTotal
       const res = await getDelayReleaseData(params)
       if (res.code === 200) {
-        this.tableList = res.data.list
-        this.tableListOld = this.tableList.map(e => e)
-        paging.pageTotal = res.data.total
+        // this.tableList = res.data
+        this.tableListOld = res.data.length && res.data.map(e => e)
+        this.tableListPagination()
+        paging.pageTotal = this.tableListOld.length
         this.paging = { ...paging }
         this.loading = false
       }
@@ -678,7 +706,9 @@ export default {
     },
     // 分页
     tableListPagination() {
-      this.tableList = this.tableListOld.map(e => e).splice(this.paging.curIndex - 1 || 0, this.paging.pageSize)
+      if (this.tableListOld.length) {
+        this.tableList = this.tableListOld.map(e => e).splice(this.paging.curIndex - 1 || 0, this.paging.pageSize)
+      }
     },
     /* E 效率：半浮层数据接口 */
     // 分页数据初始化

src/views/dataBigManage/components/qualityModule/index.vue

@@ -317,7 +317,7 @@ export default {
           'titleUnit': '个',
           'subTitleUnit': 'rate',
           'subTitle': newBug.chainRatio,
-          'IdList': newBug.IdList
+          'IdList': newBug.idList
         },
         {
           ...this.yellowObj,
@@ -326,7 +326,7 @@ export default {
           'titleUnit': '次',
           'subTitleUnit': 'rate',
           'subTitle': reopen.chainRatio,
-          'IdList': reopen.IdList
+          'IdList': reopen.idList
         },
         {
           'color': '#3F9DFE',
@@ -366,7 +366,7 @@ export default {
             'label': online.label,
             'title': online.countStr,
             'titleUnit': '次',
-            'IdList': online.IdList
+            'IdList': online.idList
           },
           {
             'innerColor': '#7ED321',
@@ -375,7 +375,7 @@ export default {
             'label': testFreeOnlineRate.label,
             'title': testFreeOnlineRate.countStr,
             'titleUnit': '%',
-            'IdList': testFreeOnlineRate.IdList
+            'IdList': testFreeOnlineRate.idList
           },
           {
             'innerColor': '#F5222D',
@@ -384,7 +384,7 @@ export default {
             'label': onlinebyStreakingRate.label,
             'title': onlinebyStreakingRate.countStr,
             'titleUnit': '%',
-            'IdList': onlinebyStreakingRate.IdList
+            'IdList': onlinebyStreakingRate.idList
           }
         ],
         rollBack