diff --git a/src/layouts/home/index.vue b/src/layouts/home/index.vue
index f2935ae..7963a11 100644
--- a/src/layouts/home/index.vue
+++ b/src/layouts/home/index.vue
@@ -63,7 +63,7 @@ export default {
min-height: 100%;
.view {
- min-height: calc(100vh - 175px);
+ min-height: calc(100vh - 177px);
//padding: 24px;
}
}
diff --git a/src/pages/ass/list/index.vue b/src/pages/ass/list/index.vue
index 622efc6..3a8e581 100644
--- a/src/pages/ass/list/index.vue
+++ b/src/pages/ass/list/index.vue
@@ -86,11 +86,11 @@
{{ status[scope.row.status] }}
-
-
- {{ stuState[scope.row.stuState] }}
-
-
+
+
+
+
+
@@ -190,7 +190,16 @@ export default {
invitationCode: "",
searchTimer: null,
curRow: {},
- ticker: null // 倒计时定时器
+ ticker: null, // 倒计时定时器
+ item:{
+
+ },
+ projectId:null,
+ url:'',
+ cid:null,
+ systemId:null,
+ assessmentId:'',
+ classId:'',
};
},
computed: {
@@ -254,11 +263,11 @@ export default {
if (item.countDown > 0) {
item.countDown--;
} else {
- if (item.status === 0 && item.type === 2) { // 待开始-定时发布
+ if (item.status == 0 && item.type == 2) { // 待开始-定时发布
item.status = 1;
item.countDown = (new Date(item.stopTime).getTime() - new Date().getTime()) / 1000;
- } else if (item.status === 1) {
- item.status = 2;
+ } else if (item.status == 1) {
+ // item.status = 2;
}
}
item.show = true;
@@ -282,22 +291,22 @@ export default {
this.totals = res.total;
this.listData.forEach(i => {
i.show = false;
- if (i.status === 2) { // 已结束
+ if (i.status == 2) { // 已结束
i.countDown = 0;
} else {
- if (i.type === 2) { // 定时发布
- if (i.status === 0) {
+ if (i.type == 2) { // 定时发布
+ if (i.status == 0) {
// 待开始
i.countDown = (new Date(i.startTime).getTime() - new Date().getTime()) / 1000; // 获得两个日期时间的秒数差
- } else if (i.status === 1) {
+ } else if (i.status == 1) {
// 进行中
i.countDown = (new Date(i.stopTime).getTime() - new Date().getTime()) / 1000;
}
- } else if (i.type === 1) { // 手动发布
- if (i.status === 0) {
+ } else if (i.type == 1) { // 手动发布
+ if (i.status == 0) {
// 待开始
i.countDown = 0;
- } else if (i.status === 1) {
+ } else if (i.status == 1) {
// 进行中
i.countDown = (new Date(i.stopTime).getTime() - new Date().getTime()) / 1000;
}
@@ -331,26 +340,27 @@ export default {
this.getData();
},
entry(row) { // 进入考核
- if (row.status === 0) {
+ this.item = row
+ this.assessmentId =this.item.assessmentId
+ this.classId = this.item.classId
+ if (row.status == 0) {
return util.warningMsg("该实验尚未开始");
- } else if (row.status === 2) {
+ } else if (row.status == 2) {
return util.warningMsg("该实验已经结束");
} else {
this.curRow = row;
- if (row.isCode === 0) { // 是否启用邀请码(0、未启用 1、启用)
- this.goSubSystem();
- } else {
- this.$get(this.api.checkInvitationCode, {
- userId: this.userId,
- id: row.id
- }).then(res => {
- if (res.errmessage == "false") {
- this.icVisible = true;
- } else {
- this.goSubSystem();
- }
+ if (row.isEnableCode == 0) { // 是否启用邀请码(0、未启用 1、启用)
+ this.$post(`${this.api.enterExam}?assessmentId=${row.assessmentId}&classId=${row.classId}`).then(res => {
+ console.log(res)
+ this.projectId = res.projectId
+ this.url = res.url
+ this.cid = res.info.cid
+ this.systemId = res.info.systemId
+ this.goSubSystem();
}).catch(res => {
});
+ } else {
+ this.icVisible = true
}
}
},
@@ -360,14 +370,14 @@ export default {
saveIc() {
if (!this.invitationCode) return util.warningMsg("请输入邀请码");
if (!this.invitationCode || String(this.invitationCode).length < 6 || isNaN(this.invitationCode)) return util.warningMsg("请输入6位纯数字邀请码");
- let data = {
- id: this.curRow.id,
- userId: this.userId,
- invitationCode: Number(this.invitationCode)
- };
- this.$post(this.api.joinPractice, data).then(res => {
+ this.$post(`${this.api.enterExam}?assessmentId=${this.item.assessmentId}&classId=${this.item.classId}&invitationCode=${this.invitationCode}`).then(res => {
util.successMsg("验证成功！");
+ console.log(res)
this.icVisible = false;
+ this.projectId = res.projectId
+ this.url = res.url
+ this.cid = res.info.cid
+ this.systemId = res.info.systemId
setTimeout(() => {
this.goSubSystem();
}, 1000);
@@ -382,37 +392,41 @@ export default {
util.cookies.set("assessmentId", this.curRow.id);
util.cookies.set("studentId", this.studentId);
util.cookies.set("userId", this.userId);
- util.cookies.set("projectId", this.curRow.projectId);
+ util.cookies.set("projectId", this.projectId);
util.cookies.set("startTime", this.curRow.startTime);
util.cookies.set("stopTime", this.curRow.stopTime);
let curriculumId = this.curRow.curriculumId;
+ let token = util.local.get(Setting.tokenKey);
let href = "";
- switch (curriculumId) {
- case 1:
- href = `${host}pyTrials/#/`;
- break;
- case 4:
- href = `${host}pyFinance/#/`;
- break;
- case 5:
- href = `${host}pyProjects/#/`;
- break;
- case 6:
- href = `${host}pyRandom/#/`;
- break;
- case 7:
- href = `${host}pyQuantification/#/`;
- break;
- case 8:
- href = `${host}pyAnalysis/#/`;
- break;
- case 9:
- href = `${host}pyDataclean/#/`;
- break;
- case 10:
- href = `${host}pyAcquisition/#/`;
- break;
- }
+ 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}`;
+ // switch (curriculumId) {
+ // // case 1:
+ // href = `${host}${this.url}/#/?projectId=${this.projectId}`;
+ // break;
+ // // case 4:
+ // // href = `${host}pyFinance/#/?projectId=${this.projectId}`;
+ // // break;
+ // // case 5:
+ // // href = `${host}pyProjects/#/?projectId=${this.projectId}`;
+ // // break;
+ // // case 6:
+ // // href = `${host}pyRandom/#/?projectId=${this.projectId}`;
+ // // break;
+ // // case 7:
+ // // href = `${host}pyQuantification/#/?projectId=${this.projectId}`;
+ // // break;
+ // // case 8:
+ // // href = `${host}pyAnalysis/#/?projectId=${this.projectId}`;
+ // // break;
+ // // case 9:
+ // // href = `${host}pyDataclean/#/?projectId=${this.projectId}`;
+ // // break;
+ // // case 10:
+ // // href = `${host}pyAcquisition/#/?projectId=${this.projectId}`;
+ // // break;
+ // }
if (!href) return util.errorMsg("该考核非Python考核，请选择其他考核");
location.href = href;
// location.href = 'http://192.168.31.154:8080/'
diff --git a/src/pages/course/list/index.vue b/src/pages/course/list/index.vue
index 506c567..c75c688 100644
--- a/src/pages/course/list/index.vue
+++ b/src/pages/course/list/index.vue
@@ -174,14 +174,12 @@ export default {
border-radius: 16px;
background-color: #fdfdfd;
box-sizing: border-box;
-
.filter {
+ width: 100%;
margin-bottom: 10px;
-
dl {
- display: flex;
+ //display: flex;
line-height: 30px;
-
dt {
color: rgba(0, 0, 0, .85);
font-size: 14px;
diff --git a/src/pages/match/list/index.vue b/src/pages/match/list/index.vue
index 6bb28b9..e768280 100644
--- a/src/pages/match/list/index.vue
+++ b/src/pages/match/list/index.vue
@@ -322,7 +322,7 @@ export default {
.box {
position: relative;
.banner-con{
- width: 100vw;
+ width: 100%;
height: 400px;
background-image: url('../../../assets/img/info-banner.png');
background-size: 100vw 400px;
diff --git a/src/pages/record/details/index.vue b/src/pages/record/details/index.vue
index 25877ef..7bdf9ad 100644
--- a/src/pages/record/details/index.vue
+++ b/src/pages/record/details/index.vue
@@ -27,7 +27,11 @@
-
+
+
+ {{ scope.row.timeSum }}min
+
+
diff --git a/src/pages/record/list/ass.vue b/src/pages/record/list/ass.vue
index 51af08b..154c155 100644
--- a/src/pages/record/list/ass.vue
+++ b/src/pages/record/list/ass.vue
@@ -16,7 +16,7 @@
- {{ scope.row.timeSum }}分
+ {{ scope.row.timeSum }}min
diff --git a/src/pages/station/preview/index.vue b/src/pages/station/preview/index.vue
index b15f97f..e599be5 100644
--- a/src/pages/station/preview/index.vue
+++ b/src/pages/station/preview/index.vue
@@ -13,8 +13,8 @@
-
-
+
+
@@ -311,6 +311,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;
+ // href = "http://192.168.31.254:8093/#/index/list?"+'token='+token+'&cid='+this.courseId+'&systemId='+this.assessmentList[0].systemId;
} 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 ea23d99..6f28761 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -4,7 +4,7 @@
const url = location.host;
const isDev = process.env.NODE_ENV === "development"; // 开发环境
const isHh = url.includes("10.196.131.73"); //是否河海版本
-const isCH = url.includes("120.78.127.12"); //是否巢湖版本
+const isCH = url.includes("124.71.12.62"); //是否巢湖版本
const isBeta = url.includes("120.78.198.231"); //是否职站测试
const isPro = url.includes("occupationlab.com"); //是否职站生产
const isTest = url.includes('39.108.250.202'); //是否中台测试服
@@ -21,8 +21,8 @@ if (isHh) {
title = "学生端";
} else if (isCH) {
// 巢湖
- host = "http://120.78.127.12/";
- defaultSubSystem = "http://120.78.127.12/pyTrials/#/";
+ host = "http://124.71.12.62/";
+ defaultSubSystem = "http://124.71.12.62/pyTrials/#/";
title = "学生端";
} else if (isBeta) {
// 职站测试
@@ -42,9 +42,9 @@ 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://192.168.31.151:9000/"; // 榕
+ // host = "http://192.168.31.151:9000/"; // 榕
// host = "http://192.168.31.125:9000/"; // 坤
systemPath = "http://192.168.31.154/";
defaultSubSystem = "http://39.108.250.202/pyTrials/#/";