From 78105475fb89f2f9cfb1426ad1430ce0fdcb0bf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com> Date: Wed, 8 Nov 2023 14:28:37 +0800 Subject: [PATCH] =?UTF-8?q?CN-1457=20fix:=20=E5=AE=9E=E4=BD=93=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=A3=80=E7=B4=A2=E6=96=B0=E5=A2=9E=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/entityExplorer/entity-explorer.scss | 14 ++++++- src/views/entityExplorer/EntityExplorer.vue | 39 +++++++++++-------- .../entityList/detailOverview/App.vue | 4 +- .../entityList/detailOverview/Domain.vue | 9 +---- .../entityList/detailOverview/Ip.vue | 8 ++-- .../entityList/entityListMixin.js | 4 +- 6 files changed, 46 insertions(+), 32 deletions(-) diff --git a/src/assets/css/components/views/entityExplorer/entity-explorer.scss b/src/assets/css/components/views/entityExplorer/entity-explorer.scss index d8eddd4a..7d5419bd 100644 --- a/src/assets/css/components/views/entityExplorer/entity-explorer.scss +++ b/src/assets/css/components/views/entityExplorer/entity-explorer.scss @@ -26,7 +26,7 @@ justify-content: flex-start; } - .explorer-top-tools, .explorer-detection-top-tools { + .explorer-top-tools, .explorer-detection-top-tools, .explorer-entity-top-tools { display: flex; justify-content: flex-end; align-items: center; @@ -46,7 +46,10 @@ } } } - .explorer-detection-top-tools { + .explorer-entity-top-tools { + width: 100%; + } + .explorer-detection-top-tools, .explorer-entity-top-tools { display: flex; justify-content: space-between; } @@ -87,6 +90,13 @@ font-size: 14px; color: #353636; font-weight: 400; + + .entity-hide-entity { + margin-left: 20px; + .el-checkbox__label { + padding-left: 6px; + } + } } .explorer-container, .explorer-container-new { display: flex; diff --git a/src/views/entityExplorer/EntityExplorer.vue b/src/views/entityExplorer/EntityExplorer.vue index 89a0b449..332f3e36 100644 --- a/src/views/entityExplorer/EntityExplorer.vue +++ b/src/views/entityExplorer/EntityExplorer.vue @@ -4,8 +4,16 @@ :class="{'entity-explorer--show-list': showList}">
-
+
{{$t('network.entity')}}
+
@@ -176,6 +184,7 @@ import { handleErrorTip } from '@/components/advancedSearch/meta/error' import { columnList } from '@/utils/static-data' import { useRoute } from 'vue-router' import { columnType } from '@/components/advancedSearch/meta/meta' +import DateTimeRange from '@/components/common/TimeRange/DateTimeRange' export default { name: 'entity-explorer', @@ -183,7 +192,8 @@ export default { Loading, ExplorerSearch, EntityFilter, - EntityList + EntityList, + DateTimeRange }, data () { return { @@ -202,13 +212,6 @@ export default { entityIpNew: '-', entityIpActive: '-', - // pageObj: { - // pageNo: 1, - // // 是否重置pageNo，在执行新搜索时是true - // resetPageNo: true, - // pageSize: defaultPageSize, - // total: 0 - // }, newFilterData: [ { icon: 'cn-icon cn-icon-registration-country', @@ -286,7 +289,7 @@ export default { initFlag: true, // 初始化标志，避免初始化时pageSize和pageNo会调用搜索 timer: null, // 初始化标志的延时器，需要销毁 summaryCount: { - total: 0, + totalCount: 0, domainCount: 0, ipCount: 0, appCount: 0 @@ -552,8 +555,8 @@ export default { const queryParams = { pageSize: params.pageSize, pageNo: params.pageNo, - // startTime: getSecond(params.startTime), - // endTime: getSecond(params.endTime), + startTime: getSecond(params.startTime), + endTime: getSecond(params.endTime), resource: params.q || '' } axios.get(api.entity.entityList.list, { params: queryParams }).then(response => { @@ -561,7 +564,6 @@ export default { this.listData = [] this.$nextTick(() => { this.listData = response.data.data.list - this.pageObj.total = response.data.data.total }) } else { this.$message.error(response.data.message) @@ -574,19 +576,20 @@ export default { queryCount (params) { this.loadingCount = true const queryParams = { - // startTime: getSecond(params.startTime), - // endTime: getSecond(params.endTime), + startTime: getSecond(params.startTime), + endTime: getSecond(params.endTime), resource: params.q || '' } axios.get(api.entity.entityList.summaryCount, { params: queryParams }).then(response => { if (response.status === 200) { this.summaryCount = response.data.data + this.pageObj.total = response.data.data.totalCount } else { - this.summaryCount = { total: 0, domainCount: 0, ipCount: 0, appCount: 0 } + this.summaryCount = { totalCount: 0, domainCount: 0, ipCount: 0, appCount: 0 } } }).catch(e => { console.error(e) - this.summaryCount = { total: 0, domainCount: 0, ipCount: 0, appCount: 0 } + this.summaryCount = { totalCount: 0, domainCount: 0, ipCount: 0, appCount: 0 } }).finally(() => { this.loadingCount = false }) @@ -751,6 +754,8 @@ export default { } }) this.keywordList = keyList + } else { + this.keywordList = [] } }, getKeyValue (str) { diff --git a/src/views/entityExplorer/entityList/detailOverview/App.vue b/src/views/entityExplorer/entityList/detailOverview/App.vue index 025ea9e4..e25b0cec 100644 --- a/src/views/entityExplorer/entityList/detailOverview/App.vue +++ b/src/views/entityExplorer/entityList/detailOverview/App.vue @@ -216,7 +216,7 @@ import Chart from '@/views/charts/Chart' import _ from 'lodash' import axios from 'axios' import relatedServer from '@/mixins/relatedServer' -import { dateFormatByAppearance, getMillisecond } from '@/utils/date-util' +import { dateFormatByAppearance, getMillisecond, getSecond } from '@/utils/date-util' import Loading from '@/components/common/Loading' import { ref } from 'vue' @@ -322,6 +322,8 @@ export default { dateFormatByAppearance, getQueryParams () { return { + startTime: getSecond(this.timeFilter.startTime), + endTime: getSecond(this.timeFilter.endTime), resource: this.entity.entityValue } }, diff --git a/src/views/entityExplorer/entityList/detailOverview/Domain.vue b/src/views/entityExplorer/entityList/detailOverview/Domain.vue index 7b0f216e..bcbed625 100644 --- a/src/views/entityExplorer/entityList/detailOverview/Domain.vue +++ b/src/views/entityExplorer/entityList/detailOverview/Domain.vue @@ -325,15 +325,10 @@ export default { getMillisecond, dateFormatByAppearance, getQueryParams () { - return { - resource: this.entity.entityValue - } - }, - getQueryParamsWithTime () { return { startTime: getSecond(this.timeFilter.startTime), endTime: getSecond(this.timeFilter.endTime), - domain: this.entity.entityValue + resource: this.entity.entityValue } }, getPerformanceQueryParams () { @@ -355,7 +350,7 @@ export default { }) }, getBasicProperties () { - axios.get(this.basicProperties, { params: this.getQueryParamsWithTime() }).then(response => { + axios.get(this.basicProperties, { params: this.getQueryParams() }).then(response => { if (response.status === 200) { this.entityData = { ...this.entityData, diff --git a/src/views/entityExplorer/entityList/detailOverview/Ip.vue b/src/views/entityExplorer/entityList/detailOverview/Ip.vue index a8ba4e95..3617cf53 100644 --- a/src/views/entityExplorer/entityList/detailOverview/Ip.vue +++ b/src/views/entityExplorer/entityList/detailOverview/Ip.vue @@ -251,7 +251,7 @@ import { valueToRangeValue } from '@/utils/unit-convert' import Chart from '@/views/charts/Chart' import _ from 'lodash' import relatedServer from '@/mixins/relatedServer' -import { dateFormatByAppearance, getMillisecond } from '@/utils/date-util' +import { dateFormatByAppearance, getMillisecond, getSecond } from '@/utils/date-util' import Loading from '@/components/common/Loading' import axios from 'axios' @@ -406,6 +406,8 @@ export default { dateFormatByAppearance, getQueryParams () { return { + startTime: getSecond(this.timeFilter.startTime), + endTime: getSecond(this.timeFilter.endTime), resource: this.entity.entityValue } }, @@ -433,8 +435,8 @@ export default { }, getOpenPort () { const params = { - // startTime: getSecond(this.timeFilter.startTime), - // endTime: getSecond(this.timeFilter.endTime), + startTime: getSecond(this.timeFilter.startTime), + endTime: getSecond(this.timeFilter.endTime), resource: this.entity.entityValue } diff --git a/src/views/entityExplorer/entityList/entityListMixin.js b/src/views/entityExplorer/entityList/entityListMixin.js index 72b35087..b13728b6 100644 --- a/src/views/entityExplorer/entityList/entityListMixin.js +++ b/src/views/entityExplorer/entityList/entityListMixin.js @@ -141,8 +141,8 @@ export default { }, getQueryParams () { return { - // startTime: getSecond(this.timeFilter.startTime), - // endTime: getSecond(this.timeFilter.endTime), + startTime: getSecond(this.timeFilter.startTime), + endTime: getSecond(this.timeFilter.endTime), resource: this.entityType } },