Merge branch 'dev_xzeq' of http://39.99.224.27:9022/changchao/founder_vue into dev_xzeq

src/views/zdxx/zdjyhd/zdcyryss.vue

@@ -90,8 +90,8 @@ export default {
         djsjStart: "",
         djsjEnd: "",
       },
-      zs: 3,
-      zsGm: 2,
+      zs: '',
+      zsGm: '',
       tableData: [],
       type: "map",
       // ],
@@ -339,6 +339,11 @@ export default {
             });
           }
         });
+        let sum = 0;
+        arr.forEach((item) => {
+          sum += item.count;
+        });
+        this.zs = sum;
         this.pieEchartsDate.forEach((item) => {
           this.zs += item.value;
         });
@@ -489,17 +494,22 @@ export default {
       }).then((res) => {
         console.log(res.data.result);
         arr = res.data.result;
-        this.pieEchartsDate = [];
+        this.pieEchartsDateGm = [];
         arr.map((i) => {
           if (i.count != 0) {
-            this.pieEchartsDate.push({
-              name: i.hyhfdmStr,
+            this.pieEchartsDateGm.push({
+              name: i.sfzdgzryStr,
               value: i.count,
             });
           }
         });
-        console.log(this.pieEchartsDate);
-        this.startMyEcharts(this.pieEchartsDate);
+        let sum = 0;
+        arr.forEach((item) => {
+          sum += item.count;
+        });
+        this.zsGm = sum;
+        console.log(this.pieEchartsDateGm);
+        this.startMyEchartsGm(this.pieEchartsDateGm);
       });
     },
   },

src/views/zdxx/zdjyhd/zdhdxx.vue

@@ -53,7 +53,7 @@ export default {
         djsjStart: "",
         djsjEnd: "",
       },
-      zs: 3,
+      zs: 0,
       zsGm: 2,
       tableData: [],
       type: "map",
@@ -214,7 +214,7 @@ export default {
               let str5 = "\xa0";
               let str4 = "                ";
               for (let i = 0; i < 7 - params.length; i++) {
-                str5 += "\xa0\xa0\xa0\xa0";
+                str5 += "\xa0\xa0\xa0";
                 // str4 += "\xa0\xa0\xa0";
                 if (i == 7 - params.length - 1) {
                   str5 += "\xa0";
@@ -223,7 +223,7 @@ export default {
               }
               if (params.length == 7) {
                 str5 = "\xa0";
-                // str4 = "\xa0";
+                str4 = "\xa0";
               }
               num = data.find((i) => params == i.name);
               return `${params}${str5}${((num.value / total) * 100).toFixed(
@@ -302,6 +302,11 @@ export default {
             })
           }
         })
+        let sum = 0
+        arr.forEach( item => {
+          sum += item.count
+        })
+        this.zs = sum
         console.log(this.pieEchartsDate);
         this.startMyEcharts(this.pieEchartsDate);
       });