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 http-equiv="X-UA-Compatible" content="IE=edge">
<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>
<link rel="stylesheet" href="/cdn/element-ui/lib/theme-chalk/index.css">
<link rel="stylesheet" href="css/largeScreenLayout.css">

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

@ -6,10 +6,13 @@
<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>
<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">
<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"
:src="row.scanPhoto || row.recentPhoto || 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="workerName" />
@ -33,7 +36,9 @@
</el-table-column>
</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>
</template>
@ -96,6 +101,18 @@ export default {
this.$api.attendance.listAttendance(postData).then(d => {
this.total = d.total || 0;
this.tableData = (d.rows || []).map(it => {
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;
});
@ -112,9 +129,11 @@ export default {
color: aquamarine;
}
}
.today-attendance-detail {
/deep/ .quality-table .el-table .el-table__row {
background-image: none !important;
td {
border-bottom: solid 1px rgba(60, 170, 255, 0.3);
}
@ -125,6 +144,7 @@ export default {
.today-attendance-detail {
.popup-project-introduction-min {
transform: translateY(100px);
.bg-pagination {
margin-top: 20px;
}

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

@ -46,7 +46,14 @@
<div class="glr-login-number analyse-login-numbe">
<div><img src="images/text_red_spot.png" />{{ item.name }}</div>
<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>

7
src/pages/index.vue
View File

@ -495,6 +495,7 @@ export default {
this.elKey++;
this.onWarningInfoNav(0);
this.sumCostOutByDeptId();
this.groupByProjectCategory(this.deptInfo.id);
}));
this.$bus.$on("deptChange", debounce(dept => {
@ -603,12 +604,6 @@ export default {
} else {
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.sumCost = d;
});

3
src/pages/projectDetail.vue
View File

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

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':'/'