jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改大屏数据

dev_xd
haha 2025-06-06 23:30:28 +08:00
parent 96d727c60f
commit 1e91636366
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
yanzhu-bigscreen/src/views/projectDetail.vue
View File

@ -3,7 +3,9 @@
<el-col :span="6" class="h100"> <el-col :span="6" class="h100">
<module-one-1-1 label="项目概况"> <module-one-1-1 label="项目概况">
<img src="images/icon2001.png" class="img-openwin" @click="showDetailDlg" /> <img src="images/icon2001.png" class="img-openwin" @click="showDetailDlg" />
<div class="glr-title prj-info-title">{{ selProject?.projectName || "" }}</div> <el-tooltip :content="selProject?.projectName || ''" placement="top">
<div class="glr-title prj-info-title">{{ selProject?.projectName || "" }}</div>
</el-tooltip>
<div class="dept-info-list"> <div class="dept-info-list">
<el-row> <el-row>
<el-col :span="12" class="dept-item"> <el-col :span="12" class="dept-item">
@ -807,6 +809,13 @@ export default {
<style lang="less"> <style lang="less">
.project-detail { .project-detail {
color: #c2d5f6; color: #c2d5f6;
.prj-info-title {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
width: calc(100% - 30px);
display: inline-block;
}
.photography-list { .photography-list {
width: calc(100% - 4px); width: calc(100% - 4px);
height: calc(100% - 26px); height: calc(100% - 26px);

14
yanzhu-bigscreen/src/views/projectLabor.vue
View File

@ -215,10 +215,16 @@ export default {
getRealAttendance() { getRealAttendance() {
this.$api.labor.getRealAttendance(this.selProject.vendorsCode, this.selProject.id).then((d) => { this.$api.labor.getRealAttendance(this.selProject.vendorsCode, this.selProject.id).then((d) => {
this.realList = d.data.map((it) => { this.realList = d.data.map((it) => {
it.name = it.workerName it.name = it.workerName||it.userName;
it.workType = it.workTypeName it.workType = it.workTypeName||it.subDeptGroupName
it.img = it.scanPhoto it.img = it.scanPhoto||it.inPhoto||it.outPhoto
if (it.attendanceOutTime) { if(it.outTime){
it.inOutType = 'out'
it.inoutDate = it.outTime
}else if(it.inTime){
it.inOutType = 'in'
it.inoutDate = it.inTime
}else if (it.attendanceOutTime) {
it.inOutType = 'out' it.inOutType = 'out'
it.inoutDate = it.attendanceInTime it.inoutDate = it.attendanceInTime
} else { } else {