diff --git a/src/assets/css/components/views/detections/detection-list/detection-list.scss b/src/assets/css/components/views/detections/detection-list/detection-list.scss index 1c17487f..e19a8e86 100644 --- a/src/assets/css/components/views/detections/detection-list/detection-list.scss +++ b/src/assets/css/components/views/detections/detection-list/detection-list.scss @@ -40,7 +40,7 @@ height: 100%; overflow: auto; - .cn-detection__shadow { + .cn-detection__shadow, .new-cn-detection__shadow { position: fixed; height: 100vh; width:100vw; @@ -49,6 +49,10 @@ z-index: 1; background-color: rgba(0, 0, 0, .2); } + + .new-cn-detection__shadow { + z-index: 4; + } } } diff --git a/src/assets/css/components/views/detections/detection-list/row.scss b/src/assets/css/components/views/detections/detection-list/row.scss index 3f1ad7c3..0913d5c1 100644 --- a/src/assets/css/components/views/detections/detection-list/row.scss +++ b/src/assets/css/components/views/detections/detection-list/row.scss @@ -7,7 +7,7 @@ justify-content: center; align-items: flex-start; margin-bottom: 1px; - padding-top: 33px; + padding-top: 18px; background-color: #F3F7FA; span { diff --git a/src/assets/css/components/views/entityExplorer/entity-explorer.scss b/src/assets/css/components/views/entityExplorer/entity-explorer.scss index 44f36367..fbdbff72 100644 --- a/src/assets/css/components/views/entityExplorer/entity-explorer.scss +++ b/src/assets/css/components/views/entityExplorer/entity-explorer.scss @@ -26,9 +26,9 @@ justify-content: flex-start; } - .explorer-top-tools { + .explorer-top-tools, .explorer-detection-top-tools { display: flex; - justify-content: space-between; + justify-content: flex-end; align-items: center; padding-bottom: 18px; @@ -46,6 +46,37 @@ } } } + .explorer-detection-top-tools { + display: flex; + justify-content: space-between; + } + .explorer-top-tools-title { + font-size: 24px; + line-height: 24px; + font-weight: 900; + color: #353636; + } + .explorer-top-tools-block { + font-family: NotoSansHans-Medium; + height: 28px; + line-height: 28px; + font-size: 14px; + color: #353636; + font-weight: 500; + padding: 0 10px; + margin-right: 10px; + border: 1px solid #E0E0E0; + border-radius: 2px; + cursor: pointer; + } + .detection-icon-setting { + margin-right: 10px; + font-size: 14px; + } + .detection-border { + border: 1px solid #E0E0E0; + border-radius: 4px; + } .explorer-container { display: flex; overflow: visible; /*overflow: hidden;*/ diff --git a/src/components/common/TimeRange/DateTimeRange.vue b/src/components/common/TimeRange/DateTimeRange.vue index b1972f38..10fa78c2 100644 --- a/src/components/common/TimeRange/DateTimeRange.vue +++ b/src/components/common/TimeRange/DateTimeRange.vue @@ -1,5 +1,5 @@