From 7980bf05bd7e37269579575e1e22b48e14ccb9e5 Mon Sep 17 00:00:00 2001 From: wangwenrui Date: Fri, 14 Feb 2020 18:07:21 +0800 Subject: [PATCH] =?UTF-8?q?pref:endpoint=20panel=20=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=A1=86=E8=B0=83=E6=95=B4=20&=20alert=20setting=20=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.endpoint pannel 搜索框调整 2.alerts settings 列表option 中操作位置调整+只显示图标 --- nezha-fronted/src/assets/stylus/main.scss | 19 ++++- .../src/components/common/language/en.js | 2 +- .../src/components/page/alert/config.vue | 13 ++- .../src/components/page/asset/asset.vue | 12 --- .../src/components/page/config/account.vue | 14 ++-- .../src/components/page/config/promServer.vue | 24 +++--- .../src/components/page/dashboard/panel.vue | 84 ++++++++++++++----- .../src/components/page/project/project.vue | 39 ++++++--- 8 files changed, 133 insertions(+), 74 deletions(-) diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index 6988bbe39..c6360f143 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -301,7 +301,7 @@ li{ margin-bottom:10px; font-size: 14px; } - .nz-tab-style-light { + .nz-tab-style-light { border-bottom: 3px solid $global-text-color-active; color: #333; cursor: default; @@ -312,7 +312,7 @@ li{ .nz-tab-style-light-right{ margin-left:30px; } - + /* begin--nz-tab组件*/ .nz-tab { font-size: 14px; @@ -336,7 +336,7 @@ li{ cursor: default; font-weight: bold; } - + /* end--nz-tab组件*/ /* end--通用*/ @@ -1084,3 +1084,16 @@ li{ color: $box-title-color; font-weight: bold; } +/*列表中状态字段 的小圆点*/ +.active-icon{ + margin-top:20px; + width:10px; + height:10px; + border-radius:50%; +} +.red { + background-color:#ff6347; +} +.green { + background-color:lightGreen; +} diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 10163e061..0abf694ac 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -165,7 +165,7 @@ const en = { title:'New asset',//'新增资产' sn:'SN',//SN host:'Host',//'Host' - state:'Status',//'状态' + state:'State',//'状态' selectTip:'Please select',//'请选择' inStock: 'In stock',//'在库' notInStock: 'Not in stock',//'出库' diff --git a/nezha-fronted/src/components/page/alert/config.vue b/nezha-fronted/src/components/page/alert/config.vue index 5860cb8b0..e11c9338b 100644 --- a/nezha-fronted/src/components/page/alert/config.vue +++ b/nezha-fronted/src/components/page/alert/config.vue @@ -67,14 +67,11 @@ @@ -260,7 +262,7 @@ }, { label: this.$t('config.promServer.checkTime'), prop: 'checkTime', - show: true + show: false }, { label: this.$t('config.account.option'), prop: 'option', diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue index 63c513a36..9ea09b57b 100644 --- a/nezha-fronted/src/components/page/dashboard/panel.vue +++ b/nezha-fronted/src/components/page/dashboard/panel.vue @@ -23,6 +23,12 @@
+
+ + + +
+
- -
- -
+ + + +
-
+
- + + +
@@ -1185,27 +1187,29 @@ } }, - queryInputInitStyle:function(){ - document.getElementById('elementQuery').parentElement.style.width='40px'; - document.getElementById('elementQuery').parentElement.style.float='right'; - }, focusInput:function(){ - document.getElementById('elementQuery').parentElement.style=''; + let classVal=document.getElementById('elementQuery').parentElement.getAttribute("class"); + classVal=classVal.replace('query-input-inactive',''); + document.getElementById('elementQuery').parentElement.setAttribute("class",classVal ); + this.$refs.elementQuery.focus(); }, blurInput:function(){ if(!this.queryExpression || this.queryExpression == ''){ - setTimeout(this.queryInputInitStyle(),100) + setTimeout(function(){ + let classVal=document.getElementById('elementQuery').parentElement.getAttribute("class"); + classVal='query-input-inactive '+classVal; + document.getElementById('elementQuery').parentElement.setAttribute("class",classVal ); + },100) } }, clearInput:function(){ - this.blurInput(); + this.$refs.elementQuery.foucs(); } }, created() { this.currentProject = this.$store.state.currentProject; this.getModuleList(); this.getMetricsTableData(); - this.getSuggestMetric() }, mounted() { this.getPanelData(); @@ -1504,4 +1508,19 @@ line-height: 37px; } /* end--覆盖分页组件样式*/ + + /* 列表搜索框 样式重写*/ + .relative-position{ + position: relative; + } + .query-input-inactive{ + left:213px; + width: 18%; + } + .query-input-inactive .el-input__inner{ + height: 26px; + line-height: 26px; + } + +