diff --git a/src/api/index.js b/src/api/index.js index e1487ee..4bf39ed 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -19,6 +19,8 @@ export default { curriculumDetail: `nakadai/nakadai/curriculum/curriculumDetail`, // 课程详情 curriculumChapter: `nakadai/nakadai/curriculum/chapter/queryChaptersAndSubsections`, // 根据课程id查询章节小节,树状结构 curriculumGetSubsection: `nakadai/nakadai/curriculum/subsection/getSubsection`, // 根据小节id获取预览文件地址 + getProjectBySystemId: 'occupationlab/occupationlab/projectManage/getProjectBySystemId', + getTheMostRecentlyRunProject: 'python/python/getTheMostRecentlyRunProject', // 能力测评 canExperiment: `occupationlab/occupationlab/evaluationrecord/can_experiment`, // 查询是否能够开启实验 diff --git a/src/assets/img/project.png b/src/assets/img/project.png new file mode 100644 index 0000000..d3df1d1 Binary files /dev/null and b/src/assets/img/project.png differ diff --git a/src/components/log/index.vue b/src/components/log/index.vue index 96d0c9e..722fa0b 100644 --- a/src/components/log/index.vue +++ b/src/components/log/index.vue @@ -2,7 +2,7 @@
- {{ item.updateTime }} + {{ item.createTime }}
{{ item.versionName }}
diff --git a/src/pages/record/list/practice.vue b/src/pages/record/list/practice.vue index c1ffa0c..082dcc1 100644 --- a/src/pages/record/list/practice.vue +++ b/src/pages/record/list/practice.vue @@ -68,7 +68,7 @@ export default { }, toDetails(row) { this.setCurriculum(this.curriculumId) - this.$router.push(`/record/details?curriculumId=${this.$parent.curriculumList.find(e => e.curriculumName === row.curriculumName).cid}&projectId=${row.projectId}`); + this.$router.push(`/record/details?curriculumId=${row.curriculumId}&projectId=${row.projectId}`); } } }; diff --git a/src/pages/station/preview/index.vue b/src/pages/station/preview/index.vue index b6fc643..1edd691 100644 --- a/src/pages/station/preview/index.vue +++ b/src/pages/station/preview/index.vue @@ -43,7 +43,7 @@
- +

{{ courseName }}

@@ -78,6 +78,23 @@

{{ teachingObjectives }}

+ + + +
+
    +
  • + + {{ item.projectName }} +
    • +
+
+ + + 取 消 + 确 定 + +
@@ -124,7 +141,11 @@ export default { currentPage: 0, // pdf文件页码 pageCount: 0, // pdf文件总页数 fileType: "pdf", // 文件类型 - desShrink: false + desShrink: false, + projectVisible: false, + projects: [], + loading: false, + curProject: '' }; }, computed: { @@ -278,35 +299,77 @@ export default { loadPdfHandler(e) { this.currentPage = 1; }, - goSystem() { // 进入实验系统 + // 选择项目 + selectProject(item) { + this.curProject = item.projectId + }, + queryProject() { + this.projectVisible = true + this.loading = true + this.$get(this.api.getProjectBySystemId, { + systemId: this.systemIds, + cId: this.courseId, // 课程id + permissions: 0 // 0: 练习,1: 考核 + }).then(({ projects }) => { + this.loading = false + this.projects = projects + }).catch(res => {}) + }, + // 进入实验 + entry() { + this.$get(this.api.getTheMostRecentlyRunProject).then(({ data }) => { + if (data.length) { + this.$confirm('是否要继续上次的实验？', '提示', { + confirmButtonText: '是', + cancelButtonText: '否', + type: 'success' + }).then(() => { + this.setParam(data[0].projectId) + }).catch(() => { + this.queryProject() + }) + } else { + this.setParam(0) + } + }).catch(res => { + this.queryProject() + }) + }, + setParam(projectId) { + const id = this.systemIds + let token = util.local.get(Setting.tokenKey); + util.cookies.set("assessmentId", "", -1); + util.cookies.set("startTime", "", -1); + util.cookies.set("stopTime", "", -1); + projectId ? util.cookies.set("projectId", projectId) : util.cookies.set("projectId", '', -1) + util.cookies.set("token", token); + util.cookies.set("courseId", this.courseId); + util.cookies.set("curriculumName", escape(this.curriculumName)); + util.cookies.set("systemId", id); + // 8个python子系统都跳这个地址，子系统会通过cookie里的systemId识别展示哪套系统 + location.href = process.env.NODE_ENV === 'development' ? + `http://${location.hostname}:8080/#/` : + Setting.isPro ? + 'https://www.occupationlab.com/pyTrials' : + `${location.origin}/pyTrials` + }, + // 进入子系统 + toSub() { const id = this.systemIds + const systemId = this.projects.find(e => e.projectId == this.curProject).systemId let token = util.local.get(Setting.tokenKey); let roleId = this.roleId == 4 ? 0 : 1; let userName = window.btoa(encodeURIComponent(this.userName)); - if (id == 11) { + if (systemId == 11) { // 银行系统 location.href = `${Setting.systemPath}/#/index/list?token=${token}&cid=${this.courseId}&systemId=${this.assessmentList[0].systemId}&projectId=&assessmentId=&classId=&stopTime=&test=true` - } else if (id == 21) { + } 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 (id == 22) { + } else if (systemId == 22) { window.open(`https://danbao.czcyedu.com/#/loginFromYyyf?userId=${this.userId}&userName=${userName}&userType=${roleId}&reqType=1&reqId=eb7d8355119d449184c548b07dc01ed9&caseId=1198241070647873538&authorization=87DIVy348Oxzj3ha&classId=1876&courserId=faaedd82adb9444285a5785e4a3dd4f9`); } else { - // python系统 - util.cookies.set("assessmentId", "", -1); - util.cookies.set("projectId", "", -1); - util.cookies.set("startTime", "", -1); - util.cookies.set("stopTime", "", -1); - util.cookies.set("token", token); - util.cookies.set("courseId", this.courseId); - util.cookies.set("curriculumName", escape(this.curriculumName)); - util.cookies.set("systemId", id); - // 8个python子系统都跳这个地址，子系统会通过cookie里的systemId识别展示哪套系统 - location.href = process.env.NODE_ENV === 'development' ? - `http://${location.hostname}:8080/#/` : - Setting.isPro ? - 'https://www.occupationlab.com/pyTrials' : - `${location.origin}/pyTrials` + this.setParam(this.curProject) } } } @@ -547,6 +610,52 @@ $height: 700px; margin: 0 auto; } } +/deep/.project-dia { + .el-dialog__body { + padding: 28px 32px; + } +} +.project { + .title { + font-size: 14px; + color: #333; + } + .projects { + display: flex; + flex-wrap: wrap; + li { + display: inline-flex; + justify-content: center; + align-items: center; + width: 240px; + padding: 16px 0; + margin: 0 20px 20px 0; + background-color: #F6F8FA; + border-radius: 16px; + cursor: pointer; + &:hover { + span { + color: #007EFF; + } + } + &:nth-child(3n) { + margin-right: 0; + } + &.active { + background-color: #f2f7ff; + span { + color: #3988ff; + } + } + } + span { + max-width: 140px; + margin-left: 14px; + font-size: 14px; + color: #333; + } + } +} @media (max-width: 1430px) { .wrap { padding: 12px 100px 20px;