xdd hai 2 meses
pai
achega
11cb108e82

+ 1 - 1
src/api/course/courseRedPacketLog.js

@@ -33,7 +33,7 @@ export function getCourseRedPacketLog(logId) {
 }
 export function courseList() {
   return request({
-    url: '/course/courseRedPacketLog//courseList',
+    url: '/course/courseRedPacketLog/courseList',
     method: 'get',
   })
 }

+ 45 - 37
src/views/course/courseAnswerlogs/index.vue

@@ -1,23 +1,15 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="120px">
-      <el-form-item label="客户电话" prop="phone">
-        <el-input
-          v-model="queryParams.phone"
-          placeholder="请输入客户电话"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="加密电话" prop="phoneMk">
-        <el-input
-          v-model="queryParams.phoneMk"
-          placeholder="请输入用户加密电话"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="项目" prop="courseId">
+        <el-select filterable  v-model="queryParams.project" placeholder="请选择项目"  clearable size="small">
+          <el-option
+            v-for="dict in projectLists"
+            :key="dict.dictValue"
+            :label="dict.dictLabel"
+            :value="parseInt(dict.dictValue)"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="课程" prop="courseId">
         <el-select filterable  v-model="queryParams.courseId" placeholder="请选择课程"  clearable size="small" @change="courseChange(queryParams.courseId)">
@@ -40,24 +32,25 @@
         </el-select>
       </el-form-item>
       <el-form-item label="销售名称" prop="companyUserName">
-        <el-input
-          v-model="queryParams.companyUserName"
-          placeholder="请输入销售名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="公司" prop="companyId" v-hasPermi="['course:courseAnswerLog:export']">
-        <el-select filterable  v-model="queryParams.companyId" placeholder="请选择公司名"  clearable size="small">
+        <el-select v-model="queryParams.companyUserId" remote placeholder="请选择" filterable clearable  style="width: 100%;" @keyup.enter.native="handleQuery">
           <el-option
-            v-for="item in companys"
-            :key="item.companyId"
-            :label="item.companyName"
-            :value="item.companyId"
-          />
+            v-for="dict in companyUserList"
+            :key="`${dict.nickName} - ${dict.userName}`"
+            :label="`${dict.nickName} - ${dict.userName}`"
+            :value="dict.userId">
+          </el-option>
         </el-select>
       </el-form-item>
+<!--      <el-form-item label="公司" prop="companyId" v-hasPermi="['course:courseAnswerLog:export']">-->
+<!--        <el-select filterable  v-model="queryParams.companyId" placeholder="请选择公司名"  clearable size="small">-->
+<!--          <el-option-->
+<!--            v-for="item in companys"-->
+<!--            :key="item.companyId"-->
+<!--            :label="item.companyName"-->
+<!--            :value="item.companyId"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <el-form-item label="是否全部正确" prop="isRight">
         <el-select filterable  v-model="queryParams.isRight" placeholder="请选择公司名"  clearable size="small">
           <el-option
@@ -96,7 +89,8 @@
 
     <el-table border v-loading="loading" :data="logsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="小程序用户名" align="center" prop="userName" />
+      <el-table-column label="用户" align="center" prop="userName" />
+      <el-table-column label="项目" align="center" prop="projectName" />
       <el-table-column label="课程名称" align="center" prop="courseName" />
       <el-table-column label="小节名称" align="center" prop="videoName" />
       <el-table-column label="是否全部正确" align="center" prop="isRight" >
@@ -105,7 +99,6 @@
         </template>
       </el-table-column>
       <el-table-column label="销售名称" align="center" prop="companyUserName" />
-      <el-table-column label="企微员工名称" align="center" prop="qwUserName" />
       <el-table-column label="公司名称" align="center" prop="companyName" />
       <el-table-column label="创建时间" align="center" prop="createTime" />
     </el-table>
@@ -125,6 +118,7 @@
 import { listLogs, getLogs, delLogs, addLogs, updateLogs, exportLogs } from "@/api/course/courseAnswerlogs";
 import { courseList, videoList } from '@/api/course/courseRedPacketLog'
 import { getCompanyList } from '@/api/company/company'
+import {getUserList} from "@/api/company/companyUser";
 
 export default {
   name: "Logs",
@@ -154,9 +148,11 @@ export default {
 
       //是否
       sysCompanyOr:[],
+      companyUserList:[],
 
       // 答题日志表格数据
       logsList: [],
+      projectLists: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -201,6 +197,16 @@ export default {
     this.getDicts("sys_company_or").then(response => {
       this.sysCompanyOr = response.data;
     });
+    this.getDicts("sys_course_project").then(response => {
+      this.projectLists = response.data;
+    })
+
+    getUserList().then(res=>{
+      if(res.code === 200) {
+        this.companyUserList = res.data
+      }
+    })
+
     this.getList();
 
   },
@@ -217,10 +223,12 @@ export default {
 
     //查询小节
     courseChange(row){
-      videoList(row).then(response => {
+      if(row){
+        videoList(row).then(response => {
 
-        this.videoList=response.list
-      });
+          this.videoList=response.list
+        });
+      }
     },
 
     timeChange(){

+ 15 - 36
src/views/course/courseAnswerlogs/myCourseAnswerlogs.vue

@@ -1,43 +1,16 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="120px">
-      <el-form-item label="企微账号" prop="qwUserId">
-        <el-select v-model="queryParams.qwUserId" placeholder="企微账号" clearable size="small" @change="updateQwuser()">
+      <el-form-item label="项目" prop="courseId">
+        <el-select filterable  v-model="queryParams.project" placeholder="请选择项目"  clearable size="small">
           <el-option
-            v-for="dict in myQwUserList"
+            v-for="dict in projectLists"
             :key="dict.dictValue"
             :label="dict.dictLabel"
-            :value="dict.dictValue"
+            :value="parseInt(dict.dictValue)"
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="会员ID" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入会员ID"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="客户电话" prop="phone">
-        <el-input
-          v-model="queryParams.phone"
-          placeholder="请输入客户电话"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="加密电话" prop="phoneMk">
-        <el-input
-          v-model="queryParams.phoneMk"
-          placeholder="请输入用户加密电话"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="课程" prop="courseId">
         <el-select filterable  v-model="queryParams.courseId" placeholder="请选择课程"  clearable size="small" @change="courseChange(queryParams.courseId)">
           <el-option
@@ -96,7 +69,8 @@
 
     <el-table border v-loading="loading" :data="logsList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="小程序用户名" align="center" prop="userName" />
+      <el-table-column label="用户" align="center" prop="userName" />
+      <el-table-column label="项目" align="center" prop="projectName" />
       <el-table-column label="课程名称" align="center" prop="courseName" />
       <el-table-column label="小节名称" align="center" prop="videoName" />
       <el-table-column label="是否全部正确" align="center" prop="isRight" >
@@ -105,7 +79,6 @@
         </template>
       </el-table-column>
       <el-table-column label="销售名称" align="center" prop="companyUserName" />
-      <el-table-column label="企微员工名称" align="center" prop="qwUserName" />
       <el-table-column label="公司名称" align="center" prop="companyName" />
       <el-table-column label="创建时间" align="center" prop="createTime" />
     </el-table>
@@ -151,6 +124,7 @@ export default {
       courseLists:[],
       //小节
       videoList:[],
+      projectLists: [],
 
       //是否
       sysCompanyOr:[],
@@ -198,6 +172,9 @@ export default {
     this.getDicts("sys_company_or").then(response => {
       this.sysCompanyOr = response.data;
     });
+    this.getDicts("sys_course_project").then(response => {
+      this.projectLists = response.data;
+    })
     this.getList();
 
   },
@@ -214,10 +191,12 @@ export default {
 
     //查询小节
     courseChange(row){
-      videoList(row).then(response => {
+      if(row) {
+        videoList(row).then(response => {
 
-        this.videoList=response.list
-      });
+          this.videoList=response.list
+        });
+      }
     },
 
     updateQwuser(){

+ 1 - 1
src/views/course/courseWatchLog/statistics.vue

@@ -41,7 +41,7 @@
 
     <el-table border v-loading="loading" :data="courseWatchLogList" @selection-change="handleSelectionChange"  show-summary>
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="企微员工名称" align="center" prop="qwUserName" />
+      <el-table-column label="用户" align="center" prop="qwUserName" />
       <el-table-column label="发课时间" align="center" prop="createTime"/>
       <el-table-column label="课程名称" align="center" prop="courseName" />
       <el-table-column label="小节名称" align="center" prop="videoName" />