Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
SuperMan
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
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
罗超
SuperMan
Commits
77b002da
Commit
77b002da
authored
Oct 18, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
年月周
parent
2fe0d4de
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
57 additions
and
1 deletion
+57
-1
cssReset.css
src/assets/css/cssReset.css
+6
-0
PersonnelManagement.vue
src/components/activity/PersonnelManagement.vue
+51
-1
No files found.
src/assets/css/cssReset.css
View file @
77b002da
...
@@ -639,4 +639,10 @@ vertical-align:middle
...
@@ -639,4 +639,10 @@ vertical-align:middle
._height_auto.el-select
.el-input
{
._height_auto.el-select
.el-input
{
height
:
auto
!important
;
height
:
auto
!important
;
}
}
.personTable
.choose2
.block
input
{
height
:
33px
;
background-color
:
#333333
;
border
:
none
;
color
:
white
;
}
/************************** luochao 重新定义表格样式 END *******************************/
/************************** luochao 重新定义表格样式 END *******************************/
\ No newline at end of file
src/components/activity/PersonnelManagement.vue
View file @
77b002da
...
@@ -69,6 +69,34 @@
...
@@ -69,6 +69,34 @@
<img
v-else
src=
"../../assets/img/champion/right1.png"
alt
/>
<img
v-else
src=
"../../assets/img/champion/right1.png"
alt
/>
</span>
</span>
</div>
</div>
<div
class=
"choose choose2"
>
<div
class=
"block"
v-if=
"index1 === 0"
>
<el-date-picker
v-model=
"weekVal"
type=
"week"
format=
"yyyy 第 W 周"
placeholder=
"请选择周"
@
change=
"getNewWeek"
>
</el-date-picker>
</div>
<div
class=
"block"
v-if=
"index1 === 1"
>
<el-date-picker
v-model=
"monthVal"
type=
"month"
value-format=
"yyyyM"
placeholder=
"请选择月"
>
</el-date-picker>
</div>
<div
class=
"block"
v-if=
"index1 === 2"
>
<el-date-picker
v-model=
"yearVal"
align=
"right"
type=
"year"
value-format=
"yyyy"
placeholder=
"请选择年"
>
</el-date-picker>
</div>
</div>
<div
class=
"slide-txt"
>
<div
class=
"slide-txt"
>
<transition
name=
"el-fade-in-linear"
>
<transition
name=
"el-fade-in-linear"
>
<p
class=
"text"
:key=
"text.id"
>
{{
text
.
val
}}
</p>
<p
class=
"text"
:key=
"text.id"
>
{{
text
.
val
}}
</p>
...
@@ -375,7 +403,11 @@
...
@@ -375,7 +403,11 @@
export
default
{
export
default
{
data
()
{
data
()
{
return
{
return
{
choose1
:
[
"本周"
,
"本月"
,
"本年"
,
"全部"
],
weekVal
:
''
,
monthVal
:
''
,
yearVal
:
''
,
NewWeekVal
:
''
,
choose1
:
[
"周"
,
"月"
,
"年"
,
"全部"
],
choose2
:
[
"个人"
,
"部门"
,
"公司"
],
choose2
:
[
"个人"
,
"部门"
,
"公司"
],
index1
:
0
,
index1
:
0
,
index2
:
0
,
index2
:
0
,
...
@@ -407,8 +439,12 @@ export default {
...
@@ -407,8 +439,12 @@ export default {
};
};
},
},
created
()
{
created
()
{
let
date
=
new
Date
();
this
.
yearVal
=
date
.
getFullYear
()
+
''
;
this
.
monthVal
=
date
.
getFullYear
()
+
''
+
(
date
.
getMonth
()
+
1
);
let
Height
=
document
.
body
.
clientHeight
;
let
Height
=
document
.
body
.
clientHeight
;
this
.
listHeight
=
Height
-
470
;
this
.
listHeight
=
Height
-
470
;
this
.
getNewWeek
(
date
)
},
},
computed
:
{
computed
:
{
text
()
{
text
()
{
...
@@ -432,6 +468,16 @@ export default {
...
@@ -432,6 +468,16 @@ export default {
document
.
onkeydown
=
null
;
document
.
onkeydown
=
null
;
},
},
methods
:
{
methods
:
{
getNewWeek
(
time
){
let
dateNow
=
time
?
new
Date
(
time
)
:
new
Date
(
this
.
weekVal
);
let
dateFirst
=
new
Date
(
dateNow
.
getFullYear
(),
0
,
1
);
let
dataNumber
=
Math
.
round
((
dateNow
.
valueOf
()
-
dateFirst
.
valueOf
())
/
86400000
);
let
num
=
Math
.
ceil
((
dataNumber
+
((
dateFirst
.
getDay
()
+
1
)
-
1
))
/
7
)
this
.
NewWeekVal
=
num
===
53
?
1
:
dateNow
.
getFullYear
()
+
''
+
num
if
(
time
)
{
this
.
weekVal
=
time
}
},
showCareer
(){
showCareer
(){
let
temp
=
this
.
tableData
[
this
.
chosenTD
.
row
].
EmployeeId
let
temp
=
this
.
tableData
[
this
.
chosenTD
.
row
].
EmployeeId
if
(
temp
!=
0
)
{
if
(
temp
!=
0
)
{
...
@@ -1169,4 +1215,8 @@ export default {
...
@@ -1169,4 +1215,8 @@ export default {
.personTable
.second
.show-btn
:hover
{
.personTable
.second
.show-btn
:hover
{
background
:
url('../../assets/img/champion/btnhover.png')
;
background
:
url('../../assets/img/champion/btnhover.png')
;
}
}
.personTable
.choose2
{
margin-left
:
10px
;
}
</
style
>
</
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