From ee9d15b2306861ae84096e860219209aa9a3662b Mon Sep 17 00:00:00 2001 From: chenjinsong <523037378@qq.com> Date: Tue, 27 Apr 2021 16:26:22 +0800 Subject: [PATCH] =?UTF-8?q?NZ-584=20feat:=20panel=E9=A1=B6=E9=83=A8?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=A0=8F=E6=94=B9=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/assets/css/common/rightBoxCommon.scss | 2 +- .../charts/chart-bar-statistics.vue | 1 - .../src/components/charts/chart-list.vue | 2 +- .../common/bottomBox/tabs/panelTabNew.vue | 48 ++- .../common/labelFilter/clickSearch.vue | 27 +- .../common/popBox/topToolMoreOptions.vue | 344 ++++++++++++++++++ .../src/components/layout/header.vue | 3 +- .../src/components/page/dashboard/panel.vue | 77 ++-- 8 files changed, 414 insertions(+), 90 deletions(-) create mode 100644 nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue diff --git a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss index 857d15336..96804dc6b 100644 --- a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss +++ b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss @@ -192,7 +192,7 @@ .right-box-select-dropdown { width: 625px; } -.limit-height { +.limit-height .el-cascader-menu { max-height: 200px; overflow: auto; } diff --git a/nezha-fronted/src/components/charts/chart-bar-statistics.vue b/nezha-fronted/src/components/charts/chart-bar-statistics.vue index 03a458296..325393ee6 100644 --- a/nezha-fronted/src/components/charts/chart-bar-statistics.vue +++ b/nezha-fronted/src/components/charts/chart-bar-statistics.vue @@ -21,7 +21,6 @@ - {{chartData.name}} diff --git a/nezha-fronted/src/components/charts/chart-list.vue b/nezha-fronted/src/components/charts/chart-list.vue index d58d41d88..adb4ea80e 100644 --- a/nezha-fronted/src/components/charts/chart-list.vue +++ b/nezha-fronted/src/components/charts/chart-list.vue @@ -1,7 +1,7 @@ diff --git a/nezha-fronted/src/components/layout/header.vue b/nezha-fronted/src/components/layout/header.vue index 9b7fda728..04d254184 100644 --- a/nezha-fronted/src/components/layout/header.vue +++ b/nezha-fronted/src/components/layout/header.vue @@ -12,7 +12,8 @@ - + +
{{$store.state.consoleCount<=10?$store.state.consoleCount:'10+'}} diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue index d5b41bc5b..8291d59d7 100644 --- a/nezha-fronted/src/components/page/dashboard/panel.vue +++ b/nezha-fronted/src/components/page/dashboard/panel.vue @@ -22,48 +22,6 @@ -
- + + + + -
@@ -127,11 +93,11 @@ import ChartBox from './chartBox' import ChartList from '../../charts/chart-list' import bus from '../../../libs/bus' import pickTime from '../../common/pickTime' -import exportXLSX from '../../common/exportXLSX' import selectPanel from '../../common/popBox/selectPanel' import panelBox from '@/components/common/rightBox/panelBox' import chartTempBox from '@/components/common/rightBox/chartTempBox' - +import topToolMoreOptions from '@/components/common/popBox/topToolMoreOptions' +import Template from '@/components/page/config/template' export default { name: 'panel', data () { @@ -216,12 +182,13 @@ export default { } }, components: { + Template, 'chart-box': ChartBox, 'chart-list': ChartList, 'pick-time': pickTime, - 'export-excel': exportXLSX, - selectPanel, 'panel-box': panelBox, + topToolMoreOptions, + selectPanel, chartTempBox }, methods: {