From 35b69ebb33480ab340ef5e6c0f5a441f7cb02440 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=AC=E9=8B=86=E5=B1=BE?= <804461479@qq.com>
Date: Mon, 20 May 2024 16:22:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E5=B1=8F=E8=94=BD=E7=AA=97=E5=8F=A3?=
=?UTF-8?q?=E7=B1=BB=E5=88=AB=EF=BC=8C=E5=B9=B6=E5=AF=B9=E6=8E=A5=E6=8E=A5?=
=?UTF-8?q?=E5=8F=A3=E6=98=BE=E7=A4=BA=E6=89=93=E5=8D=A1=E6=AD=A3=E5=B8=B8?=
=?UTF-8?q?=E7=9A=84=E5=A4=A9=E6=95=B0=E6=98=BE=E7=A4=BA=E6=AD=A3=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../admin/src/views/attendance/stat/list.vue | 44 +++++++++++--------
1 file changed, 25 insertions(+), 19 deletions(-)
diff --git a/attendance-performance-manager-ui/admin/src/views/attendance/stat/list.vue b/attendance-performance-manager-ui/admin/src/views/attendance/stat/list.vue
index 83952edb..7f52f1de 100644
--- a/attendance-performance-manager-ui/admin/src/views/attendance/stat/list.vue
+++ b/attendance-performance-manager-ui/admin/src/views/attendance/stat/list.vue
@@ -189,20 +189,25 @@ export default {
{arr[index].attendanceSummary}
</el-tag>
</el-tooltip>
+ ) : arr[index].attendanceSummary == "姝ｅ父" ? (
+ <el-tag type={"success"} size="mini">
+ {arr[index].attendanceSummary}
+ </el-tag>
) : (
<el-tag type={"danger"} size="mini">
{arr[index].attendanceSummary}
</el-tag>
)
) : (
- "姝ｅ父"
+ "--"
);
} else {
- if (currentTime < timestampToTime(new Date(), 3)) {
- return "姝ｅ父";
- } else {
- return "--";
- }
+ return "--";
+ // if (currentTime < timestampToTime(new Date(), 3)) {
+ // return "姝ｅ父";
+ // } else {
+ // return "--";
+ // }
// return "姝ｅ父";
}
},
@@ -229,11 +234,12 @@ export default {
) {
return this.handleArr(row.attendanceStaffStatEntities, item);
} else {
- if (item < timestampToTime(new Date(), 3)) {
- return "姝ｅ父";
- } else {
- return "--";
- }
+ return "--";
+ // if (item < timestampToTime(new Date(), 3)) {
+ // return "姝ｅ父";
+ // } else {
+ // return "--";
+ // }
}
},
};
@@ -448,14 +454,14 @@ export default {
show: true,
},
- {
- label: "绐楀彛绫诲埆",
- prop: "windowCategory",
- fixed: "left",
- width: 100,
- formatter: this.formatter,
- show: true,
- },
+ //{
+ // label: "绐楀彛绫诲埆",
+ // prop: "windowCategory",
+ // fixed: "left",
+ //width: 100,
+ //formatter: this.formatter,
+ //show: true,
+ //},
{
label: "鍛樺伐濮撳悕",
--
2.24.3