huoran
/
FE_occupationlab_client
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 14 Wiki Activity

fix

Browse Source
dev_202412
yujialong 4 months ago
parent 55e21d2dbb
commit db3f21f48b
4 changed files with 22 additions and 58 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/pages/record/details/index.vue
  2. 68
      src/pages/record/list/ass.vue
  3. 4
      src/pages/station/preview/index.vue
  4. 4
      src/pages/station/product/index.vue

4
src/pages/record/details/index.vue
Unescape View File

@ -57,8 +57,8 @@ export default {
}, },
], ],
curriculumId: this.$route.query.curriculumId, curriculumId: this.$route.query.curriculumId,
projectId: this.$route.query.projectId, projectId: this.$route.query.projectId || '',
paperId: this.$route.query.paperId, paperId: this.$route.query.paperId || '',
listData: [], listData: [],
total: 0, total: 0,
page: +this.$route.query.page || 1, page: +this.$route.query.page || 1,

68
src/pages/record/list/ass.vue
Unescape View File

@ -1,63 +1,28 @@
<template> <template>
<div> <div>
<el-table ref="table" <el-table ref="table" class="table" :data="listData" v-loading="loading" stripe>
class="table" <el-table-column prop="id" label="次序" width="60" align="center" type="index"></el-table-column>
:data="listData" <el-table-column prop="curriculumName" label="课程名称" align="center"></el-table-column>
v-loading="loading" <el-table-column prop="experimentalName" label="考核名称" align="center"></el-table-column>
stripe> <el-table-column prop="projectName" label="实验项目名称" align="center"></el-table-column>
<el-table-column prop="id" <el-table-column prop="score" width="60" label="得分" align="center"></el-table-column>
label="次序" <el-table-column prop="className" width="100" label="实验班级" align="center"></el-table-column>
width="60" <el-table-column prop="timeSum" width="80" label="耗时" align="center">
align="center"
type="index"></el-table-column>
<el-table-column prop="curriculumName"
label="课程名称"
align="center"></el-table-column>
<el-table-column prop="experimentalName"
label="考核名称"
align="center"></el-table-column>
<el-table-column prop="projectName"
label="实验项目名称"
align="center"></el-table-column>
<el-table-column prop="score"
width="60"
label="得分"
align="center"></el-table-column>
<el-table-column prop="className"
width="100"
label="实验班级"
align="center"></el-table-column>
<el-table-column prop="timeSum"
width="80"
label="耗时"
align="center">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.timeSum }}min {{ scope.row.timeSum }}min
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="startTime" <el-table-column prop="startTime" width="160" label="起始时间" align="center"></el-table-column>
width="160" <el-table-column prop="submitTime" width="160" label="结束时间" align="center"></el-table-column>
label="起始时间" <el-table-column label="操作" width="100" align="center">
align="center"></el-table-column>
<el-table-column prop="submitTime"
width="160"
label="结束时间"
align="center"></el-table-column>
<el-table-column label="操作"
width="100"
align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" <el-button type="text" @click="toReport(scope.row)">实验成绩报告</el-button>
@click="toReport(scope.row)">实验成绩报告</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="pagination"> <div class="pagination">
<el-pagination background <el-pagination background :current-page="page" layout="total, prev, pager, next" :total="total"
:current-page="page" @current-change="handleCurrentChange"></el-pagination>
layout="total, prev, pager, next"
:total="total"
@current-change="handleCurrentChange"></el-pagination>
</div> </div>
</div> </div>
</template> </template>
@ -120,11 +85,10 @@ export default {
}, },
toReport (row) { toReport (row) {
this.$store.commit('project/setReferrer', `${this.$route.path}?mallId=${this.mallId}&curriculumId=${this.curriculumId}&active=${this.$parent.active}&page=${this.page}`) this.$store.commit('project/setReferrer', `${this.$route.path}?mallId=${this.mallId}&curriculumId=${this.curriculumId}&active=${this.$parent.active}&page=${this.page}`)
this.$router.push(`show?reportId=${row.reportId}`); this.$router.push(`${row.paperId ? 'theoryReport' : 'trialReport'}?reportId=${row.reportId}`);
} }
} }
}; };
</script> </script>
<style lang="scss" scopted> <style lang="scss" scopted></style>
</style>

4
src/pages/station/preview/index.vue
Unescape View File

@ -478,7 +478,7 @@ export default {
this.$get(this.api.whetherToRenewTheFee, { this.$get(this.api.whetherToRenewTheFee, {
mallId: this.mallId mallId: this.mallId
}).then(({ isRenew }) => { }).then(({ isRenew }) => {
// 1正常显示资源，0显示续费 // 1正常显示资源，0显示续费，-1试用
this.overdue = isRenew this.overdue = isRenew
this.getChapter() this.getChapter()
this.getProgress() this.getProgress()
@ -707,7 +707,7 @@ export default {
}, },
preview (row, chapterName, showDia = 0) { preview (row, chapterName, showDia = 0) {
// 如果没过期，则正常预览，否则显示购买弹框 // 如果没过期，则正常预览，否则显示购买弹框
if (this.overdue || showDia) { if (this.overdue === 1 || showDia) {
this.curLink = `${chapterName}${row.name}`; // 章节名称+小节名称，小节名称有重复的情况，如果只用小节名称判断，会有同时选中多个的情况 this.curLink = `${chapterName}${row.name}`; // 章节名称+小节名称，小节名称有重复的情况，如果只用小节名称判断，会有同时选中多个的情况
this.playAuth = '' this.playAuth = ''
this.coverUrl = '' this.coverUrl = ''

4
src/pages/station/product/index.vue
Unescape View File

@ -48,7 +48,7 @@
<div class="text">{{ form.goodsRes.typeName }}</div> <div class="text">{{ form.goodsRes.typeName }}</div>
</div> </div>
</div> </div>
<button v-if="!overdue" class="btn" @click="toRenew">续期</button> <button v-if="overdue !== 1" class="btn" @click="toRenew">续期</button>
<button v-else-if="withLink" class="btn entry" @click="toStation">进入实验</button> <button v-else-if="withLink" class="btn entry" @click="toStation">进入实验</button>
</div> </div>
</div> </div>
@ -241,7 +241,7 @@ export default {
const { isRenew } = await this.$get(this.api.whetherToRenewTheFee, { const { isRenew } = await this.$get(this.api.whetherToRenewTheFee, {
mallId: this.id mallId: this.id
}) })
// 1正常显示资源，0显示续费 // 1正常显示资源，0显示续费，-1试用
this.overdue = isRenew this.overdue = isRenew
}, },
// tab切换 // tab切换

Write Preview
Loading…
Cancel
Save