|  | @@ -1,7 +1,7 @@
 | 
											
												
													
														|  |  <template>
 |  |  <template>
 | 
											
												
													
														|  |    <div>
 |  |    <div>
 | 
											
												
													
														|  |      <el-card style="margin-bottom: 20px">
 |  |      <el-card style="margin-bottom: 20px">
 | 
											
												
													
														|  | -      <headers title="数据总览" :hidenOrgan="true" />
 |  | 
 | 
											
												
													
														|  | 
 |  | +      <headers title="数据总览"  @changeOrgan="changeOrgan" :special="true"/>
 | 
											
												
													
														|  |        <div
 |  |        <div
 | 
											
												
													
														|  |          class="wall"
 |  |          class="wall"
 | 
											
												
													
														|  |          style="height: 68px"
 |  |          style="height: 68px"
 | 
											
										
											
												
													
														|  | @@ -39,7 +39,7 @@
 | 
											
												
													
														|  |      </el-card>
 |  |      </el-card>
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |      <el-card>
 |  |      <el-card>
 | 
											
												
													
														|  | -      <headers title="分部数据" @changeOrgan="changeOrgan" :special="true" />
 |  | 
 | 
											
												
													
														|  | 
 |  | +      <headers title="分部数据"  :hidenOrgan="true"/>
 | 
											
												
													
														|  |        <div class="tableWrap">
 |  |        <div class="tableWrap">
 | 
											
												
													
														|  |          <el-table
 |  |          <el-table
 | 
											
												
													
														|  |            style="width: 100%"
 |  |            style="width: 100%"
 | 
											
										
											
												
													
														|  | @@ -87,20 +87,19 @@
 | 
											
												
													
														|  |                </div>
 |  |                </div>
 | 
											
												
													
														|  |              </template> -->
 |  |              </template> -->
 | 
											
												
													
														|  |            </el-table-column>
 |  |            </el-table-column>
 | 
											
												
													
														|  | -
 |  | 
 | 
											
												
													
														|  | -
 |  | 
 | 
											
												
													
														|  |            <el-table-column
 |  |            <el-table-column
 | 
											
												
													
														|  |              align="center"
 |  |              align="center"
 | 
											
												
													
														|  | -            prop="vipStudentNum"
 |  | 
 | 
											
												
													
														|  | -            label="会员总人数"
 |  | 
 | 
											
												
													
														|  | 
 |  | +            prop="effectiveStudentNum"
 | 
											
												
													
														|  | 
 |  | +            label="有效学员数"
 | 
											
												
													
														|  |            >
 |  |            >
 | 
											
												
													
														|  |            </el-table-column>
 |  |            </el-table-column>
 | 
											
												
													
														|  | -                   <el-table-column
 |  | 
 | 
											
												
													
														|  | 
 |  | +          <el-table-column
 | 
											
												
													
														|  |              align="center"
 |  |              align="center"
 | 
											
												
													
														|  | -            prop="effectiveStudentNum"
 |  | 
 | 
											
												
													
														|  | -            label="有效学员数"
 |  | 
 | 
											
												
													
														|  | 
 |  | +            prop="vipStudentNum"
 | 
											
												
													
														|  | 
 |  | +            label="会员总人数"
 | 
											
												
													
														|  |            >
 |  |            >
 | 
											
												
													
														|  |            </el-table-column>
 |  |            </el-table-column>
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  |            <el-table-column
 |  |            <el-table-column
 | 
											
												
													
														|  |              align="center"
 |  |              align="center"
 | 
											
												
													
														|  |              prop="activeStudentNum"
 |  |              prop="activeStudentNum"
 | 
											
										
											
												
													
														|  | @@ -108,7 +107,7 @@
 | 
											
												
													
														|  |            >
 |  |            >
 | 
											
												
													
														|  |              <template slot="header" slot-scope="slot">
 |  |              <template slot="header" slot-scope="slot">
 | 
											
												
													
														|  |                <div class="titleCell">
 |  |                <div class="titleCell">
 | 
											
												
													
														|  | -                <span>活跃人数</span>
 |  | 
 | 
											
												
													
														|  | 
 |  | +                <span>活跃学员人数</span>
 | 
											
												
													
														|  |                  <el-tooltip placement="top" popper-class="mTooltip">
 |  |                  <el-tooltip placement="top" popper-class="mTooltip">
 | 
											
												
													
														|  |                    <div slot="content">
 |  |                    <div slot="content">
 | 
											
												
													
														|  |                      过去四周内有三周及以上每周训练时长超过60分钟为活跃学员
 |  |                      过去四周内有三周及以上每周训练时长超过60分钟为活跃学员
 | 
											
										
											
												
													
														|  | @@ -126,7 +125,7 @@
 | 
											
												
													
														|  |                </div>
 |  |                </div>
 | 
											
												
													
														|  |              </template>
 |  |              </template>
 | 
											
												
													
														|  |            </el-table-column>
 |  |            </el-table-column>
 | 
											
												
													
														|  | -                  <el-table-column
 |  | 
 | 
											
												
													
														|  | 
 |  | +          <el-table-column
 | 
											
												
													
														|  |              align="center"
 |  |              align="center"
 | 
											
												
													
														|  |              prop="effectiveVipStudentNum"
 |  |              prop="effectiveVipStudentNum"
 | 
											
												
													
														|  |              label="生效中会员人数"
 |  |              label="生效中会员人数"
 | 
											
										
											
												
													
														|  | @@ -143,14 +142,16 @@
 | 
											
												
													
														|  |              label="会员人数占比"
 |  |              label="会员人数占比"
 | 
											
												
													
														|  |            >
 |  |            >
 | 
											
												
													
														|  |              <template slot-scope="scope">
 |  |              <template slot-scope="scope">
 | 
											
												
													
														|  | -              <div>{{ numeral(scope.row.vipStudentRate || 0).format('0.00') }}%</div>
 |  | 
 | 
											
												
													
														|  | 
 |  | +              <div>
 | 
											
												
													
														|  | 
 |  | +                {{ numeral(scope.row.vipStudentRate || 0).format("0.00") }}%
 | 
											
												
													
														|  | 
 |  | +              </div>
 | 
											
												
													
														|  |              </template>
 |  |              </template>
 | 
											
												
													
														|  |            </el-table-column>
 |  |            </el-table-column>
 | 
											
												
													
														|  | -                    <el-table-column
 |  | 
 | 
											
												
													
														|  | 
 |  | +          <!-- <el-table-column
 | 
											
												
													
														|  |              align="center"
 |  |              align="center"
 | 
											
												
													
														|  |              prop="totalStudentNum"
 |  |              prop="totalStudentNum"
 | 
											
												
													
														|  |              label="今日使用人数"
 |  |              label="今日使用人数"
 | 
											
												
													
														|  | -          ></el-table-column>
 |  | 
 | 
											
												
													
														|  | 
 |  | +          ></el-table-column> -->
 | 
											
												
													
														|  |          </el-table>
 |  |          </el-table>
 | 
											
												
													
														|  |          <!-- <pagination
 |  |          <!-- <pagination
 | 
											
												
													
														|  |            :autoScroll="false"
 |  |            :autoScroll="false"
 | 
											
										
											
												
													
														|  | @@ -281,9 +282,9 @@ export default {
 | 
											
												
													
														|  |          name: "organRankDetail",
 |  |          name: "organRankDetail",
 | 
											
												
													
														|  |        });
 |  |        });
 | 
											
												
													
														|  |      },
 |  |      },
 | 
											
												
													
														|  | -    numeral(val){
 |  | 
 | 
											
												
													
														|  | -      return numeral(val)
 |  | 
 | 
											
												
													
														|  | -    }
 |  | 
 | 
											
												
													
														|  | 
 |  | +    numeral(val) {
 | 
											
												
													
														|  | 
 |  | +      return numeral(val);
 | 
											
												
													
														|  | 
 |  | +    },
 | 
											
												
													
														|  |    },
 |  |    },
 | 
											
												
													
														|  |    computed: {
 |  |    computed: {
 | 
											
												
													
														|  |      items() {
 |  |      items() {
 |