openf12 V2.1.7
yujialong 1 year ago
parent 29a6318bb4
commit 1639b4ed04
  1. 12
      src/components/TestPanel.vue
  2. 5
      src/config/index.js
  3. 2
      src/views/Home.vue

@ -112,7 +112,6 @@
<mavon-editor v-else <mavon-editor v-else
class="md" class="md"
v-model="pd.experimentTarget" v-model="pd.experimentTarget"
defaultOpen="preview"
:ishljs="true" :ishljs="true"
:subfield="false" :subfield="false"
:editable="false" :editable="false"
@ -186,7 +185,6 @@
<mavon-editor v-else <mavon-editor v-else
class="md" class="md"
v-model="pd.experimentDescription" v-model="pd.experimentDescription"
defaultOpen="preview"
:ishljs="true" :ishljs="true"
:subfield="false" :subfield="false"
:editable="false" :editable="false"
@ -211,7 +209,6 @@
<mavon-editor v-else <mavon-editor v-else
class="md" class="md"
v-model="item.experimentalRequirements" v-model="item.experimentalRequirements"
defaultOpen="preview"
:ishljs="true" :ishljs="true"
:subfield="false" :subfield="false"
:editable="false" :editable="false"
@ -230,7 +227,6 @@
<mavon-editor v-else <mavon-editor v-else
class="md" class="md"
v-model="pd.experimentHint" v-model="pd.experimentHint"
defaultOpen="preview"
:ishljs="true" :ishljs="true"
:subfield="false" :subfield="false"
:editable="false" :editable="false"
@ -737,7 +733,7 @@ export default {
this.$router.push(`/report?reportId=${reportId}`) this.$router.push(`/report?reportId=${reportId}`)
} else { } else {
let href = location.origin let href = location.origin
if (!this.$config.isPro && !this.$config.isZxy) href += '/student' if (this.$config.isTest) href += '/student'
href += `/#/record/show?python=1&reportId=${reportId}` href += `/#/record/show?python=1&reportId=${reportId}`
// //
if (this.projectPermissions == 0) { if (this.projectPermissions == 0) {
@ -1321,5 +1317,11 @@ export default {
/deep/.v-note-wrapper { /deep/.v-note-wrapper {
min-height: 0; min-height: 0;
height: auto; height: auto;
.v-note-panel .v-note-show {
overflow: visible;
.v-show-content {
overflow: visible;
}
}
} }
</style> </style>

@ -2,6 +2,7 @@ import Cookie from 'js-cookie'
const url = location.host const url = location.host
const isDev = process.env.NODE_ENV === 'development' //是否本地 const isDev = process.env.NODE_ENV === 'development' //是否本地
const isTest = url.includes('121.37.12.51') //测试服
const isHh = url.includes('10.196.131.73') //是否是河海版本 const isHh = url.includes('10.196.131.73') //是否是河海版本
const isPro = url.includes('occupationlab.com') //是否职站生产 const isPro = url.includes('occupationlab.com') //是否职站生产
const isZxy = url.includes('izhixinyun.com') //是否智信云 const isZxy = url.includes('izhixinyun.com') //是否智信云
@ -33,6 +34,10 @@ export default {
* @description 是否本地 * @description 是否本地
*/ */
isDev, isDev,
/**
* @description 测试服
*/
isTest,
/** /**
* @description 是否是河海版本 * @description 是否是河海版本
*/ */

@ -214,7 +214,7 @@ export default {
`http://${location.hostname}:8082/#/` : `http://${location.hostname}:8082/#/` :
`${location.origin}${this.fromManager ? `${location.origin}${this.fromManager ?
'/admin' : '/admin' :
(this.$config.isPro || this.$config.isZxy) ? (!this.$config.isTest) ?
'' : '' :
'/student'}/#/` '/student'}/#/`
// //

Loading…
Cancel
Save