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

Merge branch 'master' of ssh://git.czcyedu.com:222/huoran/FE_occupationlab_client into master

Browse Source
UI_2022-02-10 职站V2.0
luoJunYong.123 3 years ago
parent 8381e75e05 767ec47cef
commit 6879cdc795
6 changed files with 58 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      src/api/index.js
  2. 34
      src/pages/ass/list/index.vue
  3. 4
      src/pages/record/details/index.vue
  4. 25
      src/pages/record/list/index.vue
  5. 8
      src/pages/station/preview/index.vue
  6. 6
      src/setting.js

5
src/api/index.js
Unescape View File

@ -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`, // 成绩报告详情
@ -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`, //根据学校名称查询学校信息

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

@ -68,8 +68,8 @@
{{ scope.$index + (page - 1) * pageSize + 1 }}
</template>
</el-table-column>
<el-table-column prop="sysName" label="课程名称" align="center"></el-table-column>
<el-table-column prop="experimentalName" label="考核名称" align="center"></el-table-column>
<el-table-column prop="sysName" label="课程名称" align="center" show-overflow-tooltip></el-table-column>
<el-table-column prop="experimentalName" label="考核名称" align="center" show-overflow-tooltip></el-table-column>
<el-table-column prop="className" label="实验班级" align="center"></el-table-column>
<el-table-column prop="experimentalNum" label="实验人数" align="center"></el-table-column>
<el-table-column prop="experimentDuration" label="考试时长" align="center"></el-table-column>
@ -94,12 +94,12 @@
<el-table-column label="操作" align="center">
<template slot-scope="scope" v-if="scope.row.show">
<!--status:考核状态(0、待开始 1、进行中 2、已结束); stuState:学生考试状态(0、未考 1、在考 2、已考)-->
<el-button v-if="scope.row.status === 2 && scope.row.stuState === 0" type="text" disabled>未参加</el-button>
<el-button v-if="scope.row.status !== 2 && (scope.row.stuState === 0 || scope.row.stuState === 1)" type="text"
<el-button v-if="scope.row.status == 2 && scope.row.stuState == 0" type="text" disabled>未参加</el-button>
<el-button v-if="scope.row.status != 2 && (scope.row.stuState == 0 || scope.row.stuState == 1)" type="text"
@click="entry(scope.row)" :disabled="scope.row.status !== 1">进入
</el-button>
<el-button v-if="scope.row.status === 1 && scope.row.stuState === 2" type="text" disabled>已提交</el-button>
<el-button v-if="scope.row.status === 2 && scope.row.stuState === 2" type="text"
<el-button v-if="scope.row.status == 1 && scope.row.stuState == 2" type="text" disabled>已提交</el-button>
<el-button v-if="scope.row.status == 2 && scope.row.stuState == 2 && scope.row.reportId" type="text"
@click="show(scope.row)">查看成绩
</el-button>
</template>
@ -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) { // 进入考核
@ -396,7 +410,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("请输入邀请码");

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

@ -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=`;
}

25
src/pages/record/list/index.vue
Unescape View File

@ -62,7 +62,9 @@
import { mapState, mapActions, mapMutations } 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: {
@ -115,10 +118,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) {

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

@ -313,8 +313,12 @@ 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://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`);
} else if (id == 22) {

6
src/setting.js
Unescape View File

@ -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,9 +42,9 @@ if (isHh) {
title = "职站";
} else if (isDev) {
// 本地
// host = "http://39.108.250.202:9000/"; // 中台测试服
// host = "http://www.occupationlab.com: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/";

Write Preview
Loading…
Cancel
Save