Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
D
dataease
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
zhu
dataease
Commits
b65835a7
提交
b65835a7
authored
5月 18, 2021
作者:
taojinlong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat: 暂时去掉国际化切换
上级
afc6563a
隐藏空白字符变更
内嵌
并排
正在显示
7 个修改的文件
包含
35 行增加
和
41 行删除
+35
-41
en.js
frontend/src/lang/en.js
+1
-0
tw.js
frontend/src/lang/tw.js
+1
-0
zh.js
frontend/src/lang/zh.js
+7
-1
Topbar.vue
frontend/src/layout/components/Topbar.vue
+8
-8
index.vue
frontend/src/views/system/user/index.vue
+0
-2
personPwd.vue
frontend/src/views/system/user/personPwd.vue
+5
-11
privateForm.vue
frontend/src/views/system/user/privateForm.vue
+13
-19
没有找到文件。
frontend/src/lang/en.js
浏览文件 @
b65835a7
...
...
@@ -85,6 +85,7 @@ export default {
tokenError
:
'Token error, please login again'
},
commons
:
{
icon
:
'Icon'
,
all
:
'All'
,
enable
:
'Enable'
,
disable
:
'Disable'
,
...
...
frontend/src/lang/tw.js
浏览文件 @
b65835a7
...
...
@@ -85,6 +85,7 @@ export default {
tokenError
:
'信息错误,请重新登陸'
},
commons
:
{
icon
:
'圖標'
,
all
:
'全部'
,
enable
:
'啟用'
,
disable
:
'停用'
,
...
...
frontend/src/lang/zh.js
浏览文件 @
b65835a7
...
...
@@ -85,6 +85,7 @@ export default {
tokenError
:
'token错误,请重新登录'
},
commons
:
{
icon
:
'图标'
,
all
:
'全部'
,
enable
:
'启用'
,
disable
:
'停用'
,
...
...
@@ -421,7 +422,12 @@ export default {
apikey_delete_confirm
:
'这个 API Key 确定要删除吗?'
,
input_id_placeholder
:
'请输入ID (不支持中文)'
,
source
:
'用户来源'
,
choose_org
:
'选择组织'
choose_org
:
'选择组织'
,
reset_password
:
'重置密码'
,
current_user
:
'当前用户'
,
origin_passwd
:
'原始密码'
,
new_passwd
:
'新密码'
,
confirm_passwd
:
'确认密码'
},
role
:
{
menu_authorization
:
'菜单授权'
,
...
...
frontend/src/layout/components/Topbar.vue
浏览文件 @
b65835a7
...
...
@@ -35,7 +35,7 @@
<size-select
id=
"size-select"
class=
"right-menu-item hover-effect"
/>
</el-tooltip>
-->
<lang-select
class=
"right-menu-item hover-effect"
/
>
<!--
<lang-select
class=
"right-menu-item hover-effect"
/>
--
>
</
template
>
<el-dropdown
class=
"top-dropdown"
style=
"display: flex;align-items: center;"
>
...
...
@@ -45,21 +45,21 @@
<el-dropdown-menu
slot=
"dropdown"
>
<router-link
to=
"/person-info/index"
>
<el-dropdown-item>
个人信息
</el-dropdown-item>
<el-dropdown-item>
{{ $t('commons.personal_info') }}
</el-dropdown-item>
</router-link>
<router-link
to=
"/person-pwd/index"
>
<el-dropdown-item>
重置密码
</el-dropdown-item>
<el-dropdown-item>
{{ $t('user.reset_password') }}
</el-dropdown-item>
</router-link>
<a
href=
"https://panjiachen.github.io/vue-element-admin-site/#/"
target=
"_blank"
>
<el-dropdown-item>
Docs
</el-dropdown-item>
<el-dropdown-item>
{{ $t('commons.help_documentation') }}
</el-dropdown-item>
</a>
<a
href=
"https://fit2cloud.com/"
target=
"_blank"
>
<el-dropdown-item>
关于
</el-dropdown-item>
<el-dropdown-item>
{{ $t('commons.about_us') }}
</el-dropdown-item>
</a>
<el-dropdown-item
divided
@
click
.
native=
"logout"
>
<span
style=
"display:block;"
>
退出
</span>
<span
style=
"display:block;"
>
{{ $t('commons.exit_system') }}
</span>
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
...
...
@@ -100,7 +100,7 @@ import { isExternal } from '@/utils/validate'
// import Doc from '@/components/Doc'
// import Screenfull from '@/components/Screenfull'
// import SizeSelect from '@/components/SizeSelect'
import
LangSelect
from
'@/components/LangSelect'
//
import LangSelect from '@/components/LangSelect'
import
{
getSysUI
}
from
'@/utils/auth'
export
default
{
name
:
'Topbar'
,
...
...
@@ -108,7 +108,7 @@ export default {
AppLink
,
// Screenfull,
// SizeSelect,
LangSelect
//
LangSelect
// Doc
},
data
()
{
...
...
frontend/src/views/system/user/index.vue
浏览文件 @
b65835a7
...
...
@@ -287,11 +287,9 @@ export default {
methods
:
{
select
(
selection
)
{
console
.
log
(
selection
)
},
search
(
condition
)
{
console
.
log
(
condition
)
// demo只查看搜索条件,没有搜索的实现
const
temp
=
formatCondition
(
condition
)
const
param
=
temp
||
{}
const
{
currentPage
,
pageSize
}
=
this
.
paginationConfig
...
...
frontend/src/views/system/user/personPwd.vue
浏览文件 @
b65835a7
<
template
>
<layout-content
header=
"修改密码
"
>
<layout-content
:header=
"$t('member.edit_password')
"
>
<el-form
ref=
"createUserForm"
:model=
"form"
:rules=
"rule"
size=
"small"
label-width=
"auto"
label-position=
"right"
>
<el-form-item
label=
"原始密码
"
prop=
"oldPwd"
>
<el-form-item
:label=
"$t('user.origin_passwd')
"
prop=
"oldPwd"
>
<el-input
v-model=
"form.oldPwd"
type=
"password"
/>
</el-form-item>
<el-form-item
label=
"新密码
"
prop=
"newPwd"
>
<el-form-item
:label=
"$t('user.new_passwd')
"
prop=
"newPwd"
>
<el-input
v-model=
"form.newPwd"
type=
"password"
/>
</el-form-item>
<el-form-item
label=
"确认密码
"
prop=
"repeatPwd"
>
<el-form-item
:label=
"$t('user.confirm_passwd')
"
prop=
"repeatPwd"
>
<el-input
v-model=
"form.repeatPwd"
type=
"password"
/>
</el-form-item>
<el-form-item>
<el-button
type=
"primary"
@
click=
"save"
>
保存
</el-button>
<el-button
type=
"primary"
@
click=
"save"
>
{{
$t
(
'commons.confirm'
)
}}
</el-button>
</el-form-item>
</el-form>
...
...
@@ -35,12 +35,6 @@ export default {
oldPwd
:
[
{
required
:
true
,
message
:
this
.
$t
(
'user.input_password'
),
trigger
:
'blur'
}
// {
// required: true,
// pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[^]{6,30}$/,
// message: this.$t('member.password_format_is_incorrect'),
// trigger: 'blur'
// }
],
newPwd
:
[
{
required
:
true
,
message
:
this
.
$t
(
'user.input_password'
),
trigger
:
'blur'
}
...
...
frontend/src/views/system/user/privateForm.vue
浏览文件 @
b65835a7
...
...
@@ -2,48 +2,42 @@
<layout-content
header=
"个人信息"
>
<div>
<el-form
ref=
"createUserForm"
:disabled=
"formType !== 'modify'"
:model=
"form"
:rules=
"rule"
size=
"small"
label-width=
"auto"
label-position=
"right"
>
<el-form-item
label=
"用户名
"
prop=
"username"
>
<el-form-item
:label=
"$t('commons.user')
"
prop=
"username"
>
<el-input
v-model=
"form.username"
disabled
/>
</el-form-item>
<el-form-item
label=
"电话
"
prop=
"phone"
>
<el-form-item
:label=
"$t('commons.phone')
"
prop=
"phone"
>
<el-input
v-model=
"form.phone"
/>
</el-form-item>
<el-form-item
label=
"昵称
"
prop=
"nickName"
>
<el-form-item
:label=
"$t('commons.nick_name')
"
prop=
"nickName"
>
<el-input
v-model=
"form.nickName"
/>
</el-form-item>
<el-form-item
label=
"邮箱
"
prop=
"email"
>
<el-form-item
:label=
"$t('commons.email')
"
prop=
"email"
>
<el-input
v-model=
"form.email"
/>
</el-form-item>
<!--
<el-form-item
label=
"性别"
>
<el-radio-group
v-model=
"form.gender"
style=
"width: 178px"
>
<el-radio
label=
"男"
>
男
</el-radio>
<el-radio
label=
"女"
>
女
</el-radio>
</el-radio-group>
</el-form-item>
-->
<el-form-item
label=
"状态"
>
<el-form-item
:label=
"$t('commons.status')"
>
<el-radio-group
v-model=
"form.enabled"
disabled
style=
"width: 140px"
>
<el-radio
:label=
"1"
>
启用
</el-radio>
<el-radio
:label=
"0"
>
停用
</el-radio>
<el-radio
:label=
"1"
>
{{
$t
(
'commons.enable'
)
}}
</el-radio>
<el-radio
:label=
"0"
>
{{
$t
(
'commons.disable'
)
}}
</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item
disabled
label=
"部门
"
prop=
"dept"
>
<el-form-item
disabled
:label=
"$t('commons.organization')
"
prop=
"dept"
>
<treeselect
v-model=
"form.deptId"
disabled
:options=
"depts"
:load-options=
"loadDepts"
:auto-load-root-options=
"false"
placeholder=
"选择部门
"
:placeholder=
"$t('user.choose_org')
"
/>
</el-form-item>
<el-form-item
label=
"角色
"
prop=
"roleIds"
>
<el-form-item
:label=
"$t('commons.role')
"
prop=
"roleIds"
>
<el-select
v-model=
"form.roleIds"
disabled
style=
"width: 100%"
multiple
placeholder=
"请选择
"
:placeholder=
"$t('commons.please_select')
"
@
remove-tag=
"deleteTag"
@
change=
"changeRole"
>
...
...
@@ -63,8 +57,8 @@
<div
slot=
"footer"
style=
"margin-left: 30px;"
class=
"dialog-footer"
>
<el-button
v-if=
"formType==='modify'"
type=
"text"
@
click=
"reset"
>
{{
$t
(
'commons.cancel'
)
}}
</el-button>
<el-button
v-if=
"formType==='modify'"
type=
"primary"
@
click=
"save"
>
确认
</el-button>
<el-button
v-if=
"formType!=='modify'"
type=
"primary"
@
click=
"edit"
>
编辑
</el-button>
<el-button
v-if=
"formType==='modify'"
type=
"primary"
@
click=
"save"
>
{{
$t
(
'commons.confirm'
)
}}
</el-button>
<el-button
v-if=
"formType!=='modify'"
type=
"primary"
@
click=
"edit"
>
{{
$t
(
'commons.edit'
)
}}
</el-button>
</div>
</div>
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论