|
|
@@ -54,6 +54,18 @@
|
|
|
<template #bugStatusNameSlot="{scope}">
|
|
|
<div @click.stop="print(scope)">自定义</div>
|
|
|
</template>
|
|
|
+ <!-- 改进项：级别 -->
|
|
|
+ <template #improvementsOverRateColumnsPrioritySlot="{scope}">
|
|
|
+ <div v-if="scope.row.caseName" @click.stop>
|
|
|
+ <a target="_blank" :href="scope.row.url">{{ scope.row.caseName }}</a>
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
+ <!-- 改进项：状态 -->
|
|
|
+ <template #improvementsOverRateColumnsStatusSlot="{scope}">
|
|
|
+ <div v-if="scope.row.status" @click.stop>
|
|
|
+ {{ scope.row.status }} <el-tag v-if="scope.row.tag" size="mini" type="danger" effect="dark">{{ scope.row.tag }}</el-tag>
|
|
|
+ </div>
|
|
|
+ </template>
|
|
|
<!-- 报告名称 -->
|
|
|
<template #returnReasonSlot="{scope}">
|
|
|
<div v-if="scope.row.reportName" @click.stop>
|
|
|
@@ -134,7 +146,8 @@ import {
|
|
|
bugRepair2Data, // 缺陷平均修复时长
|
|
|
getStarFlowerList, // 线上问题：半浮层 列表
|
|
|
getProjectList, // 需求任务项目列表: 半浮层
|
|
|
- getOdinJobList // 获取上线过程列表
|
|
|
+ getOdinJobList, // 获取上线过程列表
|
|
|
+ dataMarketQualityGetImproveList // 线上问题-改进项半浮层
|
|
|
} from '@/api/dataMarket'
|
|
|
|
|
|
export default {
|
|
|
@@ -218,7 +231,7 @@ export default {
|
|
|
console.log(slotProp)
|
|
|
},
|
|
|
init() {
|
|
|
- console.log(this.drawerData, 210)
|
|
|
+ // console.log(this.drawerData, 210)
|
|
|
this.headerTitle = this.drawerData.headerTitle
|
|
|
this.title = this.headerTitle.search(/质量|效率/) > -1 ? this.drawerData.label || '' : this.drawerData.activeLabel
|
|
|
console.log(this.headerTitle, this.title)
|
|
|
@@ -247,7 +260,7 @@ export default {
|
|
|
const paging = _.cloneDeep(this.paging)
|
|
|
paging.pageSize = Number.parseInt(pageSize)
|
|
|
this.paging = _.cloneDeep(paging)
|
|
|
- console.log(this.paging, 250)
|
|
|
+ // console.log(this.paging, 250)
|
|
|
},
|
|
|
// 设置标题
|
|
|
setTitle() {
|
|
|
@@ -259,6 +272,9 @@ export default {
|
|
|
if (this.drawerData.label === '准出不通过率') {
|
|
|
this.title = '准出记录'
|
|
|
}
|
|
|
+ if (this.drawerData.label === '改进项完成率') {
|
|
|
+ this.title = '改进项'
|
|
|
+ }
|
|
|
if (this.drawerData.moduleName && this.drawerData.moduleName === '回滚次数') {
|
|
|
this.title = !this.drawerData.index ? '回滚次数' : this.drawerData[this.drawerData.itemKey].label
|
|
|
}
|
|
|
@@ -301,7 +317,17 @@ export default {
|
|
|
// 设置ids
|
|
|
setIds() {
|
|
|
if (this.headerTitle === '质量' && !this.drawerData.moduleName) {
|
|
|
- this.ids = this.drawerData.IdList.map(e => e)
|
|
|
+ if (this.drawerData.label === '改进项完成率') {
|
|
|
+ // if (this.drawerData.hasOwnProperty('subCountItem')) {
|
|
|
+ // const { subItemList, subIndex } = this.drawerData.subCountItem
|
|
|
+ // this.ids = subItemList[subIndex].idList.map(e => e)
|
|
|
+ // } else {
|
|
|
+ // this.ids = this.drawerData.idList.map(e => e)
|
|
|
+ // }
|
|
|
+ this.ids = this.drawerData.IdList.map(e => e)
|
|
|
+ } else {
|
|
|
+ this.ids = this.drawerData.IdList.map(e => e)
|
|
|
+ }
|
|
|
}
|
|
|
if (this.drawerData.moduleName && this.drawerData.moduleName === '上线过程') {
|
|
|
this.ids = this.drawerData.IdList.map(e => e)
|
|
|
@@ -339,6 +365,22 @@ export default {
|
|
|
first = [...timelineList.returnCase]
|
|
|
firstActive = this.drawerData.index
|
|
|
}
|
|
|
+ if (this.title === '改进项') {
|
|
|
+ secondActive = 0
|
|
|
+ firstActive = 0
|
|
|
+ first = [...timelineList.ImprovementsOverRate]
|
|
|
+ second = [...timelineList.ImprovementsOverRateTwo]
|
|
|
+ firstActive = this.drawerData.index
|
|
|
+ if (this.drawerData.hasOwnProperty('subCountItem')) {
|
|
|
+ if (this.drawerData.subCountItem.index === 3) {
|
|
|
+ firstActive = 0
|
|
|
+ secondActive = this.drawerData.subCountItem.subIndex + 1
|
|
|
+ } else {
|
|
|
+ firstActive = this.drawerData.subCountItem.index
|
|
|
+ secondActive = this.drawerData.subCountItem.subIndex
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
if (this.headerTitle === '吞吐量') {
|
|
|
secondActive = 0
|
|
|
@@ -453,6 +495,9 @@ export default {
|
|
|
// this.ids = this.drawerData[this.drawerData.itemKey].idList.map(e => e)
|
|
|
this.column = [...columns.test_freeOn_lineRateIdListColumns]
|
|
|
}
|
|
|
+ if (this.title === '改进项') {
|
|
|
+ this.column = [...columns.improvementsOverRateColumns]
|
|
|
+ }
|
|
|
if (this.title.search(/新增问题/) > -1) {
|
|
|
this.column = [...columns.newQuestionColumns]
|
|
|
}
|
|
|
@@ -520,6 +565,10 @@ export default {
|
|
|
const items = ['countStr', 'preCountStr', 'fullCountStr', 'lowCountStr']
|
|
|
this.ids = [...this.drawerData[items[value]].idList]
|
|
|
}
|
|
|
+ if (this.title === '改进项') {
|
|
|
+ this.ids = this.drawerData.IdList.map(e => e)
|
|
|
+ this.priorityList = value ? [value - 1] : []
|
|
|
+ }
|
|
|
}
|
|
|
if (this.headerTitle === '吞吐量') {
|
|
|
this.timelineData.firstActive = value || 0
|
|
|
@@ -541,8 +590,14 @@ export default {
|
|
|
this.setTableList()
|
|
|
}
|
|
|
if (index === 2) {
|
|
|
- this.timelineData.secondActive = value || 0
|
|
|
- this.ids = this.sourceData[value || 0].IdList
|
|
|
+ if (this.title === '改进项') {
|
|
|
+ // console.log(593, value)
|
|
|
+ this.timelineData.secondActive = value
|
|
|
+ } else {
|
|
|
+ this.timelineData.secondActive = value || 0
|
|
|
+ this.ids = this.sourceData[value || 0].IdList
|
|
|
+ // this.setTableList()
|
|
|
+ }
|
|
|
this.setTableList()
|
|
|
}
|
|
|
},
|
|
|
@@ -564,6 +619,11 @@ export default {
|
|
|
this.setStarFlowerList()
|
|
|
}
|
|
|
}
|
|
|
+ if (this.title.search(/改进项/) > -1) {
|
|
|
+ this.loading = true
|
|
|
+ // console.log(624)
|
|
|
+ this.dataMarketQualityGetImproveListFn()
|
|
|
+ }
|
|
|
if (this.title.search(/提测报告|准出记录/) > -1) {
|
|
|
if (this.ids.length) {
|
|
|
this.loading = true
|
|
|
@@ -649,6 +709,52 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
+ // 线上问题-改进项半浮层
|
|
|
+ async dataMarketQualityGetImproveListFn() {
|
|
|
+ const paging = { ...this.paging }
|
|
|
+ const { index, subIndex } = this.drawerData.subCountItem
|
|
|
+ const { firstActive,
|
|
|
+ // first,
|
|
|
+ secondActive
|
|
|
+ // second
|
|
|
+ } = this.timelineData
|
|
|
+ const params = {
|
|
|
+ ...paging,
|
|
|
+ isOverDue: 1,
|
|
|
+ ids: this.drawerData.IdList
|
|
|
+ }
|
|
|
+ if (firstActive) {
|
|
|
+ params.status = timelineList.ImprovementsOverRate[firstActive]
|
|
|
+ }
|
|
|
+ // console.log(722, secondActive)
|
|
|
+ if (secondActive === 2) {
|
|
|
+ params.priority = '高优'
|
|
|
+ }
|
|
|
+
|
|
|
+ if (!firstActive) {
|
|
|
+ delete params.status
|
|
|
+ } else {
|
|
|
+ delete params.isOverDue
|
|
|
+ }
|
|
|
+
|
|
|
+ if (!secondActive) {
|
|
|
+ delete params.isOverDue
|
|
|
+ } else {
|
|
|
+ params.isOverDue = 1
|
|
|
+ }
|
|
|
+
|
|
|
+ // if (index < 2 && subIndex < 1) {
|
|
|
+ // delete params.isOverDue
|
|
|
+ // }
|
|
|
+ delete params.pageTotal
|
|
|
+ const res = await dataMarketQualityGetImproveList(params)
|
|
|
+ if (res.code === 200) {
|
|
|
+ this.tableList = res.data.result
|
|
|
+ paging.pageTotal = res.data.total
|
|
|
+ this.paging = { ...paging }
|
|
|
+ this.loading = false
|
|
|
+ }
|
|
|
+ },
|
|
|
// 获取需求
|
|
|
async getRequirementList() {
|
|
|
const paging = this.paging
|
|
|
@@ -841,7 +947,7 @@ export default {
|
|
|
paging.pageTotal = this.tableListOld.length
|
|
|
paging.pageTotal = this.sourceData[0].IdList.length
|
|
|
this.paging = { ...paging }
|
|
|
- console.log(847, this.paging)
|
|
|
+ // console.log(847, this.paging)
|
|
|
this.loading = false
|
|
|
}
|
|
|
},
|
|
|
@@ -963,7 +1069,7 @@ export default {
|
|
|
this.tableHeight = 'calc(100vh - 136px)'
|
|
|
}
|
|
|
if (this.headerTitle === '质量' && this.title.search(/新增缺陷|reopen/) < 0 && !this.drawerData.moduleName) {
|
|
|
- this.tableHeight = 'calc(100vh - 136px)'
|
|
|
+ this.tableHeight = this.title === '改进项' ? 'calc(100vh - 300px)' : 'calc(100vh - 136px)'
|
|
|
}
|
|
|
if (this.headerTitle === '吞吐量') {
|
|
|
this.tableHeight = 'calc(100vh - 288px)'
|
|
|
@@ -1038,7 +1144,7 @@ export default {
|
|
|
isTimeLine(index = 1) {
|
|
|
// 是第一条
|
|
|
if (index === 1) {
|
|
|
- if (this.headerTitle.search(/质量/) > -1 && this.title.search(/新增缺陷|reopen/) > -1) {
|
|
|
+ if (this.headerTitle.search(/质量/) > -1 && this.title.search(/新增缺陷|reopen|改进项/) > -1) {
|
|
|
return true
|
|
|
}
|
|
|
if (this.drawerData.moduleName && this.drawerData.moduleName === '上线过程') {
|
|
|
@@ -1047,7 +1153,7 @@ export default {
|
|
|
if (this.drawerData.moduleName && this.drawerData.moduleName === '回滚次数') {
|
|
|
return true
|
|
|
}
|
|
|
- console.log(1049, this.title, this.headerTitle)
|
|
|
+ // console.log(1049, this.title, this.headerTitle)
|
|
|
if (this.headerTitle.search(/效率/) > -1 && this.title.search(/需求周期|任务周期|需求人力|任务人力/) > -1) {
|
|
|
return false
|
|
|
}
|
|
|
@@ -1055,7 +1161,7 @@ export default {
|
|
|
}
|
|
|
// 是第二条
|
|
|
if (index === 2) {
|
|
|
- return this.title.search(/缺陷24小时修复率/) > -1
|
|
|
+ return this.title.search(/缺陷24小时修复率|改进项/) > -1
|
|
|
}
|
|
|
}
|
|
|
}
|
洪海涛