Merge branch 'refs/heads/master-fby'

src/views/course/userCoursePeriod/index.vue

@@ -165,6 +165,7 @@
           <el-table-column label="营期名称" align="center" prop="periodName" />
           <el-table-column label="公司名称" align="center" prop="companyName" />
           <el-table-column label="营期状态" align="center" prop="periodStatus" width="100" :formatter="periodStatusFormatter" />
+          <el-table-column label="营期线" align="center" prop="periodLine" width="180" />
           <el-table-column label="开营开始时间" align="center" prop="periodStartingTime" width="180" />
           <el-table-column label="开营结束时间" align="center" prop="periodEndTime" width="180" />
           <el-table-column label="创建时间" align="center" prop="createTime" width="180" />
@@ -291,6 +292,21 @@
           >
           </el-date-picker>
         </el-form-item>
+        <el-form-item prop="periodLine">
+          <span slot="label">
+            营期线
+            <el-tooltip content="营期首次播放课程的日期" placement="top">
+              <i class="el-icon-question" style="margin-left: 5px; color: #909399; cursor: help;"></i>
+            </el-tooltip>
+          </span>
+          <el-date-picker
+            v-model="form.periodLine"
+            type="date"
+            placeholder="请选择营期线"
+            value-format="yyyy-MM-dd"
+            :clearable="false">
+          </el-date-picker>
+        </el-form-item>
       </el-form>
       <div class="drawer-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -714,6 +730,9 @@ export default {
         ],
         periodStartingTime: [
           { required: true, message: '开营日期不能为空', trigger: 'change' }
+        ],
+        periodLine:  [
+          { required: true, message: '营期线不能为空', trigger: 'change' }
         ]
       },
       // 公司选项

src/views/course/userWatchCourseStatistics/index.vue

@@ -11,12 +11,12 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="营期日期" prop="periodStartingTime">
+      <el-form-item label="营期线" prop="periodStartingTime">
         <el-date-picker clearable size="small"
                         v-model="queryParams.periodStartingTime"
                         type="date"
                         value-format="yyyy-MM-dd"
-                        placeholder="选择营期开始日期">
+                        placeholder="选择营期线">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="播出时间" prop="courseStartDateTime">
@@ -81,7 +81,7 @@
     <el-table border v-loading="loading" :data="userWatchCourseStatisticsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="营期名称" align="center" prop="periodName" />
-      <el-table-column label="营期日期" align="center" prop="periodStartingTime" />
+      <el-table-column label="营期线" align="center" prop="periodStartingTime" />
       <el-table-column label="播出时间" align="center" prop="courseStartDateTime" />
       <el-table-column label="课程名称" align="center" prop="courseName" />
       <el-table-column label="视频小节" align="center" prop="videoTitle" />
@@ -90,6 +90,7 @@
       <el-table-column label="新增会员" align="center" prop="newUserNum" />
       <el-table-column label="会员数量" align="center" prop="userNum" />
       <el-table-column label="观看人数" align="center" prop="watchNum" />
+      <el-table-column label="上线率" align="center" prop="onlineRatePercent" />
       <el-table-column label="完播人数" align="center" prop="completeWatchNum" />
       <el-table-column label="完播率" align="center" prop="completeWatchRatePercent" />
       <el-table-column label="答题人数" align="center" prop="answerNum" />

src/views/course/userWatchCourseTotalStatistics/index.vue

@@ -11,12 +11,12 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="营期日期" prop="periodStartingTime">
+      <el-form-item label="营期线" prop="periodStartingTime">
         <el-date-picker clearable size="small"
                         v-model="queryParams.periodStartingTime"
                         type="date"
                         value-format="yyyy-MM-dd"
-                        placeholder="选择营期开始日期">
+                        placeholder="选择营期线">
         </el-date-picker>
       </el-form-item>
       <el-form-item label="播出时间" prop="courseStartDateTime">
@@ -89,7 +89,7 @@
     <el-table border v-loading="loading" :data="userWatchCourseStatisticsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="营期名称" align="center" prop="periodName" />
-      <el-table-column label="营期日期" align="center" prop="periodStartingTime" />
+      <el-table-column label="营期线" align="center" prop="periodStartingTime" />
       <el-table-column label="播出时间" align="center" prop="courseStartDateTime" />
       <el-table-column label="课程名称" align="center" prop="courseName" />
       <el-table-column label="视频小节" align="center" prop="videoTitle" />
@@ -98,6 +98,7 @@
       <el-table-column label="新增会员" align="center" prop="newUserNum" />
       <el-table-column label="会员数量" align="center" prop="userNum" />
       <el-table-column label="观看人数" align="center" prop="watchNum" />
+      <el-table-column label="上线率" align="center" prop="onlineRatePercent" />
       <el-table-column label="完播人数" align="center" prop="completeWatchNum" />
       <el-table-column label="完播率" align="center" prop="completeWatchRatePercent" />
       <el-table-column label="红包领取个数" align="center" prop="redPacketNum" />

src/views/course/userWatchStatistics/index.vue

@@ -11,12 +11,12 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="营期日期" prop="periodStartingTime">
+      <el-form-item label="营期线" prop="periodStartingTime">
         <el-date-picker clearable size="small"
           v-model="queryParams.periodStartingTime"
           type="date"
           value-format="yyyy-MM-dd"
-          placeholder="选择营期开始日期">
+          placeholder="选择营期线">
         </el-date-picker>
       </el-form-item>
 
@@ -55,7 +55,7 @@
     <el-table border v-loading="loading" :data="userWatchStatisticsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="营期名称" align="center" prop="periodName" />
-      <el-table-column label="营期开始日期" align="center" prop="periodStartingTime" width="180">
+      <el-table-column label="营期线" align="center" prop="periodStartingTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.periodStartingTime, '{y}-{m}-{d}') }}</span>
         </template>
@@ -64,6 +64,7 @@
       <el-table-column label="新增会员" align="center" prop="newUserNum" />
       <el-table-column label="会员数量" align="center" prop="userNum" />
       <el-table-column label="观看人数" align="center" prop="watchNum" />
+      <el-table-column label="上线率" align="center" prop="onlineRatePercent" />
       <el-table-column label="完播人数" align="center" prop="completeWatchNum" />
       <el-table-column label="完播率" align="center" prop="completeWatchRatePercent" />