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

api优化等

Browse Source
dev_2022-04-07
yujialong 3 years ago
parent d215c59cf9
commit e8adc22c5a
3 changed files with 79 additions and 95 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. 137
      src/api/index.js
  2. 15
      src/pages/station/preview/index.vue
  3. 22
      src/setting.js

137
src/api/index.js
Unescape View File

@ -1,104 +1,103 @@
import Setting from "@/setting";
let host = Setting.apiBaseURL;
const host1 = 'http://192.168.31.137:9000'
let uploadURL = "http://39.108.250.202:9000/";
export default {
host,
// 登录
logins: `${host}users/users/user/login`, //登录
logins: `users/users/user/login`, //登录
verification: `${host}users/users/user/captcha`,// 验证码图片
logoDetail: `${host}occupationlab/sys/logo/detail`, //查看系统设置信息
logoDetail: `occupationlab/sys/logo/detail`, //查看系统设置信息
isClient: `${host}users/users/user/isClient`,
platformLogList: `${host}nakadai/log/platformLogList`,
logNotification: `${host}nakadai/log/logNotification`,
platformLogList: `nakadai/log/platformLogList`,
logNotification: `nakadai/log/logNotification`,
//实验台
curriculumDetail: `${host}nakadai/nakadai/curriculum/curriculumDetail`, // 课程详情
curriculumChapter: `${host}nakadai/curriculum/chapter/queryChaptersAndSubsections`, // 根据课程id查询章节小节,树状结构
curriculumGetSubsection: `${host}nakadai/curriculum/subsection/getSubsection`, // 根据小节id获取预览文件地址
curriculumDetail: `nakadai/nakadai/curriculum/curriculumDetail`, // 课程详情
curriculumChapter: `nakadai/curriculum/chapter/queryChaptersAndSubsections`, // 根据课程id查询章节小节,树状结构
curriculumGetSubsection: `nakadai/curriculum/subsection/getSubsection`, // 根据小节id获取预览文件地址
// 能力测评
canExperiment: `${host}occupationlab/occupationlab/evaluationrecord/can_experiment`, // 查询是否能够开启实验
experimentDetail: `${host}occupationlab/occupationlab/evaluationrecord/detail`, // 成绩详情
experimentNext: `${host}occupationlab/occupationlab/evaluationrecord/next`, // 下一题
experimentNotmade: `${host}occupationlab/occupationlab/evaluationrecord/not_made`, // 提交之前查询是否还有未做完的试题
openExercise: `${host}occupationlab/occupationlab/evaluationrecord/openExercise`, // 查询是否能开启虚拟仿真实验
openTeaching: `${host}occupationlab/occupationlab/evaluationrecord/openTeaching`, // 查询是否能开启教学实验
experimentPrevious: `${host}occupationlab/occupationlab/evaluationrecord/previous`, // 上一题
experimentRemaining: `${host}occupationlab/occupationlab/evaluationrecord/remaining`, // 获取测评剩余时间
experimentStart: `${host}occupationlab/occupationlab/evaluationrecord/start`, // 开始测评
experimentSubmit: `${host}occupationlab/occupationlab/evaluationrecord/submit`, // 提交测评
canExperiment: `occupationlab/occupationlab/evaluationrecord/can_experiment`, // 查询是否能够开启实验
experimentDetail: `occupationlab/occupationlab/evaluationrecord/detail`, // 成绩详情
experimentNext: `occupationlab/occupationlab/evaluationrecord/next`, // 下一题
experimentNotmade: `occupationlab/occupationlab/evaluationrecord/not_made`, // 提交之前查询是否还有未做完的试题
openExercise: `occupationlab/occupationlab/evaluationrecord/openExercise`, // 查询是否能开启虚拟仿真实验
openTeaching: `occupationlab/occupationlab/evaluationrecord/openTeaching`, // 查询是否能开启教学实验
experimentPrevious: `occupationlab/occupationlab/evaluationrecord/previous`, // 上一题
experimentRemaining: `occupationlab/occupationlab/evaluationrecord/remaining`, // 获取测评剩余时间
experimentStart: `occupationlab/occupationlab/evaluationrecord/start`, // 开始测评
experimentSubmit: `occupationlab/occupationlab/evaluationrecord/submit`, // 提交测评
// 实验记录
schoolCourse: `${host}nakadai/nakadai/curriculum/schoolCourse`, // 获取学校购买订单后的课程
experimentOverview: `${host}occupationlab/achievement/experimentOverview`, //实验概览
queryAssessmentByStudent: `${host}occupationlab/achievement/queryAssessmentByStudent`, //学生端考核成绩
queryPracticeByStudent: `${host}occupationlab/achievement/queryPracticeByStudent`, //学生端练习成绩
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`, // 成绩报告详情
updateReport: `${host}occupationlab/achievement/updateReport`, // 更新成绩报告
schoolCourseByAchievement: `${host}nakadai/nakadai/curriculum/schoolCourseByAchievement`, // 获取学校购买订单后的课程
exportLabReport: `${host}occupationlab/achievement/exportLabReport`,
exportBankExperimentReport: `${host}occupationlab/achievement/exportBankExperimentReport`,
schoolCourse: `nakadai/nakadai/curriculum/schoolCourse`, // 获取学校购买订单后的课程
experimentOverview: `occupationlab/achievement/experimentOverview`, //实验概览
queryAssessmentByStudent: `occupationlab/achievement/queryAssessmentByStudent`, //学生端考核成绩
queryPracticeByStudent: `occupationlab/achievement/queryPracticeByStudent`, //学生端练习成绩
exportAssessmentByStudent: `occupationlab/achievement/exportAssessmentByStudent`, // 批量导出考核成绩
exportPracticeByStudent: `occupationlab/achievement/exportPracticeByStudent`, // 批量导出练习成绩
practiceByStudentDetail: `occupationlab/achievement/practiceByStudentDetail`, // 学生端练习实验情况
exportPracticeByStudentDetail: `occupationlab/achievement/exportPracticeByStudentDetail`, // 导出学生端练习实验情况
reportDetail: `occupationlab/achievement/reportDetail`, // 成绩报告详情
updateReport: `occupationlab/achievement/updateReport`, // 更新成绩报告
schoolCourseByAchievement: `nakadai/nakadai/curriculum/schoolCourseByAchievement`, // 获取学校购买订单后的课程
exportLabReport: `occupationlab/achievement/exportLabReport`,
exportBankExperimentReport: `occupationlab/achievement/exportBankExperimentReport`,
// 考核列表
pageStuAssessment: `${host}occupationlab/assessment/pageStuAssessment`, // 学生端——学生考核列表
getPythonSysByStuAccountId: `${host}occupationlab/assessment/getPythonSysByStuAccountId`, // 学生端——课程名称
myClassByStudent: `${host}occupationlab/achievement/myClassByStudent`, // 学生端:我的班级
getStudentInfoByAccountId: `${host}occupationlab/architecture/getStudentInfoByAccountId`, // 查看学生信息
enterExam: `${host}occupationlab/assessment/enterExam`, // 学生端——进入考试
collectPaper: `${host}occupationlab/assessment/collectPaper`, // 自动结束考试
pageStuAssessment: `occupationlab/assessment/pageStuAssessment`, // 学生端——学生考核列表
getPythonSysByStuAccountId: `occupationlab/assessment/getPythonSysByStuAccountId`, // 学生端——课程名称
myClassByStudent: `occupationlab/achievement/myClassByStudent`, // 学生端:我的班级
getStudentInfoByAccountId: `occupationlab/architecture/getStudentInfoByAccountId`, // 查看学生信息
enterExam: `occupationlab/assessment/enterExam`, // 学生端——进入考试
collectPaper: `occupationlab/assessment/collectPaper`, // 自动结束考试
// 课程学习
queryGlClassification: `${host}occupationlab/management/edu/courseClassification/queryGlClassification`, // 查询课程分类
queryCourseByCondition: `${host}occupationlab/management/edu/course/queryCourseByCondition`, // 课程列表分页条件查询
getCourseById: `${host}occupationlab/management/edu/course/getCourse`, // 根据id查询课程
queryChaptersAndSubsections: `${host}occupationlab/management/edu/courseChapter/queryChaptersAndSubsections`, // 根据课程id查询章节小节,树状结构
getSubsection: `${host}occupationlab/management/edu/courseSubsection/getSubsection`, // 根据小节id获取预览文件地址
queryGlClassification: `occupationlab/management/edu/courseClassification/queryGlClassification`, // 查询课程分类
queryCourseByCondition: `occupationlab/management/edu/course/queryCourseByCondition`, // 课程列表分页条件查询
getCourseById: `occupationlab/management/edu/course/getCourse`, // 根据id查询课程
queryChaptersAndSubsections: `occupationlab/management/edu/courseChapter/queryChaptersAndSubsections`, // 根据课程id查询章节小节,树状结构
getSubsection: `occupationlab/management/edu/courseSubsection/getSubsection`, // 根据小节id获取预览文件地址
// 资讯
queryAllColumns: `${host}occupationlab/enterprise/information/column/queryAllColumns`, // 栏目树
queryArticleByCondition: `${host}occupationlab/enterprise/information/article/queryArticleByCondition`, // 文章列表分页条件查询
getArticle: `${host}occupationlab/enterprise/information/article/getArticle`, // 根据id查询文章
firstLevelColumn: `${host}occupationlab/enterprise/information/column/firstLevelColumn`,
secondaryColumnsByFirst: `${host}occupationlab/enterprise/information/column/secondaryColumnsByFirst`,
queryAllColumns: `occupationlab/enterprise/information/column/queryAllColumns`, // 栏目树
queryArticleByCondition: `occupationlab/enterprise/information/article/queryArticleByCondition`, // 文章列表分页条件查询
getArticle: `occupationlab/enterprise/information/article/getArticle`, // 根据id查询文章
firstLevelColumn: `occupationlab/enterprise/information/column/firstLevelColumn`,
secondaryColumnsByFirst: `occupationlab/enterprise/information/column/secondaryColumnsByFirst`,
// 线上赛事
onlineContestQuery: `${host}occupationlab/enterprise/match/onlineContest/onlineContestQuery`, // 线上赛事列表分页条件查询
addApplicant: `${host}occupationlab/enterprise/match/applicant/addApplicant`, // 添加报名人员
getContestProgress: `${host}occupationlab/enterprise/match/contest-progress/getContestProgress`, // 根据赛事id查询竞赛进展
getContest: `${host}occupationlab/enterprise/match/contest/getContest`, // 根据id查询赛事
onlineContestQuery: `occupationlab/enterprise/match/onlineContest/onlineContestQuery`, // 线上赛事列表分页条件查询
addApplicant: `occupationlab/enterprise/match/applicant/addApplicant`, // 添加报名人员
getContestProgress: `occupationlab/enterprise/match/contest-progress/getContestProgress`, // 根据赛事id查询竞赛进展
getContest: `occupationlab/enterprise/match/contest/getContest`, // 根据id查询赛事
// 阿里云文件/视频管理
fileDeletion: `${uploadURL}oss/manage/fileDeletion`, // 删除OSS文件
fileupload: `${uploadURL}oss/manage/fileupload`, // 文件上传
getPlayAuth: `${uploadURL}oss/manage/getPlayAuth`, // 获取播放凭证
queryProvince: `${host}nakadai/nakadai/province/queryProvince`, //查询省份
queryCity: `${host}nakadai/nakadai/city/queryCity`, //查询城市
querySchool: `${host}nakadai/nakadai/school/querySchool`, //根据学校名称查询学校信息
queryCourseDiscipline: `${host}nakadai/nakadai/subject/courseDiscipline`, //查询课程学科
queryCourseProfessionalClass: `${host}nakadai/nakadai/subject/courseProfessionalClass`, //查询专业类
queryCourseProfessional: `${host}nakadai/nakadai/subject/courseProfessional`, //查询专业
queryProvince: `nakadai/nakadai/province/queryProvince`, //查询省份
queryCity: `nakadai/nakadai/city/queryCity`, //查询城市
querySchool: `nakadai/nakadai/school/querySchool`, //根据学校名称查询学校信息
queryCourseDiscipline: `nakadai/nakadai/subject/courseDiscipline`, //查询课程学科
queryCourseProfessionalClass: `nakadai/nakadai/subject/courseProfessionalClass`, //查询专业类
queryCourseProfessional: `nakadai/nakadai/subject/courseProfessional`, //查询专业
// 个人中心
uploadUserAvatars: `${host}users/users/userAccount/updateUserAvatars`, //更改头像
queryUserInfoDetails: `${host}users/users/userAccount/queryUserInfoDetails`,//个人中心信息展示
updatePersonCenter: `${host}users/users/userAccount/updatePersonCenter`,//个人中心信息修改
examinePassword: `${host}users/users/userAccount/examinePassword`,//更换密码
bindPhoneOrEmail: `${host}users/users/userAccount/bindPhoneOrEmail`,// 绑定手机或邮箱
sendPhoneOrEmailCode: `${host}users/users/userAccount/sendPhoneOrEmailCode`,// 更换手机号或邮箱--发送手机验证码
uploadUserAvatars: `users/users/userAccount/updateUserAvatars`, //更改头像
queryUserInfoDetails: `users/users/userAccount/queryUserInfoDetails`,//个人中心信息展示
updatePersonCenter: `users/users/userAccount/updatePersonCenter`,//个人中心信息修改
examinePassword: `users/users/userAccount/examinePassword`,//更换密码
bindPhoneOrEmail: `users/users/userAccount/bindPhoneOrEmail`,// 绑定手机或邮箱
sendPhoneOrEmailCode: `users/users/userAccount/sendPhoneOrEmailCode`,// 更换手机号或邮箱--发送手机验证码
joinPractice: `${host}tms/classTech/joinPractice`, //通过邀请码进入实验
queryArchievement: `${host}tms/classTech/queryExperimentalReport`, //查看教学实验报告
queryVirtualReport: `${host}tms/classTech/queryVirtualReport`, //查看虚仿实验报告
checkInvitationCode: `${host}tms/classTech/checkInvitationCode`, //校验是否需要邀请码
userRecord: `${host}tms/classTech/userRecord`, //查询班级实验列表信息
modifyReport: `${host}Achievement/modify`
joinPractice: `tms/classTech/joinPractice`, //通过邀请码进入实验
queryArchievement: `tms/classTech/queryExperimentalReport`, //查看教学实验报告
queryVirtualReport: `tms/classTech/queryVirtualReport`, //查看虚仿实验报告
checkInvitationCode: `tms/classTech/checkInvitationCode`, //校验是否需要邀请码
userRecord: `tms/classTech/userRecord`, //查询班级实验列表信息
modifyReport: `Achievement/modify`
};

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

@ -286,19 +286,14 @@ export default {
let userName = window.btoa(encodeURIComponent(this.userName));
if (id == 11) {
href = `${Setting.systemPath}/#/index/list?token=${token}&cid=${this.courseId}&systemId=${this.assessmentList[0].systemId}&projectId=&assessmentId=&classId=&stopTime=&test=true`
// 银行系统
location.href = `${Setting.systemPath}/#/index/list?token=${token}&cid=${this.courseId}&systemId=${this.assessmentList[0].systemId}&projectId=&assessmentId=&classId=&stopTime=&test=true`
} 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) {
window.open(`https://danbao.czcyedu.com/#/loginFromYyyf?userId=${this.userId}&userName=${userName}&userType=${roleId}&reqType=1&reqId=eb7d8355119d449184c548b07dc01ed9&caseId=1198241070647873538&authorization=87DIVy348Oxzj3ha&classId=1876&courserId=faaedd82adb9444285a5785e4a3dd4f9`);
} else {
if(process.env.NODE_ENV === 'development') {
href = 'http://192.168.31.125:8080/#/'
} else {
href = `${location.origin}/pyTrials` // 8个python子系统都跳这个地址，子系统会通过cookie里的systemId识别展示哪套系统
}
}
if (id != 21 && id != 22) {
// python系统
util.cookies.set("assessmentId", "", -1);
util.cookies.set("projectId", "", -1);
util.cookies.set("startTime", "", -1);
@ -307,7 +302,9 @@ export default {
util.cookies.set("courseId", this.courseId);
util.cookies.set("curriculumName", escape(this.curriculumName));
util.cookies.set("systemId", id);
location.href = href;
location.href = process.env.NODE_ENV === 'development' ?
`http://${location.hostname}:8080/#/` :
`${location.origin}/pyTrials` // 8个python子系统都跳这个地址，子系统会通过cookie里的systemId识别展示哪套系统
}
}
}

22
src/setting.js
Unescape View File

@ -9,9 +9,9 @@ const isBeta = url.includes("120.78.198.231"); //是否职站测试
const isPro = url.includes("occupationlab.com"); //是否职站生产
const isTest = url.includes('39.108.250.202'); //是否中台测试服
let systemPath = ''
let host = "";
let title = "";
let systemPath = `${location.origin}/banksystem`
let host = `${location.origin}:9000/`
let title = '职站'
if (isHh) {
// 河海
@ -24,27 +24,15 @@ if (isHh) {
} else if (isBeta) {
// 职站测试
host = "http://120.78.198.231/";
title = "职站";
} else if (isPro) {
// 职站生产
host = "http://www.occupationlab.com:9000/";
systemPath = `http://www.huorantech.cn/banksystem`
title = "职站";
} else if (isTest){
// 中台测试
host = "http://39.108.250.202:9000/";
systemPath = `${systemPath}/banksystem`
title = "职站";
} else if (isDev) {
// 本地
// host = "http://www.occupationlab.com:9000/";//线上
host = "http://39.108.250.202:9000/"; // 中台测试服
systemPath = `http://192.168.31.125:8093`
// host = "http://192.168.31.137:9000"; // 赓
host = "http://39.108.250.202:9000/"; // 中台测试服
// host = "http://192.168.31.151:9000/"; // 榕
title = "职站";
} else {
console.log("其它版本");
// host = "http://192.168.31.137:9000"; // 赓
}
const Setting = {

Write Preview
Loading…
Cancel
Save