huoran
/
FE_occupationlab_client
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 14 Wiki Activity

Merge remote-tracking branch 'origin/master' into master

Browse Source
UI_2022-02-10
yujialong 3 years ago
parent 5f50e16475 e9a1a3c0b0
commit 77bb85bc84
8 changed files with 95 additions and 78 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/layouts/home/index.vue
  2. 140
      src/pages/ass/list/index.vue
  3. 6
      src/pages/course/list/index.vue
  4. 2
      src/pages/match/list/index.vue
  5. 6
      src/pages/record/details/index.vue
  6. 2
      src/pages/record/list/ass.vue
  7. 5
      src/pages/station/preview/index.vue
  8. 10
      src/setting.js

2
src/layouts/home/index.vue
Unescape View File

@ -63,7 +63,7 @@ export default {
min-height: 100%; min-height: 100%;
.view { .view {
min-height: calc(100vh - 175px); min-height: calc(100vh - 177px);
//padding: 24px; //padding: 24px;
} }
} }

140
src/pages/ass/list/index.vue
Unescape View File

@ -86,11 +86,11 @@
<span class="ellipsis">{{ status[scope.row.status] }}</span> <span class="ellipsis">{{ status[scope.row.status] }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="实验状态" align="center"> <!-- <el-table-column label="实验状态" align="center">-->
<template slot-scope="scope" v-if="scope.row.show"> <!-- <template slot-scope="scope" v-if="scope.row.show">-->
<span class="ellipsis">{{ stuState[scope.row.stuState] }}</span> <!-- <span class="ellipsis">{{ stuState[scope.row.stuState] }}</span>-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
<template slot-scope="scope" v-if="scope.row.show"> <template slot-scope="scope" v-if="scope.row.show">
<!--status:考核状态(0、待开始 1、进行中 2、已结束); stuState:学生考试状态(0、未考 1、在考 2、已考)--> <!--status:考核状态(0、待开始 1、进行中 2、已结束); stuState:学生考试状态(0、未考 1、在考 2、已考)-->
@ -190,7 +190,16 @@ export default {
invitationCode: "", invitationCode: "",
searchTimer: null, searchTimer: null,
curRow: {}, curRow: {},
ticker: null // 倒计时定时器 ticker: null, // 倒计时定时器
item:{
},
projectId:null,
url:'',
cid:null,
systemId:null,
assessmentId:'',
classId:'',
}; };
}, },
computed: { computed: {
@ -254,11 +263,11 @@ export default {
if (item.countDown > 0) { if (item.countDown > 0) {
item.countDown--; item.countDown--;
} else { } else {
if (item.status === 0 && item.type === 2) { // 待开始-定时发布 if (item.status == 0 && item.type == 2) { // 待开始-定时发布
item.status = 1; item.status = 1;
item.countDown = (new Date(item.stopTime).getTime() - new Date().getTime()) / 1000; item.countDown = (new Date(item.stopTime).getTime() - new Date().getTime()) / 1000;
} else if (item.status === 1) { } else if (item.status == 1) {
item.status = 2; // item.status = 2;
} }
} }
item.show = true; item.show = true;
@ -282,22 +291,22 @@ export default {
this.totals = res.total; this.totals = res.total;
this.listData.forEach(i => { this.listData.forEach(i => {
i.show = false; i.show = false;
if (i.status === 2) { // 已结束 if (i.status == 2) { // 已结束
i.countDown = 0; i.countDown = 0;
} else { } else {
if (i.type === 2) { // 定时发布 if (i.type == 2) { // 定时发布
if (i.status === 0) { if (i.status == 0) {
// 待开始 // 待开始
i.countDown = (new Date(i.startTime).getTime() - new Date().getTime()) / 1000; // 获得两个日期时间的秒数差 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; i.countDown = (new Date(i.stopTime).getTime() - new Date().getTime()) / 1000;
} }
} else if (i.type === 1) { // 手动发布 } else if (i.type == 1) { // 手动发布
if (i.status === 0) { if (i.status == 0) {
// 待开始 // 待开始
i.countDown = 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; i.countDown = (new Date(i.stopTime).getTime() - new Date().getTime()) / 1000;
} }
@ -331,26 +340,27 @@ export default {
this.getData(); this.getData();
}, },
entry(row) { // 进入考核 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("该实验尚未开始"); return util.warningMsg("该实验尚未开始");
} else if (row.status === 2) { } else if (row.status == 2) {
return util.warningMsg("该实验已经结束"); return util.warningMsg("该实验已经结束");
} else { } else {
this.curRow = row; this.curRow = row;
if (row.isCode === 0) { // 是否启用邀请码(0、未启用 1、启用) if (row.isEnableCode == 0) { // 是否启用邀请码(0、未启用 1、启用)
this.goSubSystem(); this.$post(`${this.api.enterExam}?assessmentId=${row.assessmentId}&classId=${row.classId}`).then(res => {
} else { console.log(res)
this.$get(this.api.checkInvitationCode, { this.projectId = res.projectId
userId: this.userId, this.url = res.url
id: row.id this.cid = res.info.cid
}).then(res => { this.systemId = res.info.systemId
if (res.errmessage == "false") { this.goSubSystem();
this.icVisible = true;
} else {
this.goSubSystem();
}
}).catch(res => { }).catch(res => {
}); });
} else {
this.icVisible = true
} }
} }
}, },
@ -360,14 +370,14 @@ export default {
saveIc() { saveIc() {
if (!this.invitationCode) return util.warningMsg("请输入邀请码"); if (!this.invitationCode) return util.warningMsg("请输入邀请码");
if (!this.invitationCode || String(this.invitationCode).length < 6 || isNaN(this.invitationCode)) return util.warningMsg("请输入6位纯数字邀请码"); if (!this.invitationCode || String(this.invitationCode).length < 6 || isNaN(this.invitationCode)) return util.warningMsg("请输入6位纯数字邀请码");
let data = { this.$post(`${this.api.enterExam}?assessmentId=${this.item.assessmentId}&classId=${this.item.classId}&invitationCode=${this.invitationCode}`).then(res => {
id: this.curRow.id,
userId: this.userId,
invitationCode: Number(this.invitationCode)
};
this.$post(this.api.joinPractice, data).then(res => {
util.successMsg("验证成功！"); util.successMsg("验证成功！");
console.log(res)
this.icVisible = false; this.icVisible = false;
this.projectId = res.projectId
this.url = res.url
this.cid = res.info.cid
this.systemId = res.info.systemId
setTimeout(() => { setTimeout(() => {
this.goSubSystem(); this.goSubSystem();
}, 1000); }, 1000);
@ -382,37 +392,41 @@ export default {
util.cookies.set("assessmentId", this.curRow.id); util.cookies.set("assessmentId", this.curRow.id);
util.cookies.set("studentId", this.studentId); util.cookies.set("studentId", this.studentId);
util.cookies.set("userId", this.userId); 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("startTime", this.curRow.startTime);
util.cookies.set("stopTime", this.curRow.stopTime); util.cookies.set("stopTime", this.curRow.stopTime);
let curriculumId = this.curRow.curriculumId; let curriculumId = this.curRow.curriculumId;
let token = util.local.get(Setting.tokenKey);
let href = ""; let href = "";
switch (curriculumId) { let aaa = ''
case 1: aaa = host.slice(0,host.length-6)
href = `${host}pyTrials/#/`; href = `${aaa}/${this.url}/#/index/list?token=${token}&cid=${this.cid}&systemId=${this.systemId}&projectId=${this.projectId}&assessmentId=${this.assessmentId}&classId=${this.classId}`;
break; // switch (curriculumId) {
case 4: // // case 1:
href = `${host}pyFinance/#/`; // href = `${host}${this.url}/#/?projectId=${this.projectId}`;
break; // break;
case 5: // // case 4:
href = `${host}pyProjects/#/`; // // href = `${host}pyFinance/#/?projectId=${this.projectId}`;
break; // // break;
case 6: // // case 5:
href = `${host}pyRandom/#/`; // // href = `${host}pyProjects/#/?projectId=${this.projectId}`;
break; // // break;
case 7: // // case 6:
href = `${host}pyQuantification/#/`; // // href = `${host}pyRandom/#/?projectId=${this.projectId}`;
break; // // break;
case 8: // // case 7:
href = `${host}pyAnalysis/#/`; // // href = `${host}pyQuantification/#/?projectId=${this.projectId}`;
break; // // break;
case 9: // // case 8:
href = `${host}pyDataclean/#/`; // // href = `${host}pyAnalysis/#/?projectId=${this.projectId}`;
break; // // break;
case 10: // // case 9:
href = `${host}pyAcquisition/#/`; // // href = `${host}pyDataclean/#/?projectId=${this.projectId}`;
break; // // break;
} // // case 10:
// // href = `${host}pyAcquisition/#/?projectId=${this.projectId}`;
// // break;
// }
if (!href) return util.errorMsg("该考核非Python考核，请选择其他考核"); if (!href) return util.errorMsg("该考核非Python考核，请选择其他考核");
location.href = href; location.href = href;
// location.href = 'http://192.168.31.154:8080/' // location.href = 'http://192.168.31.154:8080/'

6
src/pages/course/list/index.vue
Unescape View File

@ -174,14 +174,12 @@ export default {
border-radius: 16px; border-radius: 16px;
background-color: #fdfdfd; background-color: #fdfdfd;
box-sizing: border-box; box-sizing: border-box;
.filter { .filter {
width: 100%;
margin-bottom: 10px; margin-bottom: 10px;
dl { dl {
display: flex; //display: flex;
line-height: 30px; line-height: 30px;
dt { dt {
color: rgba(0, 0, 0, .85); color: rgba(0, 0, 0, .85);
font-size: 14px; font-size: 14px;

2
src/pages/match/list/index.vue
Unescape View File

@ -322,7 +322,7 @@ export default {
.box { .box {
position: relative; position: relative;
.banner-con{ .banner-con{
width: 100vw; width: 100%;
height: 400px; height: 400px;
background-image: url('../../../assets/img/info-banner.png'); background-image: url('../../../assets/img/info-banner.png');
background-size: 100vw 400px; background-size: 100vw 400px;

6
src/pages/record/details/index.vue
Unescape View File

@ -27,7 +27,11 @@
<el-table-column prop="id" label="次序" width="120" align="center" type="index"></el-table-column> <el-table-column prop="id" label="次序" width="120" align="center" type="index"></el-table-column>
<el-table-column prop="projectName" label="实验项目名称" align="center"></el-table-column> <el-table-column prop="projectName" label="实验项目名称" align="center"></el-table-column>
<el-table-column prop="score" label="得分" align="center"></el-table-column> <el-table-column prop="score" label="得分" align="center"></el-table-column>
<el-table-column prop="timeSum" label="耗时" align="center"></el-table-column> <el-table-column prop="timeSum" label="耗时" align="center">
<template slot-scope="scope">
{{ scope.row.timeSum }}min
</template>
</el-table-column>
<el-table-column prop="startTime" label="起始时间" align="center"></el-table-column> <el-table-column prop="startTime" label="起始时间" align="center"></el-table-column>
<el-table-column prop="submitTime" label="结束时间" align="center"></el-table-column> <el-table-column prop="submitTime" label="结束时间" align="center"></el-table-column>
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">

2
src/pages/record/list/ass.vue
Unescape View File

@ -16,7 +16,7 @@
<el-table-column prop="className" label="实验班级" align="center"></el-table-column> <el-table-column prop="className" label="实验班级" align="center"></el-table-column>
<el-table-column prop="timeSum" label="耗时" align="center"> <el-table-column prop="timeSum" label="耗时" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.timeSum }}分 {{ scope.row.timeSum }}min
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="startTime" label="起始时间" align="center"></el-table-column> <el-table-column prop="startTime" label="起始时间" align="center"></el-table-column>

5
src/pages/station/preview/index.vue
Unescape View File

@ -13,8 +13,8 @@
<template v-else-if="iframeSrc"> <template v-else-if="iframeSrc">
<iframe class="inner fileIframe" id="fileIframe" :src="iframeSrc" frameborder="0"></iframe> <iframe class="inner fileIframe" id="fileIframe" :src="iframeSrc" frameborder="0"></iframe>
<template v-if="showMask"> <template v-if="showMask">
<div class="mask" style="width: 500px;height: 30px;top: 53px;right: 320px"></div> <div class="mask" style="height: 30px;top: 53px;right: 320px"></div>
<div class="mask" style="width: 175px;height: 30px;top: 53px;right: 5px"></div> <div class="mask" style="height: 30px;top: 53px;right: 5px"></div>
</template> </template>
<template v-if="showMask1"> <template v-if="showMask1">
<div class="word-mask" style="height: 40px;"></div> <div class="word-mask" style="height: 40px;"></div>
@ -311,6 +311,7 @@ export default {
// href = `${host}bank/#/`; // href = `${host}bank/#/`;
let token = util.local.get(Setting.tokenKey); 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://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) { } 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`); 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 (id == 22) {

10
src/setting.js
Unescape View File

@ -4,7 +4,7 @@
const url = location.host; const url = location.host;
const isDev = process.env.NODE_ENV === "development"; // 开发环境 const isDev = process.env.NODE_ENV === "development"; // 开发环境
const isHh = url.includes("10.196.131.73"); //是否河海版本 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 isBeta = url.includes("120.78.198.231"); //是否职站测试
const isPro = url.includes("occupationlab.com"); //是否职站生产 const isPro = url.includes("occupationlab.com"); //是否职站生产
const isTest = url.includes('39.108.250.202'); //是否中台测试服 const isTest = url.includes('39.108.250.202'); //是否中台测试服
@ -21,8 +21,8 @@ if (isHh) {
title = "学生端"; title = "学生端";
} else if (isCH) { } else if (isCH) {
// 巢湖 // 巢湖
host = "http://120.78.127.12/"; host = "http://124.71.12.62/";
defaultSubSystem = "http://120.78.127.12/pyTrials/#/"; defaultSubSystem = "http://124.71.12.62/pyTrials/#/";
title = "学生端"; title = "学生端";
} else if (isBeta) { } else if (isBeta) {
// 职站测试 // 职站测试
@ -42,9 +42,9 @@ if (isHh) {
title = "职站"; title = "职站";
} else if (isDev) { } 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.137:9000/"; // 赓
host = "http://192.168.31.151:9000/"; // 榕 // host = "http://192.168.31.151:9000/"; // 榕
// host = "http://192.168.31.125:9000/"; // 坤 // host = "http://192.168.31.125:9000/"; // 坤
systemPath = "http://192.168.31.154/"; systemPath = "http://192.168.31.154/";
defaultSubSystem = "http://39.108.250.202/pyTrials/#/"; defaultSubSystem = "http://39.108.250.202/pyTrials/#/";

Write Preview
Loading…
Cancel
Save