From 708919ee2ed151563adfaef1336efd1741541dc3 Mon Sep 17 00:00:00 2001 From: e <2432808546@qq.com> Date: Fri, 3 Dec 2021 10:10:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index.js | 4 ++-- src/pages/ass/list/index.vue | 14 +++++++------- src/pages/record/details/index.vue | 4 ++-- src/pages/record/list/index.vue | 25 +++++++++++++++++++++---- 4 files changed, 32 insertions(+), 15 deletions(-) diff --git a/src/api/index.js b/src/api/index.js index a3c42b5..0aa8ab6 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -36,8 +36,8 @@ export default { experimentOverview: `${host}occupationlab/achievement/experimentOverview`, //实验概览 queryAssessmentByStudent: `${host}occupationlab/achievement/queryAssessmentByStudent`, //学生端考核成绩 queryPracticeByStudent: `${host}occupationlab/achievement/queryPracticeByStudent`, //学生端练习成绩 - exportAssessmentInfo: `${host}occupationlab/achievement/exportAssessmentInfo`, // 批量导出考核成绩 - exportPracticeInfo: `${host}occupationlab/achievement/exportPracticeInfo`, // 批量导出练习成绩 + exportAssessmentByStudent: `${host}occupationlab/achievement/exportAssessmentByStudent`, // 批量导出考核成绩 + exportPracticeByStudent: `${host}occupationlab/achievement/exportPracticeByStudent`, // 批量导出练习成绩 practiceByStudentDetail: `${host}occupationlab/achievement/practiceByStudentDetail`, // 学生端练习实验情况 exportPracticeByStudentDetail: `${host}occupationlab/achievement/exportPracticeByStudentDetail`, // 导出学生端练习实验情况 reportDetail: `${host}occupationlab/achievement/reportDetail`, // 成绩报告详情 diff --git a/src/pages/ass/list/index.vue b/src/pages/ass/list/index.vue index 56556bb..5d9fb7c 100644 --- a/src/pages/ass/list/index.vue +++ b/src/pages/ass/list/index.vue @@ -68,8 +68,8 @@ {{ scope.$index + (page - 1) * pageSize + 1 }} - - + + @@ -94,12 +94,12 @@ @@ -396,7 +396,7 @@ export default { } }, show(row) { // 查看成绩 - this.$router.push(`/record/list?id=${row.id}&recordId=${row.recordid}&reportId=${row.reportId}`); + this.$router.push(`/record/show?id=${row.id}&recordId=${row.recordid}&reportId=${row.reportId}`); }, saveIc() { if (!this.invitationCode) return util.warningMsg("请输入邀请码"); diff --git a/src/pages/record/details/index.vue b/src/pages/record/details/index.vue index a7689e0..685ee97 100644 --- a/src/pages/record/details/index.vue +++ b/src/pages/record/details/index.vue @@ -102,7 +102,7 @@ export default { }, responseType: 'blob' }).then((res) => { - util.downloadFileDirect(`按数据库统计使用概况导出.xls`,new Blob([res.data])) + util.downloadFileDirect(`学生练习实验情况.xls`,new Blob([res.data])) }).catch(res => {}) // location.href = this.$get(`${this.api.exportPracticeByStudentDetail}?projectId=${this.projectId}&token=${this.token}&ids=${ids.toString()}`); } else { @@ -112,7 +112,7 @@ export default { }, responseType: 'blob' }).then((res) => { - util.downloadFileDirect(`按数据库统计使用概况导出.xls`,new Blob([res.data])) + util.downloadFileDirect(`学生练习实验情况.xls`,new Blob([res.data])) }).catch(res => {}) // location.href = `${this.api.exportPracticeByStudentDetail}?projectId=${this.projectId}&token=${this.token}&ids=`; } diff --git a/src/pages/record/list/index.vue b/src/pages/record/list/index.vue index b642715..fb99970 100644 --- a/src/pages/record/list/index.vue +++ b/src/pages/record/list/index.vue @@ -62,7 +62,9 @@ import { mapState, mapActions } from "vuex"; import practice from "./practice"; import ass from "./ass"; - +import axios from 'axios'; +import Setting from "@/setting"; +import util from "@/libs/util"; export default { components: { practice, @@ -77,7 +79,8 @@ export default { tabList: { practice: "练习", ass: "考核" - } + }, + token:util.local.get(Setting.tokenKey), }; }, computed: { @@ -113,10 +116,24 @@ export default { exportData() { // 导出 if (this.active == "practice") { // 练习 - location.href = `${this.api.exportPracticeInfo}?ids=`; + axios.get(`${this.api.exportPracticeByStudent}?curriculumId=${this.curriculumId}`,{ + headers: { + token: this.token + }, + responseType: 'blob' + }).then((res) => { + util.downloadFileDirect(`学生练习成绩.xls`,new Blob([res.data])) + }).catch(res => {}) } else { // 考核 - location.href = `${this.api.exportAssessmentInfo}?ids=`; + axios.get(`${this.api.exportAssessmentByStudent}?curriculumId=${this.curriculumId}`,{ + headers: { + token: this.token + }, + responseType: 'blob' + }).then((res) => { + util.downloadFileDirect(`学生考核成绩.xls`,new Blob([res.data])) + }).catch(res => {}) } }, tabChange(index) { From 31907e56329af6c8a42937c8be1499f9de89618b Mon Sep 17 00:00:00 2001 From: e <2432808546@qq.com> Date: Fri, 3 Dec 2021 16:54:01 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/index.js | 1 - src/pages/ass/list/index.vue | 2 +- src/pages/station/preview/index.vue | 4 ++-- src/setting.js | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/api/index.js b/src/api/index.js index 0aa8ab6..9d6b78e 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -74,7 +74,6 @@ export default { fileupload: `${uploadURL}oss/manage/fileupload`, // 文件上传 getPlayAuth: `${uploadURL}oss/manage/getPlayAuth`, // 获取播放凭证 - collectPaper: `${host}occupationlab/assessment/collectPaper`, //结束考核 queryProvince: `${host}nakadai/nakadai/province/queryProvince`, //查询省份 queryCity: `${host}nakadai/nakadai/city/queryCity`, //查询城市 querySchoolData: `${host}nakadai/nakadai/school/querySchool`, //根据学校名称查询学校信息 diff --git a/src/pages/ass/list/index.vue b/src/pages/ass/list/index.vue index 5d9fb7c..b18e2e3 100644 --- a/src/pages/ass/list/index.vue +++ b/src/pages/ass/list/index.vue @@ -99,7 +99,7 @@ @click="entry(scope.row)" :disabled="scope.row.status !== 1">进入 已提交 - 查看成绩 diff --git a/src/pages/station/preview/index.vue b/src/pages/station/preview/index.vue index 1d9a9fd..eb56ba5 100644 --- a/src/pages/station/preview/index.vue +++ b/src/pages/station/preview/index.vue @@ -313,8 +313,8 @@ export default { console.log(host) // href = `${host}bank/#/`; let token = util.local.get(Setting.tokenKey); - // href = "http://39.108.250.202/banksystem/#/index/list?"+'token='+token+'&cid='+this.courseId+'&systemId='+this.assessmentList[0].systemId; - href = "http://192.168.31.155:8093/#/index/list?"+'token='+token+'&cid='+this.courseId+'&systemId='+this.assessmentList[0].systemId; + href = "http://39.108.250.202/banksystem/#/index/list?"+'token='+token+'&cid='+this.courseId+'&systemId='+this.assessmentList[0].systemId+"&projectId=&assessmentId=&classId=&stopTime="; + // href = "http://http://192.168.31.254:8093/#/index/list?"+'token='+token+'&cid='+this.courseId+'&systemId='+this.assessmentList[0].systemId+"&projectId=&assessmentId=&classId=&stopTime="; } else if (id == 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) { diff --git a/src/setting.js b/src/setting.js index 2368b87..6f28761 100644 --- a/src/setting.js +++ b/src/setting.js @@ -42,9 +42,8 @@ if (isHh) { title = "职站"; } else if (isDev) { // 本地 - // host = "http://39.108.250.202:9000/"; // 中台测试服 + host = "http://39.108.250.202:9000/"; // 中台测试服 // host = "http://192.168.31.137:9000/"; // 赓 - host = "http://39.108.250.202:9000/"; // host = "http://192.168.31.151:9000/"; // 榕 // host = "http://192.168.31.125:9000/"; // 坤 systemPath = "http://192.168.31.154/"; From 4ebfcba9da1304421e7d1c2e9989762dbc7ec585 Mon Sep 17 00:00:00 2001 From: e <2432808546@qq.com> Date: Fri, 3 Dec 2021 18:17:24 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=80=92=E8=AE=A1=E6=97=B6bug=20=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E9=93=B6=E8=A1=8C=E9=93=BE=E6=8E=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/ass/list/index.vue | 20 +++++++++++++++++--- src/pages/station/preview/index.vue | 2 +- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/pages/ass/list/index.vue b/src/pages/ass/list/index.vue index b18e2e3..e21895a 100644 --- a/src/pages/ass/list/index.vue +++ b/src/pages/ass/list/index.vue @@ -202,6 +202,8 @@ export default { assessmentId:'', classId:'', stopTime:'', + sss:1, + datassdata:0, }; }, computed: { @@ -238,6 +240,7 @@ export default { mounted() { // 页面离开的时候销毁手机和邮箱验证码定时器 this.$once("hook:beforeDestroy", function() { + this.sss = 0 clearInterval(this.ticker); this.ticker = null; }); @@ -255,7 +258,6 @@ export default { } else { if (countDown.status == 1){ this.$post(`${this.api.collectPaper}?id=${countDown.assessmentId}`).then(res => { - }) }else{ @@ -264,6 +266,11 @@ export default { } }, beginTimer() { + this.ticker = setInterval(() => { + if(this.sss == 0){ + this.ticker = null; + clearInterval(this.ticker); + }else{ for (let i = 0; i < this.listData.length; i++) { const ticker = setInterval(() => { const item = this.listData[i]; @@ -283,7 +290,8 @@ export default { this.tickerArr.push(ticker) } - + } + }, 1000); // this.ticker = setInterval(() => { // for (let i = 0; i < this.listData.length; i++) { // const item = this.listData[i]; @@ -304,6 +312,7 @@ export default { }, getData() { this.listLoading = true; + this.sss = 0 this.listData.splice(0); if (this.ticker) { clearInterval(this.ticker); @@ -340,13 +349,17 @@ export default { } } }); - this.beginTimer(); + this.sss = 1; + if(this.datassdata == 1){ + this.beginTimer() + } this.listLoading = false; }).catch(err => { this.listLoading = false; }); }, initData() { + this.sss = 0 this.page = 1; this.getData(); }, @@ -364,6 +377,7 @@ export default { }, handleCurrentChange(val) { // 切换页码 this.page = val; + this.sss = 0 this.getData(); }, entry(row) { // 进入考核 diff --git a/src/pages/station/preview/index.vue b/src/pages/station/preview/index.vue index eb56ba5..c3a841d 100644 --- a/src/pages/station/preview/index.vue +++ b/src/pages/station/preview/index.vue @@ -314,7 +314,7 @@ export default { // href = `${host}bank/#/`; let token = util.local.get(Setting.tokenKey); href = "http://39.108.250.202/banksystem/#/index/list?"+'token='+token+'&cid='+this.courseId+'&systemId='+this.assessmentList[0].systemId+"&projectId=&assessmentId=&classId=&stopTime="; - // href = "http://http://192.168.31.254:8093/#/index/list?"+'token='+token+'&cid='+this.courseId+'&systemId='+this.assessmentList[0].systemId+"&projectId=&assessmentId=&classId=&stopTime="; + // href = "http://192.168.31.254:8093/#/index/list?"+'token='+token+'&cid='+this.courseId+'&systemId='+this.assessmentList[0].systemId+"&projectId=&assessmentId=&classId=&stopTime="; } else if (id == 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) { From 767ec47cef366a5ded3010d792adec0da2b0f184 Mon Sep 17 00:00:00 2001 From: e <2432808546@qq.com> Date: Mon, 6 Dec 2021 10:10:03 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9F=9F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/station/preview/index.vue | 4 ++++ src/setting.js | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/pages/station/preview/index.vue b/src/pages/station/preview/index.vue index c3a841d..55ba8d2 100644 --- a/src/pages/station/preview/index.vue +++ b/src/pages/station/preview/index.vue @@ -313,7 +313,11 @@ export default { console.log(host) // href = `${host}bank/#/`; let token = util.local.get(Setting.tokenKey); + //线上 + // href = "http://124.71.12.62/banksystem/#/index/list?"+'token='+token+'&cid='+this.courseId+'&systemId='+this.assessmentList[0].systemId+"&projectId=&assessmentId=&classId=&stopTime="; + //测试 href = "http://39.108.250.202/banksystem/#/index/list?"+'token='+token+'&cid='+this.courseId+'&systemId='+this.assessmentList[0].systemId+"&projectId=&assessmentId=&classId=&stopTime="; + //本地 // href = "http://192.168.31.254:8093/#/index/list?"+'token='+token+'&cid='+this.courseId+'&systemId='+this.assessmentList[0].systemId+"&projectId=&assessmentId=&classId=&stopTime="; } else if (id == 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`); diff --git a/src/setting.js b/src/setting.js index 6f28761..ba0bfe4 100644 --- a/src/setting.js +++ b/src/setting.js @@ -31,7 +31,7 @@ if (isHh) { title = "职站"; } else if (isPro) { // 职站生产 - host = "http://www.occupationlab.com/"; + host = "http://www.occupationlab.com:9000/"; defaultSubSystem = "http://www.occupationlab.com/pyTrials/#/"; title = "职站"; } else if (isTest){ @@ -42,6 +42,7 @@ if (isHh) { title = "职站"; } else if (isDev) { // 本地 + // host = "http://www.occupationlab.com:9000/";//线上 host = "http://39.108.250.202:9000/"; // 中台测试服 // host = "http://192.168.31.137:9000/"; // 赓 // host = "http://192.168.31.151:9000/"; // 榕