diff --git a/nezha-fronted/src/components/charts/chart.scss b/nezha-fronted/src/components/charts/chart.scss index 7e8ffc318..30cca2458 100644 --- a/nezha-fronted/src/components/charts/chart.scss +++ b/nezha-fronted/src/components/charts/chart.scss @@ -53,6 +53,9 @@ cursor: pointer; } } +.nz-icon-warning{ + color: #e6a23c; +} .legend-container-screen.legend-container { max-height: 80px; min-height:25px; @@ -128,10 +131,10 @@ } .panel-info-corner--error .panel-info-corner-inner { - border-left: 28px solid #e02f44; - border-right: none; - border-bottom: 28px solid rgba(0,0,0,0); -} + border-left: 28px solid #e02f44; + border-right: none; + border-bottom: 28px solid rgba(0,0,0,0); + } .panel-info-corner-inner { width: 0; height: 0; @@ -157,6 +160,41 @@ max-width:280px; border: 1px solid #e02f44; } +.chart-warring-popper[x-placement^=top] .popper__arrow::after { + border-top-color: #e6a23c; + bottom:0px; +} +.chart-warring-popper[x-placement^=bottom] .popper__arrow::after { + border-bottom-color: #e6a23c; +} +.popper__arrow::after{ + border:solid 3px yellow +} +.chart-warring-popper{ + background-color:#e6a23c; + color:#FFF; + word-wrap:break-word; + word-break:break-word; + max-width:280px; + border: 1px solid #e6a23c; +} +.moreTitle{ + .panel-info-corner--error .panel-info-corner-inner { + border-left: 28px solid #e6a23c; + border-right: none; + border-bottom: 28px solid rgba(0,0,0,0); + } + .panel-info-corner-inner { + width: 0; + height: 0; + position: absolute; + left: 0; + bottom: 0; + } + .nz-icon-warning:before { + color: #fff; + } +} .nz-chart-resize { height: 100%; width: 100%; diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue index 809ea2ed3..78e69a9ad 100644 --- a/nezha-fronted/src/components/charts/line-chart-block.vue +++ b/nezha-fronted/src/components/charts/line-chart-block.vue @@ -20,6 +20,20 @@ + + +
{{$t('dashboard.panel.moreTitle')}}{{$t('dashboard.panel.showAll')}}{{seriesItem.length}}
+ + + + + + @@ -40,7 +54,7 @@ -
{{$t('dashboard.panel.moreFirstTitle')}} {{seriesLength}}{{$t('dashboard.panel.moreSecondTitle')}}{{$t('dashboard.panel.moreThirdTitle')}}{{seriesItem.length}}
+
No Data
@@ -69,6 +83,20 @@ + + +
{{$t('dashboard.panel.moreTitle')}}{{$t('dashboard.panel.showAll')}}{{seriesItemScreen.length}}
+ + + + + +
{{data.title}}   @@ -77,7 +105,6 @@
-
{{$t('dashboard.panel.moreFirstTitle')}} {{seriesLength}}{{$t('dashboard.panel.moreSecondTitle')}} {{$t('dashboard.panel.moreThirdTitle')}}{{seriesItemScreen.length}}
No Data
@@ -702,11 +729,10 @@ this.$nextTick(() => { setTimeout(function () { let divHeight = self.$refs.legendArea.offsetHeight; - let moreTilteHeight=(self.seriesItem.length==self.seriesItemArr.length)?0:20; if(!chartInfo.height){ - self.echartStore.resize({height:(400-divHeight-self.$chartResizeTool.titleHeight-self.$chartResizeTool.chartBlankHeight-moreTilteHeight)}); + self.echartStore.resize({height:(400-divHeight-self.$chartResizeTool.titleHeight-self.$chartResizeTool.chartBlankHeight)}); }else { - self.echartStore.resize({height:(chartInfo.height-divHeight-self.$chartResizeTool.titleHeight-self.$chartResizeTool.chartBlankHeight-moreTilteHeight)}); + self.echartStore.resize({height:(chartInfo.height-divHeight-self.$chartResizeTool.titleHeight-self.$chartResizeTool.chartBlankHeight)}); } if(dataArg&&dataArg.length>0){ self.echartStore.clear(); @@ -839,7 +865,7 @@ let sumHeight = Math.floor(screenHeight*0.99*0.8);//margin-top:1vh; dailog:80% //console.log("11____00",sumHeight,divHeight,legendDiv) self.$refs.screenShowArea.style.height = `${sumHeight - divHeight - self.screenTitleHeight}px`; - self.echartModalStore.resize({height: (sumHeight - divHeight - self.screenTitleHeight-5)});//图表的高度 + self.echartModalStore.resize({height: (sumHeight - divHeight - self.screenTitleHeight)});//图表的高度 console.log(self.seriesItemScreen,self.seriesItemArrScreen); self.echartModalStore.off('finished'); }) diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index e1ecceb71..88d5b8564 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -206,9 +206,8 @@ const cn = { confirm: "Ok", cancel: "取消", lastTwoDay: "最近2天", - moreFirstTitle:'仅显示', - moreSecondTitle:'个时间序列。', - moreThirdTitle:'全部显示', + moreTitle:'仅显示20个时间序列。', + showAll:'全部显示 ', }, metric: { name: "指标名称", diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index b8450c664..c2d2cb3e0 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -218,9 +218,8 @@ const en = { view:'View',//'查看' confirm:'Ok',// OK cancel:'Cancel',//'取消', - moreFirstTitle:'Showing only ', - moreSecondTitle:'time series. ', - moreThirdTitle:'Show all ', + moreTitle:'Showing only20time series. ', + showAll:'Show all ', }, metric:{ name:'Metric name', //"指标名称"