From db3f21f48b1105d6aaa0a83f1dea4a3908d6fe7b Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 1 Nov 2024 15:19:39 +0800
Subject: [PATCH] fix

---
 src/pages/record/details/index.vue  |  4 +-
 src/pages/record/list/ass.vue       | 68 +++++++----------------------
 src/pages/station/preview/index.vue |  4 +-
 src/pages/station/product/index.vue |  4 +-
 4 files changed, 22 insertions(+), 58 deletions(-)

diff --git a/src/pages/record/details/index.vue b/src/pages/record/details/index.vue
index 1afd023..fa150b6 100644
--- a/src/pages/record/details/index.vue
+++ b/src/pages/record/details/index.vue
@@ -57,8 +57,8 @@ export default {
         },
       ],
       curriculumId: this.$route.query.curriculumId,
-      projectId: this.$route.query.projectId,
-      paperId: this.$route.query.paperId,
+      projectId: this.$route.query.projectId || '',
+      paperId: this.$route.query.paperId || '',
       listData: [],
       total: 0,
       page: +this.$route.query.page || 1,
diff --git a/src/pages/record/list/ass.vue b/src/pages/record/list/ass.vue
index ee066c6..cfbdb84 100644
--- a/src/pages/record/list/ass.vue
+++ b/src/pages/record/list/ass.vue
@@ -1,63 +1,28 @@
 <template>
   <div>
-    <el-table ref="table"
-              class="table"
-              :data="listData"
-              v-loading="loading"
-              stripe>
-      <el-table-column prop="id"
-                       label="次序"
-                       width="60"
-                       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">
+    <el-table ref="table" class="table" :data="listData" v-loading="loading" stripe>
+      <el-table-column prop="id" label="次序" width="60" 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">
           {{ scope.row.timeSum }}min
         </template>
       </el-table-column>
-      <el-table-column prop="startTime"
-                       width="160"
-                       label="起始时间"
-                       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">
+      <el-table-column prop="startTime" width="160" label="起始时间" 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">
-          <el-button type="text"
-                     @click="toReport(scope.row)">实验成绩报告</el-button>
+          <el-button type="text" @click="toReport(scope.row)">实验成绩报告</el-button>
         </template>
       </el-table-column>
     </el-table>
     <div class="pagination">
-      <el-pagination background
-                     :current-page="page"
-                     layout="total, prev, pager, next"
-                     :total="total"
-                     @current-change="handleCurrentChange"></el-pagination>
+      <el-pagination background :current-page="page" layout="total, prev, pager, next" :total="total"
+        @current-change="handleCurrentChange"></el-pagination>
     </div>
   </div>
 </template>
@@ -120,11 +85,10 @@ export default {
     },
     toReport (row) {
       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>
 
-<style lang="scss" scopted>
-</style>
\ No newline at end of file
+<style lang="scss" scopted></style>
\ No newline at end of file
diff --git a/src/pages/station/preview/index.vue b/src/pages/station/preview/index.vue
index a207484..aae48db 100644
--- a/src/pages/station/preview/index.vue
+++ b/src/pages/station/preview/index.vue
@@ -478,7 +478,7 @@ export default {
       this.$get(this.api.whetherToRenewTheFee, {
         mallId: this.mallId
       }).then(({ isRenew }) => {
-        // 1正常显示资源，0显示续费
+        // 1正常显示资源，0显示续费，-1试用
         this.overdue = isRenew
         this.getChapter()
         this.getProgress()
@@ -707,7 +707,7 @@ export default {
     },
     preview (row, chapterName, showDia = 0) {
       // 如果没过期，则正常预览，否则显示购买弹框
-      if (this.overdue || showDia) {
+      if (this.overdue === 1 || showDia) {
         this.curLink = `${chapterName}${row.name}`; // 章节名称+小节名称，小节名称有重复的情况，如果只用小节名称判断，会有同时选中多个的情况
         this.playAuth = ''
         this.coverUrl = ''
diff --git a/src/pages/station/product/index.vue b/src/pages/station/product/index.vue
index 5b23030..c61a971 100644
--- a/src/pages/station/product/index.vue
+++ b/src/pages/station/product/index.vue
@@ -48,7 +48,7 @@
               <div class="text">{{ form.goodsRes.typeName }}</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>
         </div>
       </div>
@@ -241,7 +241,7 @@ export default {
       const { isRenew } = await this.$get(this.api.whetherToRenewTheFee, {
         mallId: this.id
       })
-      // 1正常显示资源，0显示续费
+      // 1正常显示资源，0显示续费，-1试用
       this.overdue = isRenew
     },
     // tab切换