fix

src/api/index.js

@@ -110,6 +110,7 @@ export default {
   schoolCourse: `nakadai/nakadai/curriculum/schoolCourse`, // 获取学校购买订单后的课程
   selfBuildCourse: `nakadai/nakadai/curriculum/selfBuildCourse`,
   getSchoolEffectiveCourse: `nakadai/nakadai/curriculum/getSchoolEffectiveCourse`,
+  getchoolBuiltCoursesList: `nakadai/nakadai/curriculum/getchoolBuiltCoursesList`,
   projectListByCourseId: `occupationlab/occupationlab/projectManage/getSchoolProjectByAssessent`, // 根据课程id获取实训项目列表
   getProjectOrExamPaperByAssessment: `occupationlab/occupationlab/projectManage/getProjectOrExamPaperByAssessment`,
 

src/pages/achievement/list/course.vue

@@ -15,6 +15,7 @@
         </template>
       </el-table-column>
       <el-table-column prop="curriculumName" label="课程" align="center" min-width="200"></el-table-column>
+      <el-table-column prop="origin" label="类型" align="center" width="120"></el-table-column>
       <!-- <el-table-column prop="className"
                        label="班级"
                        align="center"

src/pages/achievement/list/index.vue

@@ -6,7 +6,7 @@
     </div>
     <div class="page-content">
       <Course v-if="active == 'tab1'" />
-      <Project v-if="active == 'tab2' || active == 'tab3'" />
+      <Project v-if="active == 'tab2' || active == 'tab3'" ref="project" />
     </div>
   </div>
 </template>
@@ -51,6 +51,9 @@ export default {
         }
       })
       this.active = i
+
+      const el = this.$refs.project
+      el && el.getCourse && el.getCourse()
     },
     initTabs () {
       const { btns } = this

src/pages/achievement/list/project.vue

@@ -29,9 +29,8 @@
         </li>
         <li>
           <label>课程</label>
-          <el-select v-model="form.mallId" @change="initData">
-            <el-option v-for="(item, i) in curs" :key="i" :label="item.curriculumName" :value="item.mallId"
-              @change="curChange"></el-option>
+          <el-select v-model="form.curriculumId" @change="initData">
+            <el-option v-for="(item, i) in curs" :key="i" :label="item.curriculumName" :value="item.cid"></el-option>
           </el-select>
         </li>
         <li>
@@ -63,6 +62,7 @@
         </el-table-column>
       </template>
       <el-table-column prop="projectName" label="项目名称" align="center" min-width="180"></el-table-column>
+      <!-- <el-table-column prop="origin" label="类型" align="center" width="120"></el-table-column> -->
       <el-table-column prop="projectPermissions" label="分类" align="center" width="100">
         <template slot-scope="scope">
           {{ form.permissions ? '考核' : '练习' }}
@@ -96,7 +96,7 @@ export default {
     return {
       form: {
         classId: +this.$route.query.classId || '',
-        mallId: +this.$route.query.mallId || '',
+        curriculumId: +this.$route.query.curriculumId || '',
         permissions: this.$route.query.permissions ? +this.$route.query.permissions : 0,
         month: +this.$route.query.month || '',
         startTime: +this.$route.query.startTime || '',
@@ -183,21 +183,18 @@ export default {
 
     // 获取课程
     async getCourse () {
-      const { data } = await this.$get(this.api.getSchoolEffectiveCourse)
-      this.curs = data
-      this.form.mallId = this.form.mallId || data[0].mallId
-      this.getData();
-    },
-    // 课程选择回调
-    curChange (id) {
-      this.$router.push({
-        path: 'list',
-        query: {
-          ...this.$route.query,
-          mallId: id
-        }
-      })
-      this.initData()
+      if (this.$parent.active === 'tab2') {
+        const { data } = await this.$get(this.api.getSchoolEffectiveCourse)
+        this.curs = data
+        this.form.curriculumId = this.form.curriculumId || data[0].cid
+      } else {
+        const res = await this.$get(this.api.getchoolBuiltCoursesList)
+        const data = res.schoolCourse
+        this.curs = data
+        this.form.curriculumId = this.form.curriculumId || data[0].cid
+      }
+
+      this.getData()
     },
 
     getClassData () { // 获取班级下拉框数据
@@ -207,12 +204,12 @@ export default {
     },
     getData () {
       this.loading = true
-      const { mallId, permissions } = this.form
-      const cur = this.curs.find(e => e.mallId == mallId) || {}
+      const { curriculumId, permissions } = this.form
+      const cur = this.curs.find(e => e.cid == curriculumId) || {}
       let data = {
         ...this.form,
-        curriculumId: cur.cid,
-        systemId: cur.systemId,
+        mallId: cur.mallId || '',
+        systemId: cur.systemId || '',
         pageNum: this.page,
         pageSize: this.pageSize,
       };
@@ -250,10 +247,10 @@ export default {
     },
     // 进入实验记录
     entry (row) {
-      const { mallId } = this.form
-      const cur = this.curs.find(e => e.mallId == mallId) || {}
+      const { curriculumId } = this.form
+      const cur = this.curs.find(e => e.cid == curriculumId) || {}
       this.$store.commit('achievement/setReferrer', `${this.$route.path}?${qs.stringify(this.form)}&page=${this.page}`)
-      this.$router.push(`project?id=${row.assessmentId || row.projectId || ''}&paperId=${row.paperId || ''}&cid=${cur.cid}&projectName=${row.projectName || ''}&permissions=${this.form.permissions}&mallId=${this.form.mallId}&classId=${row.classId || ''}`)
+      this.$router.push(`project?id=${row.assessmentId || row.projectId || ''}&paperId=${row.paperId || ''}&cid=${curriculumId}&projectName=${row.projectName || ''}&permissions=${this.form.permissions}&mallId=${cur.mallId || ''}&classId=${row.classId || ''}`)
     },
     handleDelete (row) { // 删除
       this.$confirm("该项目下的所有成绩报告将会删除，是否继续？", "提示", {

src/pages/lesson/detail/index.vue

@@ -800,8 +800,9 @@ export default {
       if (step === 1) {
         this.$refs.form.validate(async (valid) => {
           if (valid) {
-            const form = JSON.parse(JSON.stringify(this.form))
+            const form = _.cloneDeep(this.form)
             form.platformId = Setting.platformId
+            form.cid = cid
             this.submiting = true
             const load = this.$loading({
               lock: true,

src/pages/match/add/set.vue

@@ -133,7 +133,7 @@
         </el-table-column>
         <el-table-column prop="founder" label="创建人" align="center">
           <template slot-scope="scope">
-            {{ scope.row.founder ? '老师创建' : '系统内置' }}
+            {{ scope.row.founder ? '老师创建' : '系统' }}
           </template>
         </el-table-column>
         <el-table-column prop="createTime" label="创建时间" align="center"></el-table-column>
@@ -222,7 +222,7 @@ export default {
         res.data.map(e => {
           e.id = e.mallId
           e.label = e.curriculumName
-          e.children = data.filter(n => e.systemId.split(',').includes(n.id + '')) // 筛选出该课程下的系统
+          if (e.systemId) e.children = data.filter(n => e.systemId.split(',').includes(n.id + '')) // 筛选出该课程下的系统
         })
         this.curs = res.data
 

src/pages/project/list/index.vue

@@ -28,13 +28,13 @@
                 :value="item.value"></el-option>
             </el-select>
           </li>
-          <li>
+          <!-- <li>
             <label>类型</label>
             <el-radio-group v-model="form.type" @change="initData">
               <el-radio v-for="(item, i) in projectType" :key="i" :label="item.id" border>{{ item.name
                 }}</el-radio>
             </el-radio-group>
-          </li>
+          </li> -->
           <li>
             <label>课程</label>
             <el-cascader v-model="cid" :options="curs" :props="{ checkStrictly: true, value: 'id' }"

src/pages/station/preview/index.vue

@@ -941,7 +941,7 @@ export default {
     async toSub () {
       // 理论试卷
       if (this.isTheory) {
-        window.open(this.$router.resolve(`/theoryExam?paperId=${this.curPaper}&cid=${this.courseId}&mallId=${this.mallId}&curriculumName=${this.curriculumName}`).href)
+        window.open(this.$router.resolve(`/theoryExam?paperId=${this.curPaper}&cid=${this.courseId}&mallId=${this.mallId}&curriculumName=${this.curriculumName}`).href, 'theory')
       } else {
         // 实训
         let curProject = this.projects.find(e => e.projectId == this.curProject)