From bfa69a7a720421cb7ea15d2d819ba8d56706eaff Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Sun, 13 Aug 2023 21:58:01 +0800
Subject: [PATCH 1/2] update code

---
 src/pages/progress/indexDlg3.vue | 40 ++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/pages/progress/indexDlg3.vue b/src/pages/progress/indexDlg3.vue
index d2647ff..f8af35b 100644
--- a/src/pages/progress/indexDlg3.vue
+++ b/src/pages/progress/indexDlg3.vue
@@ -67,9 +67,9 @@
                     p-id="4998"></path>
             </svg>
         </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="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-item v-for="item in scheduleInfo.images" :key="item">
                         <div style="width: 100%;display: flex;align-items: center;justify-content: center;height: 500px;">
@@ -83,7 +83,8 @@
                 </div>
             </div>
             <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">
                     <div><img src="images/title_icon.png"><span class="sp-lbl">计划节点</span></div>
                     <div class="div-text ">
@@ -126,6 +127,7 @@
                         <div>{{ scheduleInfo.planForNextWeek }}</div>
                     </div>
                 </template>
+                </div>
             </div>
         </div>
         <div v-else style="text-align: center;padding-top: 150px;min-height: 500px;">
@@ -159,15 +161,15 @@ export default {
     },
 
     mounted() {
-        let objs = window.jhcaches?.progressProjects
-        if (objs && objs.length > 0) {
-            this.prjs = objs;
-            return;
-        }
-        this.$api.project.getProgressProjects().then(d => {
-            this.prjs = d.data || [];
-            window.jhcaches.progressProjects = this.prjs;
-        });
+        // let objs = window.jhcaches?.progressProjects
+        // if (objs && objs.length > 0) {
+        //     this.prjs = objs;
+        //     return;
+        // }
+        // this.$api.project.getProgressProjects().then(d => {
+        //     this.prjs = d.data || [];
+        //     window.jhcaches.progressProjects = this.prjs;
+        // });
     },
 
     methods: {
@@ -217,11 +219,15 @@ export default {
         hideScreenUlSel2() {
             this.showSel2 = false
         },
-        showDialog(scheduleInfo, prjs) {
-            this.scheduleInfo = scheduleInfo;
-            this.localStorage2 = JSON.parse(localStorage.getItem("data2"))
-            this.dept2 = this.localStorage2.text;
-            this.show = true
+        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.localStorage2 = JSON.parse(localStorage.getItem("data2"))
+                this.dept2 = this.localStorage2.text;
+                this.show = true
+            //});
         },
         setScreenLiSel2(item) {
             this.dept2 = item.projectName

From 540f95db4e610504cd249401c6d51481fcf6c1d3 Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Sun, 13 Aug 2023 22:11:18 +0800
Subject: [PATCH 2/2] update code

---
 src/components/header.js | 2 +-
 src/pages/index.vue      | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/header.js b/src/components/header.js
index 8a3012f..e544500 100644
--- a/src/components/header.js
+++ b/src/components/header.js
@@ -182,7 +182,7 @@ Vue.component("screen-header", {
                 this.data=(d?.data||[]).map(it=>{
                      it.text=it.projectName;
                      return it;  
-                });
+                }).filter(it=>+it.progressVisible==0);
                 this.$bus.$emit("loadProjects",this.data);
                 if(this.data.length>0){
                  this.setScreenLiSel2(this.data[0],init);
diff --git a/src/pages/index.vue b/src/pages/index.vue
index 11fefd7..c8bff32 100644
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
@@ -49,8 +49,8 @@
                             <el-col :span="12">
                                 <module-one-1-1 label="人员统计">
                                     <div class="warning-info-title" style="padding-left: 20px;">
-                                        <div :class="infoNav == 0 ? 'active' : ''" @click="onWarningInfoNav(0, '在岗人数')">在岗人数</div>
-                                        <div :class="infoNav == 1 ? 'active' : ''" @click="onWarningInfoNav(1, '今日出勤')">今日出勤</div>
+                                        <div :class="infoNav == 0 ? 'active' : ''" @click="onWarningInfoNav(0)">在岗人数</div>
+                                        <div :class="infoNav == 1 ? 'active' : ''" @click="onWarningInfoNav(1)">今日出勤</div>
                                     </div>
                                     <el-row>
                                         <el-col :span="8">
@@ -547,9 +547,9 @@ export default {
                 this.elKey++;
         },
         //劳务人员概况
-        onWarningInfoNav(n, text) {
+        onWarningInfoNav(n) {
             this.infoNav = n
-            this.staffText = text
+            this.staffText = n==0?'在岗人数':'今日出勤'
             if (n == 0) {
                 this.surveyUrl = 'images/survey_icon_4.png'
                 this.laborPersonnelData = [