diff --git a/src/assets/css/components/components/advancedSearch/advanced-search2.scss b/src/assets/css/components/components/advancedSearch/advanced-search2.scss index 4c14cedb..9806d054 100644 --- a/src/assets/css/components/components/advancedSearch/advanced-search2.scss +++ b/src/assets/css/components/components/advancedSearch/advanced-search2.scss @@ -10,10 +10,9 @@ right: 10px; .search__suffix { - margin-left: 8px; // 新版实体列表改版,后续记得解开 + // margin-left: 8px; - .cn-icon-search-advance, .cn-icon-search-normal { - //.cn-icon-search-advance, .cn-icon-search-normal, .cn-icon-filter { + .cn-icon-search-advance, .cn-icon-search-normal, .cn-icon-filter { color: #A6AAAE; font-size: 18px; } diff --git a/src/assets/css/components/views/detections/detection-overview.scss b/src/assets/css/components/views/detections/detection-overview.scss index 20598102..65c57ce5 100644 --- a/src/assets/css/components/views/detections/detection-overview.scss +++ b/src/assets/css/components/views/detections/detection-overview.scss @@ -222,3 +222,10 @@ padding: 0 4px; //color: white; } + +.performance-event-remark { + font-family: NotoSansSChineseRegular; + font-size: 12px; + color: #353636; + font-weight: 400; +} diff --git a/src/assets/css/components/views/entityExplorer/entity-filter.scss b/src/assets/css/components/views/entityExplorer/entity-filter.scss index 0ea0a0de..71fbb493 100644 --- a/src/assets/css/components/views/entityExplorer/entity-filter.scss +++ b/src/assets/css/components/views/entityExplorer/entity-filter.scss @@ -1,104 +1,100 @@ .entity-filter-case { display: flex; flex-direction: column; - width: 280px; - margin-right: 10px; + width: 320px; + margin-right: 20px; overflow: auto; z-index: 1; + border: 1px solid rgba(226, 229, 236, 1) !important; + border-radius: 4px !important; .filter-case__header { - background-color: #E1E6ED; - margin-bottom: 10px; - padding-left: 8px; - height: 36px; - line-height: 36px; - color: #666; - font-size: 14px; - } - .entity-filter { - display: flex; - flex-direction: column; - border: 1px solid #E7EAED; - margin-bottom: 10px; - background-color: white; - - .filter__header { - height: 46px; - margin: 0 15px; - line-height: 46px; - border-bottom: 1px solid #EFF2F5; + padding-left: 8px; + height: 36px; + line-height: 36px; + color: #666; font-size: 14px; - color: #333; + background: #F7F7F7; + box-shadow: 0 1px 0 0 rgba(226,229,236,1); + border-radius: 4px 4px 0 0; } - .filter__body { - padding: 11px 0 21px 0; - .filter__row { - padding: 0 15px; + + .filter__header { + height: 46px; + line-height: 46px; + margin: 0 20px; + font-size: 14px; + color: #353636; + font-weight: 500; + } + + .filter__body { + width: calc(100% - 40px); + margin: 0 20px; + + .filter-hr { + width: calc(100% + 20px); + margin-left: -10px; + margin-top: 10px; + height: 1px; + background: #EFF2F5; + //background: #000; + } + + .filter__body-item { + height: 26px; + line-height: 26px; + display: flex; + align-items: center; + justify-content: space-between; + cursor: pointer; + + .filter__body-item-left { + display: flex; align-items: center; - cursor: pointer; - transition: all linear .2s; - .filter__row-popover { - display: flex; - line-height: 26px; + font-size: 14px; + color: #353636; + font-weight: 400; + + .filter-country-flag { + width: 18px; + height: 12px; } - &:hover, &.filter__row--active { - background-color: #F3F7FA; - } - .row__label { - font-size: 14px; - flex: 8; - display: flex; - i { - color: #8FA1BE; - } - span { - padding-left: 6px; - color: #333; - } - } - .row__value { - color: #666; - position: relative; - display: inline-block; + .filter__body-item-left-index { + width: 16px; + height: 16px; text-align: center; - flex: 1; - .chart__loading img { - left: unset; - right: 0; - } - } - } - } - } -} -.filter__row-popover { - .pop-title { - i { - margin-right: 6px; - } - } - .entity-pop-custom { - .filter-top-box { - .chart__loading { - height: calc(100% - 65px); - top: 64px; - } - .top-table-percent{ - display:grid; - grid-template-columns: 50% auto; - grid-template-rows: 100%; - grid-row-gap: 0px; - grid-column-gap: 0px; - .top-table-progress{ - align-content: center; - padding-top: 8px; - } - } - .customer-no-border-table { - .el-table__body-wrapper { - height: calc(100% - 36px); + background: #EFF2F5; + border-radius: 2px; + margin-right: 6px; + font-family: NotoSansHans-Black; + font-size: 9px; + color: #96A2B0; + font-weight: 900; + display: flex; + align-items: center; + justify-content: center; } + + .filter__body-item-left-label { + max-width: 180px; + font-family: NotoSansSChineseRegular; + font-size: 14px; + color: #353636; + font-weight: 400; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } + } + + .filter__body-item-right { + flex-shrink: 0; + font-family: NotoSansSChineseRegular; + font-size: 12px; + color: #717171; + font-weight: 400; } } } diff --git a/src/assets/css/components/views/entityExplorer/entityList/card.scss b/src/assets/css/components/views/entityExplorer/entityList/card.scss index 208afef8..6cc68dad 100644 --- a/src/assets/css/components/views/entityExplorer/entityList/card.scss +++ b/src/assets/css/components/views/entityExplorer/entityList/card.scss @@ -5,7 +5,7 @@ background: #FFFFFF; border-radius: 2px; transition: all .2s; - //border: 1px solid #E2E5EC; 新版实体列表改版,后续记得解开 + border: 1px solid #E2E5EC; &:hover .cn-entity__header .header__content { diff --git a/src/assets/css/components/views/entityExplorer/entityList/detail-overview.scss b/src/assets/css/components/views/entityExplorer/entityList/detail-overview.scss index 40ab4f7f..b3e683ae 100644 --- a/src/assets/css/components/views/entityExplorer/entityList/detail-overview.scss +++ b/src/assets/css/components/views/entityExplorer/entityList/detail-overview.scss @@ -160,6 +160,10 @@ &:last-of-type { padding-bottom: 0; } + + .el-popper { + min-width: 90px !important; + } } .row__content-accept { margin-left: 39px; @@ -187,6 +191,12 @@ color: #666666; } } + + .overview__row-related { + display: flex; + align-items: center; + margin-bottom: 8px; + } } .overview__content.domain__content { @@ -306,3 +316,8 @@ .margin-l-140 { margin-left: 140px; } + +.line-center { + display: flex; + align-items: center; +} diff --git a/src/assets/css/components/views/entityExplorer/entityList/entity-list.scss b/src/assets/css/components/views/entityExplorer/entityList/entity-list.scss index ed20c962..8542d855 100644 --- a/src/assets/css/components/views/entityExplorer/entityList/entity-list.scss +++ b/src/assets/css/components/views/entityExplorer/entityList/entity-list.scss @@ -1,5 +1,5 @@ .entity-list { - width: calc(100% - 290px); + width: 100%; height: calc(100% - 42px); flex: 1; position: relative; diff --git a/src/assets/css/components/views/entityExplorer/entityList/row.scss b/src/assets/css/components/views/entityExplorer/entityList/row.scss index ac1ad015..5d47ae0b 100644 --- a/src/assets/css/components/views/entityExplorer/entityList/row.scss +++ b/src/assets/css/components/views/entityExplorer/entityList/row.scss @@ -1,9 +1,8 @@ .cn-entity--list { display: flex; - //border: 1px #E2E5EC solid; - //margin-bottom: 10px; - //border-radius: 4px; - // 新版实体列表改版,后续记得解开 + border: 1px #E2E5EC solid; + margin-bottom: 10px; + border-radius: 4px; .cn-entity__collapse { margin-bottom: 1px; @@ -13,8 +12,8 @@ justify-content: center; align-items: flex-start; background-color: #F3F7FA; - //border-radius: 4px 0 0 4px; - // 新版实体列表改版,后续记得解开 + border-radius: 4px 0 0 4px; + span { transform: rotate(0); transition: all linear .2s; @@ -41,12 +40,12 @@ overflow: hidden; display: flex; flex-wrap: wrap; - //align-content: center; + align-content: center; padding: 16px 0; margin-bottom: 1px; background-color: white; - //border-radius: 0 4px 4px 0; - // 新版实体列表改版,后续记得解开 + border-radius: 0 4px 4px 0; + .cn-entity__icon { margin-left: 26px; margin-right: 10px; @@ -77,13 +76,12 @@ font-size: 16px; padding-bottom: 3px; color: #333333; - //.cn-entity__header-title { - // margin-right: 10px; - //} - //.cn-entity__header-tag { - // - //} - // 新版实体列表改版,后续记得解开 + .cn-entity__header-title { + margin-right: 10px; + } + .cn-entity__header-tag { + + } } .cn-entity__body { @@ -161,27 +159,21 @@ color: #666; } } - } - //.show-detail { - // flex-shrink: 0; - // padding: 0 30px; - // font-size: 12px; - // color: #3976CB; - // //color: #2C72C6; - // //font-weight: 400; - // //margin-top: -17px; - // // 新版实体列表改版,后续记得解开 - // - // &:hover { - // cursor: pointer; - // } - // - // //i { - // // font-size: 12px; - // // margin-right: 5px; - // //} - //} + .row-item-label { + font-family: NotoSansSChineseRegular; + font-size: 14px; + color: #717171; + font-weight: 400; + } + + .row-item-value { + font-family: NotoSansSChineseRegular; + font-size: 14px; + color: #353636; + font-weight: 400; + } + } } } } diff --git a/src/components/advancedSearch/TagMode.vue b/src/components/advancedSearch/TagMode.vue index 94e15c1e..3d86791e 100644 --- a/src/components/advancedSearch/TagMode.vue +++ b/src/components/advancedSearch/TagMode.vue @@ -75,13 +75,10 @@