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
da6939b8
Commit
da6939b8
authored
Jul 15, 2023
by
姬鋆屾
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
推修改所提出的样式喝功能上的缺陷
parent
d67f7622
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
14 deletions
+14
-14
attendance-performance-manager-ui/admin/src/assets/mixins/table.js
...e-performance-manager-ui/admin/src/assets/mixins/table.js
+4
-12
attendance-performance-manager-ui/admin/src/assets/utils/table.js
...ce-performance-manager-ui/admin/src/assets/utils/table.js
+1
-1
attendance-performance-manager-ui/admin/src/components/DataTable.vue
...performance-manager-ui/admin/src/components/DataTable.vue
+9
-1
No files found.
attendance-performance-manager-ui/admin/src/assets/mixins/table.js
View file @
da6939b8
...
...
@@ -195,9 +195,7 @@ export default {
formatter
(
row
,
column
,
val
)
{
const
content
=
formatter
(
this
.
tableData
,
column
,
val
);
return
content
==
0
?
(
<
el
-
tag
type
=
{
"
info
"
}
size
=
"
mini
"
>
{
content
}
<
/el-tag
>
<
p
>
{
content
}
<
/p
>
)
:
content
?
(
content
==
"
未处理
"
?
(
<
el
-
tag
type
=
{
"
danger
"
}
size
=
"
mini
"
>
...
...
@@ -208,17 +206,11 @@ export default {
{
content
}
<
/el-tag
>
)
:
row
.
subAddType
==
1
&&
column
.
label
.
includes
(
"
分值
"
)
?
(
<
el
-
tag
type
=
{
"
info
"
}
size
=
"
mini
"
>
{
content
}
<
/el-tag
>
<
p
>
{
content
}
<
/p
>
)
:
row
.
subAddType
==
2
&&
column
.
label
.
includes
(
"
分值
"
)
?
(
<
el
-
tag
type
=
{
"
info
"
}
size
=
"
mini
"
>
{
-
content
}
<
/el-tag
>
<
p
>
{
-
content
}
<
/p
>
)
:
(
<
el
-
tag
type
=
{
"
info
"
}
size
=
"
mini
"
>
{
content
}
<
/el-tag
>
<
p
>
{
content
}
<
/p
>
)
)
:
(
val
...
...
attendance-performance-manager-ui/admin/src/assets/utils/table.js
View file @
da6939b8
...
...
@@ -46,7 +46,7 @@ const formatterAmount = (row, column) => {
const
formatterDate
=
(
row
,
column
)
=>
{
const
property
=
column
.
property
;
const
time
=
row
[
property
];
if
(
!
time
)
return
'
-
'
;
if
(
!
time
)
return
'
-
-
'
;
let
date
=
time
.
length
<
13
?
new
Date
(
Number
(
time
)
*
1000
)
:
new
Date
(
Number
(
time
));
let
Y
=
date
.
getFullYear
()
+
'
-
'
;
let
M
=
(
date
.
getMonth
()
+
1
<
10
?
'
0
'
+
(
date
.
getMonth
()
+
1
)
:
date
.
getMonth
()
+
1
)
+
'
-
'
;
...
...
attendance-performance-manager-ui/admin/src/components/DataTable.vue
View file @
da6939b8
...
...
@@ -12,7 +12,7 @@
:empty-text=
"emptytxt ? emptytxt : emptyText"
border
style=
"width: 100%"
height=
"5
2
0"
height=
"5
7
0"
>
<el-table-column
v-for=
"column in columns"
...
...
@@ -119,6 +119,14 @@ export default {
?
(
this
.
emptytxt
=
"
暂无数据
"
)
:
(
this
.
emptytxt
=
"
加载中...
"
);
// if (val.length > 0) {
// val.forEach((v) => {
// for (let key in v) {
// v[key] ? "" : (v[key] = "--");
// }
// });
// console.log(val);
// }
},
},
methods
:
{},
...
...
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