gfwleak/cyber-narrator-cn-ui
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev-css-refact' into dev

Browse Source 
# Conflicts:
#	src/Login.vue
#	src/assets/css/components/components/rightBox/report/reportBox.scss
#	src/assets/css/components/views/charts2/entityDetailSubscriberMap.scss
#	src/assets/css/components/views/charts2/networkOverviewApps.scss
#	src/assets/css/components/views/entityExplorer/entityList/detail-overview.scss
#	src/assets/css/components/views/entityExplorer/entityList/row.scss
#	src/components/rightBox/report/ReportBox.vue
#	src/components/table/setting/knowledgeBaseTableForCard.vue
#	src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue
#	src/views/entityExplorer/entityList/Row.vue
This commit is contained in:
chenjinsong
2024-04-11 11:51:49 +08:00
parent e5c899c67f c2ee3d1f40
commit 7f5d5df9f2
310 changed files with 6097 additions and 24190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/views/entityExplorer/EntityExplorer.vue
View File

@@ -3,9 +3,9 @@
class="entity-explorer"
:class="{'entity-explorer--show-list': showList}">
<!-- 顶部工具栏，在列表页显示 -->
<div class="explorer-top-tools explorer-top-tools-new" style="margin: 2px 0;" v-show="showList">
<div class="explorer-top-tools explorer-top-tools-new" v-show="showList">
<div class="explorer-entity-top-tools">
<div class="explorer-top-tools-title" style="padding: 0;margin-left: -10px;">{{$t('network.entity')}}</div>
<div class="explorer-top-tools-title tools-title__margin">{{$t('network.entity')}}</div>
<date-time-range
class="date-time-range"
:start-time="timeFilter.startTime"
@@ -25,7 +25,7 @@
@search="search"
></explorer-search>
<!-- 内容区 -->
<div v-if="showList" style="display: flex;flex-direction: row;padding-bottom: 20px;">
<div v-if="showList" class="explorer-content">
<entity-filter
:filter-data="newFilterData"
:q="q"
@@ -40,9 +40,9 @@
@search="search"
></explorer-search>
<div style="display: flex;flex-direction: column;height: calc(100% - 42px);">
<div class="explorer-list">
<div class="explorer-result" v-if="showList" style="position: relative;display: flex">
<loading :loading="loadingCount" style="width: 240px"></loading>
<loading :loading="loadingCount" class="explorer-result-loading"></loading>
<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>
@@ -50,18 +50,10 @@
<span>{{ summaryCount.subscriberCount }}</span>
<span class="entity-hide-entity" v-if="q">
<!-- <span v-if="listData.length !== 0">-->
<!-- <el-checkbox-->
<!-- v-model="isHideRelatedEntities"-->
<!-- :label="$t('entity.hideRelatedEntities')"-->
<!-- :disabled="listData.length===0"-->
<!-- @change="hideRelatedEntities"-->
<!-- size="large" />-->
<el-radio-group v-model="isHideRelatedEntities" @change="hideRelatedEntities" class="ml-4">
<el-radio :label="true" size="large">{{ $t('entity.entityMode') }}</el-radio>
<el-radio :label="false" style="margin-left: -10px;" size="large">{{ $t('entity.relatedMode') }}</el-radio>
</el-radio-group>
<!-- </span>-->
<el-radio-group v-model="isHideRelatedEntities" @change="hideRelatedEntities" class="ml-4">
<el-radio :label="true" size="large">{{ $t('entity.entityMode') }}</el-radio>
<el-radio :label="false" class="margin-l__10" size="large">{{ $t('entity.relatedMode') }}</el-radio>
</el-radio-group>
</span>
</div>