diff --git a/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss b/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss index 322838393..d6a274580 100644 --- a/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss +++ b/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss @@ -1,38 +1,80 @@ -.chart-fullscreen.nz-dialog .panel-chart--fullscreen{ - .alert-message-info-header{ - border-bottom: 1px solid rgba(0,0,0,0.09);; - padding-bottom: 20px; - } - .alert-message-info-box{ - box-sizing: border-box; +.chart-fullscreen.nz-dialog .panel-chart--fullscreen { + .alert-message-info-header { + height: 72px; + border-bottom: 1px solid rgba(0, 0, 0, 0.09); padding: 20px; + margin-top: 0; + + .chart-header__title { + display: flex; + justify-content: center; + align-items: center; + font-weight: 600; + font-family: PingFangSC-Medium; + + .alert-message-state { + display: block; + line-height: 20px; + margin-right: 15px; + font-size: 14px; + font-weight: normal; + + padding: 2px 8px; + border-radius: 4px; + color: $--color-text-label; + } + } + + } + + .alert-message-info-box { + box-sizing: border-box; + padding: 20px 20px 33px 30px; display: flex; width: 100%; height: 100%; overflow-y: auto; - .info-box-left{ + + .info-box-left { width: 66%; min-width: 500px; min-height: 600px; margin-right: 20px; display: flex; flex-direction: column; + .nz-chart { height: 36%; margin-bottom: 20px; border: 1px solid $--border-color-light; flex: none; } - .alert-message-info-tab{ + + .alert-message-info-tab { height: 63%; flex: 1; + + .alert-label-header-title { + display: none; + } + + .alert-rule-box { + margin-bottom: 25px; + + .alert-rule-value { + padding-right: 30px; + } + } + .el-tabs.el-tabs--card { height: 100%; display: flex; flex-direction: column; - .el-tabs__header{ + + .el-tabs__header { margin: 0; - .el-tabs__item{ + + .el-tabs__item { border: 1px solid $--border-color-light; border-radius: 2px; //border-bottom: none; @@ -40,19 +82,22 @@ background: $--background-color-base; color: $--color-text-regular; } - .el-tabs__item:hover{ + + .el-tabs__item:hover { color: $--color-warning; background: $--background-color-empty; border-bottom-color: $--background-color-empty; } - .el-tabs__item.is-active{ + + .el-tabs__item.is-active { color: $--color-warning; background: $--background-color-empty; border-bottom-color: $--background-color-empty; } } - .el-tabs__content{ - padding: 20px; + + .el-tabs__content { + padding: 25px 30px; flex: 1; border: 1px solid $--border-color-light; border-top: none; @@ -61,72 +106,118 @@ } } } - .info-box-right{ + + .info-box-right { flex: 1; height: 100%; border: 1px solid #E7EAED; border-radius: 2px; box-sizing: border-box; padding: 0px 20px 20px 0; + .table-no-data { height: calc(100% - 80px); } - .time-line-header{ - padding: 20px; + + .time-line-header { + padding: 20px 20px 35px 20px; font-size: 16px; color: $--color-text-primary; font-weight: 600; display: flex; justify-content: space-between; + .scope-icon-box { display: flex; flex: 1; justify-content: right; } + .scope-box { cursor: pointer; color: $--background-color-disabled; + .nz-icon { - margin-right: 5px; - color: $--background-color-disabled ; + margin-right: 20px; + color: $--background-color-disabled; font-weight: 400; } } - .scope-box.is-select{ + + .scope-box.is-select { color: $--color-monitor; + .nz-icon { color: $--color-monitor; } } - #time-line-scope{ + + #time-line-scope { //float: right; } } - .el-timeline{ + + .el-timeline { height: calc(100% - 80px); overflow-y: auto; padding-top: 14px; padding-left: 40px; box-sizing: border-box; - .el-timeline-item{ - padding-bottom: 24px; + + .el-timeline-item { + padding-bottom: 20px; + + .el-timeline-item__wrapper { + .el-timeline-item__timestamp.is-top { + top: -50px; + } + + .el-timeline-item__content { + .nz-alert-tag.nz-alert-tag_info { + margin-right: 10px; + } + + + + .nz-alert-tag_info { + .nz-alert-tag__label { + padding-left: 10px; + padding-right: 10px; + text-align: center; + line-height: 20px; + } + + .nz-alert-tag__content { + padding-left: 6px; + padding-right: 6px; + text-align: center; + line-height: 20px; + } + } + } + } } - .has-time{ + + .has-time { padding-top: 36px; - .el-timeline-item__tail{ + + .el-timeline-item__tail { height: calc(100% + 14px); top: -14px; } } - .el-timeline-item.last .el-timeline-item__tail{ + + .el-timeline-item.last .el-timeline-item__tail { display: block; top: -100%; } - .el-timeline-item:last-child .el-timeline-item__tail.only{ + + .el-timeline-item:last-child .el-timeline-item__tail.only { display: block; top: -100%; } - .el-timeline-item__timestamp.is-top{ + + .el-timeline-item__timestamp.is-top { position: absolute; top: -40px; left: -20px; @@ -137,21 +228,25 @@ margin: 0; padding: 10px 0; } + .el-timeline-item__node { z-index: 1; } - .time-line-item-header{ + + .time-line-item-header { font-size: 14px; color: #333333; font-weight: 400; } } - .load-more-box{ + + .load-more-box { display: flex; justify-content: center; align-items: center; } } + .table-no-data { width: 100%; height: 100%; @@ -160,20 +255,24 @@ align-items: center; justify-content: center; } - .el-tabs__nav{ + + .el-tabs__nav { border: none; } - .info-box-header{ + + .info-box-header { height: 100%; overflow-y: auto; } - .info-box-title{ + + .info-box-title { font-size: 16px; color: $--color-text-primary; font-weight: 600; margin-bottom: 12px; } - .info-box-content{ + + .info-box-content { font-size: 14px; color: #666666; font-weight: 400; @@ -183,3 +282,223 @@ } } +.el-dialog__body { + .alert-message-info-box { + .info-box-right { + .el-timeline { + .el-timeline-item { + .el-timeline-item__wrapper { + .el-timeline-item__content { + .alert-message-summary { + margin: 10px 0 4px; + font-size: 14px; + font-weight: 400; + padding-left: 5px; + } + + .alert-message-startAt { + font-size: 14px; + line-height: 20px; + font-weight: 400; + margin: 3px 0 5px; + padding-left: 5px; + + span:nth-of-type(n) { + color: #999999; + margin-right: 5px; + } + + span:nth-of-type(2n) { + color: #666666; + margin-right: 15px; + } + } + + .margin-b-10 { + .alert-message-state.gray-bg { + margin-right: 5px; + padding: 2px 8px; + } + } + + .alert-message-labels { + display: flex; + flex-wrap: wrap; + + .nz-alert-tag.nz-alert-tag_normal { + display: inline-block; + margin-right: 10px !important; + display: flex; + flex-direction: row; + + .nz-alert-tag__label { + padding-left: 10px; + padding-right: 10px; + display: flex; + align-items: center; + justify-content: center; + } + + .nz-alert-tag__content { + padding-left: 6px; + padding-right: 6px; + display: flex; + align-items: center; + justify-content: center; + } + } + + .nz-alert-tag.nz-alert-tag_info { + display: inline-block; + margin-right: 20px !important; + + .nz-alert-tag__label { + padding-left: 10px; + padding-right: 10px; + text-align: center; + line-height: 20px; + } + + .nz-alert-tag__content { + padding-left: 6px; + padding-right: 6px; + text-align: center; + line-height: 20px; + } + } + } + + } + } + } + } + } + + .info-box-left { + .alert-message-info-tab { + .el-tabs.el-tabs--card.el-tabs--top { + .el-tabs__content { + #pane-detail { + .info-box-header { + .info-box-content { + display: flex; + flex-wrap: wrap; + + .nz-alert-tag.nz-alert-tag_normal { + display: inline-block; + margin-right: 20px !important; + display: flex; + flex-direction: row; + + .nz-alert-tag__label { + padding-left: 10px; + padding-right: 10px; + display: flex; + align-items: center; + justify-content: center; + } + + .nz-alert-tag__content { + padding-left: 6px; + padding-right: 6px; + display: flex; + align-items: center; + justify-content: center; + } + } + + .nz-alert-tag.nz-alert-tag_info { + display: inline-block; + margin-right: 20px !important; + + .nz-alert-tag__label { + padding-left: 10px; + padding-right: 10px; + text-align: center; + line-height: 20px; + } + + .nz-alert-tag__content { + padding-left: 6px; + padding-right: 6px; + text-align: center; + line-height: 20px; + } + } + } + } + } + + #pane-dc { + .alert-label-info { + .alert-label-box { + margin-bottom: 25px; + + .alert-label-title { + margin-right: 30px; + } + } + } + } + + #pane-asset { + .alert-label-info { + .alert-label-box { + margin-bottom: 25px; + + .alert-label-title { + margin-right: 30px; + } + } + } + } + + #pane-endpoint { + .alert-label-info { + .alert-label-box { + margin-bottom: 25px; + + .alert-label-title { + margin-right: 30px; + } + } + } + } + + #pane-module { + .alert-label-info { + .alert-label-box { + margin-bottom: 25px; + + .alert-label-title { + margin-right: 30px; + } + } + } + } + + #pane-project { + .alert-label-info { + .alert-label-box { + margin-bottom: 25px; + + .alert-label-title { + margin-right: 30px; + } + } + } + } + + #pane-trbShot { + .editor-core.ql-container.ql-snow { + background-color: #23241E; + border-radius: 2px; + color: #fff; + } + } + } + } + } + } + } +} diff --git a/nezha-fronted/src/components/chart/chart.vue b/nezha-fronted/src/components/chart/chart.vue index c9148793d..01d9408b8 100644 --- a/nezha-fronted/src/components/chart/chart.vue +++ b/nezha-fronted/src/components/chart/chart.vue @@ -1,4 +1,5 @@ -