瀏覽代碼

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

wenbobowen 4 年之前
父節點
當前提交
81bd881553

+ 4 - 4
src/api/dataMarket.js

@@ -112,7 +112,7 @@ export function getRequireAvgData(data) {
 // 任务平均交付周期:/dataMarket/efficiency/getTaskData
 export function getTaskData(data) {
   return request({
-    url: TeamManagement + '/dataMarket/efficiency/getTaskData',
+    url: TeamManagement + '/dataMarket/efficiency/getTaskDataDetail',
     method: 'post',
     data
   })
@@ -120,7 +120,7 @@ export function getTaskData(data) {
 // 平均需求使用人力:/dataMarket/efficiency/getRequirePeopleData
 export function getRequirePeopleData(data) {
   return request({
-    url: TeamManagement + '/dataMarket/efficiency/getRequirePeopleData',
+    url: TeamManagement + '/dataMarket/efficiency/getRequirePeopleDataDetail',
     method: 'post',
     data
   })
@@ -144,7 +144,7 @@ export function getDelayReleaseData(data) {
 // 缺陷24小时修复率:/dataMarket/efficiency/bugRepairData
 export function bugRepairData(data) {
   return request({
-    url: TeamManagement + '/dataMarket/efficiency/bugRepairData',
+    url: TeamManagement + '/dataMarket/efficiency/getRepair24Data',
     method: 'post',
     data
   })
@@ -152,7 +152,7 @@ export function bugRepairData(data) {
 // 缺陷平均修复时长:/dataMarket/efficiency/bugRepairData
 export function bugRepair2Data(data) {
   return request({
-    url: TeamManagement + '/dataMarket/efficiency/bugRepairData',
+    url: TeamManagement + '/dataMarket/efficiency/getRepairAvgData',
     method: 'post',
     data
   })

+ 31 - 31
src/views/dataBigManage/components/drawerModal/drawerModalData.js

@@ -109,7 +109,7 @@ export const columns = {
     requirementColumns: [
       {
         label: '优先级',
-        key: 'priorityName',
+        key: 'priorityStr',
         minWidth: 90,
         type: 'level',
         align: 'left'
@@ -125,14 +125,14 @@ export const columns = {
       },
       {
         label: '需求交付周期',
-        key: 'id',
+        key: 'title',
         minWidth: 90,
         tips: '需求从开始到交付(已上线取实际上线时间,未上线取排期交付时间)的总周期 / 参与计算的需求总量',
         align: 'left'
       },
       {
         label: '状态',
-        key: 'statusName',
+        key: 'statusStr',
         minWidth: 90,
         align: 'left'
       }
@@ -140,28 +140,28 @@ export const columns = {
     requirementColumnsTips: [
       {
         label: '需求交付周期',
-        key: 'id',
+        key: 'title',
         minWidth: 90,
         tips: '需求从开始到交付(已上线取实际上线时间,未上线取排期交付时间)的总周期 / 参与计算的需求总量',
         align: 'left'
       },
       {
         label: '产品周期',
-        key: 'id',
+        key: 'title',
         minWidth: 90,
         tips: '需求从开始到交付(已上线取实际上线时间,未上线取排期交付时间)的总周期 / 参与计算的需求总量',
         align: 'left'
       },
       {
         label: '研发周期',
-        key: 'id',
+        key: 'title',
         minWidth: 90,
         tips: '需求从开始到交付(已上线取实际上线时间,未上线取排期交付时间)的总周期 / 参与计算的需求总量',
         align: 'left'
       },
       {
         label: '测试周期',
-        key: 'id',
+        key: 'title',
         minWidth: 90,
         tips: '需求从开始到交付(已上线取实际上线时间,未上线取排期交付时间)的总周期 / 参与计算的需求总量',
         align: 'left'
@@ -171,7 +171,7 @@ export const columns = {
     taskColumns: [
       {
         label: '优先级',
-        key: 'priorityName',
+        key: 'priorityStr',
         minWidth: 90,
         type: 'level',
         align: 'left'
@@ -187,14 +187,14 @@ export const columns = {
       },
       {
         label: '任务交付周期',
-        key: 'id',
+        key: 'devCycle',
         minWidth: 90,
         tips: '需求从开始到交付(已上线取实际上线时间,未上线取排期交付时间)的总周期 / 参与计算的需求总量',
         align: 'left'
       },
       {
         label: '状态',
-        key: 'statusName',
+        key: 'statusStr',
         minWidth: 90,
         align: 'left'
       }
@@ -202,21 +202,21 @@ export const columns = {
     taskColumnsTips: [
       {
         label: '任务交付周期',
-        key: 'id',
+        key: 'devCycle',
         minWidth: 90,
         tips: '需求从开始到交付(已上线取实际上线时间,未上线取排期交付时间)的总周期 / 参与计算的需求总量',
         align: 'left'
       },
       {
         label: '研发周期',
-        key: 'id',
+        key: 'devCycle',
         minWidth: 90,
         tips: '需求从开始到交付(已上线取实际上线时间,未上线取排期交付时间)的总周期 / 参与计算的需求总量',
         align: 'left'
       },
       {
         label: '测试周期',
-        key: 'id',
+        key: 'devCycle',
         minWidth: 90,
         tips: '需求从开始到交付(已上线取实际上线时间,未上线取排期交付时间)的总周期 / 参与计算的需求总量',
         align: 'left'
@@ -226,7 +226,7 @@ export const columns = {
     requirementPeopleColumns: [
       {
         label: '优先级',
-        key: 'priorityName',
+        key: 'priorityStr',
         minWidth: 90,
         type: 'level',
         align: 'left'
@@ -242,14 +242,14 @@ export const columns = {
       },
       {
         label: '需求使用人力',
-        key: 'id',
+        key: 'peopleDay',
         minWidth: 90,
         // tips: '需求从开始到交付(已上线取实际上线时间,未上线取排期交付时间)的总周期 / 参与计算的需求总量',
         align: 'left'
       },
       {
         label: '状态',
-        key: 'statusName',
+        key: 'statusStr',
         minWidth: 90,
         align: 'left'
       }
@@ -257,28 +257,28 @@ export const columns = {
     requirementPeopleColumnsTips: [
       {
         label: '需求使用人力',
-        key: 'id',
+        key: 'peopleDay',
         minWidth: 90,
         tips: '需求从开始到交付(已上线取实际上线时间,未上线取排期交付时间)的总周期 / 参与计算的需求总量',
         align: 'left'
       },
       {
         label: '开发人力',
-        key: 'id',
+        key: 'peopleDay',
         minWidth: 90,
         tips: '需求从开始到交付(已上线取实际上线时间,未上线取排期交付时间)的总周期 / 参与计算的需求总量',
         align: 'left'
       },
       {
         label: '测试人力',
-        key: 'id',
+        key: 'peopleDay',
         minWidth: 90,
         tips: '需求从开始到交付(已上线取实际上线时间,未上线取排期交付时间)的总周期 / 参与计算的需求总量',
         align: 'left'
       },
       {
         label: '联调人力',
-        key: 'id',
+        key: 'peopleDay',
         minWidth: 90,
         tips: '需求从开始到交付(已上线取实际上线时间,未上线取排期交付时间)的总周期 / 参与计算的需求总量',
         align: 'left'
@@ -288,7 +288,7 @@ export const columns = {
     bugRepairDataColumns: [
       {
         label: '缺陷等级',
-        key: 'priorityName',
+        key: 'priorityStr',
         minWidth: 90,
         type: 'level',
         align: 'left'
@@ -304,14 +304,14 @@ export const columns = {
       },
       {
         label: '缺陷修复时长',
-        key: 'id',
+        key: 'repairTime',
         minWidth: 90,
         // tips: '需求从开始到交付(已上线取实际上线时间,未上线取排期交付时间)的总周期 / 参与计算的需求总量',
         align: 'left'
       },
       {
         label: '状态',
-        key: 'statusName',
+        key: 'statusStr',
         minWidth: 90,
         align: 'left'
       }
@@ -320,7 +320,7 @@ export const columns = {
     delayLaunchDataColumns: [
       {
         label: '优先级',
-        key: 'priorityName',
+        key: 'priorityStr',
         minWidth: 90,
         type: 'level',
         align: 'left'
@@ -336,21 +336,21 @@ export const columns = {
       },
       {
         label: '计划提测日期',
-        key: 'id',
+        key: 'deliverDate',
         minWidth: 90,
         // tips: '需求从开始到交付(已上线取实际上线时间,未上线取排期交付时间)的总周期 / 参与计算的需求总量',
         align: 'left'
       },
       {
         label: '实际提测日期',
-        key: 'id',
+        key: 'deliverRealDate',
         minWidth: 90,
         // tips: '需求从开始到交付(已上线取实际上线时间,未上线取排期交付时间)的总周期 / 参与计算的需求总量',
         align: 'left'
       },
       {
         label: '状态',
-        key: 'statusName',
+        key: 'statusStr',
         minWidth: 90,
         align: 'left'
       }
@@ -359,7 +359,7 @@ export const columns = {
     delayReleaseData2Columns: [
       {
         label: '优先级',
-        key: 'priorityName',
+        key: 'priorityStr',
         minWidth: 90,
         type: 'level',
         align: 'left'
@@ -375,21 +375,21 @@ export const columns = {
       },
       {
         label: '计划准出日期',
-        key: 'id',
+        key: 'deliverDate',
         minWidth: 90,
         // tips: '需求从开始到交付(已上线取实际上线时间,未上线取排期交付时间)的总周期 / 参与计算的需求总量',
         align: 'left'
       },
       {
         label: '实际准出日期',
-        key: 'id',
+        key: 'deliverRealDate',
         minWidth: 90,
         // tips: '需求从开始到交付(已上线取实际上线时间,未上线取排期交付时间)的总周期 / 参与计算的需求总量',
         align: 'left'
       },
       {
         label: '状态',
-        key: 'statusName',
+        key: 'statusStr',
         minWidth: 90,
         align: 'left'
       }

+ 103 - 16
src/views/dataBigManage/components/drawerModal/index.vue

@@ -118,6 +118,7 @@ export default {
       headerTitle: '',
       // timelineData,
       tableList: [],
+      tableListOld: [],
       tableHeight: 'auto',
       column: [],
       ids: [],
@@ -169,6 +170,16 @@ export default {
       this.tableList = []
       this.drawer = this.openDrawer
       this.headerTitle = this.drawerData.headerTitle
+      this.setTitle()
+      this.setIds() // 设置ids
+      this.setTimeLineData()
+      this.setTitleHeight()
+      this.setTimeLine()
+      this.setColumn()
+      this.setTableList()
+    },
+    // 设置标题
+    setTitle() {
       this.title = this.headerTitle.search(/质量|效率/) > -1 ? this.drawerData.label : this.drawerData.activeLabel
       if (this.headerTitle === '效率') {
         this.activeLabel = this.drawerData.activeLabel
@@ -195,14 +206,26 @@ export default {
           ...this.drawerData.subCountList
         ]
       }
+    },
+    // 设置ids
+    setIds() {
+      if (this.headerTitle === '质量') {
+        this.ids = this.drawerData.IdList.map(e => e)
+      }
+      if (this.headerTitle === '吞吐量') {
+        this.drawerData.list.forEach(elm => {
+          if (elm.label === this.drawerData.activeLabel) {
+            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) // 提测报告
+      }
       // 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]
-      this.ids = [2049, 1662, 2050, 1644, 2051, 1657, 1670, 1715, 1728, 1692, 2048, 2052, 2047] // 提测报告
-      this.setTimeLineData()
-      this.setTitleHeight()
-      this.setTimeLine()
-      this.setColumn()
-      this.setTableList()
+      // this.ids = [2049, 1662, 2050, 1644, 2051, 1657, 1670, 1715, 1728, 1692, 2048, 2052, 2047] // 提测报告
     },
     // 设置时间轴
     setTimeLineData() {
@@ -274,12 +297,19 @@ export default {
     },
     handleSizeChange(value) {
       this.paging.pageSize = value
-      this.setTableList()
+      if (this.headerTitle === '效率') {
+        this.tableListPagination()
+      } else {
+        this.setTableList()
+      }
     },
     handleCurrentChange(value) {
-      console.log(value)
       this.paging.curIndex = value
-      this.setTableList()
+      if (this.headerTitle === '效率') {
+        this.tableListPagination()
+      } else {
+        this.setTableList()
+      }
     },
     // 导出
     exportTable() {
@@ -339,18 +369,20 @@ export default {
         if (this.headerTitle === '效率') {
           this.timelineData.firstActive = value || 0
           if (this.title.search(/延期准出率|延期提测率/) > -1) {
-            this.ids
+            // this.ids
           } else {
             this.timelineData.firstActive = value || 0
             this.ids = this.sourceData[value || 0].IdList
           }
-
           this.setColumn()
         }
         this.setTableList()
         console.log(value, name, '第一条')
       }
       if (index === 2) {
+        this.timelineData.secondActive = value || 0
+        this.ids = this.sourceData[value || 0].IdList
+        this.setTableList()
         console.log(value, name, '第二条')
       }
     },
@@ -368,10 +400,10 @@ export default {
       }
       if (this.headerTitle === '吞吐量') {
         if (this.title.search(/需求/) > -1) {
-          this.getRequirementList()
+          this.ids.length && this.getRequirementList()
         }
         if (this.title.search(/任务/) > -1) {
-          this.getTaskList()
+          this.ids.length && this.getTaskList()
         }
       }
       if (this.headerTitle === '效率') {
@@ -391,6 +423,12 @@ export default {
         if (this.title === '缺陷24小时修复率') {
           this.setbugRepairData()
         }
+        if (this.title === '延期提测率') {
+          this.setDelayLaunchData()
+        }
+        if (this.title === '延期准出率') {
+          this.setDelayReleaseData()
+        }
       }
     },
     // 获取需求
@@ -471,6 +509,7 @@ export default {
       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.paging = { ...paging }
         this.loading = false
@@ -489,6 +528,7 @@ export default {
       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.paging = { ...paging }
         this.loading = false
@@ -507,6 +547,7 @@ export default {
       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.paging = { ...paging }
         this.loading = false
@@ -525,6 +566,7 @@ export default {
       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.paging = { ...paging }
         this.loading = false
@@ -533,29 +575,74 @@ export default {
     },
     // 缺陷24小时修复率
     async setbugRepairData() {
+      const priorityList = [[0, 1, 2], [1, 2], [2, 3]]
       const paging = this.paging
       const params = {
-        ...paging,
+        // ...paging,
         title: this.timelineData.first[this.timelineData.firstActive],
+        priorityList: priorityList[this.timelineData.secondActive],
         ids: this.ids
       }
       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.paging = { ...paging }
+        this.loading = false
+      }
+      console.log(res)
+    },
+    // getDelayLaunchData, // 延期提测率
+    async setDelayLaunchData() {
+      const paging = this.paging
+      const params = {
+        ...paging,
+        title: this.timelineData.first[this.timelineData.firstActive],
+        ids: this.ids
+      }
+      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.paging = { ...paging }
         this.loading = false
       }
       console.log(res)
     },
+    // getDelayReleaseData, // 延期准出率
+    async setDelayReleaseData() {
+      const paging = this.paging
+      const params = {
+        ...paging,
+        title: this.timelineData.first[this.timelineData.firstActive],
+        ids: this.ids
+      }
+      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.paging = { ...paging }
+        this.loading = false
+      }
+      console.log(res)
+    },
+    // 分页
+    tableListPagination() {
+      this.tableList = this.tableListOld.map(e => e).splice(this.paging.curIndex - 1 || 0, this.paging.pageSize)
+    },
     /* E 效率:半浮层数据接口 */
     // 分页数据初始化
     pagingInit() {
       this.paging = {
         curIndex: 1,
         pageTotal: 0,
-        pageSize: 5
+        pageSize: 10
       }
     },
     // 设置表格高度
@@ -563,7 +650,7 @@ export default {
       console.log(this.title)
       if (this.title.search(/状态停留分布图数据|状态累积流量图数据/) > -1) {
         this.tableHeight = 'calc(100vh - 363px)'
-      } else if (this.title.search(/需求周期|需求人力|任务周期|缺陷修复时长/) > -1) {
+      } else if (this.title.search(/需求周期|需求人力|任务周期|缺陷修复时长|延期准出率|延期提测率/) > -1) {
         this.tableHeight = 'calc(100vh - 288px)'
       } else if (this.title.search(/需求方向分布图数据|模块分布图数据/) > -1) {
         this.tableHeight = 'calc(100vh - 200px)'