Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
founder_vue
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
常超
founder_vue
Commits
da79317e
Commit
da79317e
authored
Jan 19, 2022
by
张超军
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev_zwpt' of
http://39.99.224.27:9022/changchao/founder_vue
into dev_zwpt
parents
f21543c2
298e7294
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
129 additions
and
17 deletions
+129
-17
src/utils/UserUtil.js
+5
-1
src/views/Home.vue
+0
-0
src/views/Home/Home.vue
+88
-2
src/views/bzxxgl/bzxxsh.vue
+7
-3
src/views/xtfkgl/AjXtljfkView.vue
+2
-2
src/views/xtfkgl/RyXtljfkView.vue
+2
-2
src/views/xtfkgl/scss/dialog_table.scss
+23
-7
src/views/zljc/Index.vue
+2
-0
No files found.
src/utils/UserUtil.js
View file @
da79317e
...
...
@@ -31,9 +31,13 @@ export default {
getUser
()
{
// 获取用户信息
let
userInfo
=
JSON
.
parse
(
localStorage
.
getItem
(
_USER_INFO_KEY
))
logger
.
info
(
'userInfo'
,
userInfo
)
return
userInfo
return
userInfo
.
user
},
getUserGroupId
()
{
// 获取用户信息
let
userInfo
=
JSON
.
parse
(
localStorage
.
getItem
(
_USER_INFO_KEY
))
return
userInfo
.
groupIds
},
setUser
(
userInfo
)
{
// 保存用户信息
localStorage
.
setItem
(
_USER_INFO_KEY
,
JSON
.
stringify
(
userInfo
))
},
...
...
src/views/Home.vue
View file @
da79317e
This diff is collapsed.
Click to expand it.
src/views/Home/Home.vue
View file @
da79317e
...
...
@@ -222,6 +222,31 @@
</div>
</div>
</div>
<el-dialog
class=
'exitDialog'
title=
"退出系统"
:visible
.
sync=
"dialogVisible"
:append-to-body=
'true'
:modal-append-to-body=
"false"
:close-on-click-modal=
'false'
:modal=
'false'
width=
"25rem"
>
<span>
您确认要退出系统吗?
</span>
<span
slot=
"footer"
class=
"dialog-footer"
>
<el-button
@
click=
"exit"
class=
'qr'
>
确 认
</el-button>
<el-button
@
click=
"dialogVisible=false"
class=
'qx'
>
取 消
</el-button>
</span>
</el-dialog>
</div>
</
template
>
...
...
@@ -237,6 +262,8 @@ export default {
zljcNum
:
0
,
sbAppNum
:
0
,
dfzwNum
:
0
,
dialogVisible
:
false
,
// 退出弹窗状态
};
},
methods
:
{
...
...
@@ -315,6 +342,9 @@ export default {
this
.
$router
.
pushToTab
(
"/bzxxfh"
);
},
logout
()
{
this
.
dialogVisible
=
true
},
exit
()
{
this
.
$axios
.
get
(
"/security/logout"
)
.
then
((
res
)
=>
{
...
...
@@ -456,8 +486,6 @@ export default {
this
.
userInfo
=
JSON
.
parse
(
localStorage
.
getItem
(
"userInfo"
));
console
.
log
(
this
.
userInfo
);
this
.
getHomeNum
();
},
computed
:
{
...
...
@@ -881,4 +909,62 @@ export default {
bottom
/
70px
87px
,
linear-gradient
(
133deg
,
#42bbf2
0%
,
#12a1e5
100%
);
}
//
退出
/
deep
/
.el-dialog
{
display
:
flex
;
flex-direction
:
column
;
margin
:
0
!important
;
position
:
absolute
;
top
:
40%
;
left
:
50%
;
transform
:
translate
(
-50%
,
-50%
);
/*height:600px;*/
max-height
:
calc
(
100%
-
30px
);
max-width
:
calc
(
100%
-
30px
);
}
.exitDialog
{
/deep/.el-dialog__header
{
padding
:
15px
24px
13px
;
font-size
:
16px
;
font-family
:
HarmonyOS_Sans_SC
;
color
:
#282f3c
;
border-bottom
:
1px
solid
#eeeeee
;
}
/
deep
/
.el-dialog__body
{
padding
:
30px
0
24px
;
text-align
:
center
;
}
/
deep
/
.el-dialog__footer
{
display
:
flex
;
justify-content
:
center
;
padding
:
0
0
30px
0
;
.dialog-footer
{
margin-top
:
0
;
}
.qr
{
width
:
72px
;
height
:
40px
;
background
:
#ffffff
;
border-radius
:
4px
;
border
:
1px
solid
#aeb5c2
;
font-size
:
14px
;
font-family
:
MicrosoftYaHei
;
color
:
#2e3846
;
margin
:
0
;
margin-right
:
12px
;
}
.qx
{
width
:
72px
;
height
:
40px
;
background
:
#055fe7
;
border-radius
:
4px
;
border
:
1px
solid
#055fe7
;
font-size
:
14px
;
font-family
:
MicrosoftYaHei
;
color
:
#fff
;
margin
:
0
;
margin-left
:
12px
;
}
}
}
</
style
>
src/views/bzxxgl/bzxxsh.vue
View file @
da79317e
...
...
@@ -413,9 +413,9 @@ export default {
},
shDialogVisiable
:
false
,
dwProps
:
{
value
:
"code"
,
label
:
"key"
,
children
:
"childCodeDwXz"
,
value
:
'code'
,
label
:
'key'
,
children
:
'childCodeDwXz'
,
checkStrictly
:
true
,
emitPath
:
false
,
},
...
...
@@ -712,6 +712,10 @@ export default {
_that
.
ruleForm
.
level
=
_that
.
getLevel
()
_that
.
ruleForm
.
userId
=
user
.
getUser
().
id
_that
.
ruleForm
.
userGroupIds
=
user
.
getUserGroupId
()
NetUtil
.
bzxxsh
.
shList
(
_that
.
ruleForm
)
.
then
(
res
=>
{
if
(
res
.
code
===
0
)
{
...
...
src/views/xtfkgl/AjXtljfkView.vue
View file @
da79317e
...
...
@@ -349,8 +349,8 @@ export default {
ruleForm
.
page
=
page
ruleForm
.
limit
=
limit
ruleForm
.
userId
=
user
.
getUser
().
user
.
id
ruleForm
.
userGroupIds
=
user
.
getUser
().
groupIds
ruleForm
.
userId
=
user
.
getUser
().
id
ruleForm
.
userGroupIds
=
user
.
getUser
GroupId
()
NetUtil
.
xtfkgl
.
ajList
(
ruleForm
)
...
...
src/views/xtfkgl/RyXtljfkView.vue
View file @
da79317e
...
...
@@ -353,8 +353,8 @@ export default {
ruleForm
.
page
=
page
ruleForm
.
limit
=
limit
ruleForm
.
userId
=
user
.
getUser
().
user
.
id
ruleForm
.
userGroupIds
=
user
.
getUser
().
groupIds
ruleForm
.
userId
=
user
.
getUser
().
id
ruleForm
.
userGroupIds
=
user
.
getUser
GroupId
()
logger
.
info
(
'user'
,
user
.
getUser
())
...
...
src/views/xtfkgl/scss/dialog_table.scss
View file @
da79317e
...
...
@@ -121,6 +121,14 @@
color
:
#e60012
;
box-shadow
:
0px
6px
10px
2px
rgba
(
0
,
21
,
51
,
0
.06
);
}
/
deep
/
.el-form-item__label
{
&
:
:
before
{
position
:
absolute
;
left
:
-10px
;
//transform: translateY(-70px);
}
}
}
.input-item-sm
{
...
...
@@ -135,8 +143,7 @@
background
:
#F6F8FA
;
box-shadow
:
0px
1px
2px
0px
rgba
(
5
,
95
,
231
,
0
.18
);
border-radius
:
4px
;
border
:
1px
solid
#EEEEEE
;
background
:
black
;
border
:
0px
solid
#EEEEEE
;
}
/
deep
/
.el-input__inner
{
...
...
@@ -151,6 +158,15 @@
border-radius
:
4px
;
border
:
1px
solid
#EEEEEE
;
}
.el-form-item__label
{
&
:
:
before
{
position
:
absolute
;
left
:
0px
;
//transform: translateX(70px);
}
}
}
...
...
@@ -537,11 +553,11 @@
font-family
:
HarmonyOS_Sans_SC
;
color
:
#333333
;
&
:
:
before
{
position
:
absolute
;
left
:
-10px
;
//transform: translateY(3
px);
}
//
&::before {
//
position: absolute;
//
left: -10px;
// transform: translateY(-70
px);
//
}
}
.is-error
{
...
...
src/views/zljc/Index.vue
View file @
da79317e
...
...
@@ -387,6 +387,8 @@ export default {
inspectionFlag
:
null
,
// 检查结果选择
codeDwCode
:
""
,
// 捺印单位
type
:
""
,
// 倒计时排序
userId
:
JSON
.
parse
(
localStorage
.
getItem
(
"userInfo"
)).
user
.
id
,
userGroupIds
:
JSON
.
parse
(
localStorage
.
getItem
(
"userInfo"
)).
groupIds
};
reqParam
.
page
=
this
.
currPage
;
reqParam
.
limit
=
this
.
currentPageSize
;
...
...
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