diff --git a/nezha-fronted/src/components/charts/line-chart-block.scss b/nezha-fronted/src/components/charts/line-chart-block.scss index 7b94d0d10..06f09a4e9 100644 --- a/nezha-fronted/src/components/charts/line-chart-block.scss +++ b/nezha-fronted/src/components/charts/line-chart-block.scss @@ -19,7 +19,7 @@ color:lightgray; } .legend-container{ - width: calc(100% - 130px); + width: calc(100% - 30px); max-height:80px; min-height:40px; overflow-y: auto; diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue index 250a1f1a6..3f2954d57 100644 --- a/nezha-fronted/src/components/charts/line-chart-block.vue +++ b/nezha-fronted/src/components/charts/line-chart-block.vue @@ -33,7 +33,7 @@ -
+
@@ -344,7 +344,7 @@ trigger: 'axis', confine:false, extraCssText:'z-index:1000;', - enterable:true, + /*enterable:true, 导致tooltip不消失,显示多个tooltip*/ position:function(point,params,dom,rect,size){ dom.style.transform = "translateZ(0)"; //提示框位置 @@ -510,10 +510,10 @@ grid: { //height:"50%", top: 13, - left: 65, - right: 45, - containLabel: false, - bottom:70,//156 + left: 0, + right: 30, + containLabel: true, + bottom:35,//156 }, dataZoom: [{ type: 'slider', @@ -522,7 +522,9 @@ start: 0, end: 100, height:25, - bottom:10//96 + bottom:10,//96 + left:40, + right:48, } /* , { diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue index 4a3de41b2..364028b77 100644 --- a/nezha-fronted/src/components/page/dashboard/panel.vue +++ b/nezha-fronted/src/components/page/dashboard/panel.vue @@ -10,14 +10,22 @@
- - - {{showPanel.name}} - - + + + {{showPanel.name}} + + + {{$t('dashboard.panel.createPanelTitleSec')}} {{item.name}} + :class="showPanel.id==item.id?'nz-dashboard-dropdown-bg':''" :command="item"> + + + {{item.name}} + +   + + @@ -58,14 +66,14 @@
- - - - + + + +
@@ -597,6 +605,38 @@ border-radius: 5px; } + .panel-list-width { + width:240px; + } + + .panel-dropdown-title { + line-height:25px; + padding-left:5px; + margin-left:10px; + text-align:left; + border-radius:4px; + width:120px; + height:25px; + border:solid 1px #d8dce1; + white-space: nowrap; + overflow-x: hidden; + text-overflow: ellipsis; + } + .panel-list-title { + min-height:25px; + width:100px; + white-space: nowrap; + overflow-x: hidden; + text-overflow: ellipsis; + } + + .panel-list-item { + width:190px; + white-space: nowrap; + overflow-x: hidden; + text-overflow: ellipsis; + } + .content-right-option { cursor: pointer; display: inline-block; @@ -703,9 +743,15 @@ .nz-dashboard-dropdown { height: 300px; overflow-y: auto; - + left:210px !important; li { - padding: 0 20px !important; + /*padding: 0 20px !important;*/ + padding-left:20px !important; + padding-right:0px !important; + width:240px; + white-space:nowrap; + overflow-x:hidden; + text-overflow:ellipsis; } }