From a7be2f73b8cf6181a78de67e650a29659dcc86fe Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Mon, 29 Nov 2021 15:40:52 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E7=BB=99=E8=80=83=E6=A0=B8=E8=B7=B3?=
=?UTF-8?q?=E8=BD=AC=E9=93=B6=E8=A1=8C=E5=8A=A0=E4=B8=8A=E7=BB=93=E6=9D=9F?=
=?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/ass/list/index.vue | 7 ++++++-
src/pages/station/preview/index.vue | 1 +
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/pages/ass/list/index.vue b/src/pages/ass/list/index.vue
index 3a8e581..8fa6d94 100644
--- a/src/pages/ass/list/index.vue
+++ b/src/pages/ass/list/index.vue
@@ -200,6 +200,7 @@ export default {
systemId:null,
assessmentId:'',
classId:'',
+ stopTime:'',
};
},
computed: {
@@ -356,6 +357,10 @@ export default {
this.url = res.url
this.cid = res.info.cid
this.systemId = res.info.systemId
+ var date = res.assessmentInfo.stopTime;
+ date = date.substring(0,19);
+ date = date.replace(/-/g,'/');
+ this.stopTime = new Date(date).getTime();
this.goSubSystem();
}).catch(res => {
});
@@ -400,7 +405,7 @@ export default {
let href = "";
let aaa = ''
aaa = host.slice(0,host.length-6)
- href = `${aaa}/${this.url}/#/index/list?token=${token}&cid=${this.cid}&systemId=${this.systemId}&projectId=${this.projectId}&assessmentId=${this.assessmentId}&classId=${this.classId}`;
+ href = `${aaa}/${this.url}/#/index/list?token=${token}&cid=${this.cid}&systemId=${this.systemId}&projectId=${this.projectId}&assessmentId=${this.assessmentId}&classId=${this.classId}&stopTime=${this.stopTime}`;
// switch (curriculumId) {
// // case 1:
// href = `${host}${this.url}/#/?projectId=${this.projectId}`;
diff --git a/src/pages/station/preview/index.vue b/src/pages/station/preview/index.vue
index 871b0a4..7551ce2 100644
--- a/src/pages/station/preview/index.vue
+++ b/src/pages/station/preview/index.vue
@@ -310,6 +310,7 @@ export default {
} else if (id == 10) {
href = `${host}pyAcquisition/#/`;
} else if (id == 11) {
+ 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;
From 4e8c20187ff6c9fc269784b4a3ab2222070cfb85 Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Tue, 30 Nov 2021 20:20:23 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=80=83=E6=A0=B8?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E5=80=92=E8=AE=A1=E6=97=B6=E4=B8=BA=E9=9B=B6?=
=?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=BB=93=E6=9D=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/ass/list/index.vue | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/pages/ass/list/index.vue b/src/pages/ass/list/index.vue
index 8fa6d94..41817fc 100644
--- a/src/pages/ass/list/index.vue
+++ b/src/pages/ass/list/index.vue
@@ -78,7 +78,7 @@
- {{ scope.row.countDown | timeFilter }}
+ {{ timeFilter(scope.row) }}
@@ -244,19 +244,22 @@ export default {
this.getCourseData();
this.getClassData();
},
- filters: {
+ methods: {
timeFilter(countDown) {
- if (countDown > 0) {
- let h = Math.floor(countDown / (60 * 60));
- let m = Math.floor(countDown % (60 * 60) / 60);
- let s = Math.floor(countDown % (60 * 60) % 60);
+ if (countDown.countDown > 0) {
+ let h = Math.floor(countDown.countDown / (60 * 60));
+ let m = Math.floor(countDown.countDown % (60 * 60) / 60);
+ let s = Math.floor(countDown.countDown % (60 * 60) % 60);
return `${h > 9 ? h : `0${h}`}:${m > 9 ? m : `0${m}`}:${s > 9 ? s : `0${s}`}`;
} else {
+ if (countDown.status == 2){
+
+ }else{
+ countDown.status = 2
+ }
return "00:00:00";
}
- }
- },
- methods: {
+ },
beginTimer() {
this.ticker = setInterval(() => {
for (let i = 0; i < this.listData.length; i++) {
From 98e801048edbb2623374097b2571bf9d408ebe10 Mon Sep 17 00:00:00 2001
From: e <2432808546@qq.com>
Date: Wed, 1 Dec 2021 10:28:13 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=80=83=E6=A0=B8?=
=?UTF-8?q?=E5=88=97=E8=A1=A8=E5=80=92=E8=AE=A1=E6=97=B6=E4=B8=BA=E9=9B=B6?=
=?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=BB=93=E6=9D=9F?=
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 | 6 ++++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/api/index.js b/src/api/index.js
index 3869088..2efaf46 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -49,6 +49,7 @@ export default {
myClassByStudent: `${host}occupationlab/achievement/myClassByStudent`, // 学生端:我的班级
getStudentInfoByAccountId: `${host}occupationlab/architecture/getStudentInfoByAccountId`, // 查看学生信息
enterExam: `${host}occupationlab/assessment/enterExam`, // 学生端——进入考试
+ collectPaper: `${host}occupationlab/assessment/collectPaper`, // 自动结束考试
// 课程学习
queryGlClassification: `${host}occupationlab/management/edu/courseClassification/queryGlClassification`, // 查询课程分类
diff --git a/src/pages/ass/list/index.vue b/src/pages/ass/list/index.vue
index 41817fc..52ff658 100644
--- a/src/pages/ass/list/index.vue
+++ b/src/pages/ass/list/index.vue
@@ -252,10 +252,12 @@ export default {
let s = Math.floor(countDown.countDown % (60 * 60) % 60);
return `${h > 9 ? h : `0${h}`}:${m > 9 ? m : `0${m}`}:${s > 9 ? s : `0${s}`}`;
} else {
- if (countDown.status == 2){
+ if (countDown.status == 1){
+ this.$post(`${this.api.collectPaper}?id=${countDown.assessmentId}`).then(res => {
+ })
}else{
- countDown.status = 2
+
}
return "00:00:00";
}