Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
查尔斯-BUG万象集
Continew Admin
提交
8d394937
Continew Admin
项目概览
查尔斯-BUG万象集
/
Continew Admin
11 个月 前同步成功
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
分析
仓库
DevOps
项目成员
Pages
Continew Admin
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8d394937
编写于
10月 15, 2023
作者:
查尔斯-BUG万象集
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor: 还原 loginStore 命名,重命名为 userStore
上级
e88c9a65
变更
25
隐藏空白更改
内联
并排
Showing
25 changed file
with
84 addition
and
84 deletion
+84
-84
continew-admin-ui/src/api/auth/login.ts
continew-admin-ui/src/api/auth/login.ts
+1
-1
continew-admin-ui/src/components/navbar/index.vue
continew-admin-ui/src/components/navbar/index.vue
+3
-3
continew-admin-ui/src/directive/permission/index.ts
continew-admin-ui/src/directive/permission/index.ts
+3
-3
continew-admin-ui/src/hooks/permission.ts
continew-admin-ui/src/hooks/permission.ts
+3
-3
continew-admin-ui/src/hooks/user.ts
continew-admin-ui/src/hooks/user.ts
+3
-3
continew-admin-ui/src/layout/default-layout.vue
continew-admin-ui/src/layout/default-layout.vue
+3
-3
continew-admin-ui/src/router/guard/permission.ts
continew-admin-ui/src/router/guard/permission.ts
+3
-3
continew-admin-ui/src/router/guard/userLoginInfo.ts
continew-admin-ui/src/router/guard/userLoginInfo.ts
+5
-5
continew-admin-ui/src/store/index.ts
continew-admin-ui/src/store/index.ts
+2
-2
continew-admin-ui/src/store/modules/user/index.ts
continew-admin-ui/src/store/modules/user/index.ts
+2
-2
continew-admin-ui/src/store/modules/user/types.ts
continew-admin-ui/src/store/modules/user/types.ts
+0
-0
continew-admin-ui/src/utils/permission.ts
continew-admin-ui/src/utils/permission.ts
+3
-3
continew-admin-ui/src/utils/request.ts
continew-admin-ui/src/utils/request.ts
+3
-3
continew-admin-ui/src/views/dashboard/workplace/components/banner.vue
...in-ui/src/views/dashboard/workplace/components/banner.vue
+3
-3
continew-admin-ui/src/views/demo/visualization/real-time-monitor/components/studio.vue
...emo/visualization/real-time-monitor/components/studio.vue
+2
-2
continew-admin-ui/src/views/login/components/account-login.vue
...new-admin-ui/src/views/login/components/account-login.vue
+4
-4
continew-admin-ui/src/views/login/components/email-login.vue
continew-admin-ui/src/views/login/components/email-login.vue
+2
-2
continew-admin-ui/src/views/login/components/phone-login.vue
continew-admin-ui/src/views/login/components/phone-login.vue
+2
-2
continew-admin-ui/src/views/login/social/index.vue
continew-admin-ui/src/views/login/social/index.vue
+3
-3
continew-admin-ui/src/views/system/user/center/components/basic-info.vue
...ui/src/views/system/user/center/components/basic-info.vue
+7
-7
continew-admin-ui/src/views/system/user/center/components/operation-log.vue
...src/views/system/user/center/components/operation-log.vue
+3
-3
continew-admin-ui/src/views/system/user/center/components/security-settings/update-email.vue
...user/center/components/security-settings/update-email.vue
+6
-6
continew-admin-ui/src/views/system/user/center/components/security-settings/update-phone.vue
...user/center/components/security-settings/update-phone.vue
+4
-4
continew-admin-ui/src/views/system/user/center/components/security-settings/update-pwd.vue
...m/user/center/components/security-settings/update-pwd.vue
+3
-3
continew-admin-ui/src/views/system/user/center/components/user-panel.vue
...ui/src/views/system/user/center/components/user-panel.vue
+11
-11
未找到文件。
continew-admin-ui/src/api/auth/login.ts
浏览文件 @
8d394937
import
axios
from
'
axios
'
;
import
type
{
RouteRecordNormalized
}
from
'
vue-router
'
;
import
{
UserState
}
from
'
@/store/modules/
login
/types
'
;
import
{
UserState
}
from
'
@/store/modules/
user
/types
'
;
const
BASE_URL
=
'
/auth
'
;
...
...
continew-admin-ui/src/components/navbar/index.vue
浏览文件 @
8d394937
...
...
@@ -162,7 +162,7 @@
>
<img
alt=
"avatar"
:src=
"getAvatar(
loginStore.avatar, login
Store.gender)"
:src=
"getAvatar(
userStore.avatar, user
Store.gender)"
/>
</a-avatar>
<
template
#content
>
...
...
@@ -192,7 +192,7 @@
<
script
lang=
"ts"
setup
>
import
{
computed
,
ref
,
inject
}
from
'
vue
'
;
import
{
useDark
,
useToggle
,
useFullscreen
}
from
'
@vueuse/core
'
;
import
{
useAppStore
,
use
Login
Store
}
from
'
@/store
'
;
import
{
useAppStore
,
use
User
Store
}
from
'
@/store
'
;
import
{
LOCALE_OPTIONS
}
from
'
@/locale
'
;
import
useLocale
from
'
@/hooks/locale
'
;
import
useUser
from
'
@/hooks/user
'
;
...
...
@@ -202,7 +202,7 @@
import
MessageBox
from
'
../message-box/index.vue
'
;
const
appStore
=
useAppStore
();
const
loginStore
=
useLogin
Store
();
const
userStore
=
useUser
Store
();
const
{
logout
}
=
useUser
();
const
{
changeLocale
,
currentLocale
}
=
useLocale
();
const
{
isFullscreen
,
toggle
:
toggleFullScreen
}
=
useFullscreen
();
...
...
continew-admin-ui/src/directive/permission/index.ts
浏览文件 @
8d394937
import
{
DirectiveBinding
}
from
'
vue
'
;
import
{
use
Login
Store
}
from
'
@/store
'
;
import
{
use
User
Store
}
from
'
@/store
'
;
function
checkPermission
(
el
:
HTMLElement
,
binding
:
DirectiveBinding
)
{
const
{
value
}
=
binding
;
const
loginStore
=
useLogin
Store
();
const
{
permissions
,
roles
}
=
login
Store
;
const
userStore
=
useUser
Store
();
const
{
permissions
,
roles
}
=
user
Store
;
const
superAdmin
=
'
admin
'
;
const
allPermission
=
'
*
'
;
...
...
continew-admin-ui/src/hooks/permission.ts
浏览文件 @
8d394937
import
{
RouteLocationNormalized
,
RouteRecordRaw
}
from
'
vue-router
'
;
import
{
use
Login
Store
}
from
'
@/store
'
;
import
{
use
User
Store
}
from
'
@/store
'
;
export
default
function
usePermission
()
{
const
loginStore
=
useLogin
Store
();
const
userStore
=
useUser
Store
();
return
{
accessRouter
(
route
:
RouteLocationNormalized
|
RouteRecordRaw
)
{
return
(
!
route
.
meta
?.
requiresAuth
||
!
route
.
meta
?.
roles
||
route
.
meta
?.
roles
?.
includes
(
'
*
'
)
||
this
.
includeRole
(
route
.
meta
?.
roles
,
login
Store
.
roles
)
this
.
includeRole
(
route
.
meta
?.
roles
,
user
Store
.
roles
)
);
},
includeRole
(
arr1
:
Array
<
string
>
,
arr2
:
Array
<
string
>
)
{
...
...
continew-admin-ui/src/hooks/user.ts
浏览文件 @
8d394937
...
...
@@ -2,14 +2,14 @@ import { useRouter } from 'vue-router';
import
{
useI18n
}
from
'
vue-i18n
'
;
import
{
Notification
}
from
'
@arco-design/web-vue
'
;
import
{
use
Login
Store
}
from
'
@/store
'
;
import
{
use
User
Store
}
from
'
@/store
'
;
export
default
function
useUser
()
{
const
{
t
}
=
useI18n
();
const
router
=
useRouter
();
const
loginStore
=
useLogin
Store
();
const
userStore
=
useUser
Store
();
const
logout
=
async
(
logoutTo
?:
string
)
=>
{
await
login
Store
.
logout
();
await
user
Store
.
logout
();
const
currentRoute
=
router
.
currentRoute
.
value
;
Notification
.
success
(
t
(
'
login.logout.success
'
));
router
.
push
({
...
...
continew-admin-ui/src/layout/default-layout.vue
浏览文件 @
8d394937
...
...
@@ -47,7 +47,7 @@
<
script
lang=
"ts"
setup
>
import
{
ref
,
computed
,
watch
,
provide
,
onMounted
}
from
'
vue
'
;
import
{
useRouter
,
useRoute
}
from
'
vue-router
'
;
import
{
useAppStore
,
use
Login
Store
}
from
'
@/store
'
;
import
{
useAppStore
,
use
User
Store
}
from
'
@/store
'
;
import
NavBar
from
'
@/components/navbar/index.vue
'
;
import
Menu
from
'
@/components/menu/index.vue
'
;
import
Footer
from
'
@/components/footer/index.vue
'
;
...
...
@@ -58,7 +58,7 @@
const
isInit
=
ref
(
false
);
const
appStore
=
useAppStore
();
const
loginStore
=
useLogin
Store
();
const
userStore
=
useUser
Store
();
const
router
=
useRouter
();
const
route
=
useRoute
();
const
permission
=
usePermission
();
...
...
@@ -88,7 +88,7 @@
appStore
.
updateSettings
({
menuCollapse
:
val
});
};
watch
(
()
=>
login
Store
.
roles
,
()
=>
user
Store
.
roles
,
(
roleValue
)
=>
{
if
(
roleValue
&&
!
permission
.
accessRouter
(
route
))
router
.
push
({
name
:
'
notFound
'
});
...
...
continew-admin-ui/src/router/guard/permission.ts
浏览文件 @
8d394937
...
...
@@ -2,14 +2,14 @@ import type { Router, RouteRecordNormalized } from 'vue-router';
import
NProgress
from
'
nprogress
'
;
// progress bar
import
usePermission
from
'
@/hooks/permission
'
;
import
{
use
Login
Store
,
useAppStore
}
from
'
@/store
'
;
import
{
use
User
Store
,
useAppStore
}
from
'
@/store
'
;
import
{
fixedRoutes
,
demoRoutes
}
from
'
../routes
'
;
import
{
WHITE_LIST
,
NOT_FOUND
}
from
'
../constants
'
;
export
default
function
setupPermissionGuard
(
router
:
Router
)
{
router
.
beforeEach
(
async
(
to
,
from
,
next
)
=>
{
const
appStore
=
useAppStore
();
const
loginStore
=
useLogin
Store
();
const
userStore
=
useUser
Store
();
const
Permission
=
usePermission
();
const
permissionsAllow
=
Permission
.
accessRouter
(
to
);
if
(
appStore
.
menuFromServer
)
{
...
...
@@ -52,7 +52,7 @@ export default function setupPermissionGuard(router: Router) {
const
destination
=
Permission
.
findFirstPermissionRoute
(
[...
fixedRoutes
,
...
demoRoutes
],
login
Store
.
roles
[
0
]
user
Store
.
roles
[
0
]
)
||
NOT_FOUND
;
next
(
destination
);
}
...
...
continew-admin-ui/src/router/guard/userLoginInfo.ts
浏览文件 @
8d394937
import
type
{
Router
,
LocationQueryRaw
}
from
'
vue-router
'
;
import
NProgress
from
'
nprogress
'
;
// progress bar
import
{
use
Login
Store
,
useAppStore
}
from
'
@/store
'
;
import
{
use
User
Store
,
useAppStore
}
from
'
@/store
'
;
import
{
isLogin
}
from
'
@/utils/auth
'
;
export
default
function
setupUserLoginInfoGuard
(
router
:
Router
)
{
router
.
beforeEach
(
async
(
to
,
from
,
next
)
=>
{
NProgress
.
start
();
const
loginStore
=
useLogin
Store
();
const
userStore
=
useUser
Store
();
const
appStore
=
useAppStore
();
appStore
.
init
();
if
(
isLogin
())
{
...
...
@@ -16,14 +16,14 @@ export default function setupUserLoginInfoGuard(router: Router) {
NProgress
.
done
();
return
;
}
if
(
login
Store
.
roles
[
0
])
{
if
(
user
Store
.
roles
[
0
])
{
next
();
}
else
{
try
{
await
login
Store
.
getInfo
();
await
user
Store
.
getInfo
();
next
();
}
catch
(
error
)
{
await
login
Store
.
logout
();
await
user
Store
.
logout
();
next
({
name
:
'
login
'
,
query
:
{
...
...
continew-admin-ui/src/store/index.ts
浏览文件 @
8d394937
import
{
createPinia
}
from
'
pinia
'
;
import
useAppStore
from
'
./modules/app
'
;
import
use
LoginStore
from
'
./modules/login
'
;
import
use
UserStore
from
'
./modules/user
'
;
import
useDictStore
from
'
./modules/dict
'
;
import
useTabBarStore
from
'
./modules/tab-bar
'
;
const
pinia
=
createPinia
();
export
{
useAppStore
,
use
Login
Store
,
useDictStore
,
useTabBarStore
};
export
{
useAppStore
,
use
User
Store
,
useDictStore
,
useTabBarStore
};
export
default
pinia
;
continew-admin-ui/src/store/modules/
login
/index.ts
→
continew-admin-ui/src/store/modules/
user
/index.ts
浏览文件 @
8d394937
...
...
@@ -12,7 +12,7 @@ import { removeRouteListener } from '@/utils/route-listener';
import
{
UserState
}
from
'
./types
'
;
import
useAppStore
from
'
../app
'
;
const
use
Login
Store
=
defineStore
(
'
user
'
,
{
const
use
User
Store
=
defineStore
(
'
user
'
,
{
state
:
():
UserState
=>
({
id
:
''
,
username
:
''
,
...
...
@@ -96,4 +96,4 @@ const useLoginStore = defineStore('user', {
},
});
export
default
use
Login
Store
;
export
default
use
User
Store
;
continew-admin-ui/src/store/modules/
login
/types.ts
→
continew-admin-ui/src/store/modules/
user
/types.ts
浏览文件 @
8d394937
文件已移动
continew-admin-ui/src/utils/permission.ts
浏览文件 @
8d394937
import
{
use
Login
Store
}
from
'
@/store
'
;
import
{
use
User
Store
}
from
'
@/store
'
;
/**
* 权限判断
...
...
@@ -7,8 +7,8 @@ import { useLoginStore } from '@/store';
* @return true 有权限,false 没有权限
*/
export
default
function
checkPermission
(
value
:
Array
<
string
>
)
{
const
loginStore
=
useLogin
Store
();
const
{
permissions
,
roles
}
=
login
Store
;
const
userStore
=
useUser
Store
();
const
{
permissions
,
roles
}
=
user
Store
;
const
superAdmin
=
'
admin
'
;
const
allPermission
=
'
*
'
;
...
...
continew-admin-ui/src/utils/request.ts
浏览文件 @
8d394937
import
axios
from
'
axios
'
;
import
type
{
AxiosRequestConfig
,
AxiosResponse
}
from
'
axios
'
;
import
{
use
Login
Store
}
from
'
@/store
'
;
import
{
use
User
Store
}
from
'
@/store
'
;
import
{
getToken
}
from
'
@/utils/auth
'
;
import
modalErrorWrapper
from
'
@/utils/modal-error-wrapper
'
;
import
messageErrorWrapper
from
'
@/utils/message-error-wrapper
'
;
...
...
@@ -58,8 +58,8 @@ axios.interceptors.response.use(
escToClose
:
false
,
okText
:
'
重新登录
'
,
async
onOk
()
{
const
loginStore
=
useLogin
Store
();
await
login
Store
.
logout
();
const
userStore
=
useUser
Store
();
await
user
Store
.
logout
();
window
.
location
.
reload
();
},
});
...
...
continew-admin-ui/src/views/dashboard/workplace/components/banner.vue
浏览文件 @
8d394937
...
...
@@ -11,12 +11,12 @@
<
script
lang=
"ts"
setup
>
import
{
computed
}
from
'
vue
'
;
import
{
use
Login
Store
}
from
'
@/store
'
;
import
{
use
User
Store
}
from
'
@/store
'
;
const
loginStore
=
useLogin
Store
();
const
userStore
=
useUser
Store
();
const
userInfo
=
computed
(()
=>
{
return
{
nickname
:
login
Store
.
nickname
,
nickname
:
user
Store
.
nickname
,
};
});
</
script
>
...
...
continew-admin-ui/src/views/demo/visualization/real-time-monitor/components/studio.vue
浏览文件 @
8d394937
...
...
@@ -36,10 +36,10 @@
</template>
<
script
lang=
"ts"
setup
>
import
{
use
Login
Store
}
from
'
@/store
'
;
import
{
use
User
Store
}
from
'
@/store
'
;
import
getAvatar
from
'
@/utils/avatar
'
;
const
userInfo
=
use
Login
Store
();
const
userInfo
=
use
User
Store
();
</
script
>
<
style
scoped
lang=
"less"
>
...
...
continew-admin-ui/src/views/login/components/account-login.vue
浏览文件 @
8d394937
...
...
@@ -56,7 +56,7 @@
import
{
getCurrentInstance
,
ref
,
toRefs
,
reactive
}
from
'
vue
'
;
import
{
useI18n
}
from
'
vue-i18n
'
;
import
{
useStorage
}
from
'
@vueuse/core
'
;
import
{
use
Login
Store
}
from
'
@/store
'
;
import
{
use
User
Store
}
from
'
@/store
'
;
import
{
LoginReq
}
from
'
@/api/auth/login
'
;
import
{
ValidatedError
}
from
'
@arco-design/web-vue
'
;
import
{
encryptByRsa
}
from
'
@/utils/encrypt
'
;
...
...
@@ -65,7 +65,7 @@
const
{
proxy
}
=
getCurrentInstance
()
as
any
;
const
{
t
}
=
useI18n
();
const
router
=
useRouter
();
const
loginStore
=
useLogin
Store
();
const
userStore
=
useUser
Store
();
const
loading
=
ref
(
false
);
const
captchaImgBase64
=
ref
();
const
loginConfig
=
useStorage
(
'
login-config
'
,
{
...
...
@@ -100,7 +100,7 @@
* 获取验证码
*/
const
getCaptcha
=
()
=>
{
login
Store
.
getImgCaptcha
().
then
((
res
)
=>
{
user
Store
.
getImgCaptcha
().
then
((
res
)
=>
{
form
.
value
.
uuid
=
res
.
data
.
uuid
;
captchaImgBase64
.
value
=
res
.
data
.
img
;
});
...
...
@@ -123,7 +123,7 @@
if
(
loading
.
value
)
return
;
if
(
!
errors
)
{
loading
.
value
=
true
;
login
Store
user
Store
.
login
({
username
:
values
.
username
,
password
:
encryptByRsa
(
values
.
password
)
||
''
,
...
...
continew-admin-ui/src/views/login/components/email-login.vue
浏览文件 @
8d394937
...
...
@@ -40,12 +40,12 @@
<
script
lang=
"ts"
setup
>
import
{
getCurrentInstance
,
ref
,
toRefs
,
reactive
,
computed
}
from
'
vue
'
;
import
{
useI18n
}
from
'
vue-i18n
'
;
import
{
use
Login
Store
}
from
'
@/store
'
;
import
{
use
User
Store
}
from
'
@/store
'
;
import
{
LoginReq
}
from
'
@/api/auth/login
'
;
const
{
proxy
}
=
getCurrentInstance
()
as
any
;
const
{
t
}
=
useI18n
();
const
loginStore
=
useLogin
Store
();
const
userStore
=
useUser
Store
();
const
loading
=
ref
(
false
);
const
captchaLoading
=
ref
(
false
);
const
captchaDisable
=
ref
(
false
);
...
...
continew-admin-ui/src/views/login/components/phone-login.vue
浏览文件 @
8d394937
...
...
@@ -42,12 +42,12 @@
<
script
lang=
"ts"
setup
>
import
{
getCurrentInstance
,
ref
,
toRefs
,
reactive
,
computed
}
from
'
vue
'
;
import
{
useI18n
}
from
'
vue-i18n
'
;
import
{
use
Login
Store
}
from
'
@/store
'
;
import
{
use
User
Store
}
from
'
@/store
'
;
import
{
LoginReq
}
from
'
@/api/auth/login
'
;
const
{
proxy
}
=
getCurrentInstance
()
as
any
;
const
{
t
}
=
useI18n
();
const
loginStore
=
useLogin
Store
();
const
userStore
=
useUser
Store
();
const
loading
=
ref
(
false
);
const
captchaLoading
=
ref
(
false
);
const
captchaDisable
=
ref
(
false
);
...
...
continew-admin-ui/src/views/login/social/index.vue
浏览文件 @
8d394937
...
...
@@ -7,14 +7,14 @@
<
script
setup
lang=
"ts"
>
import
{
getCurrentInstance
,
ref
}
from
'
vue
'
;
import
{
useRoute
,
useRouter
}
from
'
vue-router
'
;
import
{
use
Login
Store
}
from
'
@/store
'
;
import
{
use
User
Store
}
from
'
@/store
'
;
import
{
useI18n
}
from
'
vue-i18n
'
;
const
{
proxy
}
=
getCurrentInstance
()
as
any
;
const
{
t
}
=
useI18n
();
const
route
=
useRoute
();
const
router
=
useRouter
();
const
loginStore
=
useLogin
Store
();
const
userStore
=
useUser
Store
();
const
loading
=
ref
(
false
);
const
source
=
route
.
query
.
source
as
string
;
...
...
@@ -25,7 +25,7 @@
if
(
loading
.
value
)
return
;
loading
.
value
=
true
;
const
{
redirect
,
...
othersQuery
}
=
router
.
currentRoute
.
value
.
query
;
login
Store
user
Store
.
socialLogin
(
source
,
othersQuery
)
.
then
(()
=>
{
router
.
push
({
...
...
continew-admin-ui/src/views/system/user/center/components/basic-info.vue
浏览文件 @
8d394937
...
...
@@ -56,20 +56,20 @@
import
{
FieldRule
}
from
'
@arco-design/web-vue
'
;
import
{
BasicInfoModel
,
updateBasicInfo
}
from
'
@/api/system/user-center
'
;
import
{
useI18n
}
from
'
vue-i18n
'
;
import
{
use
Login
Store
}
from
'
@/store
'
;
import
{
use
User
Store
}
from
'
@/store
'
;
const
{
proxy
}
=
getCurrentInstance
()
as
any
;
const
{
t
}
=
useI18n
();
const
loginStore
=
useLogin
Store
();
const
userStore
=
useUser
Store
();
const
loading
=
ref
(
false
);
const
data
=
reactive
({
// 表单数据
form
:
{
username
:
login
Store
.
username
,
nickname
:
login
Store
.
nickname
,
gender
:
login
Store
.
gender
,
username
:
user
Store
.
username
,
nickname
:
user
Store
.
nickname
,
gender
:
user
Store
.
gender
,
}
as
BasicInfoModel
,
// 表单验证规则
rules
:
computed
(():
Record
<
string
,
FieldRule
[]
>
=>
{
...
...
@@ -107,8 +107,8 @@
nickname
:
form
.
value
.
nickname
,
gender
:
form
.
value
.
gender
,
})
.
then
((
res
)
=>
{
login
Store
.
getInfo
();
.
then
(()
=>
{
user
Store
.
getInfo
();
proxy
.
$message
.
success
(
t
(
'
userCenter.basicInfo.form.save.success
'
));
})
.
finally
(()
=>
{
...
...
continew-admin-ui/src/views/system/user/center/components/operation-log.vue
浏览文件 @
8d394937
...
...
@@ -62,9 +62,9 @@
OperationLogRecord
,
listOperationLog
,
}
from
'
@/api/monitor/log
'
;
import
{
use
Login
Store
}
from
'
@/store
'
;
import
{
use
User
Store
}
from
'
@/store
'
;
const
loginStore
=
useLogin
Store
();
const
userStore
=
useUser
Store
();
const
dataList
=
ref
<
OperationLogRecord
[]
>
([]);
const
total
=
ref
(
0
);
...
...
@@ -73,7 +73,7 @@
const
data
=
reactive
({
// 查询参数
queryParams
:
{
uid
:
login
Store
.
id
,
uid
:
user
Store
.
id
,
page
:
1
,
size
:
10
,
sort
:
[
'
createTime,desc
'
],
...
...
continew-admin-ui/src/views/system/user/center/components/security-settings/update-email.vue
浏览文件 @
8d394937
...
...
@@ -7,12 +7,12 @@
</
template
>
<
template
#description
>
<div
class=
"content"
>
<a-typography-paragraph
v-if=
"
login
Store.email"
>
<a-typography-paragraph
v-if=
"
user
Store.email"
>
{{
$t
(
'
userCenter.securitySettings.updateEmail.placeholder.success.email
'
)
}}
:
{{
login
Store
.
email
}}
}}
:
{{
user
Store
.
email
}}
</a-typography-paragraph>
<a-typography-paragraph
v-else
class=
"tip"
>
{{
...
...
@@ -114,13 +114,13 @@
import
{
getMailCaptcha
}
from
'
@/api/common/captcha
'
;
import
{
updateEmail
}
from
'
@/api/system/user-center
'
;
import
{
useI18n
}
from
'
vue-i18n
'
;
import
{
use
Login
Store
}
from
'
@/store
'
;
import
{
use
User
Store
}
from
'
@/store
'
;
import
{
encryptByRsa
}
from
'
@/utils/encrypt
'
;
const
{
proxy
}
=
getCurrentInstance
()
as
any
;
const
{
t
}
=
useI18n
();
const
loginStore
=
useLogin
Store
();
const
userStore
=
useUser
Store
();
const
captchaTime
=
ref
(
60
);
const
captchaTimer
=
ref
();
const
captchaLoading
=
ref
(
false
);
...
...
@@ -155,7 +155,7 @@
},
{
validator
:
(
value
,
callback
)
=>
{
if
(
value
===
login
Store
.
email
)
{
if
(
value
===
user
Store
.
email
)
{
callback
(
t
(
'
userCenter.securitySettings.updateEmail.form.error.validator.newEmail
'
...
...
@@ -261,7 +261,7 @@
currentPassword
:
encryptByRsa
(
form
.
currentPassword
)
||
''
,
}).
then
((
res
)
=>
{
handleCancel
();
login
Store
.
getInfo
();
user
Store
.
getInfo
();
proxy
.
$message
.
success
(
res
.
msg
);
});
}
...
...
continew-admin-ui/src/views/system/user/center/components/security-settings/update-phone.vue
浏览文件 @
8d394937
...
...
@@ -7,12 +7,12 @@
</
template
>
<
template
#description
>
<div
class=
"content"
>
<a-typography-paragraph
v-if=
"
login
Store.phone"
>
<a-typography-paragraph
v-if=
"
user
Store.phone"
>
{{
$t
(
'
userCenter.securitySettings.updatePhone.placeholder.success.phone
'
)
}}
:
{{
login
Store
.
phone
}}
}}
:
{{
user
Store
.
phone
}}
</a-typography-paragraph>
<a-typography-paragraph
v-else
class=
"tip"
>
{{
...
...
@@ -32,9 +32,9 @@
</template>
<
script
lang=
"ts"
setup
>
import
{
use
Login
Store
}
from
'
@/store
'
;
import
{
use
User
Store
}
from
'
@/store
'
;
const
loginStore
=
useLogin
Store
();
const
userStore
=
useUser
Store
();
</
script
>
<
style
scoped
lang=
"less"
></
style
>
continew-admin-ui/src/views/system/user/center/components/security-settings/update-pwd.vue
浏览文件 @
8d394937
...
...
@@ -7,7 +7,7 @@
</
template
>
<
template
#description
>
<div
class=
"content"
>
<a-typography-paragraph
v-if=
"
login
Store.pwdResetTime"
>
<a-typography-paragraph
v-if=
"
user
Store.pwdResetTime"
>
{{
$t
(
'
userCenter.securitySettings.updatePwd.placeholder.success.password
'
...
...
@@ -102,13 +102,13 @@
import
{
FieldRule
}
from
'
@arco-design/web-vue
'
;
import
{
updatePassword
}
from
'
@/api/system/user-center
'
;
import
{
useI18n
}
from
'
vue-i18n
'
;
import
{
use
Login
Store
}
from
'
@/store
'
;
import
{
use
User
Store
}
from
'
@/store
'
;
import
{
encryptByRsa
}
from
'
@/utils/encrypt
'
;
const
{
proxy
}
=
getCurrentInstance
()
as
any
;
const
{
t
}
=
useI18n
();
const
loginStore
=
useLogin
Store
();
const
userStore
=
useUser
Store
();
const
visible
=
ref
(
false
);
// 表单数据
...
...
continew-admin-ui/src/views/system/user/center/components/user-panel.vue
浏览文件 @
8d394937
...
...
@@ -38,31 +38,31 @@
layout=
"inline-horizontal"
>
<a-descriptions-item
:label=
"$t('userCenter.panel.label.nickname')"
>
{{
login
Store.nickname
user
Store.nickname
}}
</a-descriptions-item>
<a-descriptions-item
:label=
"$t('userCenter.panel.label.gender')"
>
<div
v-if=
"
login
Store.gender === 1"
>
<div
v-if=
"
user
Store.gender === 1"
>
{{ $t('userCenter.panel.male') }}
<icon-man
style=
"color: #19bbf1"
/>
</div>
<div
v-else-if=
"
login
Store.gender === 2"
>
<div
v-else-if=
"
user
Store.gender === 2"
>
{{ $t('userCenter.panel.female') }}
<icon-woman
style=
"color: #fa7fa9"
/>
</div>
<div
v-else
>
{{ $t('userCenter.panel.unknown') }}
</div>
</a-descriptions-item>
<a-descriptions-item
:label=
"$t('userCenter.panel.label.phone')"
>
{{
login
Store.phone || '暂无'
user
Store.phone || '暂无'
}}
</a-descriptions-item>
<a-descriptions-item
:label=
"$t('userCenter.panel.label.email')"
>
{{
login
Store.email || '暂无'
user
Store.email || '暂无'
}}
</a-descriptions-item>
<a-descriptions-item
:label=
"$t('userCenter.panel.label.deptName')"
>
{{
login
Store.deptName
user
Store.deptName
}}
</a-descriptions-item>
<a-descriptions-item
:label=
"$t('userCenter.panel.label.registrationDate')"
>
{{
login
Store.registrationDate }}
</a-descriptions-item
>
{{
user
Store.registrationDate }}
</a-descriptions-item
>
</a-descriptions>
</a-space>
...
...
@@ -73,16 +73,16 @@
import
{
getCurrentInstance
,
ref
}
from
'
vue
'
;
import
{
FileItem
,
RequestOption
}
from
'
@arco-design/web-vue
'
;
import
{
uploadAvatar
}
from
'
@/api/system/user-center
'
;
import
{
use
Login
Store
}
from
'
@/store
'
;
import
{
use
User
Store
}
from
'
@/store
'
;
import
getAvatar
from
'
@/utils/avatar
'
;
const
{
proxy
}
=
getCurrentInstance
()
as
any
;
const
loginStore
=
useLogin
Store
();
const
userStore
=
useUser
Store
();
const
avatar
=
{
uid
:
'
-2
'
,
name
:
'
avatar.png
'
,
url
:
getAvatar
(
loginStore
.
avatar
,
login
Store
.
gender
),
url
:
getAvatar
(
userStore
.
avatar
,
user
Store
.
gender
),
};
const
avatarList
=
ref
<
FileItem
[]
>
([
avatar
]);
...
...
@@ -107,7 +107,7 @@
uploadAvatar
(
formData
)
.
then
((
res
)
=>
{
onSuccess
(
res
);
login
Store
.
avatar
=
res
.
data
.
avatar
;
user
Store
.
avatar
=
res
.
data
.
avatar
;
proxy
.
$message
.
success
(
res
.
msg
);
})
.
catch
((
error
)
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录