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

Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhbigscreen into dev

prv
姜玉琦 2024-04-15 22:39:31 +08:00
parent 66f6195c7a 00b050131e
commit 4fb91763c1
9 changed files with 113 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
public/favicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

2
public/index.html
View File

@ -4,7 +4,7 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0"> <meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico"> <link rel="icon" href="<%= BASE_URL %>favicon.ico?v=2">
<title>产发工程数字管理平台-大屏</title> <title>产发工程数字管理平台-大屏</title>
<link rel="stylesheet" href="/cdn/element-ui/lib/theme-chalk/index.css"> <link rel="stylesheet" href="/cdn/element-ui/lib/theme-chalk/index.css">
<link rel="stylesheet" href="css/largeScreenLayout.css"> <link rel="stylesheet" href="css/largeScreenLayout.css">

2
src/api/costOut/index.js
View File

@ -7,7 +7,7 @@ const selectYearAndMonth=(data)=> {
url: `/bgscreen/costOut/selectYearAndMonth`, url: `/bgscreen/costOut/selectYearAndMonth`,
method: 'post', method: 'post',
data:data data:data
}).then(d=>{ }).then(d=>{
const getValue=(tmps,type)=>{ const getValue=(tmps,type)=>{
let objs=tmps.filter(d=>d.costType==type); let objs=tmps.filter(d=>d.costType==type);
return objs.length>0?objs[0]:{}; return objs.length>0?objs[0]:{};

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

@ -2,38 +2,43 @@
<MyDialog v-if="show" v-model="show" width="1600px" height="850px" class="today-attendance-detail"> <MyDialog v-if="show" v-model="show" width="1600px" height="850px" class="today-attendance-detail">
<template slot="title">今日出勤</template> <template slot="title">今日出勤</template>
<div class="head-title-tab" style="padding: 10px 0px;"> <div class="head-title-tab" style="padding: 10px 0px;">
<div :class="nav == 1 ? 'head-nav active' : 'head-nav'" @click="doNav(101)">总包人员</div> <div :class="nav == 1 ? 'head-nav active' : 'head-nav'" @click="doNav(101)">总包人员</div>
<div :class="nav == 8 ? 'head-nav active' : 'head-nav'" @click="doNav(102)">监理人员</div> <div :class="nav == 8 ? 'head-nav active' : 'head-nav'" @click="doNav(102)">监理人员</div>
<div :class="nav == 2 ? 'head-nav active' : 'head-nav'" @click="doNav(103)">劳务人员</div> <div :class="nav == 2 ? 'head-nav active' : 'head-nav'" @click="doNav(103)">劳务人员</div>
</div> </div>
<el-table v-loading="loading" :data="tableData" class="mytable" height="650" style="width: 100%;background: transparent;" ref="fbsubordinateUnit"> <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"> <el-table-column label="照片" align="center" prop="id">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-image v-if="row.scanPhoto||row.recentPhoto||row.workerPhoto" :src="row.scanPhoto||row.recentPhoto||row.workerPhoto" :preview-src-list="[row.recentPhoto||row.scanPhoto||row.workerPhoto]" style="height:60px"/> <el-image v-if="row.scanPhoto || row.recentPhoto || row.workerPhoto"
</template> :src="row.scanPhoto || row.recentPhoto || row.workerPhoto"
</el-table-column> :preview-src-list="[row.recentPhoto || row.scanPhoto || row.workerPhoto]" style="height:60px" />
<el-table-column label="姓名" align="center" prop="workerName" /> </template>
<el-table-column label="性别" align="center" prop="attendanceType" > </el-table-column>
<template slot-scope="{row}">{{ row.workerGender==1?'女':'男' }}</template> <el-table-column label="姓名" align="center" prop="workerName" />
</el-table-column> <el-table-column label="性别" align="center" prop="attendanceType">
<el-table-column label="分包商名称" align="center" prop="companyName" /> <template slot-scope="{row}">{{ row.workerGender == 1 ? '女' : '男' }}</template>
<el-table-column label="所属班组" align="center" prop="groupName" /> </el-table-column>
<el-table-column label="工种" align="center" prop="workTypeName" /> <el-table-column label="分包商名称" align="center" prop="companyName" />
<el-table-column label="上午打卡(首次)" align="center" prop="inTime"> <el-table-column label="所属班组" align="center" prop="groupName" />
<template slot-scope="{row}"> <el-table-column label="工种" align="center" prop="workTypeName" />
<span v-if="row.attendanceTime">{{ row.attendanceTime|formatTime }}</span> <el-table-column label="上午打卡(首次)" align="center" prop="inTime">
<i style="font-size: 20px;color: red;" v-else class="el-icon-close"></i> <template slot-scope="{row}">
</template> <span v-if="row.attendanceTime">{{ row.attendanceTime | formatTime }}</span>
</el-table-column> <i style="font-size: 20px;color: red;" v-else class="el-icon-close"></i>
<el-table-column label="下午打卡(末次)" align="center" prop="outTime" > </template>
<template slot-scope="{row}"> </el-table-column>
<span v-if="row.attendanceOutTime">{{ row.attendanceOutTime|formatTime }}</span> <el-table-column label="下午打卡(末次)" align="center" prop="outTime">
<i style="font-size: 20px;color: red;" v-else class="el-icon-close"></i> <template slot-scope="{row}">
</template> <span v-if="row.attendanceOutTime">{{ row.attendanceOutTime | formatTime }}</span>
</el-table-column> <i style="font-size: 20px;color: red;" v-else class="el-icon-close"></i>
</template>
</el-table-column>
</el-table> </el-table>
<el-pagination layout="total,prev, pager, next" :hide-on-single-page="true" @current-change="handleCurrentChange" :total="total" :page-size="size" :current-page.sync="index" class="bg-pagination"></el-pagination> <el-pagination layout="total,prev, pager, next" :hide-on-single-page="true"
@current-change="handleCurrentChange" :total="total" :page-size="size" :current-page.sync="index"
class="bg-pagination"></el-pagination>
</MyDialog> </MyDialog>
</template> </template>
@ -49,57 +54,69 @@ export default {
data() { data() {
return { return {
loading:false, loading: false,
show: false, show: false,
tableData: [], tableData: [],
projectId:0, projectId: 0,
deptId:0, deptId: 0,
size:10, size: 10,
index:1, index: 1,
total:0, total: 0,
nav:101 nav: 101
}; };
}, },
mounted() { mounted() {
}, },
methods: { methods: {
handleCurrentChange(n){ handleCurrentChange(n) {
this.index=n; this.index = n;
this.loadData(); this.loadData();
}, },
doNav(n){ doNav(n) {
this.nav=n; this.nav = n;
this.index=1; this.index = 1;
this.loadData(); this.loadData();
}, },
showDialog(data) { showDialog(data) {
this.projectId=data?.projectId||0; this.projectId = data?.projectId || 0;
this.deptId=data?.deptId||0; this.deptId = data?.deptId || 0;
this.size=10; this.size = 10;
this.index=1; this.index = 1;
this.loadData(); this.loadData();
this.show = true this.show = true
}, },
loadData(){ loadData() {
let postData={ let postData = {
attendanceTime:this.$dt(new Date()).format("YYYY-MM-DD"), attendanceTime: this.$dt(new Date()).format("YYYY-MM-DD"),
projectId:this.projectId, projectId: this.projectId,
pageSize:this.size, pageSize: this.size,
pageNum:this.index, pageNum: this.index,
companyTypeId:this.nav companyTypeId: this.nav
} }
this.tableData=[]; this.tableData = [];
this.loading=true; this.loading = true;
this.$api.attendance.listAttendance(postData).then(d=>{ this.$api.attendance.listAttendance(postData).then(d => {
this.total=d.total||0; this.total = d.total || 0;
this.tableData=(d.rows||[]).map(it=>{ this.tableData = (d.rows || []).map(it => {
it.scanPhoto=it.scanPhoto && it.scanPhoto.indexOf("/profile")==0?"/jhapi"+it.scanPhoto:it.scanPhoto; let dt1 = it.attendanceTime;
let dt2 = it.attendanceOutTime;
if ((!dt1 || !dt2) || dt1 == dt2) {
let dt = dt1 || dt2;
if (it.remark == "E") {
it.attendanceTime = dt;
it.attendanceOutTime = "";
} else {
it.attendanceTime = "";
it.attendanceOutTime = dt;
}
}
it.scanPhoto = it.scanPhoto && it.scanPhoto.indexOf("/profile") == 0 ? "/jhapi" + it.scanPhoto : it.scanPhoto;
return it; return it;
}); });
this.loading=false; this.loading = false;
}) })
} }
}, },
@ -107,27 +124,30 @@ export default {
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.mytable{ .mytable {
/deep/ th .cell{ /deep/ th .cell {
color: aquamarine; color: aquamarine;
} }
} }
.today-attendance-detail{
/deep/ .quality-table .el-table .el-table__row{ .today-attendance-detail {
/deep/ .quality-table .el-table .el-table__row {
background-image: none !important; background-image: none !important;
td{
border-bottom:solid 1px rgba(60,170,255,0.3); td {
border-bottom: solid 1px rgba(60, 170, 255, 0.3);
} }
} }
} }
</style> </style>
<style lang="less"> <style lang="less">
.today-attendance-detail{ .today-attendance-detail {
.popup-project-introduction-min { .popup-project-introduction-min {
transform: translateY(100px); transform: translateY(100px);
.bg-pagination{
margin-top:20px; .bg-pagination {
margin-top: 20px;
} }
} }
} }
</style> </style>

9
src/pages/components/MonitAndWarning.vue
View File

@ -46,7 +46,14 @@
<div class="glr-login-number analyse-login-numbe"> <div class="glr-login-number analyse-login-numbe">
<div><img src="images/text_red_spot.png" />{{ item.name }}</div> <div><img src="images/text_red_spot.png" />{{ item.name }}</div>
<div class="glr-rate-value glr-rate-red-value"> <div class="glr-rate-value glr-rate-red-value">
<span>{{ item.data }}/{{ item.total }}</span> <template v-if="idx==0">
<span style="color: #c0dafb">{{ item.total }}</span>
</template>
<template v-else>
<span>{{ item.data }}</span>/
<span style="color: #c0dafb">{{item.total }}</span>
</template>
</div> </div>
</div> </div>
</div> </div>

11
src/pages/index.vue
View File

@ -495,6 +495,7 @@ export default {
this.elKey++; this.elKey++;
this.onWarningInfoNav(0); this.onWarningInfoNav(0);
this.sumCostOutByDeptId(); this.sumCostOutByDeptId();
this.groupByProjectCategory(this.deptInfo.id);
})); }));
this.$bus.$on("deptChange", debounce(dept => { this.$bus.$on("deptChange", debounce(dept => {
@ -591,7 +592,7 @@ export default {
this.$refs.dlg2.showDetailDialog(this.prjProcessNav,idx,this.deptInfo); this.$refs.dlg2.showDetailDialog(this.prjProcessNav,idx,this.deptInfo);
} }
}, },
sumCostOutByDeptId() { sumCostOutByDeptId() {
let dt = this.$dt(new Date()); let dt = this.$dt(new Date());
let postData = { let postData = {
year: dt.$y, year: dt.$y,
@ -602,13 +603,7 @@ export default {
postData.projectId = this.prj.id; postData.projectId = this.prj.id;
} else { } else {
postData.id = this.deptInfo.id; postData.id = this.deptInfo.id;
} }
if (this.callSumCostTime) {
if (+new Date() - this.callSumCostTime < 400) {
return;
}
}
this.callSumCostTime = +new Date();
this.$api.costOut.sumByDeptId(postData).then(d => { this.$api.costOut.sumByDeptId(postData).then(d => {
this.sumCost = d; this.sumCost = d;
}); });

5
src/pages/projectDetail.vue
View File

@ -883,12 +883,13 @@ export default {
} }
return ""; return "";
}, },
getCurProject() { getCurProject() {
if (!this.project) { if (!this.project) {
return {}; return {};
} }
if (this.project.id == 0) { if (this.project.id == 0) {
if (this.prjs.length > 1) { if (this.prjs.length > 1) {
return this.prjs[1]; return this.prjs[1];
} }
return {}; return {};
@ -992,7 +993,7 @@ export default {
this.$api.costOut.selectYearAndMonth({ this.$api.costOut.selectYearAndMonth({
projectId: id, projectId: id,
year: dt.$y, year: dt.$y,
month: dt.$M month: dt.$M+1
}).then(d => { }).then(d => {
d.totalMonth = d.totalMonth.toFixed(2); d.totalMonth = d.totalMonth.toFixed(2);
d.totalYear = d.totalYear.toFixed(2); d.totalYear = d.totalYear.toFixed(2);

8
src/pages/quality/projectChecking.vue
View File

@ -269,11 +269,11 @@ export default {
} }
}, },
queryDataList(nav, t) { queryDataList(nav, t) {
let postData = { let postData = {
projectId: this.projectInfo.id, projectId: this.projectInfo.id,
dataTypeLvl2: nav dataTypeLvl2:nav
} }
this.$api.projectChecking.queryProjectCheckingList(1, 20, postData).then(d => { this.$api.projectChecking.queryProjectCheckingList(1, 20, postData).then(d => {
if (t == "a") { if (t == "a") {
this.dataList1 = d.rows || []; this.dataList1 = d.rows || [];

4
vue.config.js
View File

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