From 2b8d23eb6ecefb10b34d594f804e9a1315de1a67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= Date: Tue, 26 Nov 2024 18:34:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=201=E3=80=81=E4=BF=AE=E6=94=B9dataSource?= =?UTF-8?q?=E8=B7=AF=E7=94=B1=E8=B7=AF=E5=BE=84=EF=BC=9B2=E3=80=81entity?= =?UTF-8?q?=20integration=E7=9A=84mapping=E6=B7=BB=E5=8A=A0tag=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/api.js | 2 +- src/utils/constants.js | 30 +++++++++++++++++++---- src/views/setting/sources/Sources.vue | 6 ++--- src/views/setting/sources/SourcesForm.vue | 10 ++++---- 4 files changed, 34 insertions(+), 14 deletions(-) diff --git a/src/utils/api.js b/src/utils/api.js index 0109598f..4b615a69 100644 --- a/src/utils/api.js +++ b/src/utils/api.js @@ -393,7 +393,7 @@ export const api = { sourceUpload: apiVersion + '/entity/sources/upload' // 文件上传，post }, profiles: { - profiles: apiVersion + '/entity/profiles' // get列表查询，delete删除，post新增，put修改 + profiles: apiVersion + '/entity/integrations' // get列表查询，delete删除，post新增，put修改 } } } diff --git a/src/utils/constants.js b/src/utils/constants.js index 20d7ac17..0e7c21c1 100644 --- a/src/utils/constants.js +++ b/src/utils/constants.js @@ -2922,21 +2922,33 @@ export const settingFields = { { displayName: 'IP.ASN', fieldName: 'ip_asn' }, { displayName: 'IP.ISP', fieldName: 'ip_isp' }, { displayName: 'seen_time', fieldName: 'seen_time' }, - { displayName: 'tags', fieldName: 'tags' } + { displayName: 'Cloud Provider', fieldName: 'Cloud Provider' }, + { displayName: 'CDN Provider', fieldName: 'CDN Provider' }, + { displayName: 'Category Name', fieldName: 'Category Name' }, + { displayName: 'IoC', fieldName: 'IoC' }, + { displayName: 'Anonymous', fieldName: 'Anonymous' } ], domain: [ { displayName: 'Domain', fieldName: 'domain', disabled: true }, { displayName: 'Domain.Category', fieldName: 'domain_category' }, { displayName: 'Domain.Category Group', fieldName: 'domain_category_group' }, { displayName: 'seen_time', fieldName: 'seen_time' }, - { displayName: 'tags', fieldName: 'tags' } + { displayName: 'Cloud Provider', fieldName: 'Cloud Provider' }, + { displayName: 'CDN Provider', fieldName: 'CDN Provider' }, + { displayName: 'Category Name', fieldName: 'Category Name' }, + { displayName: 'IoC', fieldName: 'IoC' }, + { displayName: 'Anonymous', fieldName: 'Anonymous' } ], app: [ { displayName: 'Application', fieldName: 'app', disabled: true }, { displayName: 'APP.Category', fieldName: 'app_category' }, { displayName: 'APP.Subcategory', fieldName: 'app_subcategory' }, { displayName: 'seen_time', fieldName: 'seen_time' }, - { displayName: 'tags', fieldName: 'tags' } + { displayName: 'Cloud Provider', fieldName: 'Cloud Provider' }, + { displayName: 'CDN Provider', fieldName: 'CDN Provider' }, + { displayName: 'Category Name', fieldName: 'Category Name' }, + { displayName: 'IoC', fieldName: 'IoC' }, + { displayName: 'Anonymous', fieldName: 'Anonymous' } ], subscriber: [ { displayName: 'Subscriber ID', fieldName: 'subscriber_id', disabled: true }, @@ -2945,7 +2957,11 @@ export const settingFields = { { displayName: 'Subscriber.IMEI', fieldName: 'subscriber_imei' }, { displayName: 'Subscriber.APNs', fieldName: 'subscriber_apns' }, { displayName: 'seen_time', fieldName: 'seen_time' }, - { displayName: 'tags', fieldName: 'tags' } + { displayName: 'Cloud Provider', fieldName: 'Cloud Provider' }, + { displayName: 'CDN Provider', fieldName: 'CDN Provider' }, + { displayName: 'Category Name', fieldName: 'Category Name' }, + { displayName: 'IoC', fieldName: 'IoC' }, + { displayName: 'Anonymous', fieldName: 'Anonymous' } ], cell: [ { displayName: 'Cell ID', fieldName: 'cell_id', disabled: true }, @@ -2966,7 +2982,11 @@ export const settingFields = { { displayName: 'cell_azimuth', fieldName: 'cell_azimuth' }, { displayName: 'cell_fdd_spectrum', fieldName: 'cell_fdd_spectrum' }, { displayName: 'seen_time', fieldName: 'seen_time' }, - { displayName: 'tags', fieldName: 'tags' } + { displayName: 'Cloud Provider', fieldName: 'Cloud Provider' }, + { displayName: 'CDN Provider', fieldName: 'CDN Provider' }, + { displayName: 'Category Name', fieldName: 'Category Name' }, + { displayName: 'IoC', fieldName: 'IoC' }, + { displayName: 'Anonymous', fieldName: 'Anonymous' } ] } diff --git a/src/views/setting/sources/Sources.vue b/src/views/setting/sources/Sources.vue index bcb81462..a04b3b19 100644 --- a/src/views/setting/sources/Sources.vue +++ b/src/views/setting/sources/Sources.vue @@ -208,7 +208,7 @@ export default { }, add () { this.$router.push({ - path: '/setting/source/create', + path: '/setting/dataSource/create', query: { t: +new Date() } @@ -232,7 +232,7 @@ export default { viewSource () { const pageNo = this.$router.currentRoute.value.query.pageNo this.$router.push({ - path: '/setting/source/view', + path: '/setting/dataSource/view', query: { t: +new Date(), pageNoForTable: pageNo || 1, @@ -243,7 +243,7 @@ export default { jumpToEditPage (id) { const pageNo = this.$router.currentRoute.value.query.pageNo this.$router.push({ - path: '/setting/source/edit', + path: '/setting/dataSource/edit', query: { t: +new Date(), pageNoForTable: pageNo || 1, diff --git a/src/views/setting/sources/SourcesForm.vue b/src/views/setting/sources/SourcesForm.vue index 85f3eb00..80aa12c5 100644 --- a/src/views/setting/sources/SourcesForm.vue +++ b/src/views/setting/sources/SourcesForm.vue @@ -333,7 +333,7 @@ export default { console.error(e) this.$message.error(this.errorMsgHandler(e)) this.$router.push({ - path: '/setting/source', + path: '/setting/dataSource', query: { pageNo: this.pageNoForTable ? Number(this.pageNoForTable) : 1, t: +new Date() @@ -383,7 +383,7 @@ export default { }) this.$router.push({ - path: '/setting/source', + path: '/setting/dataSource', query: { t: +new Date() } @@ -413,7 +413,7 @@ export default { queryInfo.name = this.settingObj.name } this.$router.push({ - path: '/setting/source', + path: '/setting/dataSource', query: queryInfo }) } else { @@ -442,7 +442,7 @@ export default { customClass: 'del-model' }).then(() => { this.$router.push({ - path: '/setting/source', + path: '/setting/dataSource', query: { pageNo: self.pageNoForTable ? Number(self.pageNoForTable) : 1, t: +new Date() @@ -451,7 +451,7 @@ export default { }).catch(() => {}) } else { this.$router.push({ - path: '/setting/source', + path: '/setting/dataSource', query: { pageNo: self.pageNoForTable ? Number(self.pageNoForTable) : 1, t: +new Date()