Merge branch '04/22-index' into test

src/views/main/baseinfo/student.vue

@@ -164,7 +164,7 @@ export default {
             };
             months[key][item.title] = row.percent;
           } else {
-            if (months[key][item.title]) {
+            if (months[key][item.title]&&item.dataType!='MUSIC_GROUP_STUDENT'&&item.dataType!='VIP_PRACTICE_STUDENT_NUM') {
               months[key][item.title] += parseFloat(row.percent);
             } else {
               months[key][item.title] = row.percent;