sxyanzhu
/
jhbigscreen
4
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

update code

prv
haha 2024-03-23 02:29:51 +08:00
parent 6be30d5d44
commit ecfcaaeaed
6 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pages/components/AttendanceDetailDialog.vue
View File

@ -9,25 +9,25 @@
<el-table v-loading="loading" :data="tableData" class="mytable" height="650" style="width: 100%;background: transparent;" ref="fbsubordinateUnit">
<el-table-column label="照片" align="center" prop="id">
<template slot-scope="{row}">
<el-image v-if="row.recentPhoto" :src="row.recentPhoto" :preview-src-list="[row.recentPhoto]" style="height:60px"/>
<el-image v-if="row.recentPhoto||row.scanPhoto||row.workerPhoto" :src="row.recentPhoto||row.scanPhoto||row.workerPhoto" :preview-src-list="[row.recentPhoto||row.scanPhoto||row.workerPhoto]" style="height:60px"/>
</template>
</el-table-column>
<el-table-column label="姓名" align="center" prop="name" />
<el-table-column label="姓名" align="center" prop="workerName" />
<el-table-column label="性别" align="center" prop="attendanceType" >
<template slot-scope="{row}">{{ row.gender==1?'女':'男' }}</template>
<template slot-scope="{row}">{{ row.workerGender==1?'女':'男' }}</template>
</el-table-column>
<el-table-column label="分包商名称" align="center" prop="companyName" />
<el-table-column label="所属班组" align="center" prop="groupName" />
<el-table-column label="工种" align="center" prop="workTypeName" />
<el-table-column label="上午打卡(首次)" align="center" prop="inTime">
<template slot-scope="{row}">
<span v-if="row.inTime">{{ row.inTime|formatTime }}</span>
<span v-if="row.attendanceTime">{{ row.attendanceTime|formatTime }}</span>
<i style="font-size: 20px;color: red;" v-else class="el-icon-close"></i>
</template>
</el-table-column>
<el-table-column label="下午打卡(末次)" align="center" prop="outTime" >
<template slot-scope="{row}">
<span v-if="row.outTime">{{ row.outTime|formatTime }}</span>
<span v-if="row.attendanceOutTime">{{ row.attendanceOutTime|formatTime }}</span>
<i style="font-size: 20px;color: red;" v-else class="el-icon-close"></i>
</template>
</el-table-column>

2
src/pages/index.vue
View File

@ -556,7 +556,7 @@ export default {
return sum;
}
this.laborPersonnelTotal = 0;
this.laborPersonnelData = [{ text: "劳务人员", value: func(["2","3","4","5"]) }, { text: "监理人员", value: func(["8"]) }, { text: "总包人员", value: func(["1","6"]) }];
this.laborPersonnelData = [{ text: "劳务人员", value: func(["0","2","3","4","5"]) }, { text: "监理人员", value: func(["8"]) }, { text: "总包人员", value: func(["1","6"]) }];
this.laborPersonnelData.forEach(it=>{
this.laborPersonnelTotal += it.value;
})

2
src/pages/projectDetail.vue
View File

@ -997,7 +997,7 @@ export default {
}
this.laborPersonnelTotal = 0;
this.laborPersonnelData = [{ text: "劳务人员", value: func(["2","3","4","5"]) }, { text: "监理人员", value: func(["8"]) }, { text: "总包人员", value: func(["1","6"]) }];
this.laborPersonnelData = [{ text: "劳务人员", value: func(["0","2","3","4","5"]) }, { text: "监理人员", value: func(["8"]) }, { text: "总包人员", value: func(["1","6"]) }];
this.laborPersonnelData.forEach(it => {
this.laborPersonnelTotal += it.value;
})

2
src/pages/projectSafety.vue
View File

@ -653,7 +653,7 @@ export default {
}
this.laborPersonnelTotal = 0;
this.laborPersonnelData = [{ text: "劳务人员", value: func(["2","3"]) }, { text: "监理人员", value: func(["8"]) }, { text: "总包人员", value: func(["1"]) }];
this.laborPersonnelData = [{ text: "劳务人员", value: func(["0","2","3","4","5"]) }, { text: "监理人员", value: func(["8"]) }, { text: "总包人员", value: func(["1","6"]) }];
this.laborPersonnelData.forEach(it=>{
this.laborPersonnelTotal += it.value;
})

7
src/utils/dayfilter.js
View File

@ -7,7 +7,8 @@ const filters={
}
return "";
},
formatTime:dt=>{
formatTime:dt=>{
console.log(">>>>>>>>>>",dt)
if(dt){
return dayjs(dt).format("HH:mm:ss");
}
@ -22,7 +23,7 @@ const filters={
}
export default (vm)=>{
Object.keys(filters).forEach(k=>{
vm.filter(k,filters[k]);
Object.keys(filters).forEach(k=>{
vm.filter(k,filters[k],{deep:true});
})
}

4
vue.config.js
View File

@ -38,8 +38,8 @@ module.exports = defineConfig({
},
'/jhapi':{
//target: `http://62.234.3.186/jhapi/`,
//target: `http://127.0.0.1:8090/jhapi/`,
target: `http://szgc.jhncidg.com/jhapi/`,
target: `http://127.0.0.1:8090/jhapi/`,
//target: `http://szgc.jhncidg.com/jhapi/`,
changeOrigin: true,
pathRewrite: {
'^/jhapi':'/'