diff --git a/src/utils/api.js b/src/utils/api.js index ac93c460..a999ff72 100644 --- a/src/utils/api.js +++ b/src/utils/api.js @@ -151,7 +151,14 @@ export const api = { httpResponseDelay: '/interface/application/performance/overview/httpResponseDelay', sslConDelay: '/interface/application/performance/overview/sslConDelay', tcpLostlenPercent: '/interface/application/performance/overview/tcpLostlenPercent', - packetRetransPercent: '/interface/application/performance/overview/packetRetransPercent' + packetRetransPercent: '/interface/application/performance/overview/packetRetransPercent', + // app类别评分 + appTrafficAnalysis: '/interface/application/performance/overview/appTrafficAnalysis', + appTcpSessionDelay: '/interface/application/performance/overview/appTcpSessionDelay', + appHttpResponseDelay: '/interface/application/performance/overview/appHttpResponseDelay', + appSslConDelay: '/interface/application/performance/overview/appSslConDelay', + appTcpLostlenPercent: '/interface/application/performance/overview/appTcpLostlenPercent', + appPacketRetransPercent: '/interface/application/performance/overview/appPacketRetransPercent' }, location: { diff --git a/src/utils/constants.js b/src/utils/constants.js index be9f8c3d..c404111e 100644 --- a/src/utils/constants.js +++ b/src/utils/constants.js @@ -370,6 +370,40 @@ export const dnsServerRole = { FWDNS: 'FWDNS' } +// npm页-应用评分-类别名称、icon、i18n映射 +export const npmCategoryInfoMapping = [ + { + appSubcategory: 'multimedia-streaming', + icon: 'cn-icon cn-icon-video', + i18n: 'network.video' + }, + { + appSubcategory: 'social-networking', + icon: 'cn-icon cn-icon-social-network', + i18n: 'network.socialNetwork' + }, + { + appSubcategory: 'file-sharing', + icon: 'cn-icon cn-icon-file-sharing', + i18n: 'network.fileSharing' + }, + { + appSubcategory: 'voip-video', + icon: 'cn-icon cn-icon-voip', + i18n: 'network.voip' + }, + { + appSubcategory: 'gaming', + icon: 'cn-icon cn-icon-gaming', + i18n: 'network.gaming' + }, + { + appSubcategory: 'email', + icon: 'cn-icon cn-icon-email', + i18n: 'network.email' + } +] + // 整屏滚动的路径映射 export const wholeScreenRouterMapping = { dns: '/panel/dnsServiceInsights' diff --git a/src/utils/tools.js b/src/utils/tools.js index 8f0b6183..ae13254b 100644 --- a/src/utils/tools.js +++ b/src/utils/tools.js @@ -754,3 +754,11 @@ export function scrollToTop (dom, toTop, duration, direction) { } window.requestAnimationFrame(step) } + +export function getChainRatio (current, prev) { + if (prev === 0) { + return '-' + } else { + return (current - prev) / prev + } +} diff --git a/src/views/charts2/charts/NetworkOverviewApps.vue b/src/views/charts2/charts/NetworkOverviewApps.vue index a69b4ac3..593340c5 100644 --- a/src/views/charts2/charts/NetworkOverviewApps.vue +++ b/src/views/charts2/charts/NetworkOverviewApps.vue @@ -202,7 +202,7 @@ export default { params = { startTime: getSecond(this.timeFilter.startTime), endTime: getSecond(this.timeFilter.endTime), - appLabels: providerCards.map(item => { + appCompanies: providerCards.map(item => { return item.name }).join(',') } @@ -213,11 +213,11 @@ export default { }, handleData (prevRequest, request, _t) { Promise.all([prevRequest, request]).then(res => { - // if (res[0].code === 200 && res[1].code === 200) { - if (true) { - // const prevData = res[0].data.result - // const data = res[1].data.result - let prevData + if (res[0].code === 200 && res[1].code === 200) { + // if (true) { + const prevData = res[0].data.result + const data = res[1].data.result + /*let prevData let data if (_t === 'app') { prevData = appPrevTestData @@ -225,7 +225,7 @@ export default { } else if (_t === 'provider') { prevData = providerPrevTestData data = providerTestData - } + }*/ let toCompareType = 'bytes' if (this.metricFilter === 'Sessions/s') { toCompareType = 'sessions' diff --git a/src/views/charts2/charts/NpmAppCategoryScore.vue b/src/views/charts2/charts/NpmAppCategoryScore.vue index f7482b90..68dd56fd 100644 --- a/src/views/charts2/charts/NpmAppCategoryScore.vue +++ b/src/views/charts2/charts/NpmAppCategoryScore.vue @@ -1,6 +1,6 @@ diff --git a/src/views/charts2/charts/NpmMap.vue b/src/views/charts2/charts/NpmMap.vue index 10274dd5..29e13fd3 100644 --- a/src/views/charts2/charts/NpmMap.vue +++ b/src/views/charts2/charts/NpmMap.vue @@ -40,7 +40,7 @@