From 038dacb973bdb344a75155dc145e2e47e14e059a Mon Sep 17 00:00:00 2001
From: haha <lj7788@126.com>
Date: Wed, 29 Nov 2023 21:19:17 +0800
Subject: [PATCH] update code

---
 src/pages/progress/problemProgress.vue | 30 +++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/pages/progress/problemProgress.vue b/src/pages/progress/problemProgress.vue
index 61a8263..551ec2b 100644
--- a/src/pages/progress/problemProgress.vue
+++ b/src/pages/progress/problemProgress.vue
@@ -23,11 +23,11 @@
                 <template v-if="dataList.length>0 || isOnly">
                 <div class="project-amount project-issue" v-if="info">
                     <div class="issue-title screen-one-1-1">{{ info.projectName||prj.projectName }}</div>
-                    <div class="row-1" v-if="info.existingProblem">
+                    <div class="row-1" v-if="!info.existingProblemIsNull">
                         <div class="sp-lbl">存在问题:</div>
                         <div class="sp-detail" :title="info.existingProblem">{{ info.existingProblem }}</div>
                     </div>
-                    <div class="row-1" v-if="info.problemProgress">
+                    <div class="row-1" v-if="!info.problemProgressIsNull">
                         <div class="sp-lbl">推进情况:</div>
                         <div class="sp-detail sp-info" :title="info.problemProgress">{{ info.problemProgress }}</div>
                     </div>
@@ -70,6 +70,10 @@ export default {
             this.dept = dept;
             this.loadData();
         }));
+        this.$bus.$on("projectChange", debounce(res => {
+            this.prj = res;       
+            this.loadData();     
+        }));
         this.info = this.scheduleInfo || {};
         this.prj = this.prjInfo || {};
         if(this.$root.hasInitHeader){
@@ -99,7 +103,27 @@ export default {
         },
         loadData(){
             this.$api.schedule.constructionProgressByDept(this.dept?.id||0).then(d => {
-                this.dataList=d.data||[];
+                let tmps=[];
+                if(this.prj.id==0){
+                    (d.data||[]).forEach(it=>{
+                        if(!it.existingProblem ||!it.existingProblem.trim() || it.existingProblem.trim().indexOf("暂无")==0 || it.existingProblem.trim().indexOf("无")==0|| it.existingProblem.trim().indexOf("/")==0 ){
+                            it.existingProblemIsNull=true;
+                        }else{
+                            it.existingProblemIsNull=false;
+                        }
+                        if(!it.problemProgress ||!it.problemProgress.trim() || it.problemProgress.trim().indexOf("暂无")==0 || it.problemProgress.trim().indexOf("无")==0  || it.problemProgress.trim().indexOf("/")==0 ){
+                            it.problemProgressIsNull=true;
+                        }else{
+                            it.problemProgressIsNull=false;
+                        }
+                        if(!(it.existingProblemIsNull && it.problemProgressIsNull)){
+                            tmps.push(it);
+                        }
+                    });
+                }else{
+                    tmps=d.data||[];
+                }
+                this.dataList=tmps;
                 this.initPrj();
             });
         },