From 7b901c8ab8993754089c07ccfc241d8d7c634b93 Mon Sep 17 00:00:00 2001 From: hanyuxia Date: Fri, 22 Mar 2024 13:54:37 +0800 Subject: [PATCH 01/10] =?UTF-8?q?fix:element=E5=8D=87=E7=BA=A7=E5=90=8E?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93=E7=82=B9=E5=87=BB=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/setting/KnowledgeBaseForm.vue | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/views/setting/KnowledgeBaseForm.vue b/src/views/setting/KnowledgeBaseForm.vue index 016930f2..9c595cec 100644 --- a/src/views/setting/KnowledgeBaseForm.vue +++ b/src/views/setting/KnowledgeBaseForm.vue @@ -81,7 +81,7 @@ >
-
{{ $t('knowledgeBase.dropFileHereOr') }}{{ $t('knowledgeBase.clickToUpload') }}
+
{{ $t('knowledgeBase.dropFileHereOr') }}{{ $t('knowledgeBase.clickToUpload') }}
{{ $t('knowledgeBase.supportCsv') }}{{$t('knowledgeBase.downloadTemplate')}}
@@ -664,15 +664,10 @@ export default { customClass: 'del-model' }).then(() => { this.isClick = true - self.$refs.upload.$refs.uploadRef.handleClick() + document.getElementsByName('file')[0].click() }).catch(() => {}).finally(() => { this.isShowUploadTips = false }) - } else { - this.isClick = true - this.isShowUploadTips = false - self.$refs.upload.submit() - self.$refs.upload.$refs.uploadRef.handleClick() } } }, @@ -1196,10 +1191,15 @@ export default { const div = document.getElementsByClassName('el-upload-dragger')[0] const self = this div.addEventListener('click', function (event) { - this.isClick = true - event.stopPropagation() - event.preventDefault() - self.uploadTip(event) + self.isClick = true + if (!self.isShowUploadTips && self.importedData.length === 0) { + self.isClick = true + self.isShowUploadTips = false + } else { + event.stopPropagation() + event.preventDefault() + self.uploadTip(event) + } }) if (this.knowledgeBaseId) { this.stepHeights[2] = itemListHeight.hasData// 修改的时候一直是478 From 1910b6dd5a45e33b4e54cebf6f130e123296b0e6 Mon Sep 17 00:00:00 2001 From: hanyuxia Date: Fri, 22 Mar 2024 18:14:33 +0800 Subject: [PATCH 02/10] =?UTF-8?q?fix:=20element=E5=8D=87=E7=BA=A7=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=90=8E=E6=8A=A5=E5=91=8A=E6=96=B0=E5=A2=9E=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E4=BF=AE=E6=94=B9=EF=BC=88Input=E6=95=B0=E5=AD=97?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E6=A1=86=E4=B8=8D=E5=8F=AF=E7=82=B9=E5=87=BB?= =?UTF-8?q?=EF=BC=9BTime=20Limit=E7=9A=84=E5=BC=80=E5=A7=8B=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E9=AA=8C=E8=AF=81=E4=BB=A3=E7=A0=81=E6=8A=A5=E9=94=99?= =?UTF-8?q?=EF=BC=9Bprovider=E6=A0=B7=E5=BC=8F=E6=9C=AA=E5=AF=B9=E9=BD=90?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/rightBox/report/reportBox.scss | 3 ++ src/components/rightBox/report/ReportBox.vue | 53 +++++++++---------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/assets/css/components/components/rightBox/report/reportBox.scss b/src/assets/css/components/components/rightBox/report/reportBox.scss index d7961f2b..a369c36b 100644 --- a/src/assets/css/components/components/rightBox/report/reportBox.scss +++ b/src/assets/css/components/components/rightBox/report/reportBox.scss @@ -142,6 +142,9 @@ // border: 1px solid #dcdfe6; // border-radius: 2px 0 0 2px; //} + .el-select__prefix { + line-height:30px; + } .el-select__prefix, .el-input__prefix { left: 0; background-color: #f5f7fa; diff --git a/src/components/rightBox/report/ReportBox.vue b/src/components/rightBox/report/ReportBox.vue index c5fe7036..c2c459aa 100644 --- a/src/components/rightBox/report/ReportBox.vue +++ b/src/components/rightBox/report/ReportBox.vue @@ -43,10 +43,10 @@
- + - +
{{$t('report.customEvery')}}
- + - +
@@ -132,9 +132,9 @@ @@ -16,6 +19,7 @@ import App from './App' import Domain from './Domain' import Ip from './Ip' +import Subscriber from './Subscriber' export default { /* 详情概览 */ @@ -28,7 +32,8 @@ export default { components: { 'domain-overview': Domain, 'app-overview': App, - 'ip-overview': Ip + 'ip-overview': Ip, + 'subscriber-overview': Subscriber }, methods: { getEntity (data) { diff --git a/src/views/entityExplorer/entityList/detailOverview/Domain.vue b/src/views/entityExplorer/entityList/detailOverview/Domain.vue index 70de563b..935b2922 100644 --- a/src/views/entityExplorer/entityList/detailOverview/Domain.vue +++ b/src/views/entityExplorer/entityList/detailOverview/Domain.vue @@ -51,7 +51,7 @@
{{$t('overall.throughput')}}
-
+
{{$t('overall.sent')}}： {{valueToRangeValue(entityData.bytesSentRate, unitTypes.bps).join(' ') !== '- ' ? valueToRangeValue(entityData.bytesSentRate, unitTypes.bps).join(' ') : '-'}}
diff --git a/src/views/entityExplorer/entityList/detailOverview/Ip.vue b/src/views/entityExplorer/entityList/detailOverview/Ip.vue index 139c889f..6f0fd43c 100644 --- a/src/views/entityExplorer/entityList/detailOverview/Ip.vue +++ b/src/views/entityExplorer/entityList/detailOverview/Ip.vue @@ -87,7 +87,7 @@
{{$t('overall.throughput')}}
-
+
{{$t('overall.sent')}}: {{valueToRangeValue(entityData.bytesSentRate, unitTypes.bps).join(' ') !== '- ' ? valueToRangeValue(entityData.bytesSentRate, unitTypes.bps).join(' ') : '-'}}
diff --git a/src/views/entityExplorer/entityList/detailOverview/Subscriber.vue b/src/views/entityExplorer/entityList/detailOverview/Subscriber.vue new file mode 100644 index 00000000..32deb3b8 --- /dev/null +++ b/src/views/entityExplorer/entityList/detailOverview/Subscriber.vue @@ -0,0 +1,261 @@ + + + diff --git a/src/views/entityExplorer/entityList/detailOverview/SubscriberMap.vue b/src/views/entityExplorer/entityList/detailOverview/SubscriberMap.vue new file mode 100644 index 00000000..46223dff --- /dev/null +++ b/src/views/entityExplorer/entityList/detailOverview/SubscriberMap.vue @@ -0,0 +1,713 @@ + + + diff --git a/src/views/entityExplorer/entityList/entityListMixin.js b/src/views/entityExplorer/entityList/entityListMixin.js index 8173749a..51b63ecc 100644 --- a/src/views/entityExplorer/entityList/entityListMixin.js +++ b/src/views/entityExplorer/entityList/entityListMixin.js @@ -51,6 +51,10 @@ export default { className = 'cn-icon cn-icon-app2' break } + case ('subscriber_id'): { + className = 'cn-icon cn-icon-pedestrian' + break + } default: break } return className @@ -264,6 +268,10 @@ export default { this.performanceEventUrl = api.entity.entityList.appEventPerformance break } + case 'subscriber_id': { + this.trafficUrl = api.entity.entityList.subscriberThroughput + break + } default: break } @@ -348,8 +356,10 @@ export default { this.initUrl() setTimeout(() => { this.queryEntityDetailTraffic() - this.queryNetworkQuantity() - this.queryEventNum() + if (this.entity.entityType !== 'subscriber_id') { + this.queryNetworkQuantity() + this.queryEventNum() + } }) }, beforeUnmount () { From e645eeb1a500ad05b08507e106fd4731134606ec Mon Sep 17 00:00:00 2001 From: chenjinsong <523037378@qq.com> Date: Mon, 25 Mar 2024 15:24:39 +0800 Subject: [PATCH 06/10] =?UTF-8?q?fix:=20=E6=9B=B4=E6=94=B9license=E5=A4=B1?= =?UTF-8?q?=E6=95=88=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/http.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/http.js b/src/utils/http.js index 1fa6e9a4..95e3ca2a 100644 --- a/src/utils/http.js +++ b/src/utils/http.js @@ -31,7 +31,7 @@ axios.interceptors.request.use(config => { err => Promise.reject(err) ) const accountErrorCode = [518003, 518004, 518005, 518006, 518007, 518008] // 账号锁定等 -const licenceErrorCode = [711001] +const licenceErrorCode = [715001] // 若get请求的url中带问号，则将url上的参数截取，改为对象形式传参 axios.interceptors.request.use( From 8fc0c27b9b6d6f7b1b247839e84c12371cb2e1b7 Mon Sep 17 00:00:00 2001 From: hanyuxia Date: Mon, 25 Mar 2024 15:51:19 +0800 Subject: [PATCH 07/10] =?UTF-8?q?fix:=201.NetworkOverview=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=BA=94=E7=94=A8=E6=97=B6=EF=BC=9A=E6=BB=9A=E5=8A=A8?= =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=9D=A1=EF=BC=8C=E6=98=BE=E7=A4=BA=E6=97=A0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=9B=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=BB=93=E6=9E=9C=E4=B8=8D=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=EF=BC=9B2.NetworkOverview=20=E6=96=B0=E5=A2=9E=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E5=92=8C=E5=BA=94=E7=94=A8=E6=97=B6=EF=BC=9A?= =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=BB=9A=E5=8A=A8=E6=9D=A1=E6=97=B6=E9=97=AA?= =?UTF-8?q?=E7=8E=B0=E5=A4=9A=E4=BD=99=E7=9A=84=E6=BB=9A=E5=8A=A8=E6=9D=A1?= =?UTF-8?q?=EF=BC=9B=E6=9C=AA=E9=80=89=E6=8B=A9=E8=AE=B0=E5=BD=95=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=E4=BF=9D=E5=AD=98=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=97=A0=E5=8F=8D=E5=BA=94=EF=BC=88=E6=94=B9=E4=B8=BA=E6=97=A0?= =?UTF-8?q?=E9=80=89=E4=B8=AD=E8=AE=B0=E5=BD=95=E6=97=B6=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=BD=AE=E7=81=B0=EF=BC=89=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/views/charts2/networkOverviewApps.scss | 9 +++++++-- .../charts/networkOverview/NetworkOverviewApps.vue | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/assets/css/components/views/charts2/networkOverviewApps.scss b/src/assets/css/components/views/charts2/networkOverviewApps.scss index 57ff098e..a49039cc 100644 --- a/src/assets/css/components/views/charts2/networkOverviewApps.scss +++ b/src/assets/css/components/views/charts2/networkOverviewApps.scss @@ -215,7 +215,7 @@ display: flex; flex-direction: column; height: 100%; - + overflow-y: hidden; .add-app__header { display: flex; justify-content: space-between; @@ -232,7 +232,12 @@ .header__operations { display: flex; align-items: center; - + .no-records { + background: #21B4ED; + color: #FFFFFF !important; + opacity: 0.6; + cursor: not-allowed !important; + } .header__operation { width: 80px; height: 30px; diff --git a/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue b/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue index 55383f41..e3d0d48a 100644 --- a/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue +++ b/src/views/charts2/charts/networkOverview/NetworkOverviewApps.vue @@ -64,7 +64,7 @@
{{$t('overall.add')}}
{{$t('overall.cancel')}}
-
{{$t('overall.save')}}
+
{{$t('overall.save')}}
@@ -466,7 +466,7 @@ export default { }, addApp (pageNo, val, show, index) { if (!index) { - index = '0' + index = this.appTypeTab } this.showAddApp = true const params = { From b1ad7796919c5816c98668ebf2c99cf504869525 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com> Date: Mon, 25 Mar 2024 16:51:23 +0800 Subject: [PATCH 08/10] =?UTF-8?q?CN-1582=20fix:=201=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=88=97=E8=A1=A8=E9=A1=B6=E9=83=A8result=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E5=87=86=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?;2=E3=80=81=E5=88=97=E8=A1=A8=E5=92=8C=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=9A=84=E6=9B=B2=E7=BA=BF=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=BB=B4=E5=BA=A6=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4;3?= =?UTF-8?q?=E3=80=81=E4=BF=AE=E5=A4=8Dsubscriber=E4=B8=8D=E9=AB=98?= =?UTF-8?q?=E4=BA=AE=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/mixins/relatedServer.js | 4 ++-- src/views/entityExplorer/EntityExplorer.vue | 7 ++++++- src/views/entityExplorer/entityList/Row.vue | 6 +++--- src/views/entityExplorer/entityList/detailOverview/App.vue | 2 +- .../entityExplorer/entityList/detailOverview/Domain.vue | 2 +- src/views/entityExplorer/entityList/detailOverview/Ip.vue | 2 +- .../entityList/detailOverview/Subscriber.vue | 2 +- 7 files changed, 15 insertions(+), 10 deletions(-) diff --git a/src/mixins/relatedServer.js b/src/mixins/relatedServer.js index a8a5ee2d..4c6c57ee 100644 --- a/src/mixins/relatedServer.js +++ b/src/mixins/relatedServer.js @@ -20,7 +20,7 @@ export default { axios.get(relationshipUrlOne, { params: this.getQueryParams(DEFAULT_TIME_FILTER_RANGE.entity.relatedEntity) }).then(response => { if (response.status === 200) { const relationshipDataOne = [] - if (response.data.data.result.length > 0) { + if (response.data.data.result && response.data.data.result.length > 0) { response.data.data.result.forEach(item => { relationshipDataOne.push({ value: item, show: true }) }) @@ -36,7 +36,7 @@ export default { axios.get(relationshipUrlTow, { params: this.getQueryParams(DEFAULT_TIME_FILTER_RANGE.entity.relatedEntity) }).then(response => { if (response.status === 200) { const relationshipDataTwo = [] - if (response.data.data.result.length > 0) { + if (response.data.data.result && response.data.data.result.length > 0) { response.data.data.result.forEach(item => { relationshipDataTwo.push({ value: item, show: true }) }) diff --git a/src/views/entityExplorer/EntityExplorer.vue b/src/views/entityExplorer/EntityExplorer.vue index 3430eeae..a9691977 100644 --- a/src/views/entityExplorer/EntityExplorer.vue +++ b/src/views/entityExplorer/EntityExplorer.vue @@ -581,11 +581,15 @@ export default { let subscriberFlag = false subscriberList.forEach(item => { if (params.q.indexOf(item) > -1) { - this.newFilterData = [] subscriberFlag = true } }) if (subscriberFlag) { + this.newFilterData.forEach(item => { + item.loading = false + item.firstLoad = false + item.data = [] + }) return true } const queryParams = { @@ -643,6 +647,7 @@ export default { }).finally(() => { this.newFilterData[index].loading = false this.newFilterData[index].firstLoad = false + console.log('查看loading', this.newFilterData) }) } }) diff --git a/src/views/entityExplorer/entityList/Row.vue b/src/views/entityExplorer/entityList/Row.vue index e4634e3f..428d3aac 100644 --- a/src/views/entityExplorer/entityList/Row.vue +++ b/src/views/entityExplorer/entityList/Row.vue @@ -11,9 +11,9 @@
-