From 7be1689232a7855d7035e24ee3f00a5b2cd92cfc Mon Sep 17 00:00:00 2001 From: zxx <47968546@163.com> Date: Fri, 21 Oct 2022 22:25:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E7=9A=84=E8=AF=A6=E6=83=85=EF=BC=8C=E6=97=A5=E5=BF=97=EF=BC=8C?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 5 ++- .env.development | 2 +- .../Middle/Admin/AdminUser/UserDetail.vue | 0 src/pages/Middle/Admin/AdminUser/UserLog.vue | 0 .../Middle/Admin/AdminUser/UserSettings.vue | 0 .../Middle/Admin/AdminUser/router.map.js | 41 +++++++++++++++++-- src/utils/request.js | 6 ++- src/utils/themeUtil.js | 2 +- 8 files changed, 46 insertions(+), 10 deletions(-) create mode 100644 src/pages/Middle/Admin/AdminUser/UserDetail.vue create mode 100644 src/pages/Middle/Admin/AdminUser/UserLog.vue create mode 100644 src/pages/Middle/Admin/AdminUser/UserSettings.vue diff --git a/.env b/.env index 08a6749..2f44eed 100644 --- a/.env +++ b/.env @@ -15,6 +15,7 @@ VUE_APP_TBAS_TITLES_KEY=admin.tabs.titles VUE_APP_LAYOUT_KEY=admin.layout VUE_APP_THEME_MODE_KEY=admin.theme.mode VUE_APP_THEME_COLOR_KEY=admin.theme.color -VUE_APP_API_BASE_URL=http://192.168.52.166:30000 +VUE_APP_API_BASE_URL=http://zxx4.f3322.net:16680 VUE_APP_USER_MODEL=AdminUser - +VUE_APP_BEID=1 +VUE_APP_PTYID=0 \ No newline at end of file diff --git a/.env.development b/.env.development index 16b6c22..67a0ad0 100644 --- a/.env.development +++ b/.env.development @@ -1,2 +1,2 @@ -VUE_APP_API_BASE_URL=http://192.168.52.166:30000 \ No newline at end of file +VUE_APP_API_BASE_URL=http://zxx4.f3322.net:16680 \ No newline at end of file diff --git a/src/pages/Middle/Admin/AdminUser/UserDetail.vue b/src/pages/Middle/Admin/AdminUser/UserDetail.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/pages/Middle/Admin/AdminUser/UserLog.vue b/src/pages/Middle/Admin/AdminUser/UserLog.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/pages/Middle/Admin/AdminUser/UserSettings.vue b/src/pages/Middle/Admin/AdminUser/UserSettings.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/router/Middle/Admin/AdminUser/router.map.js b/src/router/Middle/Admin/AdminUser/router.map.js index 40ef5bc..3103309 100644 --- a/src/router/Middle/Admin/AdminUser/router.map.js +++ b/src/router/Middle/Admin/AdminUser/router.map.js @@ -18,7 +18,7 @@ const AdminUserRouterMap = { invisible:true, // 不在菜单中显示 }, authority: { - permission:[''], + permission:['AdminUser-All'], } }, AdminUserList:{ @@ -27,7 +27,7 @@ const AdminUserRouterMap = { path: '/AdminUser/AdminUserList', component: () => import('@/pages/Middle/Admin/AdminUser/UserList'), authority: { - permission:[''], + permission:['AdminUser-All','AdminUser-List'], } }, AdminUserAdd:{ @@ -39,7 +39,19 @@ const AdminUserRouterMap = { invisible:true, // 不在菜单中显示 }, authority: { - permission:[''], + permission:['AdminUser-All','AdminUser-Add'], + }, + }, + AdminUserDetail:{ + name: '用户详情', + icon: 'idcard', + path: '/AdminUser/AdminUserDetail', + component: () => import('@/pages/Middle/Admin/AdminUser/UserDetail'), + meta: { + invisible:true, // 不在菜单中显示 + }, + authority: { + permission:['AdminUser-All','AdminUser-List'], }, }, AdminUserUpdate:{ @@ -51,7 +63,28 @@ const AdminUserRouterMap = { invisible:true, // 不在菜单中显示 }, authority: { - permission:[''], + permission:['AdminUser-All','AdminUser-Update'], + }, + }, + AdminUserSettings:{ + name: '用户设置', + icon: 'idcard', + path: '/AdminUser/AdminUserSettings', + component: () => import('@/pages/Middle/Admin/AdminUser/UserSettings'), + meta: { + invisible:true, // 不在菜单中显示 + }, + authority: { + permission:['AdminUser-All','AdminUser-Settings'], + }, + }, + AdminUserLog:{ + name: '用户日志', + icon: 'idcard', + path: '/AdminUser/AdminUserLog', + component: () => import('@/pages/Middle/Admin/AdminUser/UserLog'), + authority: { + permission:['AdminUser-All','AdminUser-Log'], }, }, } diff --git a/src/utils/request.js b/src/utils/request.js index 709535e..2d6991b 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -3,8 +3,10 @@ import Cookie from 'js-cookie' // 认证 token 名称 const xsrfHeaderName = 'Authorization' - - +const beid = process.env.VUE_APP_BEID +const ptyid = process.env.VUE_APP_PTYID +beid +ptyid axios.defaults.timeout = 5000 // 请求超时时间 axios.defaults.withCredentials= false // 允许携带 cookies axios.defaults.xsrfHeaderName= xsrfHeaderName // 设置认证信息的名称 diff --git a/src/utils/themeUtil.js b/src/utils/themeUtil.js index e836d73..2ee413e 100644 --- a/src/utils/themeUtil.js +++ b/src/utils/themeUtil.js @@ -88,7 +88,7 @@ function getLocalSetting(loadTheme) { try { const localSettingCookieStr = Cookie.get(process.env.VUE_APP_THEME_SETTING_KEY) const localSettingStr = localStorage.getItem(process.env.VUE_APP_THEME_SETTING_KEY) - if (!localSettingStr){ + if (!localSettingStr && localSettingCookieStr){ localSetting = JSON.parse(localSettingCookieStr) }else{ localSetting = JSON.parse(localSettingStr)