From e9478cdeddb49a8d580d16fa7bbc3666fccbadff Mon Sep 17 00:00:00 2001 From: chenjinsong <523037378@qq.com> Date: Fri, 6 Dec 2019 17:36:33 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=91=8A=E8=AD=A6=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.告警信息 2.告警规则配置 --- nezha-fronted/src/App.vue | 2 +- nezha-fronted/src/assets/css/main.css | 3 + .../src/components/common/header.vue | 18 +- .../src/components/common/language/cn.js | 24 + .../src/components/common/language/en.js | 35 + .../src/components/page/alarm/config.vue | 625 ++++++++++++++++++ .../src/components/page/alarm/list.vue | 325 +++++++++ .../src/components/page/config/account.vue | 55 +- .../src/components/page/config/promServer.vue | 61 +- 9 files changed, 1126 insertions(+), 22 deletions(-) create mode 100644 nezha-fronted/src/components/page/alarm/config.vue create mode 100644 nezha-fronted/src/components/page/alarm/list.vue diff --git a/nezha-fronted/src/App.vue b/nezha-fronted/src/App.vue index 9be7b615f..e768e0fce 100644 --- a/nezha-fronted/src/App.vue +++ b/nezha-fronted/src/App.vue @@ -1,6 +1,6 @@ diff --git a/nezha-fronted/src/assets/css/main.css b/nezha-fronted/src/assets/css/main.css index cabd0edfc..f1153c45f 100644 --- a/nezha-fronted/src/assets/css/main.css +++ b/nezha-fronted/src/assets/css/main.css @@ -9,6 +9,9 @@ body { html { height: 100%; } +.content-box { + height: 100%; +} /*侧滑文字*/ .el-form-item .el-form-item__label{ font-size: 10px; diff --git a/nezha-fronted/src/components/common/header.vue b/nezha-fronted/src/components/common/header.vue index ce3d18d6b..932d0931b 100644 --- a/nezha-fronted/src/components/common/header.vue +++ b/nezha-fronted/src/components/common/header.vue @@ -27,11 +27,17 @@ - + + + +
{{$t('alarm.alarmList')}}
+
+ +
{{$t('alarm.alarmConfig')}}
+
+