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-platform
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-platform
Commits
df8ab0eb
Commit
df8ab0eb
authored
Jan 05, 2024
by
姬鋆屾
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
推修改考勤绩效每日打卡记录列表展示;修改打卡记录默认展示当日打卡数据
parent
be80329f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
49 additions
and
9 deletions
+49
-9
attendance-performance-manager-ui/admin/src/components/SearchForm.vue
...erformance-manager-ui/admin/src/components/SearchForm.vue
+40
-1
attendance-performance-manager-ui/admin/src/views/attendance/record/hik/list.vue
...manager-ui/admin/src/views/attendance/record/hik/list.vue
+9
-8
No files found.
attendance-performance-manager-ui/admin/src/components/SearchForm.vue
View file @
df8ab0eb
...
...
@@ -187,7 +187,11 @@
import
Qs
from
"
qs
"
;
import
{
type
}
from
"
@/assets/utils
"
;
import
{
isArray
}
from
"
util
"
;
import
{
getFirstDay
,
getLastDay
}
from
"
@/assets/utils/dateFormat.js
"
;
import
{
getFirstDay
,
getLastDay
,
timestampToTime
,
}
from
"
@/assets/utils/dateFormat.js
"
;
export
default
{
props
:
{
search
:
{
...
...
@@ -251,6 +255,23 @@ export default {
delete
this
.
form
.
summaryTimeStart
;
delete
this
.
form
.
summaryTimeEnd
;
}
if
(
this
.
$route
.
name
==
"
attendance/record/hik/list
"
)
{
if
(
this
.
form
.
attendanceDateStart
&&
this
.
form
.
attendanceDateEnd
)
{
let
startValue
=
Date
.
parse
(
this
.
form
.
attendanceDateStart
);
let
endValue
=
Date
.
parse
(
this
.
form
.
attendanceDateEnd
);
if
(
startValue
>
endValue
)
{
this
.
$message
.
error
(
"
查询-结束的日期需大于开始日期
"
);
this
.
form
.
attendanceDateEnd
=
""
;
return
false
;
}
}
else
{
this
.
form
.
attendanceDateStart
=
getFirstDay
();
this
.
form
.
attendanceDateEnd
=
getFirstDay
();
}
}
else
{
delete
this
.
form
.
attendanceDateStart
;
delete
this
.
form
.
attendanceDateEnd
;
}
let
params
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
form
));
//不更改原始数据
let
data
=
this
.
decode
(
params
);
...
...
@@ -398,6 +419,24 @@ export default {
delete
this
.
form
.
summaryTimeStart
;
delete
this
.
form
.
summaryTimeEnd
;
}
if
(
this
.
$route
.
name
==
"
attendance/record/hik/list
"
)
{
console
.
log
(
this
.
$route
,
"
11111111
"
);
if
(
this
.
form
.
attendanceDateStart
&&
this
.
form
.
attendanceDateEnd
)
{
let
startValue
=
Date
.
parse
(
this
.
form
.
attendanceDateStart
);
let
endValue
=
Date
.
parse
(
this
.
form
.
attendanceDateEnd
);
if
(
startValue
>
endValue
)
{
this
.
$message
.
error
(
"
查询-结束的日期需大于开始日期
"
);
this
.
form
.
attendanceDateEnd
=
""
;
return
false
;
}
}
else
{
this
.
form
.
attendanceDateStart
=
timestampToTime
(
new
Date
(),
3
);
this
.
form
.
attendanceDateEnd
=
timestampToTime
(
new
Date
(),
3
);
}
}
else
{
delete
this
.
form
.
attendanceDateStart
;
delete
this
.
form
.
attendanceDateEnd
;
}
let
params
=
JSON
.
parse
(
JSON
.
stringify
(
this
.
form
));
//不更改原始数据
let
data
=
this
.
decode
(
params
);
...
...
attendance-performance-manager-ui/admin/src/views/attendance/record/hik/list.vue
View file @
df8ab0eb
...
...
@@ -122,10 +122,7 @@
</div>
</el-drawer>
<div
class=
"mask"
v-if=
"progress"
>
<el-progress
:stroke-width=
"26"
:percentage=
"percent"
></el-progress>
<el-progress
:stroke-width=
"26"
:percentage=
"percent"
></el-progress>
</div>
</div>
</
template
>
...
...
@@ -134,7 +131,11 @@
/** 表单弹出框模式需引入 */
import
dialogShow
from
"
./dialogshow
"
;
import
table
from
"
@/assets/mixins/table
"
;
import
{
timestampToTime
}
from
"
@/assets/utils/dateFormat
"
;
import
{
timestampToTime
,
getFirstDay
,
getLastDay
,
}
from
"
@/assets/utils/dateFormat
"
;
export
default
{
name
:
"
AttendanceRecordHikList
"
,
components
:
{
...
...
@@ -142,6 +143,8 @@ export default {
},
mixins
:
[
table
],
created
()
{
this
.
query
.
attendanceDateStart
=
timestampToTime
(
new
Date
(),
3
);
this
.
query
.
attendanceDateEnd
=
timestampToTime
(
new
Date
(),
3
);
JSON
.
parse
(
sessionStorage
.
getItem
(
"
userData
"
)).
id
==
1
?
(
this
.
showBtn
=
true
)
:
(
this
.
showBtn
=
false
);
...
...
@@ -276,9 +279,7 @@ export default {
toView
(
row
)
{
this
.
$refs
.
dialogform
.
view
(
row
);
},
afterRender
(
data
)
{
console
.
log
(
this
.
tableData
.
data
);
},
afterRender
(
data
)
{},
},
data
()
{
return
{
...
...
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