fix: 1.修复 no Data 问题;2.折线图字段修改;3.关联session展示问题

This commit is contained in:
@changcode
2022-08-22 19:54:41 +08:00
parent 5221c21159
commit ef73a68ac2
5 changed files with 7 additions and 13 deletions

View File

@@ -246,6 +246,7 @@ export default {
} }
}, },
handleData (prevRequest, request, _t) { handleData (prevRequest, request, _t) {
this.toggleLoading(true)
Promise.all([prevRequest, request]).then(res => { Promise.all([prevRequest, request]).then(res => {
if (res[0].code === 200 && res[1].code === 200) { if (res[0].code === 200 && res[1].code === 200) {
const prevData = res[0].data.result const prevData = res[0].data.result

View File

@@ -171,13 +171,13 @@ export default {
mpackets[1].analysis = t.inboundBitsRate.analysis mpackets[1].analysis = t.inboundBitsRate.analysis
mpackets[2].analysis = t.outboundBitsRate.analysis mpackets[2].analysis = t.outboundBitsRate.analysis
mpackets[3].analysis = t.internalBitsRate.analysis mpackets[3].analysis = t.internalBitsRate.analysis
mpackets[4].analysis = t.externalBitsRate.analysis mpackets[4].analysis = t.throughBitsRate.analysis
mpackets[5].analysis = t.other.analysis mpackets[5].analysis = t.other.analysis
mpackets[0].data = t.totalBitsRate.values ? t.totalBitsRate.values : [] mpackets[0].data = t.totalBitsRate.values ? t.totalBitsRate.values : []
mpackets[1].data = t.inboundBitsRate.values ? t.inboundBitsRate.values : [] mpackets[1].data = t.inboundBitsRate.values ? t.inboundBitsRate.values : []
mpackets[2].data = t.outboundBitsRate.values ? t.outboundBitsRate.values : [] mpackets[2].data = t.outboundBitsRate.values ? t.outboundBitsRate.values : []
mpackets[3].data = t.internalBitsRate.values ? t.internalBitsRate.values : [] mpackets[3].data = t.internalBitsRate.values ? t.internalBitsRate.values : []
mpackets[4].data = t.externalBitsRate.values ? t.externalBitsRate.values : [] mpackets[4].data = t.throughBitsRate.values ? t.throughBitsRate.values : []
mpackets[5].data = t.other.values ? t.other.values : [] mpackets[5].data = t.other.values ? t.other.values : []
mpackets.forEach(e => { mpackets.forEach(e => {
e.unitType = 'bps' e.unitType = 'bps'

View File

@@ -24,6 +24,7 @@
:header-cell-style="tableHeaderCellStyle" :header-cell-style="tableHeaderCellStyle"
class="tab-table" class="tab-table"
height="100%" height="100%"
empty-text=" "
> >
<template v-for="(item,index) in customTableTitles"> <template v-for="(item,index) in customTableTitles">
<el-table-column <el-table-column

View File

@@ -1,6 +1,5 @@
<template> <template>
<div class="npm-app"> <div class="npm-app">
<chart-no-data v-if="isNoData"></chart-no-data>
<div class="npm-app-left"> <div class="npm-app-left">
<div class="npm-app-letter"> <div class="npm-app-letter">
<div v-for="(letter, index) in colorPatchData" :key="index"> <div v-for="(letter, index) in colorPatchData" :key="index">
@@ -21,6 +20,7 @@
:data="tableData" :data="tableData"
class="app-table" class="app-table"
height="100%" height="100%"
empty-text=" "
> >
<template v-for="(item, index) in customTableTitles" :key="index"> <template v-for="(item, index) in customTableTitles" :key="index">
<el-table-column class="data-column"> <el-table-column class="data-column">
@@ -102,7 +102,6 @@ import { getSecond } from '@/utils/date-util'
import { get } from '@/utils/http' import { get } from '@/utils/http'
import { getChainRatio, computeScore } from '@/utils/tools' import { getChainRatio, computeScore } from '@/utils/tools'
import chartMixin from '@/views/charts2/chart-mixin' import chartMixin from '@/views/charts2/chart-mixin'
import ChartNoData from '@/views/charts/charts/ChartNoData'
export default { export default {
name: 'NpmAppCategoryScore', name: 'NpmAppCategoryScore',
data () { data () {
@@ -128,9 +127,6 @@ export default {
] ]
} }
}, },
components: {
ChartNoData
},
mixins: [chartMixin], mixins: [chartMixin],
methods: { methods: {
init (params) { init (params) {
@@ -143,12 +139,10 @@ export default {
// 获取table后三列内容 // 获取table后三列内容
const currentTrafficRequest = get(api.npm.overview.appTrafficAnalysis, { ...params, cycle: 0 }) const currentTrafficRequest = get(api.npm.overview.appTrafficAnalysis, { ...params, cycle: 0 })
const lastCycleTrafficRequest = get(api.npm.overview.appTrafficAnalysis, { ...params, cycle: 1 }) const lastCycleTrafficRequest = get(api.npm.overview.appTrafficAnalysis, { ...params, cycle: 1 })
this.toggleLoading(true)
Promise.all([currentTrafficRequest, lastCycleTrafficRequest]).then(res => { Promise.all([currentTrafficRequest, lastCycleTrafficRequest]).then(res => {
const prevData = res[1].data.result const prevData = res[1].data.result
const data = res[0].data.result const data = res[0].data.result
if (data && data.length > 0) { if (data && data.length > 0) {
this.isNoData = false
const tableData = data.map(d => { const tableData = data.map(d => {
const mapping = npmCategoryInfoMapping.find(mapping => mapping.appSubcategory === d.appSubcategory) const mapping = npmCategoryInfoMapping.find(mapping => mapping.appSubcategory === d.appSubcategory)
const result = { const result = {
@@ -199,8 +193,6 @@ export default {
}) })
this.tableData = tableData this.tableData = tableData
}) })
} else {
this.isNoData = true
} }
}).finally(() => { }).finally(() => {
this.toggleLoading(false) this.toggleLoading(false)

View File

@@ -62,8 +62,8 @@ export default {
get(api.npm.overview.relatedSessions, params).then(res => { get(api.npm.overview.relatedSessions, params).then(res => {
if (res.code === 200) { if (res.code === 200) {
this.sessionData = res.data.result this.sessionData = res.data.result
this.clientSessions = this.sessionData.clientSessions / (this.sessionData.clientSessions + this.sessionData.serverSessions) this.clientSessions = this.sessionData.clientSessions / (this.sessionData.clientSessions * 1 + this.sessionData.serverSessions * 1)
this.serverSessions = this.sessionData.serverSessions / (this.sessionData.clientSessions + this.sessionData.serverSessions) this.serverSessions = this.sessionData.serverSessions / (this.sessionData.clientSessions * 1 + this.sessionData.serverSessions * 1)
this.sessionData.clientSessions = unitConvert(this.clientSessions, unitTypes.percent).join('') this.sessionData.clientSessions = unitConvert(this.clientSessions, unitTypes.percent).join('')
this.sessionData.serverSessions = unitConvert(this.serverSessions, unitTypes.percent).join('') this.sessionData.serverSessions = unitConvert(this.serverSessions, unitTypes.percent).join('')
if (this.clientSessions === 1) { if (this.clientSessions === 1) {