暂时修复看板超出100%

src/views/statistics/item/s12fengXian.vue

@@ -102,7 +102,7 @@
               },
               data: [
                 { value: this.data.t_mjsyshdfxsbykzjhxbNum.res[0], name: '完成率' ,v2:this.data.t_mjsyshdfxsbykzjhxbNum.number[0]},
-                { value: e, name: '未完成率' ,v2:this.data.t_mjsyshdfxsbykzjhxbNum.numberAll[0]}
+                { value: e, name: '未完成率' ,v2:this.data.t_mjsyshdfxsbykzjhxbNum.numberAll[0]-this.data.t_mjsyshdfxsbykzjhxbNum.number[0]}
               ],
               emphasis: {
                 itemStyle: {

src/views/statistics/sendDatas.js

@@ -88,6 +88,9 @@ export default {
                         valAll.forEach( function(item){
                                 b += item ;
                         });
+                        if(a>b){
+                                a=b
+                        }
                         if(b===0){
                                 c=0
                         }else{
@@ -145,6 +148,9 @@ export default {
                                         b += 1 ;
                                 }
                         });
+                        if(a>b){
+                                a=b
+                        }
                         if(b===0){
                                 c=0
                         }else{
@@ -166,8 +172,9 @@ export default {
                         let b=that.nengliObj[1].num
                         let c=0
 
-                        console.log(that.nengliObj,'904380439034904343')
-        
+                        if(a>b){
+                                a=b
+                        }
                         if(b===0){
                                 c=0
                         }else{
@@ -223,6 +230,9 @@ export default {
                         }
                         // a=a*numm
                         // console.log(numm,'numm')
+                        if(b>a){
+                                b=a
+                        }
                         if(b===0){
                                 c=0
                         }else{
@@ -277,11 +287,15 @@ export default {
                         }
                         // a=a*numm
                         // console.log(numm,'numm')
+                        if(b>a){
+                                b=a
+                        }
                         if(b===0){
                                 c=0
                         }else{
                                 c= Math.floor(b/a * 10000) / 100
                         }
+                        
                         return {
                                 "Num" :{"date": this.endDate,"number": val, "name": name, "numberAll": valAll,"valnum":a,"valAll":b,"valna":c},
                                 "config":this.getMyConfig("检测") //返回需要的对应参数
@@ -331,6 +345,9 @@ export default {
                         }
                         // a=a*numm
                         // console.log(numm,'numm')
+                        if(b>a){
+                                b=a
+                        }
                         if(b===0){
                                 c=0
                         }else{
@@ -358,6 +375,9 @@ export default {
                         let e=0
                         let n=0
                         let d=0
+                        if(jchzbNum[0]+jchzbNum1[0]+jchzbNum2[0]>jchzbSNum[0]){
+                                jchzbSNum[0] = jchzbNum[0]+jchzbNum1[0]+jchzbNum2[0]
+                        }
                         if (jchzbSNum[0]===0) {
                                 e =0
                         } else {
@@ -404,6 +424,9 @@ export default {
                         let mjjcbgSNum = this.getMatchingDataSame('t_mjjcbg')
                         let barData = []
                         // for (let i = 0; i < this.dataScope.length; i++) {
+                                if(mjjcbgNum[0]>mjjcbgSNum[0]){
+                                        mjjcbgNum[0]=mjjcbgSNum[0]
+                                }
                                 let e=0
                                 if (mjjcbgSNum[0]===0) {
                                         e =0
@@ -425,6 +448,9 @@ export default {
                         let khmydtjbSNum = this.getMatchingDataSame('t_khmydtjb')
                         let barData = []
                         // for (let i = 0; i < this.dataScope.length; i++) {
+                                if(khmydtjbNum[0]>khmydtjbNumN){
+                                        khmydtjbNum[0]=khmydtjbNumN
+                                }
                                 let e=0
                                 if (khmydtjbNumN===0) {
                                         e =0
@@ -474,11 +500,21 @@ export default {
                         } else {
                                 e1 =Math.floor(complaintNumS[0]/complaintNum[0] * 10000) / 100
                         }
+
                         if (complaintNum[0]===0) {
                                 e2 =0
                         } else {
                                 e2 =Math.floor(complainNum[0]/complaintNum[0] * 10000) / 100
                         }
+                        if(e>100){
+                                e1=100
+                        }
+                        if(e2>100){
+                                e2=100
+                        }
+                        if(e1>100){
+                                e2=100
+                        }
                         barData.push(e)
                         barData1.push(e1)
                         barData2.push(e2)
@@ -494,6 +530,9 @@ export default {
                         let ryywpxjSNum = this.getMatchingDataSame('t_ryywpxjl')
                         let barData = []
                         // for (let i = 0; i < this.dataScope.length; i++) {
+                                if(ryywpxjNum[0]>ryywpxjSNum[0]){
+                                        ryywpxjNum[0]=ryywpxjSNum[0]
+                                }
                                 let e=0
                                 if (ryywpxjSNum[0]===0) {
                                         e =0
@@ -516,6 +555,9 @@ export default {
                         let zljdSNum = this.getMatchingDataSame('t_zljd')
                         let barData = []
                         // for (let i = 0; i < this.dataScope.length; i++) {
+                                if(zljdNum[0]>zljdSNum[0]){
+                                        zljdNum[0]=zljdSNum[0]
+                                }
                                 let e=0
                                 if (zljdSNum[0]===0) {
                                         e =0
@@ -607,6 +649,9 @@ export default {
                         barData.push(numAData)
                         a=mjzlkzxbSNum[0]+mjzlkzjlbSNum[0]
                         b=mjzlkzxbNum[0]+mjzlkzjlbNum[0]
+                        if(mjzlkzxbNum[0]>mjzlkzxbSNum[0]){
+                                mjzlkzxbNum[0]=mjzlkzxbSNum[0]
+                        }
                         if(mjzlkzxbSNum[0]===0){
                                 c=0
                         }else{
@@ -628,6 +673,9 @@ export default {
                         let numData = []
                         let numAData = []
                         let barData = []
+                        if(mjsyshdfxsbykzjhxbSNum[0]>mjsyshdfxsbykzjhxbNum[0]){
+                                mjsyshdfxsbykzjhxbSNum[0]=mjsyshdfxsbykzjhxbNum[0] 
+                        }
                         // for (let i = 0; i < this.dataScope.length; i++) {
                         let e=0
                         if (mjsyshdfxsbykzjhxbNum[0]===0) {
@@ -654,6 +702,9 @@ export default {
                         let numAData = []
                         let barData = []
                         // for (let i = 0; i < this.dataScope.length; i++) {
+                        if(bfhxbgyjzcsjlbxSNum[0]>bfhxbgyjzcsjlbxNum[0]){
+                                bfhxbgyjzcsjlbxSNum[0]=bfhxbgyjzcsjlbxNum[0]
+                        }
                         let e=0
                         if (bfhxbgyjzcsjlbxNum[0]===0) {
                                 e =0