diff --git a/src/assets/css/components/components/entities/entities.scss b/src/assets/css/components/components/entities/entities.scss index d28185a0..0add7be8 100644 --- a/src/assets/css/components/components/entities/entities.scss +++ b/src/assets/css/components/components/entities/entities.scss @@ -100,13 +100,11 @@ i { font-size: 22px; - color: #23bf9a; } } .header__content { font-size: 22px; color: #333333; - font-family: PingFangSC-Medium; font-weight: 500; overflow: hidden; text-overflow: ellipsis; diff --git a/src/assets/css/components/index.scss b/src/assets/css/components/index.scss index 346565da..4d58c2bb 100644 --- a/src/assets/css/components/index.scss +++ b/src/assets/css/components/index.scss @@ -15,3 +15,4 @@ @import './views/entityExplorer/entityFilter'; @import './views/entityExplorer/entityList/entityList'; @import './views/entityExplorer/entityList/card'; +@import './views/entityExplorer/entityList/row'; diff --git a/src/assets/css/components/views/entityExplorer/entityExplorer.scss b/src/assets/css/components/views/entityExplorer/entityExplorer.scss index c36b7edf..dc0bff66 100644 --- a/src/assets/css/components/views/entityExplorer/entityExplorer.scss +++ b/src/assets/css/components/views/entityExplorer/entityExplorer.scss @@ -35,6 +35,7 @@ .explorer-container { display: flex; height: 100%; + overflow: hidden auto; } .explorer-foot { display: flex; diff --git a/src/assets/css/components/views/entityExplorer/entityFilter.scss b/src/assets/css/components/views/entityExplorer/entityFilter.scss index 236a206e..d3061e4b 100644 --- a/src/assets/css/components/views/entityExplorer/entityFilter.scss +++ b/src/assets/css/components/views/entityExplorer/entityFilter.scss @@ -2,7 +2,6 @@ display: flex; flex-direction: column; width: 280px; - padding-top: 10px; margin-right: 10px; .filter-case__header { @@ -19,11 +18,11 @@ flex-direction: column; border: 1px solid #E7EAED; margin-bottom: 10px; - padding: 0 15px; background-color: white; .filter__header { height: 46px; + margin: 0 15px; line-height: 46px; border-bottom: 1px solid #EFF2F5; font-size: 14px; @@ -35,6 +34,7 @@ .filter__row { display: flex; justify-content: space-between; + padding: 0 15px; height: 26px; align-items: center; cursor: pointer; diff --git a/src/assets/css/components/views/entityExplorer/entityList/card.scss b/src/assets/css/components/views/entityExplorer/entityList/card.scss index dc0be9a7..2c842765 100644 --- a/src/assets/css/components/views/entityExplorer/entityList/card.scss +++ b/src/assets/css/components/views/entityExplorer/entityList/card.scss @@ -42,12 +42,11 @@ width: 52px; height: 52px; border-radius: 50%; - background: #e8fbf9; - border: 2px solid #e8fbf9; + background-color: #F3F7FA; i { font-size: 22px; - color: #23bf9a; + color: #4E84B4; } } .header__content { diff --git a/src/assets/css/components/views/entityExplorer/entityList/entityList.scss b/src/assets/css/components/views/entityExplorer/entityList/entityList.scss index 32389d8c..7bf437b6 100644 --- a/src/assets/css/components/views/entityExplorer/entityList/entityList.scss +++ b/src/assets/css/components/views/entityExplorer/entityList/entityList.scss @@ -1,7 +1,6 @@ .entity-list { width: calc(100% - 290px); - height: 100%; - padding-top: 10px; + flex: 1; .entity-list__content { height: 100%; @@ -17,5 +16,10 @@ width: calc(100% - 10px); overflow: hidden auto; } + .entity-list--list { + display: flex; + flex-direction: column; + overflow: hidden auto; + } } } diff --git a/src/assets/css/components/views/entityExplorer/entityList/row.scss b/src/assets/css/components/views/entityExplorer/entityList/row.scss new file mode 100644 index 00000000..099982d1 --- /dev/null +++ b/src/assets/css/components/views/entityExplorer/entityList/row.scss @@ -0,0 +1,93 @@ +.cn-entity--list { + display: flex; + .cn-entity__collapse { + margin-bottom: 1px; + padding-top: 30px; + width: 24px; + display: flex; + justify-content: center; + align-items: flex-start; + background-color: #F3F7FA; + + i { + color: #ADBCCA; + font-size: 12px; + } + } + .cn-entity__case { + flex: 1; + display: flex; + padding: 16px 0; + margin-bottom: 1px; + background-color: white; + + .cn-entity__icon { + margin-left: 26px; + margin-right: 10px; + overflow: hidden; + display: flex; + justify-content: center; + justify-items: center; + align-items: center; + width: 52px; + height: 52px; + border-radius: 50%; + background-color: #F3F7FA; + + i { + font-size: 22px; + color: #4E84B4; + } + } + .cn-entity__row { + display: flex; + flex-direction: column; + flex: 1; + justify-content: center; + + .cn-entity__header { + font-size: 16px; + color: #333333; + } + .cn-entity__body { + display: flex; + flex-direction: column; + + .body__basic-info { + display: flex; + flex-direction: row; + + .basic-info { + flex: 1; + display: flex; + flex-direction: row; + + .basic-info__item { + padding-right: 40px; + i { + padding-right: 6px; + color: #8FA1BE; + font-size: 12px; + } + span { + font-size: 14px; + } + span:first-of-type { + color: #999; + } + span:last-of-type { + color: #666; + } + } + } + .show-detail { + flex-shrink: 0; + padding: 0 30px; + font-size: 12px; + color: #3976CB; + } + } + } + } + } +} diff --git a/src/assets/css/components/views/entityExplorer/search/explorerSearch.scss b/src/assets/css/components/views/entityExplorer/search/explorerSearch.scss index c57dc4cd..b2b10abe 100644 --- a/src/assets/css/components/views/entityExplorer/search/explorerSearch.scss +++ b/src/assets/css/components/views/entityExplorer/search/explorerSearch.scss @@ -6,6 +6,7 @@ background-image: url('~@/assets/img/cn-explore-bg.svg'); background-repeat: no-repeat; background-position: 0 100%; + margin-bottom: 10px; &.explorer-search--show-list { flex: 0 0 40px; diff --git a/src/utils/constants.js b/src/utils/constants.js index f4cf295d..e7f59c50 100644 --- a/src/utils/constants.js +++ b/src/utils/constants.js @@ -74,7 +74,7 @@ export const entityFilterType = { { column: 'city_distinct_count', labelI18nCode: 'overall.city', - icon: 'el-icon-s-home' + icon: 'cn-icon cn-icon-city' }, { column: 'asn_distinct_count', diff --git a/src/views/entityExplorer/entityList/Card.vue b/src/views/entityExplorer/entityList/Card.vue index ff852835..b3cc4b7e 100644 --- a/src/views/entityExplorer/entityList/Card.vue +++ b/src/views/entityExplorer/entityList/Card.vue @@ -128,61 +128,9 @@ diff --git a/src/views/entityExplorer/entityList/Row.vue b/src/views/entityExplorer/entityList/Row.vue index fad58f60..07d8f1b8 100644 --- a/src/views/entityExplorer/entityList/Row.vue +++ b/src/views/entityExplorer/entityList/Row.vue @@ -1,9 +1,102 @@ diff --git a/src/views/entityExplorer/entityList/entityListMixin.js b/src/views/entityExplorer/entityList/entityListMixin.js new file mode 100644 index 00000000..5a63dbdd --- /dev/null +++ b/src/views/entityExplorer/entityList/entityListMixin.js @@ -0,0 +1,53 @@ +import _ from 'lodash' + +export default { + props: { + entity: Object + }, + data () { + return { + entityData: {} + } + }, + computed: { + iconClass () { + let className + switch (this.entityData.entityType) { + case ('ip'): { + className = 'cn-icon cn-icon-ip' + break + } + case ('domain'): { + className = 'cn-icon cn-icon-domain' + break + } + case ('app'): { + className = 'cn-icon cn-icon-app' + break + } + default: break + } + return className + } + }, + methods: { + entityDetail (entity) { + + }, + queryTraffic () { + + }, + querySecurity () { + + }, + queryAlert () { + + } + }, + mounted () { + this.entityData = _.cloneDeep(this.entity) + setTimeout(() => { this.queryTraffic() }) + setTimeout(() => { this.querySecurity() }) + setTimeout(() => { this.queryAlert() }) + } +}