Merge branch 'zcwy_1127_teacher' into master_1202

src/api/boe/courseRecord.js

@@ -1,5 +1,6 @@
 /**我的授课记录*/
 import ajax from '@/api/boe/boeApiAjax.js'
+import ajax2 from '@/api/unionAjax.js'
 import axios from 'axios'
 import { getToken } from '@/utils/token'
 const baseURL = process.env.VUE_APP_BOE_BASE_API;
@@ -60,12 +61,15 @@ const exportStudentOfTearcher = function(userId) {
 const courseRecordList = function(data) {
     return ajax.postJson('/b1/system/teacher/teacher-course-list',data);
 }
-
+const getListByToken = function(data) {
+  return ajax2.get('/manageApi',`/admin/teacherRecord/getListByToken?courseName=${data.courseName}&page=${data.page}&pageSize=${data.pageSize}`);
+}
 
 
 export default {
     courseRecordExport,
     courseRecordList,
+    getListByToken,
     exportStudentOfCourse,
     exportStudentOfTearcher
 

src/views/course/Mylecnotes.vue

@@ -14,10 +14,13 @@
       </div>
       <div style="margin-top:20px;">
         <el-table :data="pageData" border stripe>
-            <el-table-column
+          <el-table-column
-            label="课程时间"
+            label="课程编号"
-            prop="courseTime"
+            prop="index"
-            width="200px">
+            width="100px">
+            <template v-slot="scope">
+              <span>{{scope.$index+1}}</span>
+            </template>
             </el-table-column>
             <el-table-column
             label="课程名称"
@@ -25,38 +28,57 @@
             width="200px">
             </el-table-column>
             <el-table-column
-            label="开课场地"
+            label="课程日期"
-            prop="address"
+            prop="teachingDate"
-            width="240px">
+            width="200px">
+          </el-table-column>
+            <el-table-column
+            label="内容分类"
+            prop="courseTypeName"
+            width="200px">
             </el-table-column>
-            <el-table-column
+            <el-table-column label="课程类型" prop="type" width="120px">
-            label="所属课程"
+              <template v-slot="scope">
-            prop="parentCourse"
+                <span>{{
-            width="120px">
+                  {
+                    "0": "在线课",
+                    "1": "面授课",
+                    "2": "课程开发",
+                    "3": "作业员入模培训",
+                    "4": "其他",
+                  }[scope.row.type+'']
+                }}</span>
+              </template>
             </el-table-column>
             <el-table-column
-            label="所属项目"
-            prop="parentProject"
-            ></el-table-column>
-            <el-table-column
-            label="所属路径"
-            prop="parentRoute"
-            width="200px"
-            ></el-table-column>
-            <el-table-column
             label="学习总人数"
-            prop="studentNumber"
+            prop="studys"
-            width="100px"
+             width="120px"
             ></el-table-column>
             <el-table-column
-            label="时长(分钟)"
+            label="授课时长(分钟)"
-            width="100px"
+            prop="teaching"
-            prop="period"
+            width="120px"
             ></el-table-column>
             <el-table-column
             label="评分"
-            width="100px"
             prop="score"
+            width="100px"
+            ></el-table-column>
+            <el-table-column label="开课状态" width="100px" prop="courseStatus">
+              <template v-slot="scope">
+                <span>{{
+                  {
+                    "0": "未开课",
+                    "1": "已开课",
+                  }[scope.row.courseStatus+'']
+                }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column
+            label="备注"
+            width="200px"
+            prop="remark"
              ></el-table-column>
             <el-table-column
             label="操作"
@@ -165,14 +187,16 @@ export default {
         let req = {
         //     userId:"6B049FAF-C314-7CCF-0D28-0D23F4C42531",
             userId: this.userInfo.sysId,
-            keyword:this.keyword,
+            courseName:this.keyword,
             page:pageIndex,
             pageSize:10
         }
-        apiCourse.courseRecordList(req).then(res=>{
+        apiCourse.getListByToken(req).then(res=>{
-          if(res.status == 200) {
+          console.log(res,'resssssssssssss')
-            this.pageData = res.result.list;
+          if(res.code == 200) {
-            this.pageInfo = res.result.pageInfo;
+            this.pageData = res.data.records;
+            console.log(this.pageData,'pageData')
+            this.pageInfo.total = Number(20);
           } else {
              this.$message({
               type: 'error',