Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
assets
Project
Project
Details
Activity
Releases
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄媛媛
assets
Commits
876dcb48
Commit
876dcb48
authored
Oct 15, 2024
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
11
parent
2f4211ed
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
116 additions
and
113 deletions
+116
-113
SignMan.vue
src/components/approval/SignMan.vue
+5
-9
Login.vue
src/components/global/Login.vue
+111
-104
No files found.
src/components/approval/SignMan.vue
View file @
876dcb48
...
...
@@ -68,7 +68,7 @@
<th>
资产编号
</th>
<th>
品牌名称
</th>
<th>
操作人/时间
</th>
<t
>
操作
</t
>
<t
h>
操作
</th
>
</thead>
<tbody>
<template
v-for=
"(item,index1) in tableData"
>
...
...
@@ -87,7 +87,6 @@
<p>
{{
item
.
AuditStatusName
}}
</p>
</div>
</div>
</td>
<td
:rowspan=
"item.DetailList.length"
v-if=
"index==0"
>
{{
item
.
SourceName
}}
</td>
<td
:rowspan=
"item.DetailList.length"
v-if=
"index==0"
>
...
...
@@ -121,7 +120,6 @@
</td>
</tr>
</
template
>
<tr
v-show=
"tableData.length==0"
>
<td
colspan=
"12"
align=
"center"
>
暂无数据
</td>
</tr>
...
...
@@ -131,7 +129,6 @@
:total=
"total"
>
</el-pagination>
</div>
<el-dialog
title=
"转交"
:visible
.
sync=
"dialogState"
width=
"530px"
>
<el-form
class=
"MyEditForm"
:model=
"addMsg"
:rules=
"rules"
ref=
"addMsg"
label-width=
"0px"
>
<div
class=
"basefix"
>
...
...
@@ -166,7 +163,7 @@
import
Treeselect
from
"@riophae/vue-treeselect"
;
import
"@riophae/vue-treeselect/dist/vue-treeselect.css"
;
export
default
{
name
:
'S
ignM
an'
,
name
:
'S
upplierm
an'
,
components
:
{
Treeselect
,
CheckDetails
...
...
@@ -233,7 +230,6 @@
},
dateList
:
[],
EmName
:
''
,
}
},
created
()
{
...
...
@@ -281,7 +277,6 @@
ZhuanJiao
(
item
)
{
this
.
dialogState
=
true
;
this
.
addMsg
.
WorkFlowId
=
item
.
Id
;
},
See
(
item
,
path
,
backto
,
type
)
{
let
shenpistr
=
type
;
...
...
@@ -321,7 +316,6 @@
this
.
EmployeeList1
=
res
.
data
.
data
;
}
else
{
this
.
EmployeeList2
=
res
.
data
.
data
;
}
}
else
{
this
.
Error
(
res
.
data
.
message
);
...
...
@@ -414,10 +408,12 @@
},
},
}
</
script
>
<
style
scoped
>
.spotquery
{
box-sizing
:
border-box
;
}
</
style
>
src/components/global/Login.vue
View file @
876dcb48
...
...
@@ -7,13 +7,11 @@
<img
style=
"width:16px;height:14px"
src=
"../../assets/img/user.png"
alt=
""
>
账号
</p>
<el-input
v-model=
"userInfo.EmAccount"
placeholder=
"请输入"
></el-input>
</div>
<div>
<p>
<img
style=
"width:16px;height:14px;margin-right:4px"
src=
"../../assets/img/passwd.png"
alt=
""
>
密码
</p>
<el-input
type=
"password"
v-model=
"userInfo.EmPassword"
placeholder=
"请输入内容"
></el-input>
</div>
<div
class=
"loginDiv"
>
<span
v-loading=
"btnLoading"
@
click=
"Login"
>
登录
</span>
...
...
@@ -24,19 +22,19 @@
</
template
>
<
script
>
export
default
{
export
default
{
name
:
'login'
,
data
()
{
return
{
userInfo
:
{
EmAccount
:
''
,
EmPassword
:
''
,
Domain
:
''
,
data
()
{
return
{
userInfo
:
{
EmAccount
:
''
,
EmPassword
:
''
,
Domain
:
''
,
},
btnLoading
:
false
,
btnLoading
:
false
,
}
},
created
()
{
created
()
{
// let href = window.location.href;
// let param = href.split('?')[1].split("&") ;
// if(param){
...
...
@@ -47,19 +45,21 @@ export default {
// this.getUserInfo();
// }
},
mounted
()
{
mounted
()
{
this
.
initData
();
},
methods
:
{
getUserInfo
(){
this
.
apiJavaPost
(
"/api/user/GetUserLoginMenu"
,{},
methods
:
{
getUserInfo
()
{
this
.
apiJavaPost
(
"/api/user/GetUserLoginMenu"
,
{},
res
=>
{
this
.
btnLoading
=
false
;
this
.
btnLoading
=
false
;
if
(
res
.
data
.
resultCode
===
1
)
{
let
user
=
res
.
data
.
data
;
let
user
=
res
.
data
.
data
;
var
userJson
=
JSON
.
stringify
(
user
);
localStorage
.
zcuserInfo
=
userJson
;
this
.
$router
.
push
({
path
:
'Home'
})
this
.
$router
.
push
({
path
:
'Home'
})
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
...
...
@@ -74,9 +74,8 @@ export default {
this
.
userInfo
.
EmPassword
=
"123456"
;
}
this
.
userInfo
.
Domain
=
window
.
location
.
hostname
// this.userInfo.Domain = "zcyx.oytour.com";
},
Login
(){
Login
()
{
if
(
this
.
userInfo
.
EmAccount
==
""
)
{
this
.
nameIsShow
=
true
;
this
.
Error
(
"请输入用户名"
);
...
...
@@ -86,16 +85,17 @@ export default {
this
.
Error
(
"请输入密码"
);
return
;
}
this
.
btnLoading
=
true
;
this
.
apiJavaPost
(
"/api/login/userlogin"
,
this
.
userInfo
,
this
.
btnLoading
=
true
;
this
.
apiJavaPost
(
"/api/login/userlogin"
,
this
.
userInfo
,
res
=>
{
this
.
btnLoading
=
false
;
this
.
btnLoading
=
false
;
if
(
res
.
data
.
resultCode
===
1
)
{
let
user
=
res
.
data
.
data
;
let
user
=
res
.
data
.
data
;
var
userJson
=
JSON
.
stringify
(
user
);
localStorage
.
zcuserInfo
=
userJson
;
this
.
$router
.
push
({
path
:
'Home'
})
this
.
$router
.
push
({
path
:
'Home'
})
}
else
{
this
.
Error
(
res
.
data
.
message
);
}
...
...
@@ -104,15 +104,15 @@ export default {
);
},
},
}
}
</
script
>
<
style
>
.login
.el-loading-mask
{
.login
.el-loading-mask
{
border-radius
:
24px
;
}
.login
{
}
.login
{
position
:
absolute
;
width
:
100%
;
height
:
100%
;
...
...
@@ -121,35 +121,42 @@ export default {
background
:
url('../../assets/img/login.png')
no-repeat
;
background-size
:
100%
100%
;
font-family
:
"PingFang"
;
}
.login
.loginContent
{
}
.login
.loginContent
{
position
:
absolute
;
top
:
20%
;
left
:
15%
;
left
:
15%
;
width
:
400px
;
}
.login
.loginContent
.el-input__inner
{
}
.login
.loginContent
.el-input__inner
{
border
:
none
;
border-bottom
:
1px
solid
#CCCCCC
;
border-radius
:
0
;
color
:
#333333
;
padding
:
0
;
}
.login
.loginContent
.el-input.is-active
.el-input__inner
,
.login
.loginContent
.el-input__inner
:focus
{
border-bottom
:
2px
solid
#089bab
!important
;
}
.loginDiv
{
margin-top
:
50px
;
}
.loginDiv
span
{
color
:
#333333
;
padding
:
0
;
}
.login
.loginContent
.el-input.is-active
.el-input__inner
,
.login
.loginContent
.el-input__inner
:focus
{
border-bottom
:
2px
solid
#089bab
!important
;
}
.loginDiv
{
margin-top
:
50px
;
}
.loginDiv
span
{
display
:
inline-block
;
width
:
180px
;
height
:
48px
;
line-height
:
48px
;
background
:
rgba
(
17
,
17
,
17
,
1
);
border-radius
:
24px
;
width
:
180px
;
height
:
48px
;
line-height
:
48px
;
background
:
rgba
(
17
,
17
,
17
,
1
);
border-radius
:
24px
;
text-align
:
center
;
color
:
#FFFFFF
;
color
:
#FFFFFF
;
cursor
:
pointer
;
}
}
</
style
>
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