diff --git a/public/images/flag/011-china.svg b/public/images/flag/011-china.svg new file mode 100644 index 00000000..9eba847c --- /dev/null +++ b/public/images/flag/011-china.svg @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/images/flag/142-australia.svg b/public/images/flag/142-australia.svg new file mode 100644 index 00000000..66544b60 --- /dev/null +++ b/public/images/flag/142-australia.svg @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/images/flag/185-united states of america.svg b/public/images/flag/185-united states of america.svg new file mode 100644 index 00000000..dedd71f1 --- /dev/null +++ b/public/images/flag/185-united states of america.svg @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/images/flag/207-germany.svg b/public/images/flag/207-germany.svg new file mode 100644 index 00000000..5687fdb6 --- /dev/null +++ b/public/images/flag/207-germany.svg @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/public/images/flag/218-south korea.svg b/public/images/flag/218-south korea.svg new file mode 100644 index 00000000..8bc3c581 --- /dev/null +++ b/public/images/flag/218-south korea.svg @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/assets/css/components/components/advancedSearch/advanced-search.scss b/src/assets/css/components/components/advancedSearch/advanced-search.scss index 436cce95..60c3eeec 100644 --- a/src/assets/css/components/components/advancedSearch/advanced-search.scss +++ b/src/assets/css/components/components/advancedSearch/advanced-search.scss @@ -42,6 +42,10 @@ color: #A6AAAE; font-size: 20px; } + .cn-icon-filter { + color: #A6AAAE; + font-size: 20px; + } .el-icon-search { color: #3976CB; font-size: 32px; @@ -64,6 +68,10 @@ color: #A6AAAE; font-size: 14px; } + .cn-icon-filter { + color: #A6AAAE; + font-size: 14px; + } .el-icon-search { color: white; font-size: 16px; diff --git a/src/assets/css/components/components/advancedSearch/advanced-search2.scss b/src/assets/css/components/components/advancedSearch/advanced-search2.scss index b631dc1d..ad24211c 100644 --- a/src/assets/css/components/components/advancedSearch/advanced-search2.scss +++ b/src/assets/css/components/components/advancedSearch/advanced-search2.scss @@ -10,9 +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 { color: #A6AAAE; font-size: 18px; } diff --git a/src/assets/css/components/views/entityExplorer/entity-explorer.scss b/src/assets/css/components/views/entityExplorer/entity-explorer.scss index 2d61b63a..7b246f4d 100644 --- a/src/assets/css/components/views/entityExplorer/entity-explorer.scss +++ b/src/assets/css/components/views/entityExplorer/entity-explorer.scss @@ -50,6 +50,10 @@ display: flex; justify-content: space-between; } + .explorer-top-tools-new { + display: flex; + justify-content: space-between; + } .explorer-top-tools-title { font-size: 24px; line-height: 24px; @@ -77,6 +81,13 @@ border: 1px solid #E2E5EC; border-radius: 4px; } + .explorer-result { + margin-top: 10px; + margin-bottom: 18px; + font-size: 14px; + color: #353636; + font-weight: 400; + } .explorer-container { display: flex; overflow: visible; /*overflow: hidden;*/ diff --git a/src/assets/css/components/views/entityExplorer/entityList/card.scss b/src/assets/css/components/views/entityExplorer/entityList/card.scss index 9189513c..6cc68dad 100644 --- a/src/assets/css/components/views/entityExplorer/entityList/card.scss +++ b/src/assets/css/components/views/entityExplorer/entityList/card.scss @@ -5,6 +5,7 @@ background: #FFFFFF; border-radius: 2px; transition: all .2s; + border: 1px solid #E2E5EC; &:hover .cn-entity__header .header__content { diff --git a/src/assets/css/components/views/entityExplorer/entityList/row.scss b/src/assets/css/components/views/entityExplorer/entityList/row.scss index 5031bff3..4a799994 100644 --- a/src/assets/css/components/views/entityExplorer/entityList/row.scss +++ b/src/assets/css/components/views/entityExplorer/entityList/row.scss @@ -1,5 +1,8 @@ .cn-entity--list { display: flex; + border: 1px #E2E5EC solid; + margin-bottom: 10px; + border-radius: 4px; .cn-entity__collapse { margin-bottom: 1px; @@ -9,6 +12,7 @@ justify-content: center; align-items: flex-start; background-color: #F3F7FA; + border-radius: 4px 0 0 4px; span { transform: rotate(0); @@ -36,9 +40,11 @@ overflow: hidden; display: flex; flex-wrap: wrap; + align-content: center; padding: 16px 0; margin-bottom: 1px; background-color: white; + border-radius: 0 4px 4px 0; .cn-entity__icon { margin-left: 26px; @@ -70,6 +76,12 @@ font-size: 16px; padding-bottom: 3px; color: #333333; + .cn-entity__header-title { + margin-right: 10px; + } + .cn-entity__header-tag { + + } } .cn-entity__body { @@ -147,8 +159,6 @@ span:last-of-type { color: #666; } - - } } @@ -156,11 +166,18 @@ 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; + } } } } diff --git a/src/components/advancedSearch/TagMode.vue b/src/components/advancedSearch/TagMode.vue index 2eb39d8a..54387d18 100644 --- a/src/components/advancedSearch/TagMode.vue +++ b/src/components/advancedSearch/TagMode.vue @@ -75,10 +75,10 @@
{{$t('entities.advancedSearch.add')}}
-
+
-
+
@@ -415,3 +415,20 @@ export default { } } + + diff --git a/src/components/advancedSearch/TextMode.vue b/src/components/advancedSearch/TextMode.vue index cc3ae574..a5cf48c3 100644 --- a/src/components/advancedSearch/TextMode.vue +++ b/src/components/advancedSearch/TextMode.vue @@ -4,9 +4,12 @@ >
- +
-
+
+ +
+
@@ -38,6 +41,9 @@ export default { }, emits: ['changeMode', 'search'], methods: { + cleanParams () { + toRaw(this.codeMirror).setValue('') + }, initCodeMirror () { this.codeMirror = CodeMirror.fromTextArea(this.$refs.textSearch, { mode: { @@ -151,3 +157,29 @@ export default { } } + + diff --git a/src/components/layout/Container.vue b/src/components/layout/Container.vue index c9fea2fa..dcc65e79 100644 --- a/src/components/layout/Container.vue +++ b/src/components/layout/Container.vue @@ -20,7 +20,7 @@ export default { entityDetectionStyle () { const route = this.$route.name !== undefined ? this.$route.name : this.$route if (listScrollPath.indexOf(route.path) > -1) { - const style = route.path === listScrollPath[0] ? 'overflow:auto;background-color: #EFF2F5;' : 'overflow:auto;' + const style = 'overflow:auto;' return style } else { return '' diff --git a/src/views/entityExplorer/EntityExplorer.vue b/src/views/entityExplorer/EntityExplorer.vue index 2d695bda..8a78390c 100644 --- a/src/views/entityExplorer/EntityExplorer.vue +++ b/src/views/entityExplorer/EntityExplorer.vue @@ -3,13 +3,18 @@ class="entity-explorer" :class="{'entity-explorer--show-list': showList}"> -
- - - - - - +
+
+
{{$t('network.entity')}}
+
+
+ + + + + + +
+ + +
+ 8,866 results，IP 2666，Domain 3200，APP 3000 +
diff --git a/src/views/entityExplorer/EntityFilter.vue b/src/views/entityExplorer/EntityFilter.vue index 68436a53..7a8d5cd0 100644 --- a/src/views/entityExplorer/EntityFilter.vue +++ b/src/views/entityExplorer/EntityFilter.vue @@ -1,149 +1,382 @@ -