fix

src/api/index.js

@@ -32,6 +32,7 @@ export default {
     saveLearningProgress: 'nakadai/nakadai/curriculum/learning/progressprogress/save',
     updateLearningProgress: 'nakadai/nakadai/curriculum/learning/progressprogress/update',
     maximumPracticeScoreList: 'occupationlab/occupationlab/achievement/maximumPracticeScoreList',
+    getSandTableLastCache: `product/product/bank/operation/getSandTableLastCache`,
     // 课程笔记
     addNote: `nakadai/curriculumNotes/addNote`,
     curriculumNoteList: `nakadai/curriculumNotes/curriculumNoteList`,
@@ -105,6 +106,7 @@ export default {
     getAssessmentDetail: `occupationlab/occupationlab/achievement/getAssessmentDetail`, // 管理端考核成绩详情
     getPracticeDetail: `occupationlab/occupationlab/achievement/getPracticeDetail`, // 管理端练习成绩详情
     myClass: `occupationlab/occupationlab/achievement/myClass`, // 教师端:我的班级
+    allClassesInOurSchool: `occupationlab/occupationlab/achievement/allClassesInOurSchool`,
     deleteReportById: `occupationlab/occupationlab/achievement/deleteReportById`, // 批量删除成绩管理中的项目/批量删除成绩管理中的考核
     reportDetail: `occupationlab/occupationlab/achievement/reportDetail`, // 查看实验报告
     schoolCourseByAchievement: `nakadai/nakadai/curriculum/schoolCourseByAchievement`, // 获取学校购买订单后的课程

src/pages/achievement/info/course.vue

@@ -3,7 +3,7 @@
     <el-card shadow="hover"
              class="m-b-20 head-card">
       <div class="flex-between m-b-20">
-        <el-page-header @back="$router.back()"
+        <el-page-header @back="back"
                         :content="goodsName"></el-page-header>
       </div>
     </el-card>
@@ -57,11 +57,11 @@
         <div class="wrong">
           <div class="line">
             <span class="jud-name">错误率最高：{{ max.projectName }}</span>
-            <span>参加考试{{ max.numberOfParticipants || 0 }}人&emsp;｜&emsp;{{ curTab == 1 ? `共${max.itemErrorCount || 0}人做错，` : '' }}错误率{{ max.errorRate || 0 }}%</span>
+            <span>参加考试{{ permissions ? peopleNum || 0 : max.quantityAfterWeightRemoval }}人&emsp;｜&emsp;{{ curTab == 1 ? `共${max.itemErrorCount || 0}人做错，` : '' }}错误率{{ max.errorRate || 0 }}%</span>
           </div>
           <div class="line">
             <span class="jud-name">错误率最低：{{ min.projectName }}</span>
-            <span>参加考试{{ min.numberOfParticipants || 0 }}人&emsp;｜&emsp;{{ curTab == 1 ? `共${min.itemErrorCount || 0}人做错，` : '' }}错误率{{ min.errorRate || 0 }}%</span>
+            <span>参加考试{{ permissions ? peopleNum || 0 : min.quantityAfterWeightRemoval }}人&emsp;｜&emsp;{{ curTab == 1 ? `共${min.itemErrorCount || 0}人做错，` : '' }}错误率{{ min.errorRate || 0 }}%</span>
           </div>
         </div>
         <div class="chart"
@@ -699,7 +699,10 @@ export default {
         ]
       }
       echarts.init(document.querySelector(`#chart1`)).setOption(option)
-    }
+    },
+    back () {
+      location.href = this.$store.state.achievement.referrer
+    },
   }
 };
 </script>

src/pages/achievement/info/project.vue

@@ -2,7 +2,7 @@
   <div>
     <div class="back-wrap">
       <span class="back"
-            @click="$router.back()">返回 ></span>
+            @click="back">返回 ></span>
       <span class="name">{{ experimentalName }}</span>
     </div>
 
@@ -351,9 +351,14 @@ export default {
   methods: {
     // 获取班级下拉框数据
     async getClass () {
-      let { list } = this.permissions ?
+      let list
-        await this.$post(`${this.api.spliceClass}?assessmentId=${this.id}`) :
+      if (this.permissions) {
-        await this.$post(this.api.myClass)
+        const res = await this.$post(`${this.api.spliceClass}?assessmentId=${this.id}`)
+        list = res.list
+      } else {
+        const res = await this.$post(this.api.allClassesInOurSchool)
+        list = res.data
+      }
       // 去掉无指定范围
       const i = list.findIndex(e => e.id == 1)
       i !== -1 && list.splice(i, 1)
@@ -664,7 +669,10 @@ export default {
         ]
       }
       echarts.init(document.querySelector(`#chart1`)).setOption(option)
-    }
+    },
+    back () {
+      location.href = this.$store.state.achievement.referrer
+    },
   }
 };
 </script>

src/pages/achievement/list/course.vue

@@ -262,6 +262,7 @@ export default {
     },
     // 进入实验记录
     entry (row) {
+      this.$store.commit('achievement/setReferrer', location.href)
       this.$router.push(`course?id=${row.mallId}&curriculumName=${row.curriculumName}&cid=${row.cid}`)
     },
     handleCurrentChange (val) { // 切换页码

src/pages/achievement/list/project.vue

@@ -38,6 +38,7 @@
         <li v-show="projectPermissions === 1">
           <label>班级</label>
           <el-select v-model="classId"
+                     clearable
                      @change="classChange">
             <el-option v-for="item in classList"
                        :key="item.id"
@@ -360,6 +361,7 @@ export default {
     },
     // 进入实验记录
     entry (row) {
+      this.$store.commit('achievement/setReferrer', location.href)
       this.$router.push(`project?id=${row.assessmentId || row.projectId}&projectName=${row.projectName}&permissions=${row.permissions || 0}&mallId=${this.mallId}&classId=${row.classId || ''}`)
     },
     handleDelete (row) { // 删除

src/pages/match/add/step1.vue

@@ -696,7 +696,7 @@ export default {
       this.$parent.showLoad()
       delete form.publishStatus
       if (status === 1) form.publishStatus = 1
-      form.ztOpen = status ? 0 : 1 // 保存则禁用，发布则启用
+      form.ztOpen = form.id ? form.ztOpen : (status ? 0 : 1) // 保存则禁用，发布则启用
       form.releaseType = releaseType
 
       form.id = this.$route.query.id

src/pages/screen/index.vue

@@ -535,7 +535,7 @@ export default {
               name: '',
               type: 'pie',
               radius: [60, 80],
-              center: ['50%', '50%'],
+              center: ['50%', '60%'],
               label: {
                 normal: {
                   show: true,

src/pages/station/preview/index.vue

@@ -576,6 +576,7 @@ export default {
       this.teachingObjectives = data.teachingObjectives;
       this.assessmentList = data.assessmentConfig;
       this.systemIds = data.systemIds
+      this.queryProject()
       this.getStatus()
     },
     // 记录最近使用
@@ -913,43 +914,62 @@ export default {
       this.curProject = item.projectId
     },
     // 展示选择项目弹框
-    queryProject () {
+    showProjectDia () {
       this.projectVisible = true
-      this.loading = true
+    },
+    // 查询项目
+    queryProject () {
       this.$get(this.api.getProjectBySystemId, {
         systemId: this.systemIds,
         cId: this.courseId, // 课程id
         mallId: this.mallId,
         permissions: 0 // 0: 练习,1: 考核
       }).then(({ projects }) => {
-        this.loading = false
         this.projects = projects
       }).catch(res => { })
     },
     // 进入实验
-    entry () {
+    entryProject (projectId) {
-      // 查询上次做的项目
+      this.$confirm('是否要继续上次的实验？', '提示', {
-      this.$get(this.api.getTheMostRecentlyRunProject, {
+        confirmButtonText: '是',
-        cid: this.courseId
+        cancelButtonText: '否',
-      }).then(({ data }) => {
+        type: 'success'
-        // 返回了data则提示是否继续，否则，显示选择项目的弹框
+      }).then(() => {
-        if (data && data.length) {
+        this.curProject = projectId
-          this.$confirm('是否要继续上次的实验？', '提示', {
+        this.toSub()
-            confirmButtonText: '是',
+      }).catch(() => {
-            cancelButtonText: '否',
+        this.showProjectDia()
-            type: 'success'
-          }).then(() => {
-            this.toPython(data[0].projectId)
-          }).catch(() => {
-            this.queryProject()
-          })
-        } else {
-          this.queryProject()
-        }
-      }).catch(res => {
-        this.queryProject()
       })
     },
+    // 进入实验
+    entry () {
+      // 查询上次做的项目(python跟沙盘接口不一样)
+      if (this.systemIds.split(',').includes('19')) { // 沙盘
+        this.$post(`${this.api.getSandTableLastCache}?cid=${this.courseId}`).then(res => {
+          // 返回了data则提示是否继续，否则，显示选择项目的弹框
+          if (res.getLastCache) {
+            this.entryProject(+res.getLastCache)
+          } else {
+            this.showProjectDia()
+          }
+        }).catch(res => {
+          this.showProjectDia()
+        })
+      } else { // python
+        this.$get(this.api.getTheMostRecentlyRunProject, {
+          cid: this.courseId
+        }).then(({ data }) => {
+          // 返回了data则提示是否继续，否则，显示选择项目的弹框
+          if (data && data.length) {
+            this.entryProject(data[0].projectId)
+          } else {
+            this.showProjectDia()
+          }
+        }).catch(res => {
+          this.showProjectDia()
+        })
+      }
+    },
     // 进入python系统
     toPython (projectId) {
       const id = this.systemIds
@@ -979,8 +999,6 @@ export default {
     toSub () {
       const { systemId } = this.projects.find(e => e.projectId == this.curProject)
       let token = util.local.get(Setting.tokenKey);
-      let roleId = this.roleId == 4 ? 0 : 1;
-      let userName = window.btoa(encodeURIComponent(this.userName));
       if (systemId == 11) {
         // 银行系统
         sessionStorage.removeItem('projectId')

src/store/modules/achievement.js

@@ -5,11 +5,15 @@ export default {
     namespaced: true,
     state: {
       row: null,
+			referrer: '',
     },
     mutations: {
       setRow: (state, row) => {
         state.row = row
       },
+      setReferrer: (state, val) => {
+        state.referrer = val
+      },
     },
     actions: {