Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
attendance-performance-manager-ui
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
attendance-performance-manager-ui
Commits
44037b97
Commit
44037b97
authored
7 months ago
by
姬鋆屾
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feated:优化考勤汇总表格显示;表头内容文字展示处理
parent
dbc13d63
master
qionglai
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
11 deletions
+11
-11
src/views/attendance/stat/list.vue
src/views/attendance/stat/list.vue
+11
-11
No files found.
src/views/attendance/stat/list.vue
View file @
44037b97
...
...
@@ -321,16 +321,16 @@ export default {
// 处理
handleArr
(
arr
,
currentTime
)
{
// 处理createTime相同的数据
for
(
let
i
=
0
;
i
<
arr
.
length
;
i
++
)
{
for
(
let
j
=
i
+
1
;
j
<
arr
.
length
;
j
++
)
{
if
(
arr
[
i
][
"
createTime
"
]
==
arr
[
j
][
"
createTime
"
])
{
if
(
arr
[
i
][
"
attendanceSummary
"
].
indexOf
(
"
;
"
)
==
-
1
)
{
arr
[
i
][
"
attendanceSummary
"
]
=
arr
[
i
][
"
attendanceSummary
"
]
+
"
;
"
+
arr
[
j
].
attendanceSummary
;
}
}
}
}
//
for (let i = 0; i
<
arr
.
length
;
i
++
)
{
//
for (let j = i + 1; j
<
arr
.
length
;
j
++
)
{
//
if (arr[i]["createTime"] == arr[j]["createTime"]) {
//
if (arr[i]["attendanceSummary"].indexOf("; ") == -1) {
//
arr[i]["attendanceSummary"] =
//
arr[i]["attendanceSummary"] + "; " + arr[j].attendanceSummary;
//
}
//
}
//
}
//
}
let
index
=
arr
.
findIndex
((
item
)
=>
item
.
createTime
==
currentTime
);
if
(
index
>
-
1
)
{
...
...
@@ -770,7 +770,7 @@ export default {
{
label
:
"
上网耍手机(次)
"
,
prop
:
"
surfingMobileTimes
"
,
show
:
true
},
{
label
:
"
溜班(次)
"
,
prop
:
"
overtimeTimes
"
,
show
:
true
},
{
label
:
"
溜班
/早退
(次)
"
,
prop
:
"
overtimeTimes
"
,
show
:
true
},
{
label
:
"
空岗(次)
"
,
prop
:
"
vacancy
"
,
show
:
true
},
...
...
This diff is collapsed.
Click to expand it.
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