From 3d2623f8cf55f7aa21f23b007cc3b90f8ffe652d Mon Sep 17 00:00:00 2001 From: chenjinsong <523037378@qq.com> Date: Thu, 23 Feb 2023 18:12:20 +0800 Subject: [PATCH] =?UTF-8?q?CN-906=20fix:=20=E7=9F=A5=E8=AF=86=E5=BA=93?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=AE=80=E7=89=88=EF=BC=9B=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E7=9B=AE=E5=BD=95=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart-box.scss | 0 .../galaxy-proxy-table.scss | 0 src/assets/css/components/index.scss | 5 +- .../views/setting/knowledgeBase.scss | 0 src/components/common/ChartTabs.vue | 2 +- src/components/layout/Header.vue | 5 +- src/components/table/CnDataList.vue | 15 +- .../ChartTable.vue | 0 .../GalaxyProxyTable.vue | 0 .../I18nTable.vue | 0 .../OperationLogTable.vue | 2 +- .../RoleTable.vue | 0 .../UserTable.vue | 0 .../table/setting/KnowledgeBaseTable.vue | 113 ++++++++++++++ src/router/index.js | 29 ++-- src/utils/api.js | 2 + src/views/administration/Chart.vue | 2 +- src/views/administration/GalaxyProxy.vue | 2 +- src/views/administration/I18n.vue | 2 +- src/views/administration/Index.vue | 32 ++-- src/views/administration/OperationLog.vue | 2 +- src/views/administration/Roles.vue | 2 +- src/views/administration/User.vue | 2 +- src/views/setting/Index.vue | 41 +++++ src/views/setting/KnowledgeBase.vue | 101 ++++++++++++ src/views/settings/Chart.vue | 82 ---------- src/views/settings/GalaxyProxy.vue | 144 ------------------ src/views/settings/I18n.vue | 86 ----------- src/views/settings/OperationLog.vue | 54 ------- src/views/settings/Roles.vue | 91 ----------- src/views/settings/User.vue | 86 ----------- 31 files changed, 302 insertions(+), 600 deletions(-) rename src/assets/css/components/components/rightBox/{settings => administration}/chart-box.scss (100%) rename src/assets/css/components/components/table/{settings => administration}/galaxy-proxy-table.scss (100%) create mode 100644 src/assets/css/components/views/setting/knowledgeBase.scss rename src/components/table/{settings => administration}/ChartTable.vue (100%) rename src/components/table/{settings => administration}/GalaxyProxyTable.vue (100%) rename src/components/table/{settings => administration}/I18nTable.vue (100%) rename src/components/table/{settings => administration}/OperationLogTable.vue (98%) rename src/components/table/{settings => administration}/RoleTable.vue (100%) rename src/components/table/{settings => administration}/UserTable.vue (100%) create mode 100644 src/components/table/setting/KnowledgeBaseTable.vue create mode 100644 src/views/setting/Index.vue create mode 100644 src/views/setting/KnowledgeBase.vue delete mode 100644 src/views/settings/Chart.vue delete mode 100644 src/views/settings/GalaxyProxy.vue delete mode 100644 src/views/settings/I18n.vue delete mode 100644 src/views/settings/OperationLog.vue delete mode 100644 src/views/settings/Roles.vue delete mode 100644 src/views/settings/User.vue diff --git a/src/assets/css/components/components/rightBox/settings/chart-box.scss b/src/assets/css/components/components/rightBox/administration/chart-box.scss similarity index 100% rename from src/assets/css/components/components/rightBox/settings/chart-box.scss rename to src/assets/css/components/components/rightBox/administration/chart-box.scss diff --git a/src/assets/css/components/components/table/settings/galaxy-proxy-table.scss b/src/assets/css/components/components/table/administration/galaxy-proxy-table.scss similarity index 100% rename from src/assets/css/components/components/table/settings/galaxy-proxy-table.scss rename to src/assets/css/components/components/table/administration/galaxy-proxy-table.scss diff --git a/src/assets/css/components/index.scss b/src/assets/css/components/index.scss index 66702791..1c39c85c 100644 --- a/src/assets/css/components/index.scss +++ b/src/assets/css/components/index.scss @@ -6,9 +6,9 @@ @import './components/common/pagination'; // @import './components/entities/entities'; @import './components/layout/layout'; -@import 'components/rightBox/settings/chart-box'; +@import 'components/rightBox/administration/chart-box'; @import 'components/setting/galaxy-proxy-debug'; -@import 'components/table/settings/galaxy-proxy-table'; +@import 'components/table/administration/galaxy-proxy-table'; @import './components/table/common'; @import './views/charts/chart'; @import 'views/entityExplorer/entity-explorer'; @@ -77,3 +77,4 @@ @import 'views/administration/AdministrationTabs'; +@import 'views/setting/knowledgeBase'; diff --git a/src/assets/css/components/views/setting/knowledgeBase.scss b/src/assets/css/components/views/setting/knowledgeBase.scss new file mode 100644 index 00000000..e69de29b diff --git a/src/components/common/ChartTabs.vue b/src/components/common/ChartTabs.vue index d1d4c1dc..0990292a 100644 --- a/src/components/common/ChartTabs.vue +++ b/src/components/common/ChartTabs.vue @@ -10,7 +10,7 @@ diff --git a/src/components/layout/Header.vue b/src/components/layout/Header.vue index e28a98bc..8933d448 100644 --- a/src/components/layout/Header.vue +++ b/src/components/layout/Header.vue @@ -285,7 +285,7 @@ export default { return this.$store.getters.menuList.find(menu => menu.code === 'networkAnalytics') }, otherMenu () { - return this.$store.getters.menuList.filter(menu => menu.code !== 'networkAnalytics') + return this.$store.getters.menuList.filter(menu => ['networkAnalytics', 'chart', 'I18N'].indexOf(menu.code) === -1) /* function excludeButton (menu) { for (let i = 0; i < menu.length; i++) { @@ -334,6 +334,9 @@ export default { } else { result = breadcrumb ? [breadcrumb.parentName, breadcrumb.name] : [] } + if (!breadcrumb.parentName) { + result = result.filter((r, i) => i > 0) + } return result }, showEntityTypeSelector () { diff --git a/src/components/table/CnDataList.vue b/src/components/table/CnDataList.vue index 4cc413a7..d2755588 100644 --- a/src/components/table/CnDataList.vue +++ b/src/components/table/CnDataList.vue @@ -2,22 +2,21 @@
-
+
+ -->
- - -
@@ -94,7 +93,7 @@ export default { updateCustomTableTitle (custom) { this.$emit('update:customTableTitle', custom) }, - onsearch () { + onSearch () { const params = { q: this.keyWord } diff --git a/src/components/table/settings/ChartTable.vue b/src/components/table/administration/ChartTable.vue similarity index 100% rename from src/components/table/settings/ChartTable.vue rename to src/components/table/administration/ChartTable.vue diff --git a/src/components/table/settings/GalaxyProxyTable.vue b/src/components/table/administration/GalaxyProxyTable.vue similarity index 100% rename from src/components/table/settings/GalaxyProxyTable.vue rename to src/components/table/administration/GalaxyProxyTable.vue diff --git a/src/components/table/settings/I18nTable.vue b/src/components/table/administration/I18nTable.vue similarity index 100% rename from src/components/table/settings/I18nTable.vue rename to src/components/table/administration/I18nTable.vue diff --git a/src/components/table/settings/OperationLogTable.vue b/src/components/table/administration/OperationLogTable.vue similarity index 98% rename from src/components/table/settings/OperationLogTable.vue rename to src/components/table/administration/OperationLogTable.vue index f16b07b1..6df3a51f 100644 --- a/src/components/table/settings/OperationLogTable.vue +++ b/src/components/table/administration/OperationLogTable.vue @@ -92,7 +92,7 @@ export default { show: true }, { - label: this.$t('config.operationlog.type'), + label: this.$t('overall.type'), prop: 'type', show: true }, diff --git a/src/components/table/settings/RoleTable.vue b/src/components/table/administration/RoleTable.vue similarity index 100% rename from src/components/table/settings/RoleTable.vue rename to src/components/table/administration/RoleTable.vue diff --git a/src/components/table/settings/UserTable.vue b/src/components/table/administration/UserTable.vue similarity index 100% rename from src/components/table/settings/UserTable.vue rename to src/components/table/administration/UserTable.vue diff --git a/src/components/table/setting/KnowledgeBaseTable.vue b/src/components/table/setting/KnowledgeBaseTable.vue new file mode 100644 index 00000000..35aa956c --- /dev/null +++ b/src/components/table/setting/KnowledgeBaseTable.vue @@ -0,0 +1,113 @@ + + + diff --git a/src/router/index.js b/src/router/index.js index e48961d3..6216c4c0 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -35,6 +35,10 @@ const routes = [ path: '/businessLog/viewer', component: () => import('@/views/businessLog/Viewer') }, + { + path: '/knowledgeBase', + component: () => import('@/views/setting/KnowledgeBase') + }, { name: 'Administration', path: '/administration', @@ -51,27 +55,22 @@ const routes = [ path: '/administration/role', component: () => import('@/views/administration/Roles') }, - { - name: 'I18n', - path: '/administration/i18n', - component: () => import('@/views/administration/I18n') - }, { name: 'OperationLog', path: '/administration/operationLog', component: () => import('@/views/administration/OperationLog') - }, - { - name: 'GalaxyProxy', - path: '/administration/galaxyProxy', - component: () => import('@/views/administration/GalaxyProxy') - }, - { - name: 'Chart', - path: '/administration/chart', - component: () => import('@/views/administration/Chart') } ] + }, + { + name: 'I18n', + path: '/i18n', + component: () => import('@/views/administration/I18n') + }, + { + name: 'Chart', + path: '/chart', + component: () => import('@/views/administration/Chart') } ] } diff --git a/src/utils/api.js b/src/utils/api.js index 6eae13d4..08f2cb29 100644 --- a/src/utils/api.js +++ b/src/utils/api.js @@ -33,6 +33,8 @@ export const api = { chartList: '/visual/chart/list', // galaxyProxy galaxyProxy: '/galaxy/setting', + // 知识库 + knowledgeBase: '/knowledgeBase', // 报告相关 reportJob: '/report/job', diff --git a/src/views/administration/Chart.vue b/src/views/administration/Chart.vue index 647130b7..42a1a228 100644 --- a/src/views/administration/Chart.vue +++ b/src/views/administration/Chart.vue @@ -53,7 +53,7 @@ + + diff --git a/src/views/setting/KnowledgeBase.vue b/src/views/setting/KnowledgeBase.vue new file mode 100644 index 00000000..3d904146 --- /dev/null +++ b/src/views/setting/KnowledgeBase.vue @@ -0,0 +1,101 @@ + + diff --git a/src/views/settings/Chart.vue b/src/views/settings/Chart.vue deleted file mode 100644 index 647130b7..00000000 --- a/src/views/settings/Chart.vue +++ /dev/null @@ -1,82 +0,0 @@ - - diff --git a/src/views/settings/GalaxyProxy.vue b/src/views/settings/GalaxyProxy.vue deleted file mode 100644 index 11813077..00000000 --- a/src/views/settings/GalaxyProxy.vue +++ /dev/null @@ -1,144 +0,0 @@ - - - diff --git a/src/views/settings/I18n.vue b/src/views/settings/I18n.vue deleted file mode 100644 index 6d21f7d2..00000000 --- a/src/views/settings/I18n.vue +++ /dev/null @@ -1,86 +0,0 @@ - - diff --git a/src/views/settings/OperationLog.vue b/src/views/settings/OperationLog.vue deleted file mode 100644 index b624d2bb..00000000 --- a/src/views/settings/OperationLog.vue +++ /dev/null @@ -1,54 +0,0 @@ - - diff --git a/src/views/settings/Roles.vue b/src/views/settings/Roles.vue deleted file mode 100644 index dbe67f3e..00000000 --- a/src/views/settings/Roles.vue +++ /dev/null @@ -1,91 +0,0 @@ - - diff --git a/src/views/settings/User.vue b/src/views/settings/User.vue deleted file mode 100644 index 2d13f29d..00000000 --- a/src/views/settings/User.vue +++ /dev/null @@ -1,86 +0,0 @@ - -