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

20240205
luoJunYong.123 3 years ago
commit 84526b50d2
  1. 1
      src/api/api.js
  2. 10
      src/components/case/index.vue
  3. 3
      src/layouts/header/index.vue
  4. 8
      src/pages/lobbyManager/list/index.vue

@ -2,6 +2,7 @@ import axios from 'axios';
import router from '../router'; import router from '../router';
// 创建axios实例 // 创建axios实例
const service = axios.create({ const service = axios.create({
// baseURL: "http://124.71.12.62:9000",//线上
baseURL: "http://39.108.250.202:9000/", // 中台测试服 baseURL: "http://39.108.250.202:9000/", // 中台测试服
// baseURL: "http://192.168.31.137:9000/", // 赓 // baseURL: "http://192.168.31.137:9000/", // 赓
// baseURL: "http://192.168.31.151:9000/", // 榕 // baseURL: "http://192.168.31.151:9000/", // 榕

@ -292,7 +292,7 @@ export default {
this.projectPermissions = this.projectId ? 1 : 0 this.projectPermissions = this.projectId ? 1 : 0
this.assessmentId && this.projectId && this.checkVer() this.assessmentId && this.projectId && this.checkVer()
this.codeId && this.codeIds.push(this.codeId) this.codeId && this.codeIds.push(this.codeId)
if (projectId !=null){ if (projectId !=null && projectId != '' && projectId !='null'){
let params = { let params = {
"projectId":projectId, "projectId":projectId,
} }
@ -452,7 +452,11 @@ export default {
this.projectName = data.data.projectManage.projectName; this.projectName = data.data.projectManage.projectName;
this.projectManage = data.data.projectManage; this.projectManage = data.data.projectManage;
this.requires = data.data.projectJudgmentVos; this.requires = data.data.projectJudgmentVos;
//线
// location.href = 'http://124.71.12.62/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId
//
location.href = 'http://39.108.250.202/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId location.href = 'http://39.108.250.202/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId
//
// location.href = "http://192.168.31.254:8093/#/index/list?"+'token='+token+'&cid='+cid+'&systemId='+systemId // location.href = "http://192.168.31.254:8093/#/index/list?"+'token='+token+'&cid='+cid+'&systemId='+systemId
} }
}).catch((error)=>{ }).catch((error)=>{
@ -639,7 +643,11 @@ export default {
this.minutes = "00"; this.minutes = "00";
this.hour = "00"; this.hour = "00";
this.grade = '00' this.grade = '00'
//线
// location.href = 'http://124.71.12.62/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId
//
location.href = 'http://39.108.250.202/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId location.href = 'http://39.108.250.202/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId
//
// location.href = "http://192.168.31.254:8093/#/index/list?"+'token='+token+'&cid='+cid+'&systemId='+systemId // location.href = "http://192.168.31.254:8093/#/index/list?"+'token='+token+'&cid='+cid+'&systemId='+systemId
}, },
checkVer() { checkVer() {

@ -34,12 +34,13 @@ export default {
}, },
exit(){ exit(){
let assessmentId = sessionStorage.getItem('assessmentId') let assessmentId = sessionStorage.getItem('assessmentId')
console.log(assessmentId)
if (assessmentId != 'null' && assessmentId != null && assessmentId != ''){ if (assessmentId != 'null' && assessmentId != null && assessmentId != ''){
window.location = 'http://39.108.250.202/student/#/ass/list' window.location = 'http://39.108.250.202/student/#/ass/list'
// window.location = 'http://www.occupationlab.com/student/#/ass/list'
}else{ }else{
let cid = sessionStorage.getItem('cid') let cid = sessionStorage.getItem('cid')
window.location = 'http://39.108.250.202/student/#/station/preview?courseId='+cid+'&curriculumName=银行项目' window.location = 'http://39.108.250.202/student/#/station/preview?courseId='+cid+'&curriculumName=银行项目'
// window.location = 'http://www.occupationlab.com/student/#/station/preview?courseId='+cid+'&curriculumName='
} }
}, },
}, },

@ -179,10 +179,18 @@ export default {
let assessmentId = sessionStorage.getItem('assessmentId') let assessmentId = sessionStorage.getItem('assessmentId')
let classId = sessionStorage.getItem('classId') let classId = sessionStorage.getItem('classId')
if (projectId){ if (projectId){
//线
// location.href = 'http://124.71.12.62/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId+'&projectId='+projectId+'&assessmentId='+assessmentId+'&classId='+classId
//
location.href = 'http://39.108.250.202/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId+'&projectId='+projectId+'&assessmentId='+assessmentId+'&classId='+classId location.href = 'http://39.108.250.202/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId+'&projectId='+projectId+'&assessmentId='+assessmentId+'&classId='+classId
//
// location.href = "http://192.168.31.254:8093/#/index/list?"+'token='+token+'&cid='+cid+'&systemId='+systemId+'&projectId='+projectId+'&assessmentId='+assessmentId+'&classId='+classId // location.href = "http://192.168.31.254:8093/#/index/list?"+'token='+token+'&cid='+cid+'&systemId='+systemId+'&projectId='+projectId+'&assessmentId='+assessmentId+'&classId='+classId
}else{ }else{
//线
// location.href = 'http://124.71.12.62/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId
//
location.href = 'http://39.108.250.202/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId location.href = 'http://39.108.250.202/banksystem/#/index/list?'+'token='+token+'&cid='+cid+'&systemId='+systemId
//
// location.href = "http://192.168.31.254:8093/#/index/list?"+'token='+token+'&cid='+cid+'&systemId='+systemId // location.href = "http://192.168.31.254:8093/#/index/list?"+'token='+token+'&cid='+cid+'&systemId='+systemId
} }
}, },

Loading…
Cancel
Save