Merge remote-tracking branch 'origin/master'

UI_2022-02-10
e 3 years ago
commit dc9b1a9059
  1. 3
      src/pages/ass/list/index.vue
  2. 3
      src/pages/station/preview/index.vue

@ -463,8 +463,7 @@ export default {
if(process.env.NODE_ENV === 'development') { if(process.env.NODE_ENV === 'development') {
href = 'http://192.168.31.125:8080/#/' href = 'http://192.168.31.125:8080/#/'
} else { } else {
const path = Setting.pythonList.find(e => e.id === curriculumId).path href = `${location.origin}/pyTrials` // 8pythoncookiesystemId
href = `${location.origin}/${path}`
} }
} }
if (!href) return util.errorMsg("该考核非Python考核,请选择其他考核"); if (!href) return util.errorMsg("该考核非Python考核,请选择其他考核");

@ -311,8 +311,7 @@ export default {
if(process.env.NODE_ENV === 'development') { if(process.env.NODE_ENV === 'development') {
href = 'http://192.168.31.125:8080/#/' href = 'http://192.168.31.125:8080/#/'
} else { } else {
const path = Setting.pythonList.find(e => e.id === id).path href = `${location.origin}/pyTrials` // 8pythoncookiesystemId
href = `${location.origin}/${path}`
} }
} }
if (id != 21 && id != 22) { if (id != 21 && id != 22) {

Loading…
Cancel
Save