Merge branch 'zcwy_1127_teacher' into master_1202

src/views/course/Mylecnotes.vue

@@ -15,12 +15,9 @@
    <div style="margin-top:20px;">
      <el-table :data="pageData" border stripe>
          <el-table-column
-            label="课程编号"
-            prop="index"
-            width="100px">
-            <template v-slot="scope">
-              <span>{{scope.$index+1}}</span>
-            </template>
+         label="课程时间"
+         prop="courseTime"
+         width="200px">
          </el-table-column>
          <el-table-column
          label="课程名称"
@@ -28,57 +25,38 @@
          width="200px">
          </el-table-column>
          <el-table-column
-            label="课程日期"
-            prop="teachingDate"
-            width="200px">
+         label="开课场地"
+         prop="address"
+         width="240px">
          </el-table-column>
          <el-table-column
-            label="内容分类"
-            prop="courseTypeName"
-            width="200px">
-            </el-table-column>
-            <el-table-column label="课程类型" prop="type" width="120px">
-              <template v-slot="scope">
-                <span>{{
-                  {
-                    "0": "在线课",
-                    "1": "面授课",
-                    "2": "课程开发",
-                    "3": "作业员入模培训",
-                    "4": "其他",
-                  }[scope.row.type+'']
-                }}</span>
-              </template>
+         label="所属课程"
+         prop="parentCourse"
+         width="120px">
          </el-table-column>
          <el-table-column
-            label="学习总人数"
-            prop="studys"
-             width="120px"
+         label="所属项目"
+         prop="parentProject"
          ></el-table-column>
          <el-table-column
-            label="授课时长(分钟)"
-            prop="teaching"
-            width="120px"
+         label="所属路径"
+         prop="parentRoute"
+         width="200px"
+         ></el-table-column>
+         <el-table-column
+         label="学习总人数"
+         prop="studentNumber"
+         width="100px"
+         ></el-table-column>
+         <el-table-column
+         label="时长(分钟)"
+         width="100px"
+         prop="period"
          ></el-table-column>
          <el-table-column
          label="评分"
-            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"
+         prop="score"
           ></el-table-column>
          <el-table-column
          label="操作"
@@ -114,23 +92,23 @@
 import apiCourse from '../../api/boe/courseRecord.js';
 import { mapGetters } from 'vuex';
 export default {
-  data(){
+data(){
  return {
      pageData:[],
      keyword:'',
      pageInfo:{},
  }
-  },
+},
 
-  mounted() {
+mounted() {
  this.recordList(1);
 
-  },
-  computed: {
+},
+computed: {
  ...mapGetters(['userInfo'])
-  },
+},
 
-  methods: {
+methods: {
 
    // 导出所有记录
    exportFile(){
@@ -187,16 +165,14 @@ export default {
      let req = {
      //     userId:"6B049FAF-C314-7CCF-0D28-0D23F4C42531",
          userId: this.userInfo.sysId,
-            courseName:this.keyword,
+         keyword:this.keyword,
          page:pageIndex,
          pageSize:10
      }
-        apiCourse.getListByToken(req).then(res=>{
-          console.log(res,'resssssssssssss')
-          if(res.code == 200) {
-            this.pageData = res.data.records;
-            console.log(this.pageData,'pageData')
-            this.pageInfo.total = Number(20);
+     apiCourse.courseRecordList(req).then(res=>{
+       if(res.status == 200) {
+         this.pageData = res.result.list;
+         this.pageInfo = res.result.pageInfo;
        } else {
           this.$message({
            type: 'error',
@@ -217,14 +193,14 @@ export default {
      this.recordList(this.pageInfo.pageIndex);
    },
 
-  },
+},
 
 }
 </script>
 
 <style lang="scss" scoped>
 .Export{
-  display: flex;
-  padding-top: 10px;
+display: flex;
+padding-top: 10px;
 }
 </style>