diff --git a/nezha-fronted/.gitignore b/nezha-fronted/.gitignore index 722b02965..7a135414c 100644 --- a/nezha-fronted/.gitignore +++ b/nezha-fronted/.gitignore @@ -1,7 +1,7 @@ .DS_Store node_modules/ /dist/ -/static/ + npm-debug.log* yarn-debug.log* yarn-error.log* diff --git a/nezha-fronted/src/assets/css/components/chart/chart.scss b/nezha-fronted/src/assets/css/components/chart/chart.scss index 1c892b8dc..4a4981234 100644 --- a/nezha-fronted/src/assets/css/components/chart/chart.scss +++ b/nezha-fronted/src/assets/css/components/chart/chart.scss @@ -313,13 +313,18 @@ .basic-info-table-list { display: flex; .basic-info-table-title,.basic-info-table-value { - display: inline-block; + display: inline-flex; flex-wrap: wrap; width: 50%; line-height: 30px; padding-left: 10px; border-bottom: 1px solid $--border-color-light; border-right: 1px solid $--border-color-light; + .alert-days-info{ + div { + vertical-align: middle; + } + } } .basic-info-table-value { border-right: none; diff --git a/nezha-fronted/src/assets/css/components/common/chartUnit.scss b/nezha-fronted/src/assets/css/components/common/chartUnit.scss index fed06acfb..21d47f2ff 100644 --- a/nezha-fronted/src/assets/css/components/common/chartUnit.scss +++ b/nezha-fronted/src/assets/css/components/common/chartUnit.scss @@ -20,6 +20,7 @@ } .chart-unit .el-input__inner { border-top-left-radius: 0 !important; - border-color: $--border-color-base; + border-color: $--explore-border-color-bottom; + // border-color: $--button-icon-border-color; border-bottom-left-radius: 0 !important; } diff --git a/nezha-fronted/src/assets/css/components/page/config/mibBrowser.scss b/nezha-fronted/src/assets/css/components/page/config/mibBrowser.scss index b1063245c..053fd0e8e 100644 --- a/nezha-fronted/src/assets/css/components/page/config/mibBrowser.scss +++ b/nezha-fronted/src/assets/css/components/page/config/mibBrowser.scss @@ -139,6 +139,7 @@ } .mib-browser-detail-row>div { padding-left: 5px; + box-sizing: border-box; } .mib-browser-detail-description { padding: 0 14px 0 0; @@ -230,3 +231,9 @@ border-color: unset; background-color: unset; } +.plTableBox.mib-browser-table{ + .el-table:not(.chart-table) .gutter{ + right: 53px !important; + height: 40px !important; + } +} \ No newline at end of file diff --git a/nezha-fronted/src/assets/css/components/page/dashboard/explore/explore.scss b/nezha-fronted/src/assets/css/components/page/dashboard/explore/explore.scss index b0f4c9ed1..5299425cb 100644 --- a/nezha-fronted/src/assets/css/components/page/dashboard/explore/explore.scss +++ b/nezha-fronted/src/assets/css/components/page/dashboard/explore/explore.scss @@ -209,6 +209,11 @@ } } } + .top-tools { + .chart-unit .el-input__inner { + border-color: $--button-icon-border-color; + } + } } /*外部引用 样式start*/ .doc-content { diff --git a/nezha-fronted/src/assets/css/components/page/dashboard/explore/promqlInput.scss b/nezha-fronted/src/assets/css/components/page/dashboard/explore/promqlInput.scss index bf5f4e331..f48884261 100644 --- a/nezha-fronted/src/assets/css/components/page/dashboard/explore/promqlInput.scss +++ b/nezha-fronted/src/assets/css/components/page/dashboard/explore/promqlInput.scss @@ -169,3 +169,11 @@ } } +.topo-page { + .promqlInput { + .el-cascader-menu { + width: 200px; + height: 100%; + } + } +} diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue b/nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue index e1e1f0354..a4c0359f5 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/IpDetails.vue @@ -36,7 +36,7 @@ >