fix

src/pages/achievement/list/index.vue

@@ -48,16 +48,12 @@
         </li>
         <li>
           <label>课程</label>
-          <el-select v-model="curriculumId"
+          <el-cascader v-model="mallIds"
-                     @change="curriculumChange">
+                       :options="curs"
-            <el-option label="不限"
+                       :props="{ checkStrictly: true, value: 'id' }"
-                       value=""></el-option>
+                       popper-class="course-cas"
-            <el-option v-for="item in curriculumList"
+                       @expand-change="curChange"
-                       :key="item.cid"
+                       @change="curChange"></el-cascader>
-                       :label="item.curriculumName"
-                       :value="item.cid">
-            </el-option>
-          </el-select>
         </li>
         <li>
           <el-input placeholder="请输入考核或项目名称"
@@ -165,9 +161,12 @@ export default {
     return {
       classId: this.$route.query.class ? +this.$route.query.class : '',
       classList: [],
-      curriculumId: this.$route.query.curriculum ? +this.$route.query.curriculum : '',
+      mallId: this.$route.query.mallId ? +this.$route.query.mallId : '',
+      systemId: this.$route.query.systemId ? +this.$route.query.systemId : '',
       curriculumList: [],
       projectPermissions: this.$route.query.per ? +this.$route.query.per : 0,
+      mallIds: [],
+      curs: [],
       keyword: "",
       searchTimer: null,
       startingtime: "",
@@ -231,20 +230,48 @@ export default {
     }
   },
   mounted () {
-    this.getschoolCourse();
+    this.getClassData()
-    this.getClassData();
+    this.getCourse()
   },
   methods: {
     pickerInput () {
       this.month = '6'
     },
-    getschoolCourse () { // 获取课程下拉框数据
+
-      this.$get(this.api.schoolCourseByAchievement).then(res => {
+    // 获取课程
-        this.curriculumList = res.data;
+    async getCourse () {
+      const { data } = await this.$get(this.api.getSystemIdBySchool)
+      const res = await this.$get(this.api.getSchoolEffectiveCourse)
+      if (res.data.length) {
+        res.data.map(e => {
+          e.id = e.mallId
+          e.label = e.curriculumName
+          e.children = data.filter(n => e.systemId.split(',').includes(n.id + '')) // 筛选出该课程下的系统
+        })
+        this.curs = res.data
+        this.mallIds = [this.mallId || res.data[0].mallId, this.systemId || data[0].id]
         this.getData();
-      }).catch(err => {
+        console.log("🚀 ~ file: index.vue:431 ~ getSystemData ~ res.data:", this.mallIds)
-      });
+      }
+    },
+    // 课程选择回调
+    curChange (val) {
+      const id = val[0]
+      if (val.length === 1) {
+        // 如果选择的是课程，则默认选中下面第一个系统
+        this.mallIds = [id, this.curs.find(e => e.id == id).children[0].id]
+      }
+      this.$router.push({
+        path: 'list',
+        query: {
+          ...this.$route.query,
+          mallId: this.mallIds[0],
+          systemId: this.mallIds[1],
+        }
+      })
+      this.getData()
     },
+
     getClassData () { // 获取班级下拉框数据
       this.$post(this.api.myClass).then(res => {
         this.classList = res.list;
@@ -256,19 +283,20 @@ export default {
         background: "rgba(255,255,255,.6)"
       });
       const per = this.projectPermissions
-      const curriculumId = this.curriculumId
+      const { mallIds } = this
-      const curr = this.curriculumList.find(e => e.cid == curriculumId)
+      const cur = this.curs.find(e => e.mallId == mallIds[0])
       let data = {
         classId: this.classId,
         permissions: per,
-        curriculumId,
+        curriculumId: cur.cid,
+        mallId: mallIds[0],
         keyWord: this.keyword,
         startTime: this.startingtime,
         endTime: this.endTime,
         month: this.month,
         pageNum: this.page,
         pageSize: this.pageSize,
-        systemId: curr ? curr.systemId : ''
+        systemId: mallIds[1]
       };
       this.$post(this.api.getAchievementInfo, data).then(res => {
         let list = []

src/pages/achievement/show/index.vue

@@ -146,7 +146,8 @@
                      v-html="scope.row.referenceAnswer"></div>
               </template>
             </el-table-column>
-            <el-table-column prop="userAnswer"
+            <el-table-column v-if="!project"
+                             prop="userAnswer"
                              label="学生答案">
               <template slot-scope="scope">
                 <div v-if='scope.row.lcRuleRecords'>

src/pages/match/add/set.vue

@@ -38,14 +38,12 @@
       <div>
         <p class="m-b-20">课程</p>
         <div class="inline-input">
-          <el-select v-model="form.cid"
+          <el-cascader v-model="mallIds"
-                     @change="courseChange">
+                       :options="curs"
-            <el-option v-for="item in curriculumList"
+                       :props="{ checkStrictly: true, value: 'id' }"
-                       :key="item.cid"
+                       popper-class="course-cas"
-                       :label="item.curriculumName"
+                       @expand-change="curChange"
-                       :value="item.cid">
+                       @change="curChange"></el-cascader>
-            </el-option>
-          </el-select>
         </div>
       </div>
     </el-card>
@@ -131,6 +129,8 @@ export default {
     return {
       loadIns: null,
       curriculumList: [],
+      curs: [],
+      mallIds: [],
       keyword: '',
       projects: [],
       page: 1,
@@ -157,28 +157,47 @@ export default {
     }
   },
   mounted () {
-    this.getCourse()
+    this.getSystemData()
   },
   methods: {
     // 获取课程
-    getCourse () {
+    async getSystemData () {
-      this.loadIns = Loading.service()
+      const { data } = await this.$get(this.api.getSystemIdBySchool)
-      this.$get(this.api.curriculumList).then(({ data }) => {
+      const res = await this.$get(this.api.getSchoolEffectiveCourse)
-        const list = data
+      const { mallId, cid, systemId } = this.form
-        this.curriculumList = data
+      if (res.data.length) {
-        if (!this.form.cid && list.length) this.form.cid = list[0].cid
+        res.data.map(e => {
-        this.courseChange()
+          e.id = e.mallId
-      }).catch(err => {
+          e.label = e.curriculumName
-        this.loadIns.close()
+          e.children = data.filter(n => e.systemId.split(',').includes(n.id + '')) // 筛选出该课程下的系统
-      });
+        })
+        this.curs = res.data
+
+        // 查询项目
+        const first = res.data[0]
+        this.mallIds = [mallId || first.mallId, systemId || data[0].id]
+        this.form.cid = cid || first.cid
+        this.sysId = systemId || first.systemId
+        this.loadIns = Loading.service()
+        this.getProject()
+      }
     },
     // 课程选择回调
-    courseChange (val) {
+    curChange (val) {
-      const { systemId } = this.curriculumList.find(e => e.cid == this.form.cid)
+      const id = val[0]
-      this.sysId = systemId
+      const item = this.curs.find(e => e.id == id)
-      if (val) this.loadIns = Loading.service()
+      if (val.length === 1) {
+        // 如果选择的是课程，则默认选中下面第一个系统
+        this.mallIds = [id, item.children[0].id]
+      }
+      this.form.mallId = id
+      this.form.cid = item.cid
+      this.sysId = this.mallIds[1]
+      this.loadIns = Loading.service()
       this.getProject()
     },
+
+
     // 查询项目
     getProject () {
       this.$post(this.api.getProjectAssessmentByCompetition, {

src/pages/product/show/index.vue

@@ -88,7 +88,7 @@
                   @click="toTrail">试用体验</button>
           <button v-else-if="isCourse || withLink"
                   class="btn entry"
-                  @click="toStation">进入实验</button>
+                  @click="toStation">进入{{ isDataforward ? '系统' : '实验' }}</button>
           <button v-else-if="isValueModule"
                   class="btn entry"
                   @click="toSystem">进入系统</button>
@@ -268,7 +268,13 @@ export default {
       let id = this.form.classificationIds
       if (id) return id[0] == 3
       return false
-    }
+    },
+    // 数据前瞻
+    isDataforward () {
+      let id = this.form.classificationIds
+      if (id) return id[0] == 5
+      return false
+    },
   },
   mounted () {
     this.getData()

src/pages/station/preview/index.vue

@@ -591,7 +591,7 @@ export default {
     },
     // 获取学习进度
     async getProgress () {
-      let res = await this.$post(`${this.api.courseLearningProgress}?courseId=${this.courseId}&systemId=${this.systemIds}`);
+      let res = await this.$post(`${this.api.courseLearningProgress}?courseId=${this.courseId}&systemId=${this.systemIds}&mallId=${this.mallId}`);
       this.progressList = res.list
       if (res.list.length) this.archProject = res.list[0].projectId
       this.maximumScores.length || this.getMaximumScore()
@@ -907,6 +907,7 @@ export default {
       this.$get(this.api.getProjectBySystemId, {
         systemId: this.systemIds,
         cId: this.courseId, // 课程id
+        mallId: this.mallId,
         permissions: 0 // 0: 练习,1: 考核
       }).then(({ projects }) => {
         this.loading = false
@@ -974,7 +975,7 @@ export default {
         location.href = `${Setting.bankPath}/#/index/list?curriculumName=${this.curriculumName}&token=${token}&cid=${this.courseId}&mallId=${this.mallId}&systemId=${this.systemIds}&projectId=${this.curProject}&assessmentId=&classId=&stopTime=&test=true&manager=1`
       } else if (systemId == 12) {
         // 众筹系统
-        window.open(`http://120.78.139.126:8879?systemId=${systemId}&courseId=${this.courseId}&projectId=${this.curProject}&token=${token}&userId=${this.userId}&classId=1`);
+        window.open(`http://120.78.139.126:8879?systemId=${systemId}&courseId=${this.courseId}&projectId=${this.curProject}&token=${token}&userId=${this.userId}&classId=1&mallId=${this.mallId}`);
       } else if (systemId == 21) {
         window.open(`http://121.37.29.24:80/yyyflogin?userId=${this.userId}&userName=${userName}&userType=${roleId}&reqType=1&reqId=3989a0ad671849b99dcbdcc208782333&caseId=9681f86902314b10bc752909121f9ab9&authorization=87DIVy348Oxzj3ha&classId=1876&courserId=7ff5d4715b114b7398b6f26c20fac460`);
       } else if (systemId == 22) {

src/setting.js

@@ -26,7 +26,7 @@ if (isPro) {
     uploadURL = `http://121.37.12.51/`
     host = "http://121.37.12.51/"; // 中台测试服
     // host = 'https://www.occupationlab.com/' // 正式服
-    host = "http://192.168.31.152:9000/"; // 榕
+    // host = "http://192.168.31.152:9000/"; // 榕
     // host = 'http://192.168.31.51:9000/'; // 赓
 }