首页数据调整

src/views/main/baseinfo/index.vue

@@ -35,22 +35,22 @@
     <empty desc="暂无统计数据" v-if="isEmpty"/>
     <el-row v-else class="rows" :gutter="20">
       <el-col :xs="24" :sm="24" :md="12">
-        <operate :data="dataInfo"/>
+        <student :data="dataInfo"/>
+      </el-col>
+      <el-col :xs="24" :sm="24" :md="12" :xl="12">
+        <management :data="dataInfo"/>
       </el-col>
       <el-col :xs="24" :sm="24" :md="12">
         <business :data="dataInfo"/>
       </el-col>
-      <el-col :xs="24" :sm="24" :md="24" :xl="12">
-        <management :data="dataInfo"/>
-      </el-col>
       <el-col :xs="24" :sm="24" :md="12">
-        <hrdata :data="dataInfo"/>
+        <curriculum :data="dataInfo"/>
       </el-col>
       <el-col :xs="24" :sm="24" :md="12">
-        <student :data="dataInfo"/>
+        <operate :data="dataInfo"/>
       </el-col>
-      <el-col :xs="24" :sm="24" :md="24">
-        <curriculum :data="dataInfo"/>
+      <el-col :xs="24" :sm="24" :md="12">
+        <hrdata :data="dataInfo"/>
       </el-col>
     </el-row>
   </div>

src/views/main/baseinfo/management.vue

@@ -36,9 +36,9 @@ export default {
   computed: {
     items() {
       return {
+        FINANCE_AMOUNT: this.data['FINANCE_AMOUNT'] || {},
         FINANCE_PAY: this.data['FINANCE_PAY'] || {},
         FINANCE_BALANCE_AMOUNT: this.data['FINANCE_BALANCE_AMOUNT'] || {},
-        FINANCE_AMOUNT: this.data['FINANCE_AMOUNT'] || {},
       }
     },
     dataZoom() {

src/views/main/baseinfo/operate.vue

@@ -37,8 +37,6 @@ export default {
       return {
         SCHOOL: this.data['SCHOOL'] || {},
         MUSIC_GROUP_NUM: this.data['MUSIC_GROUP_NUM'] || {},
-        MUSIC_GROUP_STUDENT: this.data['MUSIC_GROUP_STUDENT'] || {},
-        OTHER_STUDENT: this.data['OTHER_STUDENT'] || {},
       }
     },
     dataZoom() {

src/views/main/baseinfo/student.vue

@@ -8,7 +8,7 @@
         type="text"
       >{{isHistogram ? '学员转化漏斗图' : '学员柱状图'}}</el-button>
     </div>
-    <statistic class="statistic" :cols="0">
+    <statistic :col="5" class="statistic" :cols="0">
       <statistic-item v-for="(item, key) in items" :key="key" :class="{active: active === key}" @click="active = key">
         <span>
           {{item.title}}
@@ -46,6 +46,8 @@ export default {
   computed: {
     items() {
       return {
+        MUSIC_GROUP_STUDENT: this.data['MUSIC_GROUP_STUDENT'] || {},
+        OTHER_STUDENT: this.data['OTHER_STUDENT'] || {},
         NEWLY_STUDENT_NUM: this.data['NEWLY_STUDENT_NUM'] || {},
         QUIT_MUSIC_GROUP_STUDENT_NUM: this.data['QUIT_MUSIC_GROUP_STUDENT_NUM'] || {},
         STUDENT_CONVERSION: this.data['STUDENT_CONVERSION'] || {},

src/views/main/constant.js

@@ -3,7 +3,7 @@ export const descs = {
   MUSIC_GROUP_NUM: '截止到昨日，【进行中】乐团总数',
   MUSIC_GROUP_STUDENT: '截止到昨日，【进行中】乐团【在读】学员总数，分部下去重',
   OTHER_STUDENT: '截止到昨日，学员有剩余VIP/网管未上课时的人数总数，分部下去重',
-  ACTIVATION_RATE: '截止到昨日，平台注册学员激活率，平台注册学员设置密码人数/注册学员总数',
+  ACTIVATION_RATE: '截止到昨日，筹备中、进行中乐团在读学员和VIP、网管有课学员激活率',
   HOMEWORK_CREATE_RATE: '本月截止到昨日，服务指标的作业布置率',
   HOMEWORK_SUBMIT_RATE: '本月截止到昨日，已布置的作业学员提交率',
   HOMEWORK_COMMENT_RATE: '本月截止到昨日，学员已提交的作业老师点评率',
@@ -22,6 +22,9 @@ export const descs = {
   MUSIC_GROUP_COURSE: '截止到昨日，【已结束】乐团课程总数',
   VIP_GROUP_COURSE: '截止到昨日，【已结束】VIP课程总数',
   PRACTICE_GROUP_COURSE: '截止到昨日，【已结束】网管课程总数',
+  FINANCE_PAY: '昨日支出金额',
+  FINANCE_BALANCE_AMOUNT: '昨日余额消耗金额',
+  FINANCE_AMOUNT: '昨日现金收入金额',
 }
 
 export const errorType = {