提交测试受vip课改造

1

src/views/main/baseinfo/curriculum.vue

@@ -10,7 +10,7 @@
         :isShowQuert="true"
       />
     </div>
-    <statistic class="statistic" :cols="0">
+    <statistic class="statistic" :cols="0" :col="5">
       <statistic-item
         v-for="(item, key) in items"
         :key="key"
@@ -77,6 +77,8 @@ export default {
       return {
         MUSIC_GROUP_COURSE: this.data["MUSIC_GROUP_COURSE"] || {},
         VIP_GROUP_COURSE: this.data["VIP_GROUP_COURSE"] || {},
+        VIP_GROUP_ONLINE_COURSE: this.data["VIP_GROUP_ONLINE_COURSE"] || {},
+        VIP_GROUP_OFFLINE_COURSE: this.data["VIP_GROUP_OFFLINE_COURSE"] || {},
         PRACTICE_GROUP_COURSE: this.data["PRACTICE_GROUP_COURSE"] || {},
       };
     },
@@ -103,6 +105,7 @@ export default {
           months[key][item.title] = row.percent;
         }
       }
+      console.log(months)
       return {
         columns: ["日期", ...values.map((item) => item.title)],
         rows: Object.values(months),
@@ -145,13 +148,13 @@ export default {
         },
         yAxis: {
           //纵轴标尺固定
-          minInterval:1,
+          minInterval: 1,
           type: "value",
           scale: true,
           min: 0,
-            axisLabel:{
-            formatter:'{value}节'
-          }
+          axisLabel: {
+            formatter: "{value}节",
+          },
         },
         tooltip: {
           axisPointer: {
@@ -160,8 +163,8 @@ export default {
               color: "rgba(150,150,150,0.2)",
             },
           },
-
           formatter: (item) => {
+            console.log(this.items['VIP_GROUP_COURSE']['indexMonthData'][item[0].dataIndex].extendInfo)
             return [
               item[0].axisValueLabel,
               ...item.map(
@@ -202,7 +205,6 @@ export default {
         for (const item of res.data) {
           // 再循环一遍
           for (const key in this.items) {
-
             if (item.dataType == key) {
               data[item.dataType] = {
                 ...item,
@@ -220,7 +222,6 @@ export default {
       this.$emit("resetDate", data);
     },
     isDayOrMoth(arr) {
-
       if (!arr || arr.length < 1) {
         this.timer = "day";
       } else {