dev_202412
yujialong 4 months ago
parent 3715bf714a
commit e6903a20d4
  1. 1
      src/pages/match/details/index.vue
  2. 1
      src/pages/match/list/index.vue
  3. 129
      src/pages/station/preview/index.vue
  4. 1
      src/pages/touristMatch/list/index.vue
  5. 2
      src/setting.js

@ -1456,6 +1456,7 @@ export default {
//
toTeam () {
if (this.fromOffical && !this.agreeCheck) return Util.errorMsg('请勾选同意,才可创建团队!')
if (!this.enterForm.realSchoolId) return Util.errorMsg('请选择来自学校')
this.teamVisible = true
},
//

@ -758,6 +758,7 @@ export default {
//
toTeam () {
if (this.fromOffical && !this.agreeCheck) return Util.errorMsg('请勾选同意,才可创建团队!')
if (!this.enterForm.realSchoolId) return Util.errorMsg('请选择来自学校')
this.teamForm = {
competitionId: this.curItem.id,
teamName: '',

@ -44,8 +44,11 @@
</div>
</div>
<div class="catalog">
<el-button v-if="!overdue" class="renew" type="primary" size="small" @click="showBuy">续费</el-button>
<a v-else class="entry" @click="entry">进入实验</a>
<div class="entry-wrap">
<el-button v-if="!overdue" class="renew" type="primary" size="small" @click="showBuy">续费</el-button>
<a v-if="practiceTheoreticalPaper" class="entry" @click="entry(1)">进入理论</a>
<a v-if="practicePracticeProject" class="entry" @click="entry(0)">进入实训</a>
</div>
<div class="list">
<h4 class="title">{{ curriculumName || courseName }}</h4>
<div>
@ -261,11 +264,20 @@
<el-dialog title="请选择项目" v-loading="loading" :visible.sync="projectVisible" width="828px" custom-class="project-dia"
:close-on-click-modal="false">
<ul class="projects">
<li v-for="(item, i) in projects" :key="i" :class="{ active: curProject == item.projectId }"
@click="selectProject(item)">
<img src="@/assets/img/project.png" alt="">
<span>{{ i + 1 }}. {{ item.projectName }}</span>
</li>
<template v-if="isTheory">
<li v-for="(item, i) in papers" :key="i" :class="{ active: curPaper == item.paperId }"
@click="selectPaper(item)">
<img src="@/assets/img/project.png" alt="">
<span>{{ i + 1 }}. {{ item.paperName }}</span>
</li>
</template>
<template v-else>
<li v-for="(item, i) in projects" :key="i" :class="{ active: curProject == item.projectId }"
@click="selectProject(item)">
<img src="@/assets/img/project.png" alt="">
<span>{{ i + 1 }}. {{ item.projectName }}</span>
</li>
</template>
</ul>
<span slot="footer" class="dialog-footer">
@ -308,6 +320,8 @@ export default {
editorConfig,
startTime: Date.now(), //
systemIds: '',
practicePracticeProject: 0,
practiceTheoreticalPaper: 0,
type: 1,
video: "",
chapterList: [], //
@ -358,8 +372,11 @@ export default {
videoSrc: '',
desShrink: false,
projectVisible: false,
isTheory: 0,
projects: [],
papers: [],
loading: false,
curPaper: '',
curProject: '',
overdue: 0, //
buyVisible: false,
@ -446,6 +463,8 @@ export default {
this.teachingObjectives = data.teachingObjectives;
this.assessmentList = data.assessmentConfig;
this.systemIds = data.systemIds
this.practicePracticeProject = data.practicePracticeProject
this.practiceTheoreticalPaper = data.practiceTheoreticalPaper
this.queryProject()
}
this.getStatus()
@ -777,12 +796,17 @@ export default {
fullScreen () {
this.pdfVisible = true
},
//
selectPaper (item) {
this.curPaper = item.paperId
},
//
selectProject (item) {
this.curProject = item.projectId
},
//
showProjectDia () {
showProjectDia (isTheory) {
this.isTheory = isTheory
this.projectVisible = true
},
//
@ -792,8 +816,9 @@ export default {
cId: this.courseId, // id
mallId: this.mallId,
permissions: 0 // 0: ,1:
}).then(({ projects }) => {
this.projects = projects
}).then(res => {
this.projects = res.projects //
this.papers = res.exercisePaperList //
}).catch(res => { })
},
//
@ -811,41 +836,48 @@ export default {
})
},
//
entry () {
// (python)
if (this.systemIds.split(',').includes('19')) { //
this.$post(`${this.api.getSandTableLastCache}?cid=${this.courseId}`).then(res => {
// data
if (res.getLastCache) {
this.entryProject(+res.getLastCache)
} else {
entry (isTheory) {
if (isTheory) {
//
this.showProjectDia(1)
} else {
//
const systemIds = this.systemIds.split(',')
// (python)
if (systemIds.includes('19')) { //
this.$post(`${this.api.getSandTableLastCache}?cid=${this.courseId}`).then(res => {
// data
if (res.getLastCache) {
this.entryProject(+res.getLastCache)
} else {
this.showProjectDia()
}
}).catch(res => {
this.showProjectDia()
}
}).catch(res => {
this.showProjectDia()
})
} else { // python
// python
// const opened = +localStorage.getItem('opened')
// if (opened) {
// Util.errorMsg('Python', 5000)
// return false
// } else {
// localStorage.setItem('opened', 1)
// }
this.$get(this.api.getTheMostRecentlyRunProject, {
cid: this.courseId
}).then(({ data }) => {
// data
if (data && data.length) {
this.entryProject(data[0].projectId)
} else {
})
} else { // python
// python
// const opened = +localStorage.getItem('opened')
// if (opened) {
// Util.errorMsg('Python', 5000)
// return false
// } else {
// localStorage.setItem('opened', 1)
// }
this.$get(this.api.getTheMostRecentlyRunProject, {
cid: this.courseId
}).then(({ data }) => {
// data
if (data && data.length) {
this.entryProject(data[0].projectId)
} else {
this.showProjectDia()
}
}).catch(res => {
this.showProjectDia()
}
}).catch(res => {
this.showProjectDia()
})
})
}
}
},
// python
@ -979,9 +1011,14 @@ $height: 700px;
font-size: 17px;
}
.entry-wrap {
display: flex;
justify-content: space-between;
}
.entry {
display: block;
width: 100%;
width: 48%;
height: 34px;
margin-bottom: 16px;
font-size: 17px;
@ -994,6 +1031,10 @@ $height: 700px;
&:hover {
opacity: 0.9;
}
&:only-child {
width: 100%;
}
}
.types {

@ -641,6 +641,7 @@ export default {
//
toTeam () {
if (this.fromOffical && !this.agreeCheck) return Util.errorMsg('请勾选同意,才可创建团队!')
if (!this.enterForm.realSchoolId) return Util.errorMsg('请选择来自学校')
this.teamForm = {
competitionId: this.curItem.id,
teamName: '',

@ -30,7 +30,7 @@ if (isDev) {
host = "http://121.37.12.51/"; // 测试服
// host = 'https://www.occupationlab.com/' // 正式服
const ip = localStorage.getItem('localIp')
const ips = ['http://192.168.31.217:9000/', 'http://192.168.31.51:9000/', 'https://izhixinyun.com/']
const ips = ['http://192.168.31.217:9000/', 'http://192.168.31.51:9000/', 'http://121.37.12.51/']
host = ips[+ip]
// host = 'http://192.168.31.51:9000/'
} else if (isSq) {

Loading…
Cancel
Save