优化更改

src/widgets/HomePageNew/GroupInfo.ts

@@ -579,6 +579,7 @@ class GroupInfo {
     }
     //显示管点的信息
     getNodeInfo(data){
+        let total=null;
         let levelHtml="<div class='firstLevel'>"+
         "<div class='firstNode'><div class='nodeText  ysj'>0</div><div class='nodeType'>"+"雨水井"+"</div></div><div class='nodeSplit'></div>"+
         "<div class='firstNode'><div class='nodeText  wsj'>0</div><div class='nodeType'>"+"污水井"+"</div></div><div class='nodeSplit'></div>"+
@@ -588,9 +589,9 @@ class GroupInfo {
         "<div class='otherNode'><span class='nodenumber pfk'>0</span><span class='nodetitle'>"+"排放口"+"</span></div>"+
         "<div class='otherNode'><span class='nodenumber fm'>0</span><span class='nodetitle'>"+"阀门"+"</span></div>"+
         "<div class='otherNode'><span class='nodenumber zm'>0</span><span class='nodetitle'>"+"闸门"+"</span></div>"+
-        "<div class='otherNode'><span class='nodenumber bz'>0</span><span class='nodetitle'>"+"泵站"+"</span></div>"+
-        "<div class='otherNode'><span class='nodenumber txc'>0</span><span class='nodetitle'>"+"调蓄池"+"</span></div>"+
-        "<div class='otherNode'><span class='nodenumber wsc'>0</span><span class='nodetitle'>"+"污水厂"+"</span></div>"+
+        // "<div class='otherNode'><span class='nodenumber bz'>0</span><span class='nodetitle'>"+"泵站"+"</span></div>"+
+        // "<div class='otherNode'><span class='nodenumber txc'>0</span><span class='nodetitle'>"+"调蓄池"+"</span></div>"+
+        // "<div class='otherNode'><span class='nodenumber wsc'>0</span><span class='nodetitle'>"+"污水厂"+"</span></div>"+
         "<div class='otherNode'><span class='nodenumber qt'>0</span><span class='nodetitle'>"+"其他"+"</span></div>"+
         "</div>"
         this.global.domObj.find('.rightTopRight').empty().append(levelHtml)
@@ -638,16 +639,25 @@ class GroupInfo {
                             break;
                 case '闸门':this.global.domObj.find('.zm').html(""+data.nodeDesignAndScan[index].designNums+"")
                             break;
-                case '泵站':this.global.domObj.find('.bz').html(""+data.nodeDesignAndScan[index].designNums+"")
+                // case '泵站':this.global.domObj.find('.bz').html(""+data.nodeDesignAndScan[index].designNums+"")
+                //             break;
+                // case '调蓄池':this.global.domObj.find('.txc').html(""+data.nodeDesignAndScan[index].designNums+"")
+                //             break;
+                // case '污水厂':this.global.domObj.find('.wsc').html(""+data.nodeDesignAndScan[index].designNums+"")
+                //             break;
+                // case '其他':this.global.domObj.find('.qt').html(""+data.nodeDesignAndScan[index].designNums+"")
+                //             break;
+                case '泵站':total+=data.nodeDesignAndScan[index].designNums
                             break;
-                case '调蓄池':this.global.domObj.find('.txc').html(""+data.nodeDesignAndScan[index].designNums+"")
+                case '调蓄池':total+=data.nodeDesignAndScan[index].designNums
                             break;
-                case '污水厂':this.global.domObj.find('.wsc').html(""+data.nodeDesignAndScan[index].designNums+"")
+                case '污水厂':total+=data.nodeDesignAndScan[index].designNums
                             break;
-                case '其他':this.global.domObj.find('.qt').html(""+data.nodeDesignAndScan[index].designNums+"")
+                case '其他':total+=data.nodeDesignAndScan[index].designNums
                             break;
             }
         }
+        this.global.domObj.find('.qt').html(""+total+"")
     }
     //渲染管网信息的管线统计图表
     getPipeSituation(data){

src/widgets/HomePageNew/MapProjectOperation.ts

@@ -598,6 +598,7 @@ class MapProjectOpeartion{
     }
     //显示管点的信息
     getNodeInfo(data){
+        let total=null;
         let levelHtml="<div class='firstLevel'>"+
         "<div class='firstNode'><div class='nodeText  ysj'>0/0</div><div class='nodeType'>"+"雨水井"+"</div></div><div class='nodeSplit'></div>"+
         "<div class='firstNode'><div class='nodeText  wsj'>0/0</div><div class='nodeType'>"+"污水井"+"</div></div><div class='nodeSplit'></div>"+
@@ -607,9 +608,9 @@ class MapProjectOpeartion{
         "<div class='otherNode'><span class='nodenumber pfk'>0</span><span class='nodetitle'>"+"排放口"+"</span></div>"+
         "<div class='otherNode'><span class='nodenumber fm'>0</span><span class='nodetitle'>"+"阀门"+"</span></div>"+
         "<div class='otherNode'><span class='nodenumber zm'>0</span><span class='nodetitle'>"+"闸门"+"</span></div>"+
-        "<div class='otherNode'><span class='nodenumber bz'>0</span><span class='nodetitle'>"+"泵站"+"</span></div>"+
-        "<div class='otherNode'><span class='nodenumber txc'>0</span><span class='nodetitle'>"+"调蓄池"+"</span></div>"+
-        "<div class='otherNode'><span class='nodenumber wsc'>0</span><span class='nodetitle'>"+"污水厂"+"</span></div>"+
+        // "<div class='otherNode'><span class='nodenumber bz'>0</span><span class='nodetitle'>"+"泵站"+"</span></div>"+
+        // "<div class='otherNode'><span class='nodenumber txc'>0</span><span class='nodetitle'>"+"调蓄池"+"</span></div>"+
+        // "<div class='otherNode'><span class='nodenumber wsc'>0</span><span class='nodetitle'>"+"污水厂"+"</span></div>"+
         "<div class='otherNode'><span class='nodenumber qt'>0</span><span class='nodetitle'>"+"其他"+"</span></div>"+
         "</div>"
         this.domObj.find('.rightTopRight').empty().append(levelHtml)
@@ -657,16 +658,26 @@ class MapProjectOpeartion{
                             break;
                 case '闸门':this.domObj.find('.zm').html(""+data.nodeDesignAndScan[index].designNums+"")
                             break;
-                case '泵站':this.domObj.find('.bz').html(""+data.nodeDesignAndScan[index].designNums+"")
+                // case '泵站':this.domObj.find('.bz').html(""+data.nodeDesignAndScan[index].designNums+"")
+                //             break;
+                // case '调蓄池':this.domObj.find('.txc').html(""+data.nodeDesignAndScan[index].designNums+"")
+                //             break;
+                // case '污水厂':this.domObj.find('.wsc').html(""+data.nodeDesignAndScan[index].designNums+"")
+                //             break;
+                // case '其他':this.domObj.find('.qt').html(""+data.nodeDesignAndScan[index].designNums+"")
+                //             break;
+
+                case '泵站':total+=data.nodeDesignAndScan[index].designNums
                             break;
-                case '调蓄池':this.domObj.find('.txc').html(""+data.nodeDesignAndScan[index].designNums+"")
+                case '调蓄池':total+=data.nodeDesignAndScan[index].designNums
                             break;
-                case '污水厂':this.domObj.find('.wsc').html(""+data.nodeDesignAndScan[index].designNums+"")
+                case '污水厂':total+=data.nodeDesignAndScan[index].designNums
                             break;
-                case '其他':this.domObj.find('.qt').html(""+data.nodeDesignAndScan[index].designNums+"")
+                case '其他':total+=data.nodeDesignAndScan[index].designNums
                             break;
             }
         }
+        this.domObj.find('.qt').html(""+total+"")
     }
     //渲染管网信息的管线统计图表
     getPipeSituation(data){

src/widgets/PrjProgressAnalysis/Widget.ts

@@ -325,7 +325,7 @@ class PrjProgressAnalysis extends BaseWidget {
                 acceRelationFields.forEach(calcuFields => {
                     let value = 0;
                     //如果上一期和这一期都为0
-                    if (item[calcuFields.dividendField] == 0 && item[calcuFields.dividendField] == 0)
+                    if (item[calcuFields.dividendField] == 0 && item[calcuFields.divisorField] == 0)
                     {
                         value = 0;
                     }

src/widgets/ProcessConfiguration/Widget.ts

@@ -398,19 +398,25 @@ class ProcessConfiguration extends BaseWidget {
     //   dom.empty().append(html);
     // }.bind(this));
     let html="";
-    this.matchInfo.forEach(item=>{
-      if(type=='gyupdate'){
-        if(resultData.tdGroup){
+    if(type=='gyupdate'){
+      if(resultData.tdGroup){
+        this.matchInfo.forEach(item=>{   
           if(resultData.tdGroup==item.id){
             html += "<option selected value='" + item.id + "'>" + item.value + "</option>"
           }else{
             html += "<option value='" + item.id + "'>" + item.value + "</option>"
           }
-        }
-      }else {
-        html += "<option value='" + item.id + "'>" + item.value + "</option>"
+        })
+      }else{
+        this.matchInfo.forEach(item=>{   
+          html += "<option value='" + item.id + "'>" + item.value + "</option>"
+        })  
       }
-    })
+    }else {
+      this.matchInfo.forEach(item=>{   
+        html += "<option value='" + item.id + "'>" + item.value + "</option>"
+      })
+    }
     let dom = Obj.conObj.find('.tdGroup');
     dom.empty().append(html);
     //监理拍照字段匹配