|
|
@@ -4,7 +4,7 @@
|
|
|
<el-header class="header">
|
|
|
<el-menu :default-active="activeIndex" active-text-color="#409EFF" mode="horizontal" @select="handleSelect">
|
|
|
<el-menu-item index="0">业务线数据</el-menu-item>
|
|
|
- <el-menu-item index="2">部门数据</el-menu-item>
|
|
|
+ <el-menu-item index="3">部门数据</el-menu-item>
|
|
|
</el-menu>
|
|
|
<el-date-picker
|
|
|
v-model="timeInterval"
|
|
|
@@ -13,11 +13,12 @@
|
|
|
start-placeholder="开始日期"
|
|
|
end-placeholder="结束日期"
|
|
|
value-format="timestamp"
|
|
|
+ @change="dataSearch"
|
|
|
/>
|
|
|
</el-header>
|
|
|
<el-container style="height:calc(100vh - 140px);">
|
|
|
<el-aside class="aside">
|
|
|
- <el-tree ref="treeBox" :data="dealWithBusinessDate" :expand-on-click-node="false" node-key="id" highlight-current :props="defaultProps" style="margin-top:20px" @node-click="handleNodeClick" />
|
|
|
+ <el-tree ref="treeBox" :data="dealWithBusinessDate" node-key="id" highlight-current :props="defaultProps" style="margin-top:20px" @node-click="handleNodeClick" />
|
|
|
</el-aside>
|
|
|
<el-main class="combine-table">
|
|
|
<el-menu :default-active="activeIndexSecondary" active-text-color="#409EFF" mode="horizontal" @select="handleSelectSecondary">
|
|
|
@@ -37,14 +38,14 @@
|
|
|
style="width:50%;"
|
|
|
align="center"
|
|
|
>
|
|
|
- <template slot-scope="scope"><a href="javascript:void(0)" style="color:#20a0ff" @click="toReportView(0)">{{ scope.row.totalOnlineNum }}</a></template>
|
|
|
+ <template slot-scope="scope"><a href="javascript:void(0)" style="color:#20a0ff" @click="toReportView('0')">{{ scope.row.totalOnlineNum }}</a></template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
label="免提测上线数"
|
|
|
style="width:50%;"
|
|
|
align="center"
|
|
|
>
|
|
|
- <template slot-scope="scope"><a href="javascript:void(0)" style="color:#20a0ff" @click="toReportView(1)">{{ scope.row.noTestNum }}</a></template>
|
|
|
+ <template slot-scope="scope"><a href="javascript:void(0)" style="color:#20a0ff" @click="toReportView('1')">{{ scope.row.noTestNum }}</a></template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
<el-table
|
|
|
@@ -64,7 +65,7 @@
|
|
|
style="width:20%;"
|
|
|
align="center"
|
|
|
>
|
|
|
- <template slot-scope="scope"><a href="javascript:void(0)" style="color:#20a0ff" @click="toReportView(2)">{{ scope.row.rollbackNum }}</a></template>
|
|
|
+ <template slot-scope="scope"><a href="javascript:void(0)" style="color:#20a0ff" @click="toReportView('2')">{{ scope.row.rollbackNum }}</a></template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="name"
|
|
|
@@ -77,21 +78,21 @@
|
|
|
style="width:20%;"
|
|
|
align="center"
|
|
|
>
|
|
|
- <template slot-scope="scope"><a href="javascript:void(0)" style="color:#20a0ff" @click="toReportView(3)">{{ scope.row.preRollbackNum }}</a></template>
|
|
|
+ <template slot-scope="scope"><a href="javascript:void(0)" style="color:#20a0ff" @click="toReportView('3')">{{ scope.row.preRollbackNum }}</a></template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
label="小流量回滚数"
|
|
|
style="width:20%;"
|
|
|
align="center"
|
|
|
>
|
|
|
- <template slot-scope="scope"><a href="javascript:void(0)" style="color:#20a0ff" @click="toReportView(4)">{{ scope.row.preLess5Min }}</a></template>
|
|
|
+ <template slot-scope="scope"><a href="javascript:void(0)" style="color:#20a0ff" @click="toReportView('4')">{{ scope.row.preLess5Min }}</a></template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
label="全量回滚数"
|
|
|
style="width:20%;"
|
|
|
align="center"
|
|
|
>
|
|
|
- <template slot-scope="scope"><a href="javascript:void(0)" style="color:#20a0ff" @click="toReportView(5)">{{ scope.row.allRollbackNum }}</a></template>
|
|
|
+ <template slot-scope="scope"><a href="javascript:void(0)" style="color:#20a0ff" @click="toReportView('5')">{{ scope.row.allRollbackNum }}</a></template>
|
|
|
</el-table-column>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
@@ -298,10 +299,11 @@
|
|
|
size="mini"
|
|
|
>
|
|
|
<el-table-column
|
|
|
- prop="totalBugNum"
|
|
|
label="提报bug数"
|
|
|
align="center"
|
|
|
- />
|
|
|
+ >
|
|
|
+ <template slot-scope="scope"><a href="javascript:void(0)" style="color:#20a0ff" @click="toDefectView()">{{ scope.row.totalBugNum }}</a></template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column
|
|
|
label="缺陷分级"
|
|
|
align="center"
|
|
|
@@ -402,8 +404,8 @@ import { getBusiness, getDepartment, getOnlineProblem, getOnlineAllCount, getOnl
|
|
|
export default {
|
|
|
filters: {
|
|
|
toPercent(value) {
|
|
|
- if (value === 0) {
|
|
|
- return 0
|
|
|
+ if (!value) {
|
|
|
+ return
|
|
|
} else {
|
|
|
return Number(value * 100).toFixed(2) + '%'
|
|
|
}
|
|
|
@@ -422,11 +424,11 @@ export default {
|
|
|
loadingOnlineProcess: true,
|
|
|
activeIndex: '0',
|
|
|
activeIndexSecondary: '3',
|
|
|
- timeInterval: '',
|
|
|
+ // timeInterval: '',
|
|
|
pauseTreeNode: {},
|
|
|
pauseKey: '',
|
|
|
- dealWithBusinessDate: []
|
|
|
- // timeInterval: [new Date().getTime() - 15 * 24 * 60 * 60 * 1000, new Date().getTime()]
|
|
|
+ dealWithBusinessDate: [],
|
|
|
+ timeInterval: [new Date().getTime() - 365 * 24 * 60 * 60 * 1000, new Date().getTime()]
|
|
|
}
|
|
|
},
|
|
|
created() {
|
|
|
@@ -438,10 +440,10 @@ export default {
|
|
|
this.loadingOnlineProcess = true
|
|
|
await getBusiness().then(res => {
|
|
|
this.businessData = res.code === 0 ? res.data : ''
|
|
|
- const processFunc = (arr) => { // models和child
|
|
|
+ const processFunc = (arr) => { // modules和child
|
|
|
arr.forEach((each) => {
|
|
|
- if (each.models.length !== 0) {
|
|
|
- each.child = each.models
|
|
|
+ if (each.modules) {
|
|
|
+ each.child = each.modules
|
|
|
} else {
|
|
|
each.child = processFunc(each.child)
|
|
|
}
|
|
|
@@ -461,9 +463,18 @@ export default {
|
|
|
await getDepartment().then(res => {
|
|
|
this.dealWithBusinessDate = res.code === 0 ? res.data : ''
|
|
|
this.pauseTreeNode = this.dealWithBusinessDate[0] ? this.dealWithBusinessDate[0] : ''
|
|
|
- this.pauseKey = 2
|
|
|
+ this.pauseKey = 3
|
|
|
})
|
|
|
- this.allCountAndProlemGet()
|
|
|
+ this.deleteAfter()
|
|
|
+ },
|
|
|
+ deleteAfter() {
|
|
|
+ const pretermitSearch = { id: this.pauseTreeNode.id, type: this.pauseKey, startTime: this.timeInterval[0], endTime: this.timeInterval[1] }
|
|
|
+ axios.all([getOnlineAllCount(pretermitSearch), getOnlineProblem({ id: this.pauseTreeNode.id })]).then(axios.spread((resAllCount, resProblem) => {
|
|
|
+ this.onlineProcess = resAllCount.code === 0 ? resAllCount.data : ''
|
|
|
+ this.problemData = resProblem.code === 0 ? resProblem.data : ''
|
|
|
+ // Object.assign(this.onlineProcess, this.toPercent([this.onlineProcess.allRollbackPercent, this.onlineProcess.preLess5MinPercent, this.onlineProcess.preRollbackPercent, this.onlineProcess.rollbackPercent, this.onlineProcess.noTestPercent]))
|
|
|
+ this.loadingOnlineProcess = false
|
|
|
+ }))
|
|
|
},
|
|
|
allCountAndProlemGet() {
|
|
|
const pretermitSearch = { id: this.pauseTreeNode.id, type: this.pauseKey, startTime: this.timeInterval[0], endTime: this.timeInterval[1] }
|
|
|
@@ -475,11 +486,18 @@ export default {
|
|
|
this.loadingOnlineProcess = false
|
|
|
}))
|
|
|
},
|
|
|
+ dataSearch() {
|
|
|
+ if (this.pauseKey === 0) {
|
|
|
+ this._initBusinessTreeAndBeginInfo()
|
|
|
+ } else if (this.pauseKey === 3) {
|
|
|
+ this.initDepartmentTree()
|
|
|
+ }
|
|
|
+ },
|
|
|
handleSelect(key) {
|
|
|
if (key === '0') {
|
|
|
this.pauseKey = key
|
|
|
this._initBusinessTreeAndBeginInfo()
|
|
|
- } else if (key === '2') {
|
|
|
+ } else if (key === '3') {
|
|
|
this.pauseKey = key
|
|
|
this.initDepartmentTree()
|
|
|
} else {
|
|
|
@@ -489,17 +507,19 @@ export default {
|
|
|
toReportView(e) {
|
|
|
this.$router.push({ name: '上线过程', query: { id: this.pauseTreeNode.id, type: this.pauseKey, dataType: e, startTime: this.timeInterval[0], endTime: this.timeInterval[1] }})
|
|
|
},
|
|
|
+ toDefectView() {
|
|
|
+ this.$router.push({ name: '上线过程', query: { id: this.pauseTreeNode.id, type: this.pauseKey, startTime: this.timeInterval[0], endTime: this.timeInterval[1] }})
|
|
|
+ },
|
|
|
handleSelectSecondary(key) {
|
|
|
console.log(key)
|
|
|
},
|
|
|
handleNodeClick(data) {
|
|
|
this.loadingOnlineProcess = true
|
|
|
this.pauseTreeNode = data
|
|
|
- if (!this.pauseTreeNode.child) {
|
|
|
- this.pauseKey = 1
|
|
|
- }
|
|
|
- if (this.pauseTreeNode.models) {
|
|
|
- this.pauseKey = 0
|
|
|
+ this.pauseKey = data.type
|
|
|
+ if (this.pauseKey === 3) {
|
|
|
+ this.deleteAfter()
|
|
|
+ return
|
|
|
}
|
|
|
this.allCountAndProlemGet()
|
|
|
},
|
|
|
@@ -560,7 +580,7 @@ export default {
|
|
|
.combine-table >>> .is-active
|
|
|
font-weight bold
|
|
|
.combine-table >>> th
|
|
|
- background-color #F0F7FF !important
|
|
|
+ background-color #F1F4F7 !important
|
|
|
font-size 10px
|
|
|
.combine-table >>> .move-border-top
|
|
|
border-top 0px
|
panxiandiao_i