fix: 实体列表的吞吐量数值为0展示以及展开详情为'-'时去除单位

This commit is contained in:
刘洪洪
2023-07-12 18:05:47 +08:00
parent 7b4070f06a
commit c0f6a47da4
4 changed files with 38 additions and 16 deletions

View File

@@ -80,7 +80,7 @@
<span class="row-item-label">{{ $t('entities.sentThroughput') }}&nbsp;:&nbsp;&nbsp;</span> <span class="row-item-label">{{ $t('entities.sentThroughput') }}&nbsp;:&nbsp;&nbsp;</span>
<span class="row-item-value"> <span class="row-item-value">
{{ {{
entityData.bytesSentRate ? unitConvert(entityData.bytesSentRate, unitTypes.byte).join(' ') + 'ps' : '-' unitConvert(entityData.bytesSentRate, unitTypes.byte).join(' ') !=='- ' ? unitConvert(entityData.bytesSentRate, unitTypes.byte).join(' ') + 'ps' : '-'
}} }}
</span> </span>
<!-- 曲线--> <!-- 曲线-->
@@ -110,9 +110,7 @@
<i class="cn-icon cn-icon-fall"></i> <i class="cn-icon cn-icon-fall"></i>
<span class="row-item-label">{{ $t('entities.receivedThroughput') }}&nbsp;:&nbsp;&nbsp;</span> <span class="row-item-label">{{ $t('entities.receivedThroughput') }}&nbsp;:&nbsp;&nbsp;</span>
<span class="row-item-value"> <span class="row-item-value">
{{ {{ unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ') + 'ps' : '-' }}
entityData.bytesReceivedRate ? unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ') + 'ps' : '-'
}}
</span> </span>
<div class="item-box-loading"> <div class="item-box-loading">
<loading :loading="loading" size="small"></loading> <loading :loading="loading" size="small"></loading>

View File

@@ -30,24 +30,32 @@
<loading :loading="loadingTraffic" size="small" inner-style="left: 8.75rem;" style="width: 50%;"></loading> <loading :loading="loadingTraffic" size="small" inner-style="left: 8.75rem;" style="width: 50%;"></loading>
<div class="overview__row"> <div class="overview__row">
<div class="row__label row__label--width130">{{$t('overall.peak')}}</div> <div class="row__label row__label--width130">{{$t('overall.peak')}}</div>
<div class="row__content">{{unitConvert(entityData.max, unitTypes.byte).join(' ')}}/s</div> <div class="row__content">
{{unitConvert(entityData.max, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.max, unitTypes.byte).join(' ') + '/s' : '-'}}
</div>
</div> </div>
<div class="overview__row"> <div class="overview__row">
<div class="row__label row__label--width130">{{$t('overall.mean')}}</div> <div class="row__label row__label--width130">{{$t('overall.mean')}}</div>
<div class="row__content">{{unitConvert(entityData.avg, unitTypes.byte).join(' ')}}/s</div> <div class="row__content">
{{unitConvert(entityData.avg, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.avg, unitTypes.byte).join(' ') + '/s' : '-'}}
</div>
</div> </div>
<div class="overview__row"> <div class="overview__row">
<div class="row__label row__label--width130">{{$t('overall.throughput')}}</div> <div class="row__label row__label--width130">{{$t('overall.throughput')}}</div>
<div class="row__contents"> <div class="row__contents">
<div class="row__content"> <div class="row__content">
<div class="row__charts-msg">{{$t('overall.sent')}}{{unitConvert(entityData.bytesSentRate, unitTypes.byte).join(' ')}}ps</div> <div class="row__charts-msg">{{$t('overall.sent')}}
{{unitConvert(entityData.bytesSentRate, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ') + 'ps' : '-'}}
</div>
<!-- 曲线--> <!-- 曲线-->
<div class="row__content-loading"> <div class="row__content-loading">
<div class="row__charts" :id="`entityDetailSend${entity.entityValue}`" ></div> <div class="row__charts" :id="`entityDetailSend${entity.entityValue}`" ></div>
</div> </div>
</div> </div>
<div class="row__content row__content-accept"> <div class="row__content row__content-accept">
<div class="row__charts-msg">{{$t('overall.received')}}{{unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ')}}ps</div> <div class="row__charts-msg">{{$t('overall.received')}}
{{unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ')}}ps
</div>
<!-- 曲线--> <!-- 曲线-->
<div class="row__content-loading"> <div class="row__content-loading">
<div class="row__charts" :id="`entityDetailReceived${entity.entityValue}`" ></div> <div class="row__charts" :id="`entityDetailReceived${entity.entityValue}`" ></div>

View File

@@ -38,24 +38,32 @@
<loading :loading="loadingTraffic" size="small" inner-style="left: 8.75rem;" style="width: 50%;"></loading> <loading :loading="loadingTraffic" size="small" inner-style="left: 8.75rem;" style="width: 50%;"></loading>
<div class="overview__row"> <div class="overview__row">
<div class="row__label row__label--width130">{{$t('overall.peak')}}</div> <div class="row__label row__label--width130">{{$t('overall.peak')}}</div>
<div class="row__content">{{unitConvert(entityData.max, unitTypes.byte).join(' ')}}/s</div> <div class="row__content">
{{unitConvert(entityData.max, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.max, unitTypes.byte).join(' ') + '/s' : '-'}}
</div>
</div> </div>
<div class="overview__row"> <div class="overview__row">
<div class="row__label row__label--width130">{{$t('overall.mean')}}</div> <div class="row__label row__label--width130">{{$t('overall.mean')}}</div>
<div class="row__content">{{unitConvert(entityData.avg, unitTypes.byte).join(' ')}}/s</div> <div class="row__content">
{{unitConvert(entityData.avg, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.avg, unitTypes.byte).join(' ') + '/s' : '-'}}
</div>
</div> </div>
<div class="overview__row"> <div class="overview__row">
<div class="row__label row__label--width130">{{$t('overall.throughput')}}</div> <div class="row__label row__label--width130">{{$t('overall.throughput')}}</div>
<div class="row__contents"> <div class="row__contents">
<div class="row__content"> <div class="row__content">
<div class="row__charts-msg">{{$t('overall.sent')}}{{unitConvert(entityData.bytesSentRate, unitTypes.byte).join(' ')}}ps</div> <div class="row__charts-msg">{{$t('overall.sent')}}
{{unitConvert(entityData.bytesSentRate, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ') + 'ps' : '-'}}
</div>
<!-- 曲线--> <!-- 曲线-->
<div class="row__content-loading"> <div class="row__content-loading">
<div class="row__charts" :id="`entityDetailSend${entity.entityValue}`" >{</div> <div class="row__charts" :id="`entityDetailSend${entity.entityValue}`" >{</div>
</div> </div>
</div> </div>
<div class="row__content row__content-accept"> <div class="row__content row__content-accept">
<div class="row__charts-msg">{{$t('overall.received')}}{{unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ')}}ps</div> <div class="row__charts-msg">{{$t('overall.received')}}
{{unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ') + 'ps' : '-'}}
</div>
<!-- 曲线--> <!-- 曲线-->
<div class="row__content-loading"> <div class="row__content-loading">
<div class="row__charts" :id="`entityDetailReceived${entity.entityValue}`" ></div> <div class="row__charts" :id="`entityDetailReceived${entity.entityValue}`" ></div>

View File

@@ -61,24 +61,32 @@
<loading :loading="loadingTraffic" size="small" inner-style="left: 8.75rem;" style="width: 50%;"></loading> <loading :loading="loadingTraffic" size="small" inner-style="left: 8.75rem;" style="width: 50%;"></loading>
<div class="overview__row"> <div class="overview__row">
<div class="row__label row__label--width130">{{$t('overall.peak')}}</div> <div class="row__label row__label--width130">{{$t('overall.peak')}}</div>
<div class="row__content">{{unitConvert(entityData.max, unitTypes.byte).join(' ')}}/s</div> <div class="row__content">
{{unitConvert(entityData.max, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.max, unitTypes.byte).join(' ') + '/s' : '-'}}
</div>
</div> </div>
<div class="overview__row"> <div class="overview__row">
<div class="row__label row__label--width130">{{$t('overall.mean')}}</div> <div class="row__label row__label--width130">{{$t('overall.mean')}}</div>
<div class="row__content">{{unitConvert(entityData.avg, unitTypes.byte).join(' ')}}/s</div> <div class="row__content">
{{unitConvert(entityData.avg, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.avg, unitTypes.byte).join(' ') + '/s' : '-'}}
</div>
</div> </div>
<div class="overview__row"> <div class="overview__row">
<div class="row__label row__label--width130">{{$t('overall.throughput')}}</div> <div class="row__label row__label--width130">{{$t('overall.throughput')}}</div>
<div class="row__contents"> <div class="row__contents">
<div class="row__content"> <div class="row__content">
<div class="row__charts-msg">{{$t('overall.sent')}}{{unitConvert(entityData.bytesSentRate, unitTypes.byte).join(' ')}}ps</div> <div class="row__charts-msg">{{$t('overall.sent')}}
{{unitConvert(entityData.bytesSentRate, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ') + 'ps' : '-'}}
</div>
<!-- 曲线--> <!-- 曲线-->
<div class="row__content-loading"> <div class="row__content-loading">
<div class="row__charts" :id="`entityDetailSend${entity.entityValue}`"></div> <div class="row__charts" :id="`entityDetailSend${entity.entityValue}`"></div>
</div> </div>
</div> </div>
<div class="row__content row__content-accept"> <div class="row__content row__content-accept">
<div class="row__charts-msg">{{$t('overall.received')}}{{unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ')}}ps</div> <div class="row__charts-msg">{{$t('overall.received')}}
{{unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ') !== '- ' ? unitConvert(entityData.bytesReceivedRate, unitTypes.byte).join(' ') + 'ps' : '-'}}
</div>
<!-- 曲线--> <!-- 曲线-->
<div class="row__content-loading"> <div class="row__content-loading">
<div class="row__charts" :id="`entityDetailReceived${entity.entityValue}`"></div> <div class="row__charts" :id="`entityDetailReceived${entity.entityValue}`"></div>