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

dev-login
姜玉琦 2023-08-13 22:13:00 +08:00
parent 86a5119254 540f95db4e
commit 31b369ed87
3 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/header.js
View File

@ -182,7 +182,7 @@ Vue.component("screen-header", {
this.data=(d?.data||[]).map(it=>{ this.data=(d?.data||[]).map(it=>{
it.text=it.projectName; it.text=it.projectName;
return it; return it;
}); }).filter(it=>+it.progressVisible==0);
this.$bus.$emit("loadProjects",this.data); this.$bus.$emit("loadProjects",this.data);
if(this.data.length>0){ if(this.data.length>0){
this.setScreenLiSel2(this.data[0],init); this.setScreenLiSel2(this.data[0],init);

8
src/pages/index.vue
View File

@ -49,8 +49,8 @@
<el-col :span="12"> <el-col :span="12">
<module-one-1-1 label="人员统计"> <module-one-1-1 label="人员统计">
<div class="warning-info-title" style="padding-left: 20px;"> <div class="warning-info-title" style="padding-left: 20px;">
<div :class="infoNav == 0 ? 'active' : ''" @click="onWarningInfoNav(0, '在岗人数')">在岗人数</div> <div :class="infoNav == 0 ? 'active' : ''" @click="onWarningInfoNav(0)">在岗人数</div>
<div :class="infoNav == 1 ? 'active' : ''" @click="onWarningInfoNav(1, '今日出勤')">今日出勤</div> <div :class="infoNav == 1 ? 'active' : ''" @click="onWarningInfoNav(1)">今日出勤</div>
</div> </div>
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
@ -547,9 +547,9 @@ export default {
this.elKey++; this.elKey++;
}, },
//劳务人员概况 //劳务人员概况
onWarningInfoNav(n, text) { onWarningInfoNav(n) {
this.infoNav = n this.infoNav = n
this.staffText = text this.staffText = n==0?'在岗人数':'今日出勤'
if (n == 0) { if (n == 0) {
this.surveyUrl = 'images/survey_icon_4.png' this.surveyUrl = 'images/survey_icon_4.png'
this.laborPersonnelData = [ this.laborPersonnelData = [

32
src/pages/progress/indexDlg3.vue
View File

@ -67,9 +67,9 @@
p-id="4998"></path> p-id="4998"></path>
</svg> </svg>
</div> </div>
<div style="display: flex;align-items: center;height: 782px;"> <div style="display: block;height: 782px;">
<div class="prj-info-list" v-if="scheduleInfo && JSON.stringify(scheduleInfo) != '{}'"> <div class="prj-info-list" v-if="scheduleInfo && JSON.stringify(scheduleInfo) != '{}'">
<div class="col-1" style="width:500px;padding-top:12px;"> <div class="col-1" style="width:500px;padding-top:12px;display: inline-block;margin-top: 120px;">
<el-carousel height="500px" v-if="scheduleInfo && scheduleInfo.images && scheduleInfo.images.length > 0"> <el-carousel height="500px" v-if="scheduleInfo && scheduleInfo.images && scheduleInfo.images.length > 0">
<el-carousel-item v-for="item in scheduleInfo.images" :key="item"> <el-carousel-item v-for="item in scheduleInfo.images" :key="item">
<div style="width: 100%;display: flex;align-items: center;justify-content: center;height: 500px;"> <div style="width: 100%;display: flex;align-items: center;justify-content: center;height: 500px;">
@ -83,7 +83,8 @@
</div> </div>
</div> </div>
<div class="col-2 scroll" <div class="col-2 scroll"
style="flex-grow: 1;max-height: 750px;min-height:400px;overflow: auto;width: calc(100% - 504px);margin-top:8px;"> style="flex-grow: 1;max-height: 750px;min-height:750px;overflow: auto;width: calc(100% - 504px);margin-top:8px;display: inline-flex;align-items: center;">
<div>
<template v-if="scheduleInfo.plannedNode"> <template v-if="scheduleInfo.plannedNode">
<div><img src="images/title_icon.png"><span class="sp-lbl">计划节点</span></div> <div><img src="images/title_icon.png"><span class="sp-lbl">计划节点</span></div>
<div class="div-text "> <div class="div-text ">
@ -128,6 +129,7 @@
</template> </template>
</div> </div>
</div> </div>
</div>
<div v-else style="text-align: center;padding-top: 150px;min-height: 500px;"> <div v-else style="text-align: center;padding-top: 150px;min-height: 500px;">
<img src="images/nodata.png" style="width: 240px;"> <img src="images/nodata.png" style="width: 240px;">
<div style="text-align: center;">暂无数据</div> <div style="text-align: center;">暂无数据</div>
@ -159,15 +161,15 @@ export default {
}, },
mounted() { mounted() {
let objs = window.jhcaches?.progressProjects // let objs = window.jhcaches?.progressProjects
if (objs && objs.length > 0) { // if (objs && objs.length > 0) {
this.prjs = objs; // this.prjs = objs;
return; // return;
} // }
this.$api.project.getProgressProjects().then(d => { // this.$api.project.getProgressProjects().then(d => {
this.prjs = d.data || []; // this.prjs = d.data || [];
window.jhcaches.progressProjects = this.prjs; // window.jhcaches.progressProjects = this.prjs;
}); // });
}, },
methods: { methods: {
@ -217,11 +219,15 @@ export default {
hideScreenUlSel2() { hideScreenUlSel2() {
this.showSel2 = false this.showSel2 = false
}, },
showDialog(scheduleInfo, prjs) { showDialog(scheduleInfo, prjs,dept) {
//this.$api.project.getProgressProjects(dept.id).then(d => {
//this.prjs = d.data || [];
this.prjs=(prjs||[]).filter(d=>+d.progressVisible==0);
this.scheduleInfo = scheduleInfo; this.scheduleInfo = scheduleInfo;
this.localStorage2 = JSON.parse(localStorage.getItem("data2")) this.localStorage2 = JSON.parse(localStorage.getItem("data2"))
this.dept2 = this.localStorage2.text; this.dept2 = this.localStorage2.text;
this.show = true this.show = true
//});
}, },
setScreenLiSel2(item) { setScreenLiSel2(item) {
this.dept2 = item.projectName this.dept2 = item.projectName