提交

1

src/views/main/baseinfo/modals/manageOrganAll.vue

@@ -139,7 +139,7 @@
 
     <div class="wrap">
       <div class="chioseBox">
-        <el-radio-group v-model="timer"  >
+        <el-radio-group v-model="timer">
           <el-radio-button label="day">按天</el-radio-button>
           <el-radio-button label="month">按月</el-radio-button>
         </el-radio-group>
@@ -181,7 +181,7 @@ import { descs, chioseNum } from "../../constant";
 import { orderType } from "@/constant";
 
 export default {
-  props: ["data", "search",],
+  props: ["data", "search"],
   components: {
     "ve-line": veLine,
     "count-to": countTo,
@@ -282,8 +282,16 @@ export default {
             months[key] = {
               日期: key,
             };
+            months[key][item.title] = row.percent;
+          } else {
+            if (months[key][item.title]) {
+              months[key][item.title] = (
+                parseFloat(months[key][item.title]) + parseFloat(row.percent)
+              ).toFixed(2);
+            } else {
+              months[key][item.title] = parseFloat(row.percent).toFixed(2);
+            }
           }
-          months[key][item.title] = row.percent;
         }
       }
       // console.log(values);
@@ -347,7 +355,6 @@ export default {
     dataEmpty() {
       return !this.chartData.rows.length;
     },
-
   },
   data() {
     // this.chartSettings = {
@@ -361,7 +368,7 @@ export default {
       endDate: "",
       show: true,
       activeName: "first",
-      timer:'day'
+      timer: "day",
     };
   },
   mounted() {