diff --git a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue index e247619c8..39da13cb5 100644 --- a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue +++ b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue @@ -133,9 +133,14 @@ export default { }) minTime = timeSorted.length ? timeSorted[0][0] : '' maxTime = timeSorted.length ? timeSorted[timeSorted.length - 1][0] : '' - minValue = valueSorted.length ? valueSorted[0][1] : '' - maxValue = valueSorted.length ? valueSorted[valueSorted.length - 1][1] : '' + minValue = valueSorted.length ? valueSorted[0][1] : 0 + maxValue = valueSorted.length ? valueSorted[valueSorted.length - 1][1] : 0 const unit = chartDataFormat.getUnit(chartUnit) + if (!isNaN(maxValue)) { + maxValue = Number(maxValue) + } else { + maxValue = 0 + } maxValue = chartDataFormat.formatDatas(maxValue, unit.type, 'ceil', unit.ascii) // 取最大值后 需要对其进行取整 let oldValue = maxValue let dot = 0 @@ -154,7 +159,8 @@ export default { maxValue = Math.floor(oldValue) / Math.pow(10, dot) dot++ } - const copies = chartDataFormat.copies(oldValue, unit.type) + console.log(oldValue) + const copies = chartDataFormat.copies(Number(oldValue), unit.type) return { minTime, maxTime, minValue, maxValue, copies, unit, dot } }, xAxisLabelFormatter (minTime, maxTime) { diff --git a/nezha-fronted/src/components/charts/chartDataFormat.js b/nezha-fronted/src/components/charts/chartDataFormat.js index 9d307364b..a380cc174 100644 --- a/nezha-fronted/src/components/charts/chartDataFormat.js +++ b/nezha-fronted/src/components/charts/chartDataFormat.js @@ -790,6 +790,9 @@ export default { } }, Interval: function (value, copies, type, interValType) { + if (!copies) { + copies = 1 + } if (interValType === 'max' && value < 1) { if (value < 1) { value = 1 diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue index 98cec42fa..f68914d65 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTabNew.vue @@ -23,7 +23,7 @@ id="asset-list" :params="filter" :params-type="paramsType" - :permissions="{import: 'main_add', export: 'panel_edit'}" + :permissions="{import: 'main_add', export: 'main_edit'}" class="top-tool-export margin-r-10" export-file-name="asset-charts" export-url="visual/panel/export" @@ -60,8 +60,8 @@ :showLock="from === fromRoute.endpoint" class="top-tool-export margin-r-10" export-file-name="endpoint-charts" - export-url="visual/panel/export" - import-url="visual/panel/import" + :export-url="'visual/panel/export'" + :import-url="'visual/panel/import'" @afterImport="getTableData" @panelLockChange="panelLockChange" > diff --git a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue index 84829587e..e0cefbae5 100644 --- a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue +++ b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue @@ -13,7 +13,7 @@