From 8d9703c62cc5491627d6edcee0999feaeb5ba9c6 Mon Sep 17 00:00:00 2001 From: wangwenrui Date: Fri, 29 May 2020 15:21:04 +0800 Subject: [PATCH 1/4] =?UTF-8?q?perf:model=20=E9=A1=B5=E9=9D=A2url=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8=E9=BB=98=E8=AE=A4=E6=98=BE=E7=A4=BA=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/charts/chart-alert-list.vue | 57 ----------------- .../src/components/charts/chart-list.vue | 14 ++-- .../src/components/charts/chart-url.scss | 13 +++- .../src/components/charts/chart-url.vue | 64 ++++++++++++++++--- .../src/components/common/language/cn.js | 3 +- .../src/components/common/language/en.js | 3 +- .../components/page/dashboard/chartBox.vue | 4 ++ 7 files changed, 86 insertions(+), 72 deletions(-) diff --git a/nezha-fronted/src/components/charts/chart-alert-list.vue b/nezha-fronted/src/components/charts/chart-alert-list.vue index d571f636d..860e9aba3 100644 --- a/nezha-fronted/src/components/charts/chart-alert-list.vue +++ b/nezha-fronted/src/components/charts/chart-alert-list.vue @@ -1042,64 +1042,7 @@ export default { }, // 设置数据, filter区分 setData(chartItem, seriesItem, panelId, filter,area,errorMsg) { - if(errorMsg && errorMsg!==''){ - this.isError = true; - this.errorContent = errorMsg; - }else { - this.isError = false; - this.errorContent = ''; - } - if(area==='showFullScreen'){//全屏按时间查询 - this.data = chartItem; - this.unit = chartDataFormat.getUnit(this.data.unit); - this.searchTime[0] = filter.start_time;//将列表的查询时间复制给全屏的查询时间 - this.searchTime[1] = filter.end_time; - // this.seriesItemScreen = seriesItem; - this.storedScreanTableData=seriesItem; - this.storedScreanTableData=Object.assign([],this.storedScreanTableData.reverse()); - this.screenPageObj.total=this.storedScreanTableData.length; - this.seriesItemScreen=this.filterShowData(this.storedScreanTableData,this.screenPageObj); - this.endLoading('screen'); - }else{ - //设置高度 chart-table - this.$nextTick(() => { - const chartBox = document.getElementById('chartTableDiv'+this.chartIndex); - let height = Math.round(chartItem.height/10)*10;//图表高度四舍五入 - if(height