diff --git a/yanzhu-bigscreen/src/views/detail/attendanceInfoDlg.vue b/yanzhu-bigscreen/src/views/detail/attendanceInfoDlg.vue
index d1e07cc8..ce67931e 100644
--- a/yanzhu-bigscreen/src/views/detail/attendanceInfoDlg.vue
+++ b/yanzhu-bigscreen/src/views/detail/attendanceInfoDlg.vue
@@ -7,28 +7,30 @@
{{ it.label }}({{ getTypeCount(it) }})
-
+
-
+
-
-
-
-
+
+
+
+
- 在场
+ 在场
离场
-
+
{{ scope.row.createTime | toDate }}
-
+
@@ -43,7 +45,7 @@
-
+
-
+
@@ -95,6 +98,7 @@ export default {
//在岗人员
data() {
return {
+ dpi: "",
show: false,
title: '在岗人员',
prjInfo: {},
@@ -108,9 +112,25 @@ export default {
total: 0,
dataList: [],
loading: false,
+ tbHeight: 400,
}
},
+ mounted() {
+ this.dpi = this.$dpi();
+ window.addEventListener("resize", () => {
+ if (this.dpi != this.$dpi()) {
+ this.dpi = this.$dpi();
+ this.resize();
+ }
+ });
+ this.resize();
+ },
methods: {
+ resize() {
+ let is1K = this.$dpi() == "1K";
+ let is2K = this.$dpi() == "2K";
+ this.tbHeight = is1K ? 400 : is2K ? 500 : 600;
+ },
handleCurrentChange(n) {
this.index = n;
this.loadData();
@@ -137,6 +157,7 @@ export default {
pageNum: this.index,
craftType: this.nav,
comId: this.prjInfo.comId,
+ useStatus: 0,
projectId: this.prjInfo.id
};
if (this.type == 1) {
@@ -147,7 +168,7 @@ export default {
comId: this.prjInfo.comId,
projectId: this.prjInfo.id,
craftType: this.nav,
- inTime: '2024-10-14'
+ inTime: this.$dt(new Date()).format("YYYY-MM-DD")
};
}
this.loading = true;
@@ -155,13 +176,15 @@ export default {
this.loading = false;
if (this.type == 0) {
this.dataList = (d.rows || []).map(d => {
- d.info = this.$tryToJson(d.user?.userInfos || "{}")
+ d.info = this.$tryToJson(d.userInfos || "{}")
d.user = d.user || {};
if (d.info.birthDay) {
let birthDay = this.$dt(d.info.birthDay).format("YYYY-MM-DD");
d.info.birthDayStr = birthDay;
d.info.age = this.$dt(new Date()).diff(d.info.birthDay, 'year');
}
+ d.sex = d.userSex == 0 ? '男' : '女';
+ d.nativePlace = d.info.nativePlace || "";
return d;
});
} else {
@@ -185,67 +208,79 @@ export default {