zx 3 日 前
コミット
b3e7f6733a

+ 9 - 198
src/views/course/userWatchCourseStatistics/index.vue

@@ -1,15 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="营期id" prop="periodId">
-        <el-input
-          v-model="queryParams.periodId"
-          placeholder="请输入营期id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+
       <el-form-item label="营期名称" prop="periodName">
         <el-input
           v-model="queryParams.periodName"
@@ -19,15 +11,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="课程id" prop="courseId">
-        <el-input
-          v-model="queryParams.courseId"
-          placeholder="请输入课程id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="课程名称" prop="courseName">
         <el-input
           v-model="queryParams.courseName"
@@ -37,15 +20,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="视频id" prop="videoId">
-        <el-input
-          v-model="queryParams.videoId"
-          placeholder="请输入视频id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="视频标题" prop="videoTitle">
         <el-input
           v-model="queryParams.videoTitle"
@@ -55,16 +29,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="销售公司id" prop="companyId">
-        <el-input
-          v-model="queryParams.companyId"
-          placeholder="请输入销售公司id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="销售公司名称" prop="companyName">
+      <el-form-item label="销售公司" prop="companyName">
         <el-input
           v-model="queryParams.companyName"
           placeholder="请输入销售公司名称"
@@ -73,16 +38,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="销售id" prop="companyUserId">
-        <el-input
-          v-model="queryParams.companyUserId"
-          placeholder="请输入销售id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="课程开始日期" prop="courseStartDateTime">
+
+      <el-form-item label="课程日期" prop="courseStartDateTime">
         <el-date-picker clearable size="small"
           v-model="queryParams.courseStartDateTime"
           type="date"
@@ -99,7 +56,7 @@
           @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"
@@ -107,96 +64,7 @@
           placeholder="选择营期开始日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="新增会员数量" prop="newUserNum">
-        <el-input
-          v-model="queryParams.newUserNum"
-          placeholder="请输入新增会员数量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="会员数量" prop="userNum">
-        <el-input
-          v-model="queryParams.userNum"
-          placeholder="请输入会员数量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="观看人数" prop="watchNum">
-        <el-input
-          v-model="queryParams.watchNum"
-          placeholder="请输入观看人数"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="完播人数" prop="completeWatchNum">
-        <el-input
-          v-model="queryParams.completeWatchNum"
-          placeholder="请输入完播人数"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="完播率" prop="completeWatchRate">
-        <el-input
-          v-model="queryParams.completeWatchRate"
-          placeholder="请输入完播率"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="答题人数" prop="answerNum">
-        <el-input
-          v-model="queryParams.answerNum"
-          placeholder="请输入答题人数"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="答题正确人数" prop="answerRightNum">
-        <el-input
-          v-model="queryParams.answerRightNum"
-          placeholder="请输入答题正确人数"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="答题正确率" prop="answerRightRate">
-        <el-input
-          v-model="queryParams.answerRightRate"
-          placeholder="请输入答题正确率"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="红包领取数量" prop="redPacketNum">
-        <el-input
-          v-model="queryParams.redPacketNum"
-          placeholder="请输入红包领取数量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="红包领取总额" prop="redPacketAmount">
-        <el-input
-          v-model="queryParams.redPacketAmount"
-          placeholder="请输入红包领取总额"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -204,75 +72,18 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['course:userWatchCourseStatistics:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['course:userWatchCourseStatistics:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['course:userWatchCourseStatistics:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['course:userWatchCourseStatistics:export']"
-        >导出</el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table border v-loading="loading" :data="userWatchCourseStatisticsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键id" align="center" prop="id" />
-      <el-table-column label="营期id" align="center" prop="periodId" />
       <el-table-column label="营期名称" align="center" prop="periodName" />
-      <el-table-column label="课程id" align="center" prop="courseId" />
       <el-table-column label="课程名称" align="center" prop="courseName" />
-      <el-table-column label="视频id" align="center" prop="videoId" />
       <el-table-column label="视频标题" align="center" prop="videoTitle" />
-      <el-table-column label="销售公司id" align="center" prop="companyId" />
-      <el-table-column label="销售公司名称" align="center" prop="companyName" />
-      <el-table-column label="销售id" align="center" prop="companyUserId" />
-      <el-table-column label="课程开始日期" align="center" prop="courseStartDateTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.courseStartDateTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="销售公司" align="center" prop="companyName" />
+      <el-table-column label="课程日期" align="center" prop="courseStartDateTime" />
       <el-table-column label="销售名称" align="center" prop="companyUserName" />
-      <el-table-column label="营期开始日期" align="center" prop="periodStartingTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.periodStartingTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="营期日期" align="center" prop="periodStartingTime" />
       <el-table-column label="新增会员数量" align="center" prop="newUserNum" />
       <el-table-column label="会员数量" align="center" prop="userNum" />
       <el-table-column label="观看人数" align="center" prop="watchNum" />

+ 6 - 117
src/views/course/userWatchStatistics/index.vue

@@ -1,15 +1,7 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="营期id" prop="periodId">
-        <el-input
-          v-model="queryParams.periodId"
-          placeholder="请输入营期id"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+
       <el-form-item label="营期名称" prop="periodName">
         <el-input
           v-model="queryParams.periodName"
@@ -19,7 +11,7 @@
           @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"
@@ -27,51 +19,9 @@
           placeholder="选择营期开始日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="新增会员数量" prop="newUserNum">
-        <el-input
-          v-model="queryParams.newUserNum"
-          placeholder="请输入新增会员数量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="会员数量" prop="userNum">
-        <el-input
-          v-model="queryParams.userNum"
-          placeholder="请输入会员数量"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="观看人数" prop="watchNum">
-        <el-input
-          v-model="queryParams.watchNum"
-          placeholder="请输入观看人数"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="完播人数" prop="completeWatchNum">
-        <el-input
-          v-model="queryParams.completeWatchNum"
-          placeholder="请输入完播人数"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="完播率" prop="completeWatchRate">
-        <el-input
-          v-model="queryParams.completeWatchRate"
-          placeholder="请输入完播率"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+
+
+
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -79,55 +29,11 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['course:userWatchStatistics:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['course:userWatchStatistics:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['course:userWatchStatistics:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          :loading="exportLoading"
-          @click="handleExport"
-          v-hasPermi="['course:userWatchStatistics:export']"
-        >导出</el-button>
-      </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table border v-loading="loading" :data="userWatchStatisticsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键id" align="center" prop="id" />
       <el-table-column label="营期id" align="center" prop="periodId" />
       <el-table-column label="营期名称" align="center" prop="periodName" />
       <el-table-column label="营期开始日期" align="center" prop="periodStartingTime" width="180">
@@ -140,24 +46,7 @@
       <el-table-column label="观看人数" align="center" prop="watchNum" />
       <el-table-column label="完播人数" align="center" prop="completeWatchNum" />
       <el-table-column label="完播率" align="center" prop="completeWatchRate" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['course:userWatchStatistics:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['course:userWatchStatistics:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
+
     </el-table>
 
     <pagination