From fca5d6ac92ce9960a5e94e3f39db992cc55849a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com> Date: Sat, 15 Apr 2023 13:13:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96ui?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/icons/svg/fullscreen.svg | 2 +- src/assets/icons/svg/github.svg | 2 +- src/assets/icons/svg/question.svg | 2 +- src/assets/icons/svg/search.svg | 2 +- src/views/components/CommonMenu/index.vue | 12 +++++++----- src/views/index_v1.vue | 2 +- src/views/system/article/manager.vue | 3 +++ src/views/tool/gen/genInfoForm.vue | 2 +- 8 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/assets/icons/svg/fullscreen.svg b/src/assets/icons/svg/fullscreen.svg index 0e86b6f..88bfc36 100644 --- a/src/assets/icons/svg/fullscreen.svg +++ b/src/assets/icons/svg/fullscreen.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/svg/github.svg b/src/assets/icons/svg/github.svg index db0a0d4..c987bd0 100644 --- a/src/assets/icons/svg/github.svg +++ b/src/assets/icons/svg/github.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/svg/question.svg b/src/assets/icons/svg/question.svg index cf75bd4..e2d1485 100644 --- a/src/assets/icons/svg/question.svg +++ b/src/assets/icons/svg/question.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/assets/icons/svg/search.svg b/src/assets/icons/svg/search.svg index 84233dd..4081462 100644 --- a/src/assets/icons/svg/search.svg +++ b/src/assets/icons/svg/search.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/components/CommonMenu/index.vue b/src/views/components/CommonMenu/index.vue index 800cebf..118177e 100644 --- a/src/views/components/CommonMenu/index.vue +++ b/src/views/components/CommonMenu/index.vue @@ -15,16 +15,18 @@ import { getCurrentInstance } from 'vue' const { proxy } = getCurrentInstance() const menuList = ref([ - { path: '/tool/gen', title: '代码生成', color: '#40c9c6', name: 'code', permi: ['tool:gen:list'] }, - { path: '/tool/file', title: '文件存储', color: '#6A5ACD', name: 'upload', permi: ['tool:file:list'] }, + { path: '/tool/gen', title: '代码生成', color: '#40c9c6', name: 'code', perms: ['tool:gen:list'] }, + { path: '/tool/file', title: '文件存储', color: '#6A5ACD', name: 'upload', perms: ['tool:file:list'] }, // // { path: '/system/user', title: '角色管理', color: '#7FFF00', name: 'peoples' }, - { path: '/system/dict', title: '字典管理', color: '#B0E0E6', name: 'dict', permi: ['system:dict:list'] }, - { path: '/monitor/job', title: '定时任务', color: '#D2691E', name: 'job', permi: ['monitor:job:list'] } + { path: '/system/dict', title: '字典管理', color: '#B0E0E6', name: 'dict', perms: ['system:dict:list'] }, + { path: '/monitor/job', title: '定时任务', color: '#D2691E', name: 'job', perms: ['monitor:job:list'] }, + { path: '/system/log/operlog', title: '操作日志', color: '#D2691E', name: 'form', perms: ['monitor:operlog:list'] }, + // { path: '/system/log/logininfor', title: '登录日志', color: '#D2691E', name: 'logininfor' } ]) function checkPermi(v) { if (v && v.permi) { - return proxy.$auth.hasPermiOr(v.permi) + return proxy.$auth.hasPermiOr(v.perms) } return true } diff --git a/src/views/index_v1.vue b/src/views/index_v1.vue index b10ca47..4a8820b 100644 --- a/src/views/index_v1.vue +++ b/src/views/index_v1.vue @@ -50,7 +50,7 @@ - + {{ $t('layout.modifyInformation') }} diff --git a/src/views/system/article/manager.vue b/src/views/system/article/manager.vue index e8383ad..4c24519 100644 --- a/src/views/system/article/manager.vue +++ b/src/views/system/article/manager.vue @@ -1,5 +1,8 @@ - +