From 097b6b33f063bc9a599eb8ae7ee59b67da1c422c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=8A=B2=E6=9D=BE?= <523037378@qq.com> Date: Fri, 21 Feb 2020 17:57:19 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20dc=E5=88=97=E8=A1=A8=E3=80=81=E5=BC=B9?= =?UTF-8?q?=E6=A1=86=E5=88=9D=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/assets/stylus/main.scss | 7 +- .../src/components/common/header.vue | 3 + .../src/components/common/language/en.js | 4 + .../src/components/common/rightBox/dcBox.vue | 160 ++++++++++ .../src/components/page/alert/config.vue | 6 - .../src/components/page/asset/asset.vue | 5 - .../src/components/page/config/account.vue | 24 +- .../src/components/page/config/dc.vue | 275 ++++++++++++++++++ .../src/components/page/config/promServer.vue | 13 +- .../src/components/page/dashboard/panel.vue | 6 - .../src/components/page/project/project.vue | 5 - nezha-fronted/src/main.js | 3 + nezha-fronted/src/router/index.js | 4 + 13 files changed, 463 insertions(+), 52 deletions(-) create mode 100644 nezha-fronted/src/components/common/rightBox/dcBox.vue create mode 100644 nezha-fronted/src/components/page/config/dc.vue diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index 35687fa88..368785ffc 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -451,6 +451,11 @@ li{ width: 260px; margin: -1px 20px 0 0; } +.top-tools .top-tool-btn-txt .nz-icon{ + display: inline-block; + font-size: 12px; + margin-right:6px; +} .top-tool-right { display: flex; align-content: center; @@ -619,7 +624,7 @@ li{ } /*此处自定义弹框尺寸,不同功能可能需要的尺寸不一样,需自行添加*/ -.right-box-account, .right-box-prom, .right-box-alert-config, .right-box-project, .right-box-module, .right-box-edit-endpoint, .right-box-panel { +.right-box-account, .right-box-prom, .right-box-alert-config, .right-box-project, .right-box-module, .right-box-edit-endpoint, .right-box-panel, .right-box-dc { width: 520px; } .right-box-add-asset, .right-box-add-chart { diff --git a/nezha-fronted/src/components/common/header.vue b/nezha-fronted/src/components/common/header.vue index 6eb14993e..61d8f4910 100644 --- a/nezha-fronted/src/components/common/header.vue +++ b/nezha-fronted/src/components/common/header.vue @@ -91,6 +91,9 @@
{{$t('config.promServer.promServerList')}}
+ +
{{$t('config.dc.dc')}}
+