summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzyh <[email protected]>2024-03-28 10:19:53 +0800
committerzyh <[email protected]>2024-03-28 10:19:53 +0800
commit9963bc4c12532468c1fcc03bee07b3458732c534 (patch)
tree8c3bbc42c255c2558ef6961beeb3665c7a68e778
parent3cb3c98551a59955cb03eb3721bf939b479ed81e (diff)
NEZ-3431 fix: 时序图表 未采集到数据时 显示与配置不符rel-24.01.11
-rw-r--r--nezha-fronted/src/components/chart/chart/uplot/chartTimeSeriesMixin.js1
-rw-r--r--nezha-fronted/src/components/chart/chartDetailNew.vue3
2 files changed, 3 insertions, 1 deletions
diff --git a/nezha-fronted/src/components/chart/chart/uplot/chartTimeSeriesMixin.js b/nezha-fronted/src/components/chart/chart/uplot/chartTimeSeriesMixin.js
index ac7f6efa5..9896a11b7 100644
--- a/nezha-fronted/src/components/chart/chart/uplot/chartTimeSeriesMixin.js
+++ b/nezha-fronted/src/components/chart/chart/uplot/chartTimeSeriesMixin.js
@@ -151,6 +151,7 @@ export default {
// 设置图表颜色
const chartType = item.yAxisIndex == 1 ? lodash.get(this.chartInfo, 'param.rightYAxis.style', 'line') : this.chartInfo.type
item.stroke = color
+ item.spanGaps = this.chartInfo.param.nullType != 'null'
if (chartType === 'area') {
// 使用 tinycolor 转换为十六进制
const hexColor = tinycolor(color).toHexString()
diff --git a/nezha-fronted/src/components/chart/chartDetailNew.vue b/nezha-fronted/src/components/chart/chartDetailNew.vue
index 40f96c7eb..d2b452425 100644
--- a/nezha-fronted/src/components/chart/chartDetailNew.vue
+++ b/nezha-fronted/src/components/chart/chartDetailNew.vue
@@ -39,7 +39,8 @@
<div class="asset-info-collapse">
<i class="nz-icon nz-icon-cpu"></i>
<span>{{$t('asset.cpu')}}</span>
- <span>{{chartDetail.feature.cpu.name}} * {{chartDetail.feature.cpu.physicalPackageCount}}</span>
+ <span>{{chartDetail.feature.cpu.name}}</span>
+ <span v-if="chartDetail.feature.cpu.physicalPackageCount>1">* {{chartDetail.feature.cpu.physicalPackageCount}}</span>
</div>
</template>
<div class="asset-info-list">