From ea73268c656738d636b7ade91830039768cec2d4 Mon Sep 17 00:00:00 2001 From: zyh Date: Fri, 31 May 2024 09:31:08 +0800 Subject: [PATCH] =?UTF-8?q?NEZ-3483=20feat:=20Log=20settings=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-docs/package-lock.json | 2 +- .../common/bottomBox/dashboardTab.scss | 1 - .../common/bottomBox/tabs/dashboardTab.vue | 2 +- .../common/mixin/system/systemMixin.js | 13 ++- .../src/components/page/config/auditLog.vue | 91 +++++++++++++++++++ nezha-fronted/src/permission.js | 2 +- nezha-fronted/src/router/index.js | 4 + 7 files changed, 104 insertions(+), 11 deletions(-) create mode 100644 nezha-fronted/src/components/page/config/auditLog.vue diff --git a/nezha-docs/package-lock.json b/nezha-docs/package-lock.json index 251012c7c..53bcb34f9 100644 --- a/nezha-docs/package-lock.json +++ b/nezha-docs/package-lock.json @@ -5,7 +5,7 @@ "requires": true, "packages": { "": { - "name": "nezha", + "name": "nezha-docs", "version": "0.0.0", "license": "MIT", "dependencies": { diff --git a/nezha-fronted/src/assets/css/components/common/bottomBox/dashboardTab.scss b/nezha-fronted/src/assets/css/components/common/bottomBox/dashboardTab.scss index a22fae581..1a9b3a710 100644 --- a/nezha-fronted/src/assets/css/components/common/bottomBox/dashboardTab.scss +++ b/nezha-fronted/src/assets/css/components/common/bottomBox/dashboardTab.scss @@ -71,7 +71,6 @@ .table-list { overflow-y: auto; height: 100%; - padding: 20px 0; box-sizing: border-box; } diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue index 128581bd2..852a189b7 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue @@ -89,7 +89,7 @@ -
+
diff --git a/nezha-fronted/src/components/common/mixin/system/systemMixin.js b/nezha-fronted/src/components/common/mixin/system/systemMixin.js index 8e52afb00..e2c99a31c 100644 --- a/nezha-fronted/src/components/common/mixin/system/systemMixin.js +++ b/nezha-fronted/src/components/common/mixin/system/systemMixin.js @@ -260,11 +260,10 @@ export default { this.$refs.emailForm.clearValidate() } if (type == 'monitor') { - if(response.data.interface_name){ - let arr = response.data.interface_name.split(',') - this.monitor.interface_name = arr.map(item=>{ - return {text: item} - + if (response.data.interface_name) { + const arr = response.data.interface_name.split(',') + this.monitor.interface_name = arr.map(item => { + return { text: item } }) } localStorage.setItem('nz-prometheus-federation-enabled', this.monitor.prometheus_federation_enabled) @@ -284,8 +283,8 @@ export default { param.map_center_config = JSON.stringify(mapConfig) param.pin_policy = JSON.stringify(this.basic.pin_policy) } - if(type == 'monitor') { - let str = this.monitor.interface_name.map(item=>{ + if (type == 'monitor') { + const str = this.monitor.interface_name.map(item => { return item.text }) param.interface_name = str.join(',') diff --git a/nezha-fronted/src/components/page/config/auditLog.vue b/nezha-fronted/src/components/page/config/auditLog.vue new file mode 100644 index 000000000..b247c93af --- /dev/null +++ b/nezha-fronted/src/components/page/config/auditLog.vue @@ -0,0 +1,91 @@ + + + diff --git a/nezha-fronted/src/permission.js b/nezha-fronted/src/permission.js index 3f0846721..6773ada76 100644 --- a/nezha-fronted/src/permission.js +++ b/nezha-fronted/src/permission.js @@ -8,7 +8,7 @@ import bus from '@/libs/bus' import Message from '@/components/common/message/index' Vue.use(VueResource) -const loginWhiteList = ['/setup', '/sys/license/upload', '/sys/license/state', '/sys/appearance', '/i18n', '/terminal', 'uPlot'] // 免登陆白名单 +const loginWhiteList = ['/setup', '/sys/license/upload', '/sys/license/state', '/sys/appearance', '/i18n', '/terminal', '/auditLog'] // 免登陆白名单 export const permissionWhiteList = ['/profile', '/menu', ...loginWhiteList] // 权限白名单 router.beforeEach((to, from, next) => { if (window.entrance) { diff --git a/nezha-fronted/src/router/index.js b/nezha-fronted/src/router/index.js index 992c2dd68..5d7425dfb 100644 --- a/nezha-fronted/src/router/index.js +++ b/nezha-fronted/src/router/index.js @@ -180,6 +180,10 @@ export default new Router({ path: '/monitor', component: resolve => require(['@/components/page/config/monitor'], resolve) }, + { + path: '/auditLog', + component: resolve => require(['@/components/page/config/auditLog'], resolve) + }, { path: '/terminalSetting', component: resolve => require(['@/components/page/config/terminal'], resolve)