yujialong 2 months ago
parent 1d74a542c9
commit 3a75b3e136
  1. 7
      src/components/TestPanel.vue
  2. 15
      src/config/index.js
  3. 4
      src/util/index.js

@ -676,7 +676,6 @@ export default {
this.$router.push(`/report?reportId=${reportId}`)
} else {
let href = location.origin
if (this.$config.isTest) href += '/student'
if (this.$config.isDev) href = `http://${location.hostname}:8082`
href += `/#/record/trialReport?python=1&reportId=${reportId}`
//
@ -1125,11 +1124,11 @@ export default {
this.client.heartbeat.incoming = 0
//
const headers = {
login: this.$config.isTest ? 'huorantest' : 'huoran',
passcode: this.$config.isTest ? 'huorantest2024' : 'huoran2024'
login: 'huoran',
passcode: 'huoran2024'
};
//
this.client.connect(headers.login, headers.passcode, this.onConnected, this.$config.isTest ? `pytest` : 'pyhost')
this.client.connect(headers.login, headers.passcode, this.onConnected, this.onFailed, this.$config.isTest ? `pytest` : 'pyhost')
},
onConnected () {
//

@ -2,9 +2,8 @@ import Cookie from 'js-cookie'
const url = location.host
const isDev = process.env.NODE_ENV === 'development' //是否本地
const isTest = url.includes('118.31.167.228') //测试服
const isTest = url.includes('occupationlab.com') //测试服
const isHh = url.includes('10.196.131.73') //是否是河海版本
const isPro = url.includes('occupationlab.com') //是否职站生产
const isZxy = url.includes('izhixinyun.com') //是否智信云
let vscodeUrl = 'http://172.16.40.56:8088/'
@ -12,15 +11,13 @@ let host = location.origin + '/'
// let host = `https://izhixinyun.com/`
let bankPath = `${location.origin}/systembank` // 银行系统
// 118.31.167.228 | 192.168.31.151
// occupationlab.com | 192.168.31.151
if (isDev) {
host = 'http://192.168.31.217:9000/'
host = 'http://118.31.167.228/'
host = 'https://occupationlab.com/'
// host = 'https://izhixinyun.com/'
bankPath = `http://${location.hostname}:8093`
} else if (isPro) {
host = 'https://occupationlab.com/'
bankPath = `https://www.huorantech.cn/systembank`
} else if (isTest) {
vscodeUrl = 'https://vscode.occupationlab.com'
} else if (isZxy) {
vscodeUrl = 'https://vscode.izhixinyun.com'
@ -44,10 +41,6 @@ export default {
* @description 是否是河海版本
*/
isHh,
/**
* @description 是否是职站生产
*/
isPro,
/**
* @description 是否智信云
*/

@ -106,9 +106,7 @@ export default {
`http://${location.hostname}:8082/#/` :
`${location.origin}${Cookie.get('admin-fromManager') ?
'/admin' :
(!Config.isTest) ?
'' :
'/student'}/#/`
''}/#/`
// 考核
if (Cookie.get('admin-assessmentId')) {
href += `ass/list`

Loading…
Cancel
Save