diff --git a/nezha-fronted/src/assets/css/components/common/popBox/selectDashboard.scss b/nezha-fronted/src/assets/css/components/common/popBox/selectDashboard.scss index a16284c0a..da898d9ea 100644 --- a/nezha-fronted/src/assets/css/components/common/popBox/selectDashboard.scss +++ b/nezha-fronted/src/assets/css/components/common/popBox/selectDashboard.scss @@ -247,6 +247,18 @@ } } +.selectDashboard{ + .selectDashboard-select{ + display: flex; + align-items: center; + i.el-icon-arrow-down{ + font-size: 16px; + margin-left: 5px; + color: $--color-text-regular; + } + } +} + .right-box-playlist{ .el-input-group__append{ background-color: $--right-box-sub-title-background-color; diff --git a/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss b/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss index 970ef72c8..6a5c78fce 100644 --- a/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss +++ b/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss @@ -151,7 +151,7 @@ } .show-panel-name{ display: inline-block; - padding: 0 5px; + padding: 0 8px; font-weight: bold; max-width: 310px; overflow:hidden; diff --git a/nezha-fronted/src/components/chart/chart/options/chartTimeSeries.js b/nezha-fronted/src/components/chart/chart/options/chartTimeSeries.js index 6820f2cac..6698e3118 100644 --- a/nezha-fronted/src/components/chart/chart/options/chartTimeSeries.js +++ b/nezha-fronted/src/components/chart/chart/options/chartTimeSeries.js @@ -16,6 +16,7 @@ export const chartTimeSeriesLineOption = { showTitle: true, feature: { dataZoom: { + show: false, yAxisIndex: false, title: { zoom: i18n.t('overall.toolBox.zoom'), @@ -24,7 +25,7 @@ export const chartTimeSeriesLineOption = { }, // stack使用自定义按钮 myStack: { - show: true, + show: false, title: i18n.t('overall.toolBox.stack'), icon: stackIconSvg, iconStyle: {} @@ -51,7 +52,7 @@ export const chartTimeSeriesLineOption = { grid: { left: 20, right: 35, - top: 42, + top: 20, bottom: 15, containLabel: true }, diff --git a/nezha-fronted/src/components/page/dashboard/dashboard.vue b/nezha-fronted/src/components/page/dashboard/dashboard.vue index 7b4e58138..bf4765386 100644 --- a/nezha-fronted/src/components/page/dashboard/dashboard.vue +++ b/nezha-fronted/src/components/page/dashboard/dashboard.vue @@ -19,17 +19,20 @@ :panel-lock="panelLock" :placement="'bottom-start'" :show-panel="showPanel" - style="display: inline-block;padding: 0" + class="selectDashboard" @deletePanel="del" @editPanel="edit" @selectDashboard="panelChange" @startPlay="startPlay" >