diff --git a/src/assets/css/components/views/entityExplorer/entity-explorer.scss b/src/assets/css/components/views/entityExplorer/entity-explorer.scss index f1b243bf..aa083e75 100644 --- a/src/assets/css/components/views/entityExplorer/entity-explorer.scss +++ b/src/assets/css/components/views/entityExplorer/entity-explorer.scss @@ -134,9 +134,10 @@ display: inline-block; position: relative; .overview-left-loading-span { - font-size: 30px; - color: #333333; - font-weight: bold; + font-family: NotoSansHans-Medium; + font-size: 18px; + color: #575757; + font-weight: 500; } .chart__loading i.el-icon-loading { top: calc(50% - 12px); @@ -152,6 +153,7 @@ .right-row { display: flex; height: 18px; + line-height: 18px; align-items: center; color: #666666; @@ -174,15 +176,41 @@ color: #333333; font-weight: bold; } + .right-value-block { + font-family: NotoSansHans-Medium; + font-size: 14px; + color: #353636; + font-weight: 600; + + .last-hour { + font-family: NotoSansSChineseRegular; + font-size: 12px; + color: #717171; + font-weight: 400; + } + } i { padding-right: 4px; - font-size: 18px; + font-size: 19px; } .cn-icon-increase { color: #23BF9A; } .cn-icon-active { - color: #0091FF; + color: #35ADDA; + } + .entity-explorer-total__icon { + width: 18px; + height: 18px; + line-height: 18px; + padding-left: 3px; + background-color: #04A6AB; + color: #fff; + border-radius: 50%; + font-size: 12px; + font-weight: 500; + margin-right: 4px; + margin-left: 1px; } } } diff --git a/src/assets/css/font/iconfont.css b/src/assets/css/font/iconfont.css index 9873ea5b..4d6d4e63 100644 --- a/src/assets/css/font/iconfont.css +++ b/src/assets/css/font/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "cn-icon"; /* Project id 2614877 */ - src: url('iconfont.woff2?t=1691573279860') format('woff2'), - url('iconfont.woff?t=1691573279860') format('woff'), - url('iconfont.ttf?t=1691573279860') format('truetype'); + src: url('iconfont.woff2?t=1691743782241') format('woff2'), + url('iconfont.woff?t=1691743782241') format('woff'), + url('iconfont.ttf?t=1691743782241') format('truetype'); } .cn-icon { @@ -13,6 +13,14 @@ -moz-osx-font-smoothing: grayscale; } +.cn-icon-_zhanbi:before { + content: "\e65a"; +} + +.cn-icon-tag1:before { + content: "\e774"; +} + .cn-icon-Event1:before { content: "\e80b"; } diff --git a/src/assets/css/font/iconfont.js b/src/assets/css/font/iconfont.js index bde1bd89..b57a4cc7 100644 --- a/src/assets/css/font/iconfont.js +++ b/src/assets/css/font/iconfont.js @@ -1 +1 @@ -window._iconfont_svg_string_2614877='',function(l){var a=(a=document.getElementsByTagName("script"))[a.length-1],c=a.getAttribute("data-injectcss"),a=a.getAttribute("data-disable-injectsvg");if(!a){var h,o,i,m,v,z=function(a,c){c.parentNode.insertBefore(a,c)};if(c&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}h=function(){var a,c=document.createElement("div");c.innerHTML=l._iconfont_svg_string_2614877,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(a=document.body).firstChild?z(c,a.firstChild):a.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(o=function(){document.removeEventListener("DOMContentLoaded",o,!1),h()},document.addEventListener("DOMContentLoaded",o,!1)):document.attachEvent&&(i=h,m=l.document,v=!1,n(),m.onreadystatechange=function(){"complete"==m.readyState&&(m.onreadystatechange=null,t())})}function t(){v||(v=!0,i())}function n(){try{m.documentElement.doScroll("left")}catch(a){return void setTimeout(n,50)}t()}}(window); +window._iconfont_svg_string_2614877='',function(l){var a=(a=document.getElementsByTagName("script"))[a.length-1],c=a.getAttribute("data-injectcss"),a=a.getAttribute("data-disable-injectsvg");if(!a){var h,o,i,m,v,z=function(a,c){c.parentNode.insertBefore(a,c)};if(c&&!l.__iconfont__svg__cssinject__){l.__iconfont__svg__cssinject__=!0;try{document.write("")}catch(a){console&&console.log(a)}}h=function(){var a,c=document.createElement("div");c.innerHTML=l._iconfont_svg_string_2614877,(c=c.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",c=c,(a=document.body).firstChild?z(c,a.firstChild):a.appendChild(c))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(o=function(){document.removeEventListener("DOMContentLoaded",o,!1),h()},document.addEventListener("DOMContentLoaded",o,!1)):document.attachEvent&&(i=h,m=l.document,v=!1,s(),m.onreadystatechange=function(){"complete"==m.readyState&&(m.onreadystatechange=null,t())})}function t(){v||(v=!0,i())}function s(){try{m.documentElement.doScroll("left")}catch(a){return void setTimeout(s,50)}t()}}(window); \ No newline at end of file diff --git a/src/assets/css/font/iconfont.ttf b/src/assets/css/font/iconfont.ttf index c613dd14..0fdc0dd5 100644 Binary files a/src/assets/css/font/iconfont.ttf and b/src/assets/css/font/iconfont.ttf differ diff --git a/src/assets/css/font/iconfont.woff b/src/assets/css/font/iconfont.woff index 1f77145a..c3ad8585 100644 Binary files a/src/assets/css/font/iconfont.woff and b/src/assets/css/font/iconfont.woff differ diff --git a/src/assets/css/font/iconfont.woff2 b/src/assets/css/font/iconfont.woff2 index c02f6ea7..460a8ce1 100644 Binary files a/src/assets/css/font/iconfont.woff2 and b/src/assets/css/font/iconfont.woff2 differ diff --git a/src/components/advancedSearch/Index.vue b/src/components/advancedSearch/Index.vue index 0b166ff5..9de6dc9b 100644 --- a/src/components/advancedSearch/Index.vue +++ b/src/components/advancedSearch/Index.vue @@ -7,6 +7,7 @@ ref="textMode" :column-list="columnList" :str="str" + :show-list="showList" @changeMode="changeMode" @search="search" > @@ -17,6 +18,7 @@ :operator-list="showOperatorList" :connection-list="showConnectionList" :convert-meta-list="metaList" + :show-list="showList" @changeMode="changeMode" @search="search" > @@ -50,6 +52,9 @@ export default { type: Boolean, default: true }, + showList: { + type: Boolean + }, // 条件字段列表 columnList: { type: Array, diff --git a/src/components/advancedSearch/TagMode.vue b/src/components/advancedSearch/TagMode.vue index 61a28c13..4651c546 100644 --- a/src/components/advancedSearch/TagMode.vue +++ b/src/components/advancedSearch/TagMode.vue @@ -88,7 +88,7 @@ -
+
@@ -107,7 +107,8 @@ export default { columnList: Array, operatorList: Array, connectionList: Array, - convertMetaList: Array + convertMetaList: Array, + showList: Boolean }, data () { return { diff --git a/src/components/advancedSearch/TextMode.vue b/src/components/advancedSearch/TextMode.vue index fecf6f12..5094faff 100644 --- a/src/components/advancedSearch/TextMode.vue +++ b/src/components/advancedSearch/TextMode.vue @@ -18,7 +18,7 @@
-
+
@@ -42,7 +42,8 @@ export default { name: 'TextMode', props: { columnList: Array, - str: String + str: String, + showList: Boolean }, data () { return { @@ -230,4 +231,8 @@ export default { margin-top: 9px !important; } } +.entity-explorer-search { + color: #3976CB; + margin-top: -2px; +} diff --git a/src/utils/tools.js b/src/utils/tools.js index 4b44db08..4611446f 100644 --- a/src/utils/tools.js +++ b/src/utils/tools.js @@ -1360,10 +1360,10 @@ export function toUpperCaseByString (str) { * @returns {string} */ export function numberWithCommas (num) { - if (typeof num === 'number') { + if (num) { return num.toString().replace(/\B(? - {{ numberWithCommas(entityAppTotal) }} + APP
-
- APP -
-
- -
Active
+
+ +
{{ $t('network.total') }}
-
{{ numberWithCommas(entityAppActive) }}
+
{{ numberWithCommas(entityAppTotal) }}
+
+
+ +
+ +
{{ $t('entity.active') }}
+
+ +
+ {{ numberWithCommas(entityAppActive) }} + {{ $t('entity.inLastHour') }} +
@@ -85,19 +94,28 @@
- {{ numberWithCommas(entityDomainTotal) }} + Domain
-
- DOMAIN +
+ +
{{ $t('network.total') }}
+
+ +
{{ numberWithCommas(entityDomainTotal) }}
+
+
-
Active
+
{{ $t('entity.active') }}
-
{{ numberWithCommas(entityDomainActive) }}
+
+ {{ numberWithCommas(entityDomainActive) }} + {{ $t('entity.inLastHour') }} +
@@ -107,19 +125,28 @@
- {{ numberWithCommas(entityIpTotal) }} + IP
-
- IP +
+ +
{{ $t('network.total') }}
+
+ +
{{ numberWithCommas(entityIpTotal) }}
+
+
-
Active
+
{{ $t('entity.active') }}
-
{{ numberWithCommas(entityIpActive) }}
+
+ {{ numberWithCommas(entityIpActive) }} + {{ $t('entity.inLastHour') }} +
diff --git a/src/views/entityExplorer/search/ExplorerSearch.vue b/src/views/entityExplorer/search/ExplorerSearch.vue index dd8773d0..529472de 100644 --- a/src/views/entityExplorer/search/ExplorerSearch.vue +++ b/src/views/entityExplorer/search/ExplorerSearch.vue @@ -10,6 +10,7 @@ :connection-list="connectionList" :default-mode="defaultMode" :full-text="true" + :show-list="showList" :class="{'advanced-search--show-list': showList}" @search="search" >