Procházet zdrojové kódy

Merge branch 'iteration_0802' into test

lex-xin před 3 roky
rodič
revize
5aa1b71903

+ 34 - 0
src/views/main/cloudDate/organDate.vue

@@ -43,6 +43,40 @@
           ></el-table-column>
           <el-table-column
             align="center"
+            prop="newStudentNum"
+            label="新用户人数"
+          >
+            <template slot="header">
+              <div class="titleCell">
+                <span>新用户人数</span>
+                <el-tooltip placement="top" popper-class="mTooltip">
+                  <div slot="content">
+                    乐团在读学员已上课程≤4节
+                  </div>
+                  <i
+                    class="el-icon-question micon el-tooltip"
+                    style="
+                      font-size: 18px;
+                      color: #f56c6c;
+                      top: 2px;
+                      position: relative;
+                    "
+                  ></i>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="newStudentDuty"
+            label="新用户占比"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.newStudentDuty }}%
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
             prop="totalStudentNum"
             label="学员总数"
           >

+ 34 - 0
src/views/main/cloudDate/organRankDetail.vue

@@ -55,6 +55,40 @@
           ></el-table-column>
           <el-table-column
             align="center"
+            prop="newStudentNum"
+            label="新用户人数"
+          >
+            <template slot="header">
+              <div class="titleCell">
+                <span>新用户人数</span>
+                <el-tooltip placement="top" popper-class="mTooltip">
+                  <div slot="content">
+                    乐团在读学员已上课程≤4节
+                  </div>
+                  <i
+                    class="el-icon-question micon el-tooltip"
+                    style="
+                      font-size: 18px;
+                      color: #f56c6c;
+                      top: 2px;
+                      position: relative;
+                    "
+                  ></i>
+                </el-tooltip>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
+            prop="newStudentDuty"
+            label="新用户占比"
+          >
+            <template slot-scope="scope">
+              {{ scope.row.newStudentDuty }}%
+            </template>
+          </el-table-column>
+          <el-table-column
+            align="center"
             prop="totalStudentNum"
             label="学员总数"
           >