From c0f6a47da49d06b0da397f0dd9a21702191dd7b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= Date: Wed, 12 Jul 2023 18:05:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=9E=E4=BD=93=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E5=90=9E=E5=90=90=E9=87=8F=E6=95=B0=E5=80=BC=E4=B8=BA?= =?UTF-8?q?0=E5=B1=95=E7=A4=BA=E4=BB=A5=E5=8F=8A=E5=B1=95=E5=BC=80?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=B8=BA'-'=E6=97=B6=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/entityExplorer/entityList/Row.vue | 6 ++---- .../entityList/detailOverview/App.vue | 16 ++++++++++++---- .../entityList/detailOverview/Domain.vue | 16 ++++++++++++---- .../entityList/detailOverview/Ip.vue | 16 ++++++++++++---- 4 files changed, 38 insertions(+), 16 deletions(-) diff --git a/src/views/entityExplorer/entityList/Row.vue b/src/views/entityExplorer/entityList/Row.vue index bacf6d49..51084735 100644 --- a/src/views/entityExplorer/entityList/Row.vue +++ b/src/views/entityExplorer/entityList/Row.vue @@ -80,7 +80,7 @@ {{ $t('entities.sentThroughput') }} :   {{ - entityData.bytesSentRate ? unitConvert(entityData.bytesSentRate, unitTypes.byte).join(' ') + 'ps' : '-' + unitConvert(entityData.bytesSentRate, unitTypes.byte).join(' ') !=='- ' ? unitConvert(entityData.bytesSentRate, unitTypes.byte).join(' ') + 'ps' : '-' }} @@ -110,9 +110,7 @@ {{ $t('entities.receivedThroughput') }} :   - {{ - entityData.bytesReceivedRate ? unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ') + 'ps' : '-' - }} + {{ unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ') + 'ps' : '-' }}
diff --git a/src/views/entityExplorer/entityList/detailOverview/App.vue b/src/views/entityExplorer/entityList/detailOverview/App.vue index ce3be78d..26d7aa24 100644 --- a/src/views/entityExplorer/entityList/detailOverview/App.vue +++ b/src/views/entityExplorer/entityList/detailOverview/App.vue @@ -30,24 +30,32 @@
{{$t('overall.peak')}}
-
{{unitConvert(entityData.max, unitTypes.byte).join(' ')}}/s
+
+ {{unitConvert(entityData.max, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.max, unitTypes.byte).join(' ') + '/s' : '-'}} +
{{$t('overall.mean')}}
-
{{unitConvert(entityData.avg, unitTypes.byte).join(' ')}}/s
+
+ {{unitConvert(entityData.avg, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.avg, unitTypes.byte).join(' ') + '/s' : '-'}} +
{{$t('overall.throughput')}}
-
{{$t('overall.sent')}}:{{unitConvert(entityData.bytesSentRate, unitTypes.byte).join(' ')}}ps
+
{{$t('overall.sent')}}: + {{unitConvert(entityData.bytesSentRate, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ') + 'ps' : '-'}} +
-
{{$t('overall.received')}}:{{unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ')}}ps
+
{{$t('overall.received')}}: + {{unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ')}}ps +
diff --git a/src/views/entityExplorer/entityList/detailOverview/Domain.vue b/src/views/entityExplorer/entityList/detailOverview/Domain.vue index f21977c4..f8890906 100644 --- a/src/views/entityExplorer/entityList/detailOverview/Domain.vue +++ b/src/views/entityExplorer/entityList/detailOverview/Domain.vue @@ -38,24 +38,32 @@
{{$t('overall.peak')}}
-
{{unitConvert(entityData.max, unitTypes.byte).join(' ')}}/s
+
+ {{unitConvert(entityData.max, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.max, unitTypes.byte).join(' ') + '/s' : '-'}} +
{{$t('overall.mean')}}
-
{{unitConvert(entityData.avg, unitTypes.byte).join(' ')}}/s
+
+ {{unitConvert(entityData.avg, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.avg, unitTypes.byte).join(' ') + '/s' : '-'}} +
{{$t('overall.throughput')}}
-
{{$t('overall.sent')}}:{{unitConvert(entityData.bytesSentRate, unitTypes.byte).join(' ')}}ps
+
{{$t('overall.sent')}}: + {{unitConvert(entityData.bytesSentRate, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ') + 'ps' : '-'}} +
{
-
{{$t('overall.received')}}:{{unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ')}}ps
+
{{$t('overall.received')}}: + {{unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ') + 'ps' : '-'}} +
diff --git a/src/views/entityExplorer/entityList/detailOverview/Ip.vue b/src/views/entityExplorer/entityList/detailOverview/Ip.vue index 79d5ec23..0f8e862f 100644 --- a/src/views/entityExplorer/entityList/detailOverview/Ip.vue +++ b/src/views/entityExplorer/entityList/detailOverview/Ip.vue @@ -61,24 +61,32 @@
{{$t('overall.peak')}}
-
{{unitConvert(entityData.max, unitTypes.byte).join(' ')}}/s
+
+ {{unitConvert(entityData.max, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.max, unitTypes.byte).join(' ') + '/s' : '-'}} +
{{$t('overall.mean')}}
-
{{unitConvert(entityData.avg, unitTypes.byte).join(' ')}}/s
+
+ {{unitConvert(entityData.avg, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.avg, unitTypes.byte).join(' ') + '/s' : '-'}} +
{{$t('overall.throughput')}}
-
{{$t('overall.sent')}}:{{unitConvert(entityData.bytesSentRate, unitTypes.byte).join(' ')}}ps
+
{{$t('overall.sent')}}: + {{unitConvert(entityData.bytesSentRate, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ') + 'ps' : '-'}} +
-
{{$t('overall.received')}}:{{unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ')}}ps
+
{{$t('overall.received')}}: + {{unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ') + 'ps' : '-'}} +