Merge remote-tracking branch 'origin/dev-ele-update' into dev

# Conflicts:
#	package.json
This commit is contained in:
chenjinsong
2024-03-07 15:58:35 +08:00
84 changed files with 1303 additions and 514 deletions

View File

@@ -41,11 +41,11 @@
></explorer-search>
<div style="display: flex;flex-direction: column;height: calc(100% - 42px);">
<div class="explorer-result" v-if="showList" style="position: relative;">
<div class="explorer-result" v-if="showList" style="position: relative;display: flex">
<loading :loading="loadingCount" style="width: 240px"></loading>
<span>{{ summaryCount.totalCount }}&nbsp;</span>{{$t('overall.results')}}IP
<span>{{ summaryCount.ipCount }}</span>{{$t('overall.domain')}}
<span>{{ summaryCount.domainCount }}</span>APP
<span>{{ summaryCount.totalCount }}&nbsp;</span>{{$t('overall.results')}}IP<span class="margin-r-3"></span>
<span>{{ summaryCount.ipCount }}</span>{{$t('overall.domain')}}<span class="margin-r-3"></span>
<span>{{ summaryCount.domainCount }}</span>APP<span class="margin-r-3"></span>
<span>{{ summaryCount.appCount }}</span>
<span class="entity-hide-entity" v-if="q">