update code

public/css/largeScreenStyle.css

@@ -59,10 +59,10 @@ table{
 }
 .head-title-label{
     width: 22%;
-    font-size: 28px;
+    font-size: 26px;
     position: relative;
     padding-left: 15px;
-    padding-top: 15px;
+    padding-top: 23px;
     font-family: "title-font";
     background-image:-webkit-linear-gradient(bottom,#3da2ff,#3ea4ff,#96f3ff);
     -webkit-background-clip:text;

src/pages/index.vue

@@ -180,7 +180,7 @@
 
                                     <staff-survey-chart unit="万元" :height="60" :data="investmentAmountData1" 
                                         :max="prjInfo.contractAmount*1.0 || 10000" :width="200"></staff-survey-chart>
-                                    <staff-survey-chart unit="万元" :height="60" :data="investmentAmountData2"
+                                    <staff-survey-chart unit="万元" :height="60" :data="investmentAmountData2" v-if="1==2"
                                         :max="prjInfo.contractAmount*1.0 || 10000" :width="200"></staff-survey-chart>
 
                                 </div>
@@ -288,11 +288,11 @@ export default {
             infoNav: 0,
             staffText: '在岗人员',
             surveyUrl: 'images/survey_icon_4.png',
-            laborPersonnelTotal: 149,
+            laborPersonnelTotal: 0,
             laborPersonnelData: [
-                { text: "总包人员", value: 28 },
+                { text: "总包人员", value: 0 },
-                { text: "监理人员", value: 3 },
+                { text: "监理人员", value: 0 },
-                { text: "劳务人员", value: 118 },
+                { text: "劳务人员", value: 0 },
             ],
             //项目进度
             prjProcessNav: 0,
@@ -437,6 +437,7 @@ export default {
             this.investmentAmountData1[0].value = "" + res.paidAmount * 1.0;
             this.investmentAmountData2[0].value = "" + res.onAccountAmount * 1.0;
             this.elKey++;
+            this.onWarningInfoNav(0);
         });
         this.$bus.$on("deptChange",dept=>{
             this.deptInfo=dept;
@@ -553,11 +554,15 @@ export default {
             if (n == 0) {
                 this.surveyUrl = 'images/survey_icon_4.png'
                 this.laborPersonnelData = [
-                    { text: "总包人员", value: 28 },
+                    { text: "总包人员", value: this.prjInfo?.servicePersonnel||0 },
-                    { text: "监理人员", value: 3 },
+                    { text: "监理人员", value: this.prjInfo?.supervisorPersonnel||0 },
-                    { text: "劳务人员", value: 118 },
+                    { text: "劳务人员", value: this.prjInfo?.generalContractor||0 },
                 ]
-                this.laborPersonnelTotal = 100;
+                let sum=0;
+                this.laborPersonnelData.forEach(it=>{
+                    sum+=it.value;
+                })
+                this.laborPersonnelTotal = sum;
             } else {
                 this.surveyUrl = 'images/survey_icon_5.png'
                 this.laborPersonnelTotal = 133;

src/pages/progress/indexDlg3.vue

@@ -202,7 +202,7 @@ export default {
             let idx = 0;
             if (item) {
                 idx = this.prjs.indexOf(item);
-                if (idx < this.prjs.length - 2) {
+                if (idx < this.prjs.length - 1) {
                     idx++;
                 } else {
                     idx = 0;

src/pages/projectDetail.vue

@@ -236,7 +236,7 @@
                                             <div class="dangerous-dot-item"></div>
                                         </div>
                                         <div class="dangerous-time-max">
-                                            <div class="dangerous-time-min">计划：{{item.startDate||'---'}}</div>
+                                            <div class="dangerous-time-min">计划：{{item.planEndDate||'---'}}</div>
                                             <div class="dangerous-time-min">实际：{{item.endDate||'--'}}</div>
                                             <div v-if="item.finishState>0" class="project-expect-state dangerous-time-nav" 
                                                 :class="(item.finishState==1?'active':'')+' state-'+item.finishState">{{item.finish}}</div>
@@ -516,7 +516,11 @@ export default {
                     this.scheduleInfo=obj;
                });
                this.projectBuildNode=[];
-               this.$api.project.getProjectBuildNode(this.project.id).then(d=>{
+               this.getProjectBuildNode();
+               
+            },
+            getProjectBuildNode(){
+                this.$api.project.getProjectBuildNode(this.project.id).then(d=>{
                 let tmps=(d.data||[]).map(it=>{
                     it.lvl=it.baseBuildNode.nodeLvl;
                     it.parentLvl=it.lvl.substring(0,it.lvl.length-2);
@@ -525,32 +529,39 @@ export default {
                     return it;
                 }).filter(it=>it.lvl.length==2);                  
                 this.projectBuildNode=tmps.map(it=>{
-                    let t1= + this.$dt(this.$dt(new Date()).format("YYYY-MM-DD"));
+                    let dt0=+ this.$dt(this.$dt(new Date()).format("YYYY-MM-DD"));//当时时间
-                    if(!it.startDate && !it.endDate){
+                    let dt1=it.planStartDate?+this.$dt(it.planStartDate):0;//计划开始
+                    let dt2=it.planEndDate?+this.$dt(it.planEndDate):0;//计划结束
+                    let dt3=it.startDate?+this.$dt(it.startDate):0;//实际开始
+                    let dt4=it.endDate?+this.$dt(it.endDate):0;//实际结束
+                    if(!it.planStartDate ||!it.planEndDate){
                         it.finish="";
-                        it.finishState=0;
+                        it.finishState=-1; 
-                    }else if(!it.endDate){
+                        return it;
-                        let t2=+this.$dt(it.startDate);
+                    }
-                        if(t2<t1){
+                    if(it.endDate){
-                            let ts=(t1-t2)/3600/1000/24;
+                        if(dt4>dt2){
-                            it.finish="逾期"+ts+"天";
+                            it.finishState=1;                            
-                            it.finishState=1;
+                            it.finish="逾期"+((dt4-dt2)/3600/1000/24)+"天";
-                        }else{
-                            it.finish="进行中";
-                            it.finishState=2;
-                        }
-                    }else{
-                        let t3=+this.$dt(it.endDate);
-                        let t4=+this.$dt(it.startDate);
-                        if(t3>t4){
-                            let ts2=(t3-t4)/3600/1000/24;
-                            it.finish="逾期"+ts2+"天";
-                            it.finishState=1;
                         }else{
                             it.finish="正常完工";
                             it.finishState=3;
                         }
+                    }else{
+                        if(it.startDate){
+                            if(dt2>=dt0){
+                                it.finish="进行中";
+                                it.finishState=2; 
+                            }else{
+                                it.finishState=1;                            
+                                it.finish="逾期"+((dt2-dt0)/3600/1000/24)+"天";
+                            }
+                        }else{
+                            it.finish="未开工";
+                            it.finishState=4; 
+                        }
                     }
+                    
                     return it;
                 });