Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
ferry_web
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
jianan
ferry_web
Commits
818d77b0
Commit
818d77b0
authored
Sep 25, 2020
by
Mr. Lan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 添加默认LDAP登陆配置项。
parent
36698ecb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
8 deletions
+17
-8
src/views/login/index.vue
+4
-4
src/views/system/settings/index.vue
+13
-4
No files found.
src/views/login/index.vue
View file @
818d77b0
...
...
@@ -89,7 +89,7 @@
<img
style=
"height: 48px;width: 100%;border: 1px solid rgba(0,0,0, 0.1);border-radius:5px;"
:src=
"codeUrl"
@
click=
"getCode"
>
</div>
<div
prop=
"code"
style=
"width: 100%;float: left;margin-bottom: 13px"
>
<el-checkbox
v-model=
"
loginTypeStatus
"
>
LDAP登陆
</el-checkbox>
<el-checkbox
v-model=
"
sysInfo.is_ldap
"
>
LDAP登陆
</el-checkbox>
</div>
<el-button
:loading=
"loading"
type=
"primary"
style=
"width:100%;padding:12px 20px;margin-bottom:30px;"
@
click
.
native
.
prevent=
"handleLogin"
>
<span
v-if=
"!loading"
>
登 录
</span>
...
...
@@ -113,7 +113,6 @@ export default {
name
:
'Login'
,
data
()
{
return
{
loginTypeStatus
:
true
,
codeUrl
:
''
,
cookiePassword
:
''
,
loginForm
:
{
...
...
@@ -141,7 +140,8 @@ export default {
currentTime
:
null
,
sysInfo
:
{
logo
:
''
,
name
:
''
name
:
''
,
is_ldap
:
false
}
}
},
...
...
@@ -220,7 +220,7 @@ export default {
handleLogin
()
{
this
.
$refs
.
loginForm
.
validate
(
valid
=>
{
if
(
valid
)
{
if
(
this
.
loginTypeStatus
)
{
if
(
this
.
sysInfo
.
is_ldap
)
{
this
.
loginForm
.
loginType
=
1
}
else
{
this
.
loginForm
.
loginType
=
0
...
...
src/views/system/settings/index.vue
View file @
818d77b0
...
...
@@ -5,7 +5,7 @@
<span>
配置信息
</span>
</div>
<div
class=
"text item"
>
<el-form
ref=
"ruleForm"
:model=
"ruleForm"
:rules=
"rules"
label-width=
"1
0
0px"
>
<el-form
ref=
"ruleForm"
:model=
"ruleForm"
:rules=
"rules"
label-width=
"1
2
0px"
>
<el-form-item
label=
"系统名称:"
prop=
"name"
>
<el-input
v-model=
"ruleForm.name"
/>
</el-form-item>
...
...
@@ -22,6 +22,10 @@
<i
v-else
class=
"el-icon-plus avatar-uploader-icon"
/>
</el-upload>
</el-form-item>
<el-form-item
label=
"默认LDAP登陆:"
>
<el-radio
v-model=
"ruleForm.is_ldap"
:label=
"true"
>
是
</el-radio>
<el-radio
v-model=
"ruleForm.is_ldap"
:label=
"false"
>
否
</el-radio>
</el-form-item>
<el-form-item
style=
"margin-bottom: 0"
>
<el-button
v-permisaction=
"['system:settings:index:config']"
type=
"primary"
@
click=
"submitForm('ruleForm', 1)"
>
确定
</el-button>
</el-form-item>
...
...
@@ -85,7 +89,8 @@ export default {
editable
:
[],
ruleForm
:
{
name
:
''
,
logo
:
''
logo
:
''
,
is_ldap
:
false
},
rules
:
{
name
:
[
...
...
@@ -99,7 +104,7 @@ export default {
tableData
:
[]
}
},
moun
ted
()
{
crea
ted
()
{
this
.
getSettingsInfo
()
},
methods
:
{
...
...
@@ -110,9 +115,13 @@ export default {
if
(
v
.
content
===
undefined
||
v
.
content
===
null
)
{
this
.
ruleForm
=
{
name
:
''
,
logo
:
''
logo
:
''
,
is_ldap
:
false
}
}
else
{
if
(
v
.
content
.
is_ldap
===
undefined
||
v
.
content
.
is_ldap
===
null
)
{
v
.
content
.
is_ldap
=
false
}
this
.
ruleForm
=
v
.
content
}
}
else
if
(
v
.
classify
===
2
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment