From d1efdde2ba85d3a35222b90d475070a7391a452d Mon Sep 17 00:00:00 2001 From: chenjinsong <523037378@qq.com> Date: Mon, 1 Nov 2021 23:05:28 +0800 Subject: [PATCH] =?UTF-8?q?NEZ-1072=20feat:=20=E4=B8=BB=E9=A2=98=E5=88=87?= =?UTF-8?q?=E6=8D=A2=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../css/components/charts/chart-list.scss | 38 ++ .../components/common/alert/alertLabel.scss | 25 +- .../common/alert/alertRuleInfo.scss | 5 +- .../common/bottomBox/bottomBox.scss | 6 + .../common/detailView/detailView.scss | 3 + .../detailView/view/detailViewRight.scss | 1 + .../common/project/L5/topoTooltip.scss | 6 +- .../common/project/popData/Info.scss | 78 ++++ .../common/rightBox/alertRuleBox.scss | 115 +++--- .../common/table/alert/alertRuleTable.scss | 10 +- .../src/assets/css/components/index.scss | 2 + .../components/page/alert/alertMessage.scss | 19 +- .../css/components/page/alert/nzAlertTag.scss | 11 +- .../components/page/config/mibBrowser.scss | 2 +- .../page/dashboard/explore/logTab.scss | 8 + .../css/components/page/dashboard/panel.scss | 1 + nezha-fronted/src/assets/stylus/main.scss | 32 +- .../src/components/charts/chart-list.vue | 41 +- .../components/common/alert/alertLabel.vue | 111 +---- .../components/common/alert/alertRuleInfo.vue | 178 --------- .../components/common/bottomBox/bottomBox.vue | 132 ------ .../bottomBox/tabs/endpointQueryTab.vue | 18 +- .../list/alertRule/alertRuleDetail.vue | 3 - .../detailView/list/asset/assetDetail.vue | 4 - .../common/detailView/list/dc/dcDetail.vue | 4 - .../common/detailView/list/detailList.scss | 101 ----- .../list/endpoint/endpointDetail.vue | 4 - .../detailView/list/module/moduleDetail.vue | 4 - .../terminalLogDetail/terminalLogDetail.vue | 4 - .../detailView/list/userDetail/userDetail.vue | 4 - .../common/detailView/nzDetailView.vue | 9 - .../detailView/view/detailViewRight.vue | 63 --- .../common/project/L5/topoTooltip.vue | 90 ----- .../common/project/popData/Info.vue | 70 ---- .../common/rightBox/alertRuleBox.vue | 64 --- .../common/table/alert/alertRuleTable.vue | 53 --- .../common/table/settings/endpointTable.vue | 40 +- .../components/page/alert/alertMessage.vue | 18 +- .../src/components/page/alert/nzAlertTag.vue | 79 ---- .../src/components/page/config/mibBrowser.vue | 238 ----------- .../page/dashboard/explore/exploreItem.vue | 378 ------------------ .../page/dashboard/explore/logTab.vue | 115 ------ .../page/dashboard/explore/promqlInput.vue | 166 -------- .../src/components/page/dashboard/panel.vue | 76 ---- 44 files changed, 271 insertions(+), 2158 deletions(-) create mode 100644 nezha-fronted/src/assets/css/components/charts/chart-list.scss create mode 100644 nezha-fronted/src/assets/css/components/common/project/popData/Info.scss delete mode 100644 nezha-fronted/src/components/common/detailView/list/detailList.scss diff --git a/nezha-fronted/src/assets/css/components/charts/chart-list.scss b/nezha-fronted/src/assets/css/components/charts/chart-list.scss new file mode 100644 index 000000000..2f15e32a6 --- /dev/null +++ b/nezha-fronted/src/assets/css/components/charts/chart-list.scss @@ -0,0 +1,38 @@ +.charts__chart-list { + .chartBox { + float:left; + padding: 0 10px 10px 0; + position:relative; + box-sizing: border-box; + } + .no-data{ + height: 1189px; + width: 100%; + position: relative; + .icon { + width: 5rem; + height: 5rem; + position: absolute; + top: 50%; + left: 50%; + margin-top: -52px; + margin-left: -40px; + text-align: center; + } + .no-data-div { + position: absolute; + font-size: 16px; + color: $--color-text-primary; + font-weight: 400; + margin-left: -29px; + top: 52.5%; + left: 50% + } + } + .list-width{ + width: 100%; + padding: 0 10px 5px 10px; + box-sizing: border-box; + overflow: hidden;/*避免鼠标第一次放到曲线时,x轴出现滚动条后消失*/ + } +} diff --git a/nezha-fronted/src/assets/css/components/common/alert/alertLabel.scss b/nezha-fronted/src/assets/css/components/common/alert/alertLabel.scss index ced39ae33..fb8465129 100644 --- a/nezha-fronted/src/assets/css/components/common/alert/alertLabel.scss +++ b/nezha-fronted/src/assets/css/components/common/alert/alertLabel.scss @@ -7,7 +7,6 @@ box-shadow: -1px 1px 9px -1px rgba(205,205,205,0.77); .alert-label-info{ - border: 1px solid $--border-color-light; border-bottom: none; font-size: 13px; line-height: 26px; @@ -15,21 +14,21 @@ .alert-label-box{ display: flex; justify-content:space-between; - border-bottom: 1px solid $--border-color-light; } .alert-label-title{ - text-align: left; - width: 110px; - border-right: 1px solid $--border-color-light; + font-size: 14px; color: $--color-text-regular; + letter-spacing: 0; + line-height: 23px; + min-width: 110px; padding: 0 3px 0 13px; } .alert-label-value{ - text-align: left; - width: 150px; - color: #1a1a1a; - padding: 0 3px 0 13px; - word-break: break-all; + height: 26px; + font-size: 14px; + color: $--color-text-primary; + letter-spacing: 0; + line-height: 23px; } .danger{ background-color: $--color-danger; @@ -46,6 +45,12 @@ .active-icon{ margin-top: 0; } + .alert-label-remark { + overflow: hidden; + text-overflow:ellipsis; + white-space: nowrap; + max-width: 210px; + } } .alert-label::after, .alert-labelUp::after { content: ''; diff --git a/nezha-fronted/src/assets/css/components/common/alert/alertRuleInfo.scss b/nezha-fronted/src/assets/css/components/common/alert/alertRuleInfo.scss index e7ca43e66..2970fbc3d 100644 --- a/nezha-fronted/src/assets/css/components/common/alert/alertRuleInfo.scss +++ b/nezha-fronted/src/assets/css/components/common/alert/alertRuleInfo.scss @@ -16,7 +16,7 @@ line-height: 0; border: 5px; border-style: dashed solid dashed dashed; - border-color: transparent #fff transparent transparent; + border-color: transparent $--background-color-empty transparent transparent; position: absolute; top: 100px; left: 0; @@ -47,7 +47,7 @@ line-height: 0; border: 5px; border-style: dashed solid dashed dashed; - border-color: transparent #fff transparent transparent; + border-color: transparent $--background-color-empty transparent transparent; position: absolute; bottom: 95px; left: 0; @@ -61,7 +61,6 @@ box-shadow: -1px 1px 9px -1px rgba(205,205,205,0.77); } .alert-rule-info{ - border: 1px solid $--border-color-light; border-bottom: none; font-size: 13px; line-height: 26px; diff --git a/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss b/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss index 13c55a5a6..c21903c8e 100644 --- a/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss +++ b/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss @@ -119,6 +119,12 @@ .bottom-box .sub-container .nz-table2{ height: calc(100% - 20px); } +.asset-detail .sub-container .nz-table2 { + height: 100%; +} +.endpoint-tab-new .sub-container .nz-table2 { + height: 100%; +} /* end--二级顶部工具栏*/ .log-no-data { diff --git a/nezha-fronted/src/assets/css/components/common/detailView/detailView.scss b/nezha-fronted/src/assets/css/components/common/detailView/detailView.scss index cccbaff60..0f0c00641 100644 --- a/nezha-fronted/src/assets/css/components/common/detailView/detailView.scss +++ b/nezha-fronted/src/assets/css/components/common/detailView/detailView.scss @@ -80,5 +80,8 @@ width: calc(100% - 20px); } } +.nz-detail-view-no-data { + border-top: 1px solid $--border-color-light; +} diff --git a/nezha-fronted/src/assets/css/components/common/detailView/view/detailViewRight.scss b/nezha-fronted/src/assets/css/components/common/detailView/view/detailViewRight.scss index 5916cd1d9..129ecf20d 100644 --- a/nezha-fronted/src/assets/css/components/common/detailView/view/detailViewRight.scss +++ b/nezha-fronted/src/assets/css/components/common/detailView/view/detailViewRight.scss @@ -39,6 +39,7 @@ position: relative; padding: 0; background-color: $--background-color-empty; + overflow-y: hidden; } .sub-box .top-tools.top-tools--sub { diff --git a/nezha-fronted/src/assets/css/components/common/project/L5/topoTooltip.scss b/nezha-fronted/src/assets/css/components/common/project/L5/topoTooltip.scss index 2901a44eb..30c4bb1dc 100644 --- a/nezha-fronted/src/assets/css/components/common/project/L5/topoTooltip.scss +++ b/nezha-fronted/src/assets/css/components/common/project/L5/topoTooltip.scss @@ -1,15 +1,15 @@ .tooltip-box { background: $--background-color-empty; - box-shadow: 1px 2px 8px 0 rgba(0, 0, 0, 0.11); + box-shadow: 1px 2px 8px 0 rgba(0, 0, 0, 0.08); border-radius: 4px; padding: 10px; max-height: 400px; min-height: 200px; height: 100%; box-sizing: border-box; + border: 1px solid $--border-color-light; .tooltip-box-chart { - border: 1px solid $--border-color-light; max-height: 400px; min-height: 200px; height: 100%; @@ -38,6 +38,7 @@ margin-top: 24px; padding-top: 5px; line-height: 16px; + border-top: 1px dashed $--border-color-base; } } @@ -61,7 +62,6 @@ .topology-tool-tip .topology-chart-title { margin-top: -23px; border-bottom: 1px dashed $--border-color-base; - padding-left: 0; margin-left: 10px; padding: 0; box-sizing: border-box; diff --git a/nezha-fronted/src/assets/css/components/common/project/popData/Info.scss b/nezha-fronted/src/assets/css/components/common/project/popData/Info.scss new file mode 100644 index 000000000..0a3ca5055 --- /dev/null +++ b/nezha-fronted/src/assets/css/components/common/project/popData/Info.scss @@ -0,0 +1,78 @@ +.info-content{ + display: flex; + margin-right: 15px; + flex-direction: column; + justify-content: space-between; + background: $--background-color-empty; + border: 1px solid $--border-color-light; + box-shadow: 0 6px 16px 0 rgba(0,0,0,0.08); + border-radius: 3px; +} +.pop-data-info-content { + + .info-box { + background: $--background-color-empty; + margin-bottom: 15px; + min-width: 260px; + } + + .info-box-title { + background: $--background-color-1; + font-size: 14px; + color: $--color-text-primary; + height: 26px; + line-height: 26px; + padding-left: 12px; + font-weight: bold; + } + + .info-box-content { + font-size: 12px; + color: $--color-text-primary; + } + + .content-box { + padding: 0 12px; + height: 26px; + line-height: 24px; + } + + .content-title { + font-size: 14px; + min-width: 120px; + display: inline-block; + color: $--color-text-regular; + padding: 3px 0; + } + + .content-text { + color: $--color-text-primary; + font-size: 14px; + padding: 3px 5px; + } + + .module-type { + text-align: center; + width: 44px; + display: inline-block; + height: 20px; + margin: 0 auto; + line-height: 20px; + } + + .module-type:first-child { + border-radius: 4px 0 0 4px; + margin-right: -4px; + border-right: none; + } + + .module-type:last-child { + border-radius: 0 4px 4px 0; + z-index: -1; + } + + .module-type-select { + border-color: rgba(255, 140, 14, 0.54); + color: rgba(255, 140, 14, 0.54); + } +} diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/alertRuleBox.scss b/nezha-fronted/src/assets/css/components/common/rightBox/alertRuleBox.scss index bae4b6160..448e65ac9 100644 --- a/nezha-fronted/src/assets/css/components/common/rightBox/alertRuleBox.scss +++ b/nezha-fronted/src/assets/css/components/common/rightBox/alertRuleBox.scss @@ -1,59 +1,64 @@ -.severity-circle{ - position: absolute; - left: 10px; - top: 0; -} -.severity-box{ - position: relative; -} -.severity-box /deep/ .el-select .el-input__inner{ - padding-left: 25px; -} -.half-form-item { - width: calc(50% - 5px); - display: inline-block; - .el-form-item__content,.el-select{ - width: 100%; +.right-box-alert-rule { + .severity-circle{ + position: absolute; + left: 10px; + top: 0; } -} -.right-box-alert-rule /deep/ .right-box__container .el-form-item__content .el-input-group--prepend{ - width: 100%; -} -/deep/ .rich-text-editor{ - line-height: 24px; -} -/deep/ .el-input-group__prepend{ - position: relative; - .hide-icon{ - width: 38px; - .el-input__inner{ - border: none; - text-align: center; + .severity-box{ + position: relative; + } + .severity-box .el-select .el-input__inner{ + padding-left: 25px; + } + .half-form-item { + width: calc(50% - 5px); + display: inline-block; + .el-form-item__content,.el-select{ + width: 100%; } } -} -.alert-rule-split-title{ - background: $--background-color-base; - font-size: 14px; - color: $--color-text-primary; - letter-spacing: 0; - font-weight: 400; - line-height: 24px; - padding-left: 10px; - margin-bottom: 10px; - height: 24px; -} -/deep/ .el-form-item__content .el-input-group{ - vertical-align: middle; -} -.severity-item{ - color: $--color-text-secondary; - font-size: 12px; - max-width: 120px; - overflow: hidden; -} -.text-ellipsis{ - overflow:hidden; - text-overflow:ellipsis; - white-space:nowrap + .right-box-alert-rule .right-box__container .el-form-item__content .el-input-group--prepend{ + width: 100%; + } + .rich-text-editor{ + line-height: 24px; + } + .el-input-group__prepend{ + position: relative; + .hide-icon{ + width: 38px; + .el-input__inner{ + border: none; + text-align: center; + } + } + } + .alert-rule-split-title{ + background: $--background-color-base; + font-size: 14px; + color: $--color-text-primary; + letter-spacing: 0; + font-weight: 400; + line-height: 24px; + padding-left: 10px; + margin-bottom: 10px; + height: 24px; + } + .el-form-item__content .el-input-group{ + vertical-align: middle; + } + .severity-item{ + color: $--color-text-secondary; + font-size: 12px; + max-width: 120px; + overflow: hidden; + } + .text-ellipsis{ + overflow:hidden; + text-overflow:ellipsis; + white-space:nowrap + } + .query-row .metric-selector-input-box { + width: calc(100% - 120px); + } } diff --git a/nezha-fronted/src/assets/css/components/common/table/alert/alertRuleTable.scss b/nezha-fronted/src/assets/css/components/common/table/alert/alertRuleTable.scss index 7d7ffbda4..53f8d8739 100644 --- a/nezha-fronted/src/assets/css/components/common/table/alert/alertRuleTable.scss +++ b/nezha-fronted/src/assets/css/components/common/table/alert/alertRuleTable.scss @@ -20,11 +20,17 @@ padding: 2px 6px; } .schedEnableTitle { - padding: 15px 20px; + padding: 20px 15px; + margin-right: 0; + left: 1995px !important; + background: $--background-color-empty; + border: 1px solid rgba(119,131,145,0.60); + box-shadow: 0 6px 16px 0 rgba(0,0,0,0.08); + border-radius: 3px; } .schedEnableTitle .nz-icon-a-rilizhou, .schedEnableTitle .nz-icon-dingshishijian { font-size: 14px; - color: $--color-primary; + color: $--color-text-regular; margin-right: 12px; } .schedEnableTitle .week-item { diff --git a/nezha-fronted/src/assets/css/components/index.scss b/nezha-fronted/src/assets/css/components/index.scss index 6851698ce..446f3bfcb 100644 --- a/nezha-fronted/src/assets/css/components/index.scss +++ b/nezha-fronted/src/assets/css/components/index.scss @@ -1,4 +1,5 @@ @import './charts/chart.scss'; +@import './charts/chart-list.scss'; @import './cli/webSSH.scss'; @import './common/alert/alertLabel.scss'; @import './common/alert/alertRuleInfo.scss'; @@ -19,6 +20,7 @@ @import './common/popBox/selectAssetType.scss'; @import './common/popBox/selectPanel.scss'; @import './common/popBox/selectWalk.scss'; +@import './common/project/popData/Info.scss'; @import './common/project/L5/popData/common.scss'; @import './common/project/L5/CanvasContextMenu.scss'; @import './common/project/L5/CanvasProps.scss'; diff --git a/nezha-fronted/src/assets/css/components/page/alert/alertMessage.scss b/nezha-fronted/src/assets/css/components/page/alert/alertMessage.scss index 9f7c30a38..a7e67041c 100644 --- a/nezha-fronted/src/assets/css/components/page/alert/alertMessage.scss +++ b/nezha-fronted/src/assets/css/components/page/alert/alertMessage.scss @@ -1,6 +1,15 @@ -.active { - border-bottom: 3px solid $--color-primary; - color: $--color-text-primary; - cursor: default; - font-weight: bold; +.alert-message-list { + .active { + border-bottom: 3px solid $--color-primary; + color: $--color-text-primary; + cursor: default; + font-weight: bold; + } + .list-page .main-container{ + display: flex; + flex-direction: column; + .nz-table2{ + flex: 1; + } + } } diff --git a/nezha-fronted/src/assets/css/components/page/alert/nzAlertTag.scss b/nezha-fronted/src/assets/css/components/page/alert/nzAlertTag.scss index c2a0e12d3..dea03cd98 100644 --- a/nezha-fronted/src/assets/css/components/page/alert/nzAlertTag.scss +++ b/nezha-fronted/src/assets/css/components/page/alert/nzAlertTag.scss @@ -4,13 +4,11 @@ font-size: 12px; line-height: 20px; border-radius: 4px; - display: inline-block; + display: inline-flex; box-sizing: content-box; .nz-alert-tag__label { border-radius: 3px 0 0 3px; padding: 0 4px; - min-width: 36px; - max-width: 100px; text-align: center; text-overflow: ellipsis; white-space: nowrap; @@ -22,6 +20,7 @@ margin-left: -1px; } .nz-alert-tag__content { + flex: 1; border-radius: 0 3px 3px 0; padding: 0 4px; min-width: 36px; @@ -34,10 +33,10 @@ display: inline-block; } .nz-alert-tag_normal { - border-color: #409eff; + border-color: $--color-text-link; .nz-alert-tag__label { - border-right: 1px solid #409eff; - background-color: #409eff; + border-right: 1px solid $--color-text-link; + background-color: $--color-text-link; color: white; } } 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 ec0440eca..bb68b0915 100644 --- a/nezha-fronted/src/assets/css/components/page/config/mibBrowser.scss +++ b/nezha-fronted/src/assets/css/components/page/config/mibBrowser.scss @@ -9,7 +9,7 @@ line-height: 24px; } .mib-browser-ad-search { - width: 450px; + width: 300px; } .mib-browser-model-dropdown { height: 300px; diff --git a/nezha-fronted/src/assets/css/components/page/dashboard/explore/logTab.scss b/nezha-fronted/src/assets/css/components/page/dashboard/explore/logTab.scss index 9f575b676..d88704e89 100644 --- a/nezha-fronted/src/assets/css/components/page/dashboard/explore/logTab.scss +++ b/nezha-fronted/src/assets/css/components/page/dashboard/explore/logTab.scss @@ -6,6 +6,14 @@ .log-table{ position: relative; min-height: 200px; + .table-no-data { + position: absolute; + top: 50%; + left: 50%; + margin-top: -35px; + margin-left: -50px; + text-align: center; + } } .log-table .nz-table2 { padding: 10px 0 0 0; diff --git a/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss b/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss index b5d1aadec..294a087c1 100644 --- a/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss +++ b/nezha-fronted/src/assets/css/components/page/dashboard/panel.scss @@ -1,5 +1,6 @@ .border-t-1-de{ border-top: 1px solid $--border-color-base; + padding-top: 10px; } .border-t-1-tr{ border-top: 1px solid transparent; diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index c22d19d88..282bac6d1 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -1214,32 +1214,30 @@ li { } .result-detail{ height: 100px; - /*overflow-y: auto;*/ margin-bottom: 20px; } .result-title-top{ - font-family: Roboto-Regular; font-size: 14px; - color: #333333; + color: $--color-text-primary; letter-spacing: 0; font-weight: 400; } .nz-icon-import-success{ margin-right: 5px; - color: #23BF9A ; + color: $--color-success; font-size: 14px; - background: #fff; + background: $--background-color-empty; } .nz-icon-import-failed { margin-right: 5px; - color: #EC7F66 ; + color: $--color-danger; font-size: 14px; - background: #fff; + background: $--background-color-empty; } .result-detail { opacity: 0.9; - background: #F6F8FA; - border: 1px solid #E7EAED; + background: $--background-color-base; + border: 1px solid $--border-color-light; border-radius: 2px; padding: 12px; margin-top: 10px; @@ -1248,9 +1246,8 @@ li { display: flex; margin-bottom: 5px; .line-num { - font-family: Roboto-Medium; font-size: 14px; - color: #333333; + color: $--color-text-primary; letter-spacing: 0; line-height: 16px; font-weight: 600; @@ -1258,16 +1255,14 @@ li { } .line-content{ flex: 1; - font-family: Roboto-Black; font-size: 14px; - color: #666666; + color: $--color-text-regular; letter-spacing: 0; line-height: 16px; font-weight: 400; overflow: hidden; - white-space:nowrap; - overflow:hidden; - text-overflow:ellipsis; + white-space: nowrap; + text-overflow: ellipsis; } } } @@ -1278,11 +1273,11 @@ li { align-items: center; justify-content: center; font-size: 14px; - color: #666666; + color: $--color-text-regular; letter-spacing: 0; font-weight: 600; .nz-icon-import-success { - color: #23BF9A; + color: $--color-success; font-size: 80px; } .result-success-txt{ @@ -1307,7 +1302,6 @@ li { top:50%; left:50%; transform:translate(-50%,-50%); - /*height:600px;*/ max-height:calc(100% - 30px); max-width:calc(100% - 30px); } diff --git a/nezha-fronted/src/components/charts/chart-list.vue b/nezha-fronted/src/components/charts/chart-list.vue index 3bfb88ca4..54c97a47b 100644 --- a/nezha-fronted/src/components/charts/chart-list.vue +++ b/nezha-fronted/src/components/charts/chart-list.vue @@ -1,44 +1,5 @@ -