Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
R
robot-monitor
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
汪晓凯
robot-monitor
Commits
eb83ea77
Commit
eb83ea77
authored
Jul 02, 2018
by
wxk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
登录页面接口ok
parent
33f4b64c
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
66 additions
and
30 deletions
+66
-30
index.js
config/index.js
+10
-1
preHeader.vue
src/components/preHeader.vue
+16
-3
api-config.js
src/config/api-config.js
+13
-0
Login.vue
src/views/Login.vue
+27
-26
No files found.
config/index.js
View file @
eb83ea77
...
@@ -10,7 +10,16 @@ module.exports = {
...
@@ -10,7 +10,16 @@ module.exports = {
// Paths
// Paths
assetsSubDirectory
:
'static'
,
assetsSubDirectory
:
'static'
,
assetsPublicPath
:
'/'
,
assetsPublicPath
:
'/'
,
proxyTable
:
{},
proxyTable
:
{
'/asset_monitor'
:
{
target
:
'http://47.91.221.203:46656'
,
// 接口的域名
// secure: false, // 如果是https接口,需要配置这个参数
changeOrigin
:
true
,
// 如果接口跨域,需要进行这个参数配置
pathRewrite
:
{
'^/api'
:
''
}
}
},
// Various Dev Server settings
// Various Dev Server settings
host
:
'localhost'
,
// can be overwritten by process.env.HOST
host
:
'localhost'
,
// can be overwritten by process.env.HOST
...
...
src/components/preHeader.vue
View file @
eb83ea77
...
@@ -3,19 +3,32 @@
...
@@ -3,19 +3,32 @@
<span
class=
"title"
>
机器人监控
</span>
<span
class=
"title"
>
机器人监控
</span>
<div
class=
"contain"
>
<div
class=
"contain"
>
<span
class=
"username"
>
{{
username
}}
</span>
<span
class=
"username"
>
{{
username
}}
</span>
<span
class=
"loginout"
>
退出
</span>
<span
class=
"loginout"
@
click=
"exitLogin"
>
退出
</span>
</div>
</div>
</div>
</div>
</
template
>
</
template
>
<
script
>
<
script
>
export
default
{
export
default
{
name
:
"pre-header"
,
data
(){
data
(){
return
{
return
{
username
:
'wxk@33.cn'
,
username
:
localStorage
.
getItem
(
"username"
)
,
}
}
},
},
methods
:
{
//退出登录
exitLogin
(){
this
.
$router
.
push
({
path
:
'/'
});
this
.
$notify
({
title
:
'提示'
,
message
:
"退出成功"
,
type
:
'success'
,
duration
:
'2000'
,
});
}
}
}
}
</
script
>
</
script
>
...
...
src/config/api-config.js
0 → 100644
View file @
eb83ea77
const
baseUrl
=
"/asset_monitor"
;
const
Api
=
{
Login
:
baseUrl
+
"/login"
,
//登录
Register
:
baseUrl
+
"/register"
,
//注册
ResetPassword
:
baseUrl
+
"/resetPassword"
,
//重置密码
SendEmailVcode
:
baseUrl
+
"/sendEmailVcode"
,
//发送验证码
GetMatchRobots
:
baseUrl
+
"/accountlist"
,
//获取符合条件的机器人
GetRobotStatus
:
baseUrl
+
"/robotStatus"
,
//机器人预警状态查询
GetPlatformInfo
:
baseUrl
+
"/platform"
,
//交易所及匹配的交易对、目标币信息查询
}
export
default
Api
;
src/views/Login.vue
View file @
eb83ea77
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
</div>
</div>
<div
class=
"groupcom inputpwd"
>
<div
class=
"groupcom inputpwd"
>
<i
class=
"iicon pwd"
></i>
<i
class=
"iicon pwd"
></i>
<input
type=
"password"
placeholder=
"请输入密码"
class=
"usercom"
v-model=
"loginBody.password"
@
keyup
.
enter=
"
login('/login')
"
>
<input
type=
"password"
placeholder=
"请输入密码"
class=
"usercom"
v-model=
"loginBody.password"
@
keyup
.
enter=
"
Login
"
>
</div>
</div>
<div
class=
"ground"
>
<div
class=
"ground"
>
<span
class=
"ground-right"
>
<span
class=
"ground-right"
>
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
<input
type=
"checkbox"
name=
"记住用户密码"
class=
"rember"
v-model=
"isSaveLoginInfo"
>
<input
type=
"checkbox"
name=
"记住用户密码"
class=
"rember"
v-model=
"isSaveLoginInfo"
>
<span>
记住用户名
</span>
<span>
记住用户名
</span>
</div>
</div>
<el-button
type=
"primary"
class=
"loginget"
@
click=
"
login('/login')
"
>
立刻登录
</el-button>
<el-button
type=
"primary"
class=
"loginget"
@
click=
"
Login
"
>
立刻登录
</el-button>
</div>
</div>
</div>
</div>
<!-- 注册 -->
<!-- 注册 -->
...
@@ -44,7 +44,7 @@
...
@@ -44,7 +44,7 @@
<div
class=
"inputyzm inputpwd"
>
<div
class=
"inputyzm inputpwd"
>
<i
class=
"iicon pwd"
></i>
<i
class=
"iicon pwd"
></i>
<input
type=
"text"
placeholder=
"请输入验证码"
class=
"usercomyzm"
v-model=
"regist_yzm"
>
<input
type=
"text"
placeholder=
"请输入验证码"
class=
"usercomyzm"
v-model=
"regist_yzm"
>
<el-button
type=
"primary"
class=
"getyzm"
@
click=
"getYZM('
/sendEmailVcode
')"
:disabled=
'!show'
>
<el-button
type=
"primary"
class=
"getyzm"
@
click=
"getYZM('
regist
')"
:disabled=
'!show'
>
<span
v-show =
"show"
>
获取验证码
</span>
<span
v-show =
"show"
>
获取验证码
</span>
<span
v-show =
"!show"
class=
"count"
>
还剩下
{{
count
}}
s
</span>
<span
v-show =
"!show"
class=
"count"
>
还剩下
{{
count
}}
s
</span>
</el-button>
</el-button>
...
@@ -55,7 +55,7 @@
...
@@ -55,7 +55,7 @@
<span
@
click=
"goShowPanel(1)"
class=
"bluepoint"
>
马上登录
</span>
<span
@
click=
"goShowPanel(1)"
class=
"bluepoint"
>
马上登录
</span>
</span>
</span>
</div>
</div>
<el-button
type=
"primary"
class=
"loginget"
@
click=
"registered
('/register')
"
>
立刻注册
</el-button>
<el-button
type=
"primary"
class=
"loginget"
@
click=
"registered"
>
立刻注册
</el-button>
</div>
</div>
</div>
</div>
<!-- 找回密码 -->
<!-- 找回密码 -->
...
@@ -69,7 +69,7 @@
...
@@ -69,7 +69,7 @@
<div
class=
"inputyzm inputpwd"
>
<div
class=
"inputyzm inputpwd"
>
<i
class=
"iicon pwd"
></i>
<i
class=
"iicon pwd"
></i>
<input
type=
"text"
placeholder=
"请输入验证码"
class=
"usercomyzm"
v-model=
"forget_yzm"
>
<input
type=
"text"
placeholder=
"请输入验证码"
class=
"usercomyzm"
v-model=
"forget_yzm"
>
<el-button
type=
"primary"
class=
"getyzm"
@
click=
"getYZM
2('/sendEmailVcode
')"
:disabled=
'!show'
>
<el-button
type=
"primary"
class=
"getyzm"
@
click=
"getYZM
('forgetpassword
')"
:disabled=
'!show'
>
<span
v-show =
"show"
>
获取验证码
</span>
<span
v-show =
"show"
>
获取验证码
</span>
<span
v-show =
"!show"
class=
"count"
>
还剩下
{{
count
}}
s
</span>
<span
v-show =
"!show"
class=
"count"
>
还剩下
{{
count
}}
s
</span>
</el-button>
</el-button>
...
@@ -88,7 +88,7 @@
...
@@ -88,7 +88,7 @@
<span
@
click=
"goShowPanel(1)"
class=
"bluepoint"
>
马上登录
</span>
<span
@
click=
"goShowPanel(1)"
class=
"bluepoint"
>
马上登录
</span>
</span>
</span>
</div>
</div>
<el-button
type=
"primary"
class=
"loginget"
@
click=
"forgetpassword
('/resetPassword')
"
>
找回密码
</el-button>
<el-button
type=
"primary"
class=
"loginget"
@
click=
"forgetpassword"
>
找回密码
</el-button>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -99,7 +99,7 @@ const regEmail2 = /^[a-z0-9]+([._\\-]*[a-z0-9])*@disanbo.com+$/;
...
@@ -99,7 +99,7 @@ const regEmail2 = /^[a-z0-9]+([._\\-]*[a-z0-9])*@disanbo.com+$/;
const
regPwd
=
/
[
a-zA-Z0-9_
]{8,16}
/
;
const
regPwd
=
/
[
a-zA-Z0-9_
]{8,16}
/
;
const
TIME_COUNT
=
60
;
const
TIME_COUNT
=
60
;
import
axios
from
'axios'
;
import
axios
from
'axios'
;
// import api from "../api
";
import
ApiConfig
from
"../config/api-config
"
;
export
default
{
export
default
{
data
(){
data
(){
return
{
return
{
...
@@ -137,9 +137,10 @@ export default {
...
@@ -137,9 +137,10 @@ export default {
this
.
isSaveLoginInfo
=
''
;
this
.
isSaveLoginInfo
=
''
;
this
.
show
=
true
;
this
.
show
=
true
;
},
},
//注册获取验证码
//获取验证码
getYZM
(
url
){
getYZM
(
type
){
if
(
this
.
regist_email
==
''
||
!
(
regEmail
.
test
(
this
.
regist_email
)
||
regEmail2
.
test
(
this
.
regist_email
))){
const
Email
=
type
===
'regist'
?
this
.
regist_email
:
this
.
forget_email
;
if
(
Email
==
''
||
!
(
regEmail
.
test
(
Email
)
||
regEmail2
.
test
(
Email
))){
this
.
$notify
({
this
.
$notify
({
title
:
'提示'
,
title
:
'提示'
,
message
:
"请输入正确的邮箱"
,
message
:
"请输入正确的邮箱"
,
...
@@ -160,8 +161,8 @@ export default {
...
@@ -160,8 +161,8 @@ export default {
this
.
timer
=
null
;
this
.
timer
=
null
;
}
}
},
1000
)
},
1000
)
axios
.
post
(
api
.
config
.
URL
+
url
,{
"user"
:
this
.
regist_e
mail
}).
then
(
res
=>
{
axios
.
post
(
ApiConfig
.
SendEmailVcode
,{
"user"
:
E
mail
}).
then
(
res
=>
{
console
.
log
(
res
)
//
console.log(res)
if
(
res
.
status
==
200
&&
res
.
data
==
"emailsend success"
){
//发送成功并且注册成功
if
(
res
.
status
==
200
&&
res
.
data
==
"emailsend success"
){
//发送成功并且注册成功
this
.
$notify
({
this
.
$notify
({
title
:
'提示'
,
title
:
'提示'
,
...
@@ -189,7 +190,7 @@ export default {
...
@@ -189,7 +190,7 @@ export default {
});
});
},
},
//找回密码获取验证码
//找回密码获取验证码
getYZM2
(
url
){
/* getYZM2(
){
if(this.forget_email == '' || ! (regEmail.test(this.forget_email) || regEmail2.test(this.forget_email))){
if(this.forget_email == '' || ! (regEmail.test(this.forget_email) || regEmail2.test(this.forget_email))){
this.$notify({
this.$notify({
title: '提示',
title: '提示',
...
@@ -211,7 +212,7 @@ export default {
...
@@ -211,7 +212,7 @@ export default {
this.timer = null;
this.timer = null;
}
}
}, 1000)
}, 1000)
axios
.
post
(
api
.
config
.
URL
+
url
,{
"user"
:
this
.
forget_email
}).
then
(
res
=>
{
axios.post(
ApiConfig.SendEmailVcode
,{"user":this.forget_email}).then(res => {
console.log(res)
console.log(res)
if(res.status == 200&& res.data == "emailsend success"){//发送成功并且注册成功
if(res.status == 200&& res.data == "emailsend success"){//发送成功并且注册成功
this.$notify({
this.$notify({
...
@@ -238,9 +239,9 @@ export default {
...
@@ -238,9 +239,9 @@ export default {
duration:'2000',
duration:'2000',
});
});
});
});
},
},
*/
//注册
//注册
registered
(
url
){
registered
(){
//console.log(this.regist_email)
//console.log(this.regist_email)
//console.log(this.regist_password)
//console.log(this.regist_password)
if
(
this
.
regist_password
==
''
||
this
.
regist_rppassword
==
''
||
this
.
regist_password
!=
this
.
regist_rppassword
){
//密码格式不对
if
(
this
.
regist_password
==
''
||
this
.
regist_rppassword
==
''
||
this
.
regist_password
!=
this
.
regist_rppassword
){
//密码格式不对
...
@@ -261,8 +262,8 @@ export default {
...
@@ -261,8 +262,8 @@ export default {
});
});
return
;
return
;
}
}
axios
.
post
(
api
.
config
.
URL
+
url
,{
"user"
:
this
.
regist_email
,
"password"
:
this
.
regist_password
,
"emailvcode"
:
this
.
regist_yzm
}).
then
(
res
=>
{
axios
.
post
(
ApiConfig
.
Register
,{
"user"
:
this
.
regist_email
,
"password"
:
this
.
regist_password
,
"emailvcode"
:
this
.
regist_yzm
}).
then
(
res
=>
{
console
.
log
(
res
)
//
console.log(res)
if
(
res
.
data
==
'register success'
){
if
(
res
.
data
==
'register success'
){
this
.
$notify
({
this
.
$notify
({
title
:
'提示'
,
title
:
'提示'
,
...
@@ -294,7 +295,7 @@ export default {
...
@@ -294,7 +295,7 @@ export default {
})
})
},
},
//登录
//登录
login
(
url
){
Login
(
){
if
(
this
.
loginBody
.
email
==
''
||
this
.
loginBody
.
password
==
''
){
if
(
this
.
loginBody
.
email
==
''
||
this
.
loginBody
.
password
==
''
){
this
.
$notify
({
this
.
$notify
({
title
:
'提示'
,
title
:
'提示'
,
...
@@ -304,10 +305,9 @@ export default {
...
@@ -304,10 +305,9 @@ export default {
});
});
return
;
return
;
}
}
axios
.
post
(
api
.
config
.
URL
+
url
,{
"user"
:
this
.
loginBody
.
email
,
"password"
:
this
.
loginBody
.
password
}).
then
(
res
=>
{
axios
.
post
(
ApiConfig
.
Login
,{
"user"
:
this
.
loginBody
.
email
,
"password"
:
this
.
loginBody
.
password
}).
then
(
res
=>
{
console
.
log
(
res
)
//
console.log(res)
if
(
res
.
data
==
"login success"
){
if
(
res
.
data
==
"login success"
){
sessionStorage
.
setItem
(
"login_success"
,
'hzyhbk'
);
this
.
$notify
({
this
.
$notify
({
title
:
'提示'
,
title
:
'提示'
,
message
:
"登陆成功"
,
message
:
"登陆成功"
,
...
@@ -357,7 +357,7 @@ export default {
...
@@ -357,7 +357,7 @@ export default {
}
}
},
},
//找回密码
//找回密码
forgetpassword
(
url
){
forgetpassword
(){
//console.log(this.regist_email)
//console.log(this.regist_email)
//console.log(this.regist_password)
//console.log(this.regist_password)
if
(
this
.
forget_password
==
''
||
this
.
forget_rppassword
==
''
){
//密码格式不对
if
(
this
.
forget_password
==
''
||
this
.
forget_rppassword
==
''
){
//密码格式不对
...
@@ -387,8 +387,8 @@ export default {
...
@@ -387,8 +387,8 @@ export default {
});
});
return
;
return
;
}
}
axios
.
post
(
api
.
config
.
URL
+
url
,{
"user"
:
this
.
forget_email
,
"password"
:
this
.
forget_password
,
"emailvcode"
:
this
.
forget_yzm
}).
then
(
res
=>
{
axios
.
post
(
ApiConfig
.
ResetPassword
,{
"user"
:
this
.
forget_email
,
"password"
:
this
.
forget_password
,
"emailvcode"
:
this
.
forget_yzm
}).
then
(
res
=>
{
console
.
log
(
res
)
//
console.log(res)
if
(
res
.
data
==
'reset passwords success'
){
if
(
res
.
data
==
'reset passwords success'
){
this
.
$notify
({
this
.
$notify
({
title
:
'提示'
,
title
:
'提示'
,
...
@@ -424,7 +424,8 @@ export default {
...
@@ -424,7 +424,8 @@ export default {
<
style
scoped
>
<
style
scoped
>
.whole
{
.whole
{
min-width
:
1120px
;
min-width
:
1120px
;
min-height
:
100vh
;
height
:
100%
;
min-height
:
700px
;
background
:
#7792A7
;
background
:
#7792A7
;
}
}
.top-title
{
.top-title
{
...
...
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