Merge remote-tracking branch 'origin/master' into 转接增加清空标签配置

src/views/course/courseUserStatistics/qw/index.vue

@@ -367,7 +367,7 @@ import {
   exportCourseWatchLog,
   statisticsList,
   qwWatchLogStatisticsList,
-  exportWatchLogStatistics
+  // exportWatchLogStatistics
 } from "@/api/course/qw/courseWatchLog";
 import { courseList, videoList } from "@/api/course/courseRedPacketLog";
 import { treeselect } from "@/api/company/companyDept";
@@ -707,8 +707,8 @@ export default {
       })
         .then(() => {
           this.exportLoading = true;
-          // return exportCourseWatchLog(queryParams);
-         return  exportWatchLogStatistics(queryParams);
+          return exportCourseWatchLog(queryParams);
+         // return  exportWatchLogStatistics(queryParams);
         })
         .then((response) => {
           console.log(response);

src/views/course/courseWatchLog/index.vue

@@ -11,16 +11,16 @@
           />
         </el-select>
       </el-form-item>
-        <el-form-item label="项目" prop="project">
-          <el-select  v-model="queryParams.project" placeholder="请选择项目" clearable size="small" >
-            <el-option
-              v-for="item in projectOptions"
-              :key="item.dictValue"
-              :label="item.dictLabel"
-              :value="item.dictValue"
-            />
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item label="项目" prop="project">-->
+<!--          <el-select  v-model="queryParams.project" placeholder="请选择项目" clearable size="small" >-->
+<!--            <el-option-->
+<!--              v-for="item in projectOptions"-->
+<!--              :key="item.dictValue"-->
+<!--              :label="item.dictLabel"-->
+<!--              :value="item.dictValue"-->
+<!--            />-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
       <el-form-item label="会员昵称" prop="nickName" v-if="queryParams.sendType == 1">
         <el-input
           v-model="queryParams.nickName"