From 058b1c3fc449ed6cbe8b52ee0ffc37b37f0e87d1 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 10 Aug 2023 10:33:58 +0800
Subject: [PATCH] fix

---
 src/api/index.js                    |   1 +
 src/assets/img/entry.png            | Bin 1144 -> 15730 bytes
 src/components/breadcrumb/index.vue |  81 +--
 src/layouts/header/index.vue        |   2 +-
 src/layouts/navbar/index.vue        |  11 +-
 src/pages/ass/list/index.vue        |  16 +-
 src/pages/course/details/index.vue  | 730 +++++++++++++++-------------
 src/pages/match/details/index.vue   |   7 +-
 src/pages/match/list/index.vue      |   8 +-
 src/pages/record/list/ass.vue       |   9 +-
 src/pages/record/list/index.vue     |  54 +-
 src/pages/record/list/practice.vue  |   4 +-
 src/pages/record/show/index.vue     |  66 ++-
 src/pages/screen/index.vue          |   3 +
 src/pages/station/preview/index.vue |  92 ++--
 src/setting.js                      |   2 +-
 src/styles/page/station.scss        |  12 +-
 17 files changed, 593 insertions(+), 505 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index 3abb6e2..6de39a0 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -181,6 +181,7 @@ export default {
     fileDeletion: `${uploadURL}oss/manage/fileDeletion`, // 删除OSS文件
     fileupload: `${uploadURL}oss/manage/fileupload`, // 文件上传
     getPlayAuth: `${uploadURL}oss/manage/getPlayAuth`, // 获取播放凭证
+    getPlayAuthNakadai: `nakadai/nakadai/oss/getPlayAuth`, // 获取播放凭证
 
     queryProvince: `nakadai/nakadai/province/queryProvince`, //查询省份
     queryCity: `nakadai/nakadai/city/queryCity`, //查询城市
diff --git a/src/assets/img/entry.png b/src/assets/img/entry.png
index abf3fbb94ff4ca2d98f3737ac50beb9f8dd52ab6..fefe9aea60120bbec8b65a5b2ffb932be61d2632 100644
GIT binary patch
literal 15730
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
OI(pbh>F&s>+5ZJ#Y~BI@

delta 1134
zcmV-!1d;pldiV&C8Gi!+005L|w<!Ps0I^U^R7Der{{Vjf0000glm8lw{~L?{1c3i5
zlm8-)|0|RK0Dk`~lm8ow{{(>l9*qAFhW{my{~3z^2ZH|<i2oCZ|0$CHw%Y$7j{gdS
z{|tox-tPa)<^M00|09q8K%W0PoBx5o|LF7ouh#!@xBp?U|9>iz|MmL+<njO6>;In4
z|7x@UOQiocng8wf|I+CH$KwBs#Q#~V|C7o8c)R}zg8oFH|H0t@sMG(x-v3jm|1+5X
zfOhg&0000AbW%=JCh!39@U5+_@$TG>%U%Eg18hk|K~!ko?bvB^nm`-|aMCtu`|K{e
zEVmq@XuR*JNq@fo2kQccRMV;Po(}!Jz;Sq?Jp7LV?TdE*jpi&=)!l=NLHkDEa8%Zv
zrrpzb3{}PMvx4|v62ADV(chS;CQ1m|3c^4Y`GQm}2p)zUI~XOoO0`Bf9ER9t+2k#V
z3JuE-L3j~)qtObj&z;tgI(esEtss0T#tf{FLTF)2%YVcc-ohm@+9rPv!oo%MdJ-6}
zARkd!bj##DuJjh!(E|w-3QQXpOhQtdY|;3&283KUS=bua<Hvd%xul5=r%~HzG$CEr
z?MT=)yTfrA+$Fm-Fm4)#$r%puWa!2d4#WEBO-7FM=p@Lo@e&1Ri8{bufI$;j%vcBh
z<OPc+!++T^uG{1z4aa!WGfz0!@VRUarTdIR+BO}B$Pp0sf%Vc2yw#-DYIU0uXT&^9
z7eqN*5Qd&HZ~${YUjVW5TM%T`4d2cRb;=qc7wB<wF&|8))3`aq88GQ{le$F)XAMFx
z-~j$C4M?&cC&^=yn8-}~{T>R#U~Ynpk?Y9TTz`643WS3rFWlpnYIsU@HxhQ6?6_q`
zC?c@a$vRy;rl|>qHcZ)ZvC&VliN#klbJS|aiv&q>Smkrm&?B+`!f!hxL;%(?-dm%W
z0I7q_+R1df>aa#;I_uA013bt045<Qeg-uE)1#$7MA%bjSmO->?9>B&kD6e&8+Rctb
zSbu|QGJl~pG^~-gw+0Notbh}PxSF`Dk9iryauh-dM|BihonSS9lJ;g+Z-5D1zBqr|
zf@Zk^{;eQ}wWdP>uoOyvv_x(&8ss0Vz((wJ2gt2nxiU{V`(q~<ZqWz-Vi2qwqhIR=
zlgT6)*Xy+q8*#_Qv@@9%U&aoA-t#za6n|zP>Y&Wv7C|tXts|<tZWKjAM2f3Z!?d_B
z@kurmuDe2E@KBP#P{#&~0f;uk2h88;g{ua^JZtYfwj<rJe1;41EP8APrw76O!>Z7Z
zsO2%78B-ZVC#;1NgJAsFJ0NsR;uu%&h5bQr<HVo0UGw-(DI3xzSEcQFMm?HPjc0;`
zNk5xO<l1(F;Ag%KZSmPL$~<lvy0FR3Xm{A~>81WgTSR)kYJE?#l9ZmGFXj9(>DIn#
z56Cc6kV^ZmX?Mk&%xe3oX<xL5AEe^Ge%HSI0&qc_8iVg&mjD0&07*qoM6N<$g0bN~
Ab^rhX

diff --git a/src/components/breadcrumb/index.vue b/src/components/breadcrumb/index.vue
index c128970..9a6a143 100644
--- a/src/components/breadcrumb/index.vue
+++ b/src/components/breadcrumb/index.vue
@@ -3,15 +3,13 @@
   <div class="breadcrumb">
     <el-breadcrumb separator=">">
       <template v-for="(item, index) in pages">
-        <el-breadcrumb-item
-          v-if="index != pages.length - 1"
-          :key="index"
-          :to="{ path: route, query }">
+        <el-breadcrumb-item v-if="index != pages.length - 1"
+                            :key="index"
+                            :to="{ path: route, query }">
           {{item}}
         </el-breadcrumb-item>
-        <el-breadcrumb-item
-          v-else
-          :key="index">
+        <el-breadcrumb-item v-else
+                            :key="index">
           {{item}}
         </el-breadcrumb-item>
       </template>
@@ -21,44 +19,53 @@
 
 <script>
 export default {
-    props: {
-      data: {
-        type: String,
-        required: true
-      },
-      route: {
-        type: String,
-        default: 'list'
-      },
-      query: {
-        type: Object
-      }
+  props: {
+    data: {
+      type: String,
+      required: true
     },
-    data() {
-      return {
-        pages: this.data.split('/')
-      };
+    route: {
+      type: String,
+      default: 'list'
     },
-    methods: {
-      update(data){
-        this.pages = data.split('/')
-      }
+    query: {
+      type: Object
     }
+  },
+  data () {
+    return {
+      pages: this.data.split('/')
+    };
+  },
+  methods: {
+    update (data) {
+      this.pages = data.split('/')
+    }
+  }
 };
 </script>
 <style lang="scss" scoped>
 .breadcrumb {
-  margin: 4px 0 16px;
-  /deep/.el-breadcrumb__item {
-    .is-link, .el-breadcrumb__separator {
-      font-weight: 400;
-      color: $main-color;
+    display: flex;
+    align-items: center;
+    /deep/.el-breadcrumb {
+        margin: 4px 0 16px;
     }
-    &:last-child {
-      .is-link {
-        color: #0B1D30;
-      }
+    /deep/.el-breadcrumb__item {
+        .el-breadcrumb__inner,
+        .el-breadcrumb__separator {
+            font-size: 16px;
+            font-weight: 400;
+        }
+        .is-link,
+        .el-breadcrumb__separator {
+            color: $main-color;
+        }
+        &:last-child {
+            .is-link {
+                color: #0b1d30;
+            }
+        }
     }
-  }
 }
 </style>
\ No newline at end of file
diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index 3ee5238..0a6d699 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -151,7 +151,7 @@ export default {
     },
     initSocket ({ id, account }) {
       // 实例化socket
-      this.socket = new WebSocket(`wss://${Setting.isDev ? '121.37.12.51' : location.host}/nakadai/websocket/${id}/${account}`)
+      this.socket = new WebSocket(`${Setting.isTest ? 'ws' : 'wss'}://${Setting.isDev ? '121.37.12.51' : location.host}/nakadai/websocket/${id}/${account}`)
       // this.socket = new WebSocket(`ws://121.37.12.51:9100/nakadai/websocket/${id}/${account}`)
       // 监听socket连接
       this.socket.onopen = this.open;
diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue
index 0423736..422183f 100644
--- a/src/layouts/navbar/index.vue
+++ b/src/layouts/navbar/index.vue
@@ -268,12 +268,19 @@ export default {
         }
     }
 }
-@media (max-width: 1380px) {
+@media (max-width: 1440px) {
     .nav {
-        left: 58%;
+        left: 53%;
         & > li {
             padding: 0 10px;
         }
     }
 }
+@media (max-width: 1360px) {
+    .nav {
+        & > li {
+            padding: 0 4px;
+        }
+    }
+}
 </style>
\ No newline at end of file
diff --git a/src/pages/ass/list/index.vue b/src/pages/ass/list/index.vue
index 4afb955..cdc2947 100644
--- a/src/pages/ass/list/index.vue
+++ b/src/pages/ass/list/index.vue
@@ -490,30 +490,32 @@ export default {
       this.invitationCode = "";
     },
     goSubSystem () {
-      let token = util.local.get(Setting.tokenKey)
+      const token = util.local.get(Setting.tokenKey)
       const classId = this.classId
       const classItem = this.classList.find(e => e.id == classId)
-      let curriculumId = this.curRow.curriculumId
+      const row = this.curRow
+      const { curriculumId, mallId } = row
       util.cookies.set("token", token)
       util.cookies.set("assessmentId", this.assessmentId)
       util.cookies.set("classId", classId)
       util.cookies.set("className", classItem ? encodeURI(classItem.className) : '')
       util.cookies.set("projectId", this.projectId)
       util.cookies.set("courseId", this.cid)
-      util.cookies.set("curriculumName", escape(this.curRow.sysName));
-      util.cookies.set("startTime", this.curRow.startTime)
-      util.cookies.set("stopTime", this.curRow.stopTime)
+      util.cookies.set("curriculumName", escape(row.sysName));
+      util.cookies.set("startTime", row.startTime)
+      util.cookies.set("stopTime", row.stopTime)
       util.cookies.set("systemId", this.systemId);
+      util.cookies.set('mallId', mallId)
       util.cookies.set('fromManager', '', -1)
       util.cookies.set('competitionId', '', -1)
       util.cookies.set('isSubmit', '', -1)
       util.cookies.set('language', '', -1)
       let href = ''
       if (curriculumId == 11) {
-        href = `${Setting.systemPath}/#/index/list?token=${token}&cid=${this.cid}&systemId=${this.systemId}&projectId=${this.projectId}&assessmentId=${this.assessmentId}&classId=${this.classId}&stopTime=${this.stopTime}`;
+        href = `${Setting.systemPath}/#/index/list?token=${token}&cid=${this.cid}&systemId=${this.systemId}&projectId=${this.projectId}&mallId=${mallId}&assessmentId=${this.assessmentId}&classId=${classId}&stopTime=${this.stopTime}`;
       } else if (curriculumId == 12) {
         // 众筹系统
-        window.open(`http://120.78.139.126:8879?systemId=${this.systemId}&courseId=${this.cid}&projectId=${this.projectId}&token=${token}&userId=${this.userId}&assessmentId=${this.assessmentId}&classId=${this.curRow.classId}`);
+        window.open(`http://120.78.139.126:8879?systemId=${this.systemId}&courseId=${this.cid}&projectId=${this.projectId}&token=${token}&userId=${this.userId}&assessmentId=${this.assessmentId}&classId=${classId}&mallId=${mallId}`);
       } else {
         if (process.env.NODE_ENV === 'development') {
           href = 'http://192.168.31.125:8085/#/'
diff --git a/src/pages/course/details/index.vue b/src/pages/course/details/index.vue
index f952055..c07ecd1 100644
--- a/src/pages/course/details/index.vue
+++ b/src/pages/course/details/index.vue
@@ -1,74 +1,117 @@
 <template>
-    <div class="wrap pb">
-        <breadcrumb ref="breadcrumb" :data="'课程学习/' + courseName" :query="breadcrumbQuery"></breadcrumb>
-        <div class="flex">
-            <div class="cover" :class="{'is-word': showMask1}">
-                <img v-if="coverUrl" :src="coverUrl" alt="" width="100%" height="100%">
-                <template v-else-if="iframeSrc">
-                    <iframe class="inner fileIframe" id="fileIframe" :src="iframeSrc" frameborder="0"></iframe>
-                    <template v-if="showMask">
-                        <div class="mask" style="width: 500px;height: 30px;top: 53px;right: 320px"></div>
-                        <div class="mask" style="width: 175px;height: 30px;top: 53px;right: 5px"></div>
-                    </template>
-                    <template v-if="showMask1">
-                        <div class="word-mask" style="height: 40px;"></div>
-                        <div class="word-mask2" style="top: 55px;left: 28%;width: 44%;height: calc(100% - 80px);"></div>
-                    </template>
-                    <template v-if="showMask2">
-                        <div class="excel-mask1" style="height: 48px;"></div>
-                    </template>
-                </template>
-                <div class="pdf inner" v-else-if="pdfSrc">
-                    <p class="arrow">
-                        <span @click="changePdfPage(0)" class="turn el-icon-arrow-left" :class="{grey: currentPage==1}"></span>
-                        {{currentPage}} / {{pageCount}}
-                        <span @click="changePdfPage(1)" class="turn el-icon-arrow-right" :class="{grey: currentPage==pageCount}"></span>
+  <div class="wrap pb">
+    <breadcrumb ref="breadcrumb"
+                :data="'课程学习/' + courseName"
+                :query="breadcrumbQuery"></breadcrumb>
+    <div class="flex">
+      <div class="cover"
+           :class="{'is-word': showMask1}">
+        <img v-if="coverUrl"
+             :src="coverUrl"
+             alt=""
+             width="100%"
+             height="100%">
+        <template v-else-if="iframeSrc">
+          <iframe class="inner fileIframe"
+                  id="fileIframe"
+                  :src="iframeSrc"
+                  frameborder="0"></iframe>
+          <template v-if="showMask">
+            <div class="mask"
+                 style="width: 500px;height: 30px;top: 53px;right: 320px"></div>
+            <div class="mask"
+                 style="width: 175px;height: 30px;top: 53px;right: 5px"></div>
+          </template>
+          <template v-if="showMask1">
+            <div class="word-mask"
+                 style="height: 40px;"></div>
+            <div class="word-mask2"
+                 style="top: 55px;left: 28%;width: 44%;height: calc(100% - 80px);"></div>
+          </template>
+          <template v-if="showMask2">
+            <div class="excel-mask1"
+                 style="height: 48px;"></div>
+          </template>
+        </template>
+        <div class="pdf inner"
+             v-else-if="pdfSrc">
+          <p class="arrow">
+            <span @click="changePdfPage(0)"
+                  class="turn el-icon-arrow-left"
+                  :class="{grey: currentPage==1}"></span>
+            {{currentPage}} / {{pageCount}}
+            <span @click="changePdfPage(1)"
+                  class="turn el-icon-arrow-right"
+                  :class="{grey: currentPage==pageCount}"></span>
+          </p>
+          <pdf class="pdf-wrap"
+               :src="pdfSrc"
+               :page="currentPage"
+               @num-pages="pageCount=$event"
+               @page-loaded="currentPage=$event"
+               @loaded="loadPdfHandler">
+          </pdf>
+        </div>
+        <div class="inner"
+             v-else-if="playAuth">
+          <div class="video_wid"
+               id="player"></div>
+        </div>
+      </div>
+      <div class="catalog">
+        <div class="list">
+          <h4 class="title">{{courseName}}</h4>
+          <div class="desc-wrap">
+            <div class="desc"
+                 :class="{active: desShrink}"
+                 v-html="description"></div>
+            <i class="arrow"
+               :class="{active: desShrink}"
+               v-if="description && description.length > 40">
+            </i>
+          </div>
+          <div class="chapters">
+            <template v-if="chapterList && chapterList.length">
+              <div class="chapter"
+                   v-for="(item,index) in chapterList"
+                   :key="index">
+                <div class="chapterName">{{item.name}}</div>
+                <div class="section"
+                     v-if="item.subsectionList.length">
+                  <div v-for="(section,i) in item.subsectionList"
+                       :key="i"
+                       @click="preview(section, item.name)">
+                    <p class="sectionName"
+                       :class="{active: curLink === `${item.name}${section.name}`}">
+                      <img v-if="section.fileType === 'pptx'"
+                           src="@/assets/img/exts/ppt.png"
+                           alt="">
+                      <img v-else-if="section.fileType === 'mp4'"
+                           src="@/assets/img/exts/video.png"
+                           alt="">
+                      <img v-else-if="section.fileType === 'doc' || section.fileType === 'docx'"
+                           src="@/assets/img/exts/word.png"
+                           alt="">
+                      <img v-else-if="section.fileType === 'txt'"
+                           src="@/assets/img/exts/txt.png"
+                           alt="">
+                      <img v-else-if="section.fileType === 'pdf'"
+                           src="@/assets/img/exts/pdf.png"
+                           alt="">
+                      <img v-else
+                           src="@/assets/img/exts/pic.png"
+                           alt="">
+                      {{ section.name }}
                     </p>
-                    <pdf
-                        class="pdf-wrap"
-                        :src="pdfSrc"
-                        :page="currentPage"
-                        @num-pages="pageCount=$event"
-                        @page-loaded="currentPage=$event"
-                        @loaded="loadPdfHandler">
-                    </pdf>
-                </div>
-                <div class="inner" v-else-if="playAuth">
-                    <div class="video_wid" id="player"></div>
-                </div>
-            </div>
-            <div class="catalog">
-                <div class="list">
-                    <h4 class="title">{{courseName}}</h4>
-                    <div class="desc-wrap">
-                        <div class="desc" :class="{active: desShrink}" v-html="description"></div>
-                        <i class="arrow" :class="{active: desShrink}" v-if="description && description.length > 40">
-                        </i>
-                    </div>
-                    <div class="chapters">
-                        <template v-if="chapterList && chapterList.length">
-                            <div class="chapter" v-for="(item,index) in chapterList" :key="index">
-                                <div class="chapterName">{{item.name}}</div>
-                                <div class="section" v-if="item.subsectionList.length">
-                                    <div v-for="(section,i) in item.subsectionList" :key="i" @click="preview(section, item.name)">
-                                        <p class="sectionName" :class="{active: curLink === `${item.name}${section.name}`}">
-                                          <img v-if="section.fileType === 'pptx'" src="@/assets/img/exts/ppt.png" alt="">
-                                          <img v-else-if="section.fileType === 'mp4'" src="@/assets/img/exts/video.png" alt="">
-                                          <img v-else-if="section.fileType === 'doc' || section.fileType === 'docx'" src="@/assets/img/exts/word.png" alt="">
-                                          <img v-else-if="section.fileType === 'txt'" src="@/assets/img/exts/txt.png" alt="">
-                                          <img v-else-if="section.fileType === 'pdf'" src="@/assets/img/exts/pdf.png" alt="">
-                                          <img v-else src="@/assets/img/exts/pic.png" alt="">
-                                          {{ section.name }}
-                                        </p>
-                                    </div>
-                                </div>
-                            </div>
-                        </template>
-                    </div>
+                  </div>
                 </div>
-            </div>
+              </div>
+            </template>
+          </div>
         </div>
+      </div>
     </div>
+  </div>
 </template>
 
 <script>
@@ -81,205 +124,208 @@ import breadcrumb from '@/components/breadcrumb'
 import Setting from "@/setting"
 import util from "@/libs/util"
 export default {
-    data() {
-        return {
-            breadcrumbQuery: {
-              source: this.$route.query.source
-            },
-            startTime: Date.now(), // 页面进来的时间
-            id: this.$route.query.id,
-            video: 'http://liuwanr.oss-cn-shenzhen.aliyuncs.com/mp4/20200519/1589871025648.mp4',
-            chapterList: [],
-            courseName: '',
-            description: '',
-            coverUrl: '',
-            playAuth: '',
-            player: null,
-            previewImg: '',
-            iframeSrc: '',
-            isWord: false,
-            isPPT: false,
-            isExcel: false,
-            showMask: false,
-            showMask1: false,
-            showMask2: false,
-            closePosi: {
-                top: '80px'
-            },
-            pdfVisible: false,
-            pdfSrc: '',
-            currentPage: 0, // pdf文件页码
-            pageCount: 0, // pdf文件总页数
-            fileType: 'pdf', // 文件类型
-            desShrink: false,
-            curLink: "", // 当前选中
-        };
+  data () {
+    return {
+      breadcrumbQuery: {
+        source: this.$route.query.source
+      },
+      startTime: Date.now(), // 页面进来的时间
+      id: this.$route.query.id,
+      video: 'http://liuwanr.oss-cn-shenzhen.aliyuncs.com/mp4/20200519/1589871025648.mp4',
+      chapterList: [],
+      courseName: '',
+      description: '',
+      coverUrl: '',
+      playAuth: '',
+      player: null,
+      previewImg: '',
+      iframeSrc: '',
+      isWord: false,
+      isPPT: false,
+      isExcel: false,
+      showMask: false,
+      showMask1: false,
+      showMask2: false,
+      closePosi: {
+        top: '80px'
+      },
+      pdfVisible: false,
+      pdfSrc: '',
+      currentPage: 0, // pdf文件页码
+      pageCount: 0, // pdf文件总页数
+      fileType: 'pdf', // 文件类型
+      desShrink: false,
+      curLink: "", // 当前选中
+    };
+  },
+  computed: {
+    ...mapState({
+      courseId: state => state.courseId,
+      classId: state => state.classId,
+    }),
+  },
+  components: { pdf, breadcrumb },
+  mounted () {
+    this.insertScript()
+    this.getData()
+  },
+  destroyed () {
+    // 记录播放时长
+    util.local.get(Setting.tokenKey) && this.$post(this.api.playRecordSave, {
+      courseId: this.id,
+      courseType: 1,
+      playTime: Math.ceil((Date.now() - this.startTime) / 1000 / 60)
+    }).then(({ data }) => { }).catch(res => { })
+  },
+  methods: {
+    ...mapMutations('project', [
+      'SET_COURSE'
+    ]),
+    getData () {
+      this.$post(`${this.api.findByIdCourse}?id=${this.id}`).then(({ data }) => {
+        this.courseName = data.courseName
+        this.description = data.courseIntroduction
+        this.coverUrl = data.coverUrl || 'https://huoran.oss-cn-shenzhen.aliyuncs.com/20220224/png/1496735335294984192.png'
+        this.getChapter()
+        this.$refs.breadcrumb.update('课程学习/' + (this.$route.query.source == 1 ? '本校课程' : '共享课程') + '/' + this.courseName)
+      }).catch(res => { })
     },
-    computed: {
-        ...mapState({
-            courseId: state => state.courseId,
-            classId: state => state.classId,
-        }),
+    async getChapter () {
+      let res = await this.$get(`${this.api.queryChaptersAndSubsections}?courseId=${this.id}`)
+      this.chapterList = res.chapterList
+      if (this.chapterList.length && this.chapterList[0].subsectionList && this.chapterList[0].subsectionList.length) {
+        this.preview(this.chapterList[0].subsectionList[0], this.chapterList[0].name, 0);
+      }
     },
-    components: { pdf, breadcrumb },
-    mounted() {
-        this.insertScript()
-        this.getData()
+    insertScript () {
+      const linkTag = document.createElement('link');
+      linkTag.rel = 'stylesheet';
+      linkTag.href = 'https://g.alicdn.com/de/prismplayer/2.8.2/skins/default/aliplayer-min.css';
+      document.body.appendChild(linkTag);
+
+      const scriptTag = document.createElement('script');
+      scriptTag.type = 'text/javascript';
+      scriptTag.src = 'https://g.alicdn.com/de/prismplayer/2.8.2/aliplayer-min.js';
+      document.body.appendChild(scriptTag);
     },
-    destroyed() {
-      // 记录播放时长
-      util.local.get(Setting.tokenKey) && this.$post(this.api.playRecordSave, {
-        courseId: this.id,
-        courseType: 1,
-        playTime: Math.ceil((Date.now() - this.startTime) / 1000 / 60)
-      }).then(({ data }) => {}).catch(res => {})
+    transferType (ext) {
+      const suf = ext.toLowerCase()
+      if ('jpg,jpeg,png,gif,svg,psd'.includes(suf)) return '图片'
+      if ('mp4,3gp,mov,m4v,avi,dat,mkv,flv,vob,rmvb,rm,qlv'.includes(suf)) return '视频'
+      return suf
     },
-    methods: {
-        ...mapMutations('project', [
-          'SET_COURSE'
-        ]),
-        getData(){
-          this.$post(`${this.api.findByIdCourse}?id=${this.id}`).then(({ data }) => {
-            this.courseName = data.courseName
-            this.description = data.courseIntroduction
-            this.coverUrl = data.coverUrl || 'https://huoran.oss-cn-shenzhen.aliyuncs.com/20220224/png/1496735335294984192.png'
-            this.getChapter()
-            this.$refs.breadcrumb.update('课程学习/' + (this.$route.query.source == 1 ? '本校课程' : '共享课程') + '/' + this.courseName)
-          }).catch(res => {})
-        },
-        async getChapter(){
-            let res = await this.$get(`${this.api.queryChaptersAndSubsections}?courseId=${this.id}`)
-            this.chapterList = res.chapterList
-            if (this.chapterList.length && this.chapterList[0].subsectionList && this.chapterList[0].subsectionList.length) {
-                this.preview(this.chapterList[0].subsectionList[0], this.chapterList[0].name, 0);
-            }
-        },
-        insertScript(){
-            const linkTag = document.createElement('link');
-            linkTag.rel = 'stylesheet';
-            linkTag.href = 'https://g.alicdn.com/de/prismplayer/2.8.2/skins/default/aliplayer-min.css';
-            document.body.appendChild(linkTag);
-
-            const scriptTag = document.createElement('script');
-            scriptTag.type = 'text/javascript';
-            scriptTag.src = 'https://g.alicdn.com/de/prismplayer/2.8.2/aliplayer-min.js';
-            document.body.appendChild(scriptTag);
-        },
-        transferType(ext){
-          const suf = ext.toLowerCase()
-          if('jpg,jpeg,png,gif,svg,psd'.includes(suf)) return '图片'
-          if('mp4,3gp,mov,m4v,avi,dat,mkv,flv,vob,rmvb,rm,qlv'.includes(suf)) return '视频'
-          return suf
-        },
-        preview(row, chapterName, showConfirm = 1){
-            // 如果没登录，直接去登录
-            if (!util.local.get(Setting.tokenKey) && !util.local.get('oc_server_token') && showConfirm) {
-              this.$confirm('请先登录，是否直接前往登录？', "提示", {
-                type: 'success'
-              }).then(() => {
-                this.SET_COURSE(this.id)
-                this.$router.push('/login')
-              }).catch(() => {})
-              return false
-            }
-            this.curLink = `${chapterName}${row.name}`;
+    preview (row, chapterName, showConfirm = 1) {
+      // 如果没登录，直接去登录
+      if (!util.local.get(Setting.tokenKey) && !util.local.get('oc_server_token') && showConfirm) {
+        this.$confirm('请先登录，是否直接前往登录？', "提示", {
+          type: 'success'
+        }).then(() => {
+          this.SET_COURSE(this.id)
+          this.$router.push('/login')
+        }).catch(() => { })
+        return false
+      }
+      this.curLink = `${chapterName}${row.name}`;
+      this.playauth = ''
+      this.coverUrl = ''
+      this.pdfSrc = ''
+      this.iframeSrc = ''
+      this.isPPT = false
+      this.isWord = false
+      this.isExcel = false
+      if (this.transferType(row.fileType) == '视频') {
+        this.$get(`${this.api.getPlayAuthNakadai}/${row.fileId}`).then(res => {
+          this.playAuth = res.playAuth
+          // 如果已经产生了实例，则销毁重新创建，不然播放器会播放上一个视频
+          if (this.player) {
+            this.player.dispose()
             this.player = null
-            this.playauth = ''
-            this.coverUrl = ''
-            this.pdfSrc = ''
-            this.iframeSrc = ''
+          }
+          this.$nextTick(() => {
+            if (this.player) {
+              this.player.replayByVidAndPlayAuth(row.fileId, this.playAuth);
+            } else {
+              this.player = new Aliplayer({
+                id: "player",
+                width: "100%",
+                autoplay: false,
+                vid: row.fileId,
+                playauth: this.playAuth,
+                encryptType: 1 //当播放私有加密流时需要设置。
+              });
+            }
+          });
+        }).catch(res => { })
+      } else if (this.transferType(row.fileType) == '图片') {
+        this.coverUrl = row.fileUrl
+      } else if (row.fileType == 'pdf') {
+        this.pdfSrc = row.fileUrl
+        this.pdfVisible = true
+      } else {
+        this.$get(`${this.api.getSubsection}?subsectionId=${row.id}`).then(res => {
+          if (row.fileType == 'pptx') {
+            this.isPPT = true
+            this.isWord = false
+            this.isExcel = false
+          } else if (row.fileType == 'doc' || row.fileType == 'docx') {
+            this.isPPT = false
+            this.isWord = true
+            this.isExcel = false
+          } else if (row.fileType == 'xls' || row.fileType == 'xlsx') {
+            this.isExcel = true
+            this.isPPT = false
+            this.isWord = false
+          } else {
             this.isPPT = false
             this.isWord = false
             this.isExcel = false
-            if(this.transferType(row.fileType) == '视频'){
-                this.$get(`${this.api.getPlayAuth}/${row.fileId}`).then(res => {
-                    this.playAuth = res.data.playAuth
-                    this.$nextTick(() => {
-                        if(this.player){
-                            this.player.replayByVidAndPlayAuth(row.fileId,this.playAuth)
-                        }else{
-                            this.player = new Aliplayer({
-                                id: 'player',
-                                width: '100%',
-                                autoplay: false,
-                                vid : row.fileId,
-                                playauth : this.playAuth,
-                                encryptType:1, //当播放私有加密流时需要设置。
-                            })
-                        }
-                    })
-
-                }).catch(res => {})
-            }else if(this.transferType(row.fileType) == '图片'){
-                this.coverUrl = row.fileUrl
-            }else if(row.fileType == 'pdf'){
-                this.pdfSrc = row.fileUrl
-                this.pdfVisible = true
-            }else{
-                this.$get(`${this.api.getSubsection}?subsectionId=${row.id}`).then(res => {
-                    if(row.fileType == 'pptx'){
-                        this.isPPT = true
-                        this.isWord = false
-                        this.isExcel = false
-                    }else if(row.fileType == 'doc' || row.fileType == 'docx'){
-                        this.isPPT = false
-                        this.isWord = true
-                        this.isExcel = false
-                    }else if(row.fileType == 'xls' || row.fileType == 'xlsx'){
-                        this.isExcel = true
-                        this.isPPT = false
-                        this.isWord = false
-                    }else{
-                        this.isPPT = false
-                        this.isWord = false
-                        this.isExcel = false
-                    }
-                    if(this.isPPT){
-                        this.showMask = true
-                    }else{
-                        this.showMask = false
-                    }
-                    if(this.isWord){
-                        this.showMask1 = true
-                    }else{
-                        this.showMask1 = false
-                    }
-                    if(this.isExcel){
-                        this.showMask2 = true
-                    }else{
-                        this.showMask2 = false
-                    }
-                    this.iframeSrc = res.previewUrl
-                })
-                    .catch(err => {
-                    });
-            }
-        },
-        closePlayer(){
-            this.playAuth = ''
-            this.player.pause()
-        },
-        closeIframe(){
-            this.iframeSrc = ''
+          }
+          if (this.isPPT) {
+            this.showMask = true
+          } else {
             this.showMask = false
+          }
+          if (this.isWord) {
+            this.showMask1 = true
+          } else {
             this.showMask1 = false
-        },
-        closePdf(){
-            this.pdfSrc = ''
-            this.currentPage = 1
-        },
-        changePdfPage (val) {
-            if (val === 0 && this.currentPage > 1) {
-                this.currentPage--
-            }
-            if (val === 1 && this.currentPage < this.pageCount) {
-                this.currentPage++
-            }
-        },
-        loadPdfHandler (e) {
-            this.currentPage = 1
-        }
+          }
+          if (this.isExcel) {
+            this.showMask2 = true
+          } else {
+            this.showMask2 = false
+          }
+          this.iframeSrc = res.previewUrl
+        })
+          .catch(err => {
+          });
+      }
+    },
+    closePlayer () {
+      this.playAuth = ''
+      this.player.pause()
+    },
+    closeIframe () {
+      this.iframeSrc = ''
+      this.showMask = false
+      this.showMask1 = false
+    },
+    closePdf () {
+      this.pdfSrc = ''
+      this.currentPage = 1
+    },
+    changePdfPage (val) {
+      if (val === 0 && this.currentPage > 1) {
+        this.currentPage--
+      }
+      if (val === 1 && this.currentPage < this.pageCount) {
+        this.currentPage++
+      }
+    },
+    loadPdfHandler (e) {
+      this.currentPage = 1
     }
+  }
 };
 </script>
 <style>
@@ -289,7 +335,8 @@ export default {
 </style>
 <style lang="scss" scoped>
 $height: 700px;
-.video_wid,.cover{
+.video_wid,
+.cover {
     position: relative;
     width: 76%;
     height: $height !important;
@@ -303,35 +350,36 @@ $height: 700px;
         line-height: 24px;
     }
 }
-.cover{
+.cover {
     flex: 1;
     background-color: #252528;
-    img{
+    img {
         border-radius: 8px;
     }
-    &.is-word{
+    &.is-word {
         overflow: hidden;
     }
 }
-.fileIframe{
+.fileIframe {
     height: $height !important;
 }
-.video_wid,.inner{
+.video_wid,
+.inner {
     width: 100%;
     height: 100% !important;
     border: 0;
     overflow: auto;
 }
-.cover.is-word{
-    .inner{
+.cover.is-word {
+    .inner {
         height: calc(100% + 38px) !important;
         margin-top: -38px;
     }
 }
-.video_wid:focus{
+.video_wid:focus {
     outline: none;
 }
-.catalog{
+.catalog {
     width: 296px;
     padding: 16px;
     margin-left: 12px;
@@ -344,31 +392,31 @@ $height: 700px;
         background: url(../../../assets/img/entry.png) 0 0/100% 100% no-repeat;
         cursor: pointer;
         &:hover {
-            opacity: .9;
+            opacity: 0.9;
         }
     }
 }
-.list{
-    height: calc(700px - 82px) ;
+.list {
+    height: calc(700px - 82px);
     overflow-y: auto;
-    .title{
+    .title {
         margin-bottom: 11px;
         color: #fff;
         font-size: 16px;
     }
-    .desc-wrap{
+    .desc-wrap {
         position: relative;
-        .desc{
+        .desc {
             font-size: 12px;
             color: #fff;
             line-height: 22px;
             @include mul-ellipsis(4);
-            &.active{
+            &.active {
                 display: block;
                 overflow: visible;
             }
         }
-        .arrow{
+        .arrow {
             position: absolute;
             bottom: 2px;
             right: 0;
@@ -376,40 +424,40 @@ $height: 700px;
             justify-content: space-between;
             width: 46px;
             background-color: #fff;
-            span{
+            span {
                 font-size: 14px;
                 color: rgba(0, 0, 0, 0.65);
             }
-            img{
+            img {
                 width: 16px;
                 cursor: pointer;
             }
-            &.active{
-                span{
+            &.active {
+                span {
                     opacity: 0;
                 }
-                img{
+                img {
                     transform: rotate(180deg);
                 }
             }
         }
     }
-    .chapters{
+    .chapters {
         margin-top: 16px;
         max-height: calc(100% - 53px);
         overflow: auto;
     }
-    .chapter{
+    .chapter {
         margin-bottom: 20px;
-        .chapterName{
+        .chapterName {
             color: #fff;
             font-size: 14px;
         }
-        .section{
+        .section {
             padding: 5px 15px;
             margin-top: 12px;
             background-color: #121214;
-            .sectionName{
+            .sectionName {
                 margin: 12px 0;
                 font-size: 12px;
                 color: #999;
@@ -418,27 +466,27 @@ $height: 700px;
                 img {
                     margin-right: 8px;
                 }
-                &.active{
+                &.active {
                     color: #fff;
                 }
             }
         }
     }
 }
-.el-image-viewer__wrapper{
+.el-image-viewer__wrapper {
     transform: translateY(-10px);
-    transition: transform .5s;
+    transition: transform 0.5s;
 
-    &.active{
-        transform: translateY(0)
+    &.active {
+        transform: translateY(0);
     }
 }
-.el-image-viewer__close{
+.el-image-viewer__close {
     z-index: 2000;
     top: 15px;
     right: 15px;
-    &.doc-close{
-        i{
+    &.doc-close {
+        i {
             color: #000 !important;
         }
     }
@@ -451,20 +499,20 @@ $height: 700px;
     background: rgba(0, 0, 0, 0.06);
 }
 
-.mask{
+.mask {
     z-index: 9;
     position: absolute;
-    background-color: rgb(57,58,61);
+    background-color: rgb(57, 58, 61);
 }
-.word-mask{
+.word-mask {
     z-index: 9;
     position: absolute;
     top: 0;
     right: 0;
     width: 100%;
-    background-color: rgb(243,242,241);
+    background-color: rgb(243, 242, 241);
 }
-.word-mask1{
+.word-mask1 {
     z-index: 9;
     position: absolute;
     top: 0;
@@ -472,12 +520,12 @@ $height: 700px;
     width: 100%;
     background-color: #185abd;
 }
-.word-mask2{
+.word-mask2 {
     z-index: 9;
     position: absolute;
     background-color: transparent;
 }
-.excel-mask1{
+.excel-mask1 {
     z-index: 9;
     position: absolute;
     top: 0;
@@ -485,24 +533,24 @@ $height: 700px;
     width: 60%;
     background-color: #107c41;
 }
-/deep/.pdf-dia{
+/deep/.pdf-dia {
     border-radius: 0 !important;
-    .el-dialog__header{
+    .el-dialog__header {
         display: none;
     }
-    .el-dialog__body{
+    .el-dialog__body {
         padding: 0;
     }
-    .el-dialog__headerbtn{
+    .el-dialog__headerbtn {
         top: 10px;
-        .el-dialog__close{
+        .el-dialog__close {
             color: #fff;
             font-size: 16px;
         }
     }
 }
-.pdf{
-    .arrow{
+.pdf {
+    .arrow {
         padding: 10px 0;
         display: flex;
         justify-content: center;
@@ -510,57 +558,57 @@ $height: 700px;
         font-size: 16px;
         color: #fff;
         background-color: #333;
-        .turn{
+        .turn {
             margin: 0 10px;
             font-size: 18px;
             cursor: pointer;
         }
     }
-    .pdf-wrap{
+    .pdf-wrap {
         width: 80%;
         margin: 0 auto;
     }
 }
 /deep/.project-dia {
-  .el-dialog__body {
-    padding: 28px 32px;
-  }
+    .el-dialog__body {
+        padding: 28px 32px;
+    }
 }
 .projects {
-  display: flex;
-  flex-wrap: wrap;
-  max-height: 400px;
-  overflow: auto;
-  li {
-    display: inline-flex;
-    align-items: center;
-    width: 238px;
-    padding: 16px;
-    margin: 0 20px 20px 0;
-    background-color: #F6F8FA;
-    border-radius: 16px;
-    cursor: pointer;
-    &:hover {
-      span {
-        color: #007EFF;
-      }
-    }
-    &:nth-child(3n) {
-      margin-right: 0;
+    display: flex;
+    flex-wrap: wrap;
+    max-height: 400px;
+    overflow: auto;
+    li {
+        display: inline-flex;
+        align-items: center;
+        width: 238px;
+        padding: 16px;
+        margin: 0 20px 20px 0;
+        background-color: #f6f8fa;
+        border-radius: 16px;
+        cursor: pointer;
+        &:hover {
+            span {
+                color: #007eff;
+            }
+        }
+        &:nth-child(3n) {
+            margin-right: 0;
+        }
+        &.active {
+            background-color: #f2f7ff;
+            span {
+                color: #3988ff;
+            }
+        }
     }
-    &.active {
-      background-color: #f2f7ff;
-      span {
-        color: #3988ff;
-      }
+    span {
+        max-width: 140px;
+        margin-left: 14px;
+        font-size: 14px;
+        color: #333;
     }
-  }
-  span {
-    max-width: 140px;
-    margin-left: 14px;
-    font-size: 14px;
-    color: #333;
-  }
 }
 @media (max-width: 1430px) {
     .wrap {
diff --git a/src/pages/match/details/index.vue b/src/pages/match/details/index.vue
index 953d798..59fd3fc 100644
--- a/src/pages/match/details/index.vue
+++ b/src/pages/match/details/index.vue
@@ -736,7 +736,7 @@ export default {
   },
   computed: {
     ...mapState("user", [
-      'logView'
+      "userId", 'logView'
     ]),
   },
   components: {
@@ -1432,6 +1432,7 @@ export default {
       util.cookies.set('stopTime', form.endTime)
       util.cookies.set('resultsDetails', form.resultsDetails)
       util.cookies.set('resultAnnouncementTime', form.resultAnnouncementTime)
+      util.cookies.set('mallId', form.mallId)
       util.cookies.set('fromManager', '', -1)
       util.cookies.set('language', '', -1)
       // 8个python子系统都跳这个地址，子系统会通过cookie里的systemId识别展示哪套系统
@@ -1444,7 +1445,7 @@ export default {
     // 进入子系统
     toSub () {
       const { form } = this
-      const { systemId, projectId, cid, stageId, endTime } = this.curStage
+      const { systemId, projectId, cid, stageId, startTime, endTime, mallId } = this.curStage
       const competitionId = form.id
       const teamId = form.competitionRegistration.teamId
       let token = util.local.get(Setting.tokenKey);
@@ -1453,7 +1454,7 @@ export default {
         location.href = `${Setting.systemPath}/#/index/list?curriculumName=${this.curriculumName}&token=${token}&cid=${cid}&systemId=${systemId}&projectId=${projectId}&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}&assessmentId=&classId=&stopTime=&test=true`
       } else if (systemId == 12) {
         // 众筹系统
-        window.open(`http://120.78.139.126:8879?systemId=${systemId}&courseId=${cid}&projectId=${projectId}&token=${token}&userId=${this.userId}&classId=1&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}&endTime=${endTime}`);
+        window.open(`http://120.78.139.126:8879?systemId=${systemId}&courseId=${cid}&projectId=${projectId}&token=${token}&userId=${this.userId}&classId=1&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}&startTime=${startTime}&endTime=${endTime}&mallId=${mallId}`);
       } else {
         // python系统
         this.toPython(this.curProject)
diff --git a/src/pages/match/list/index.vue b/src/pages/match/list/index.vue
index ace8c9f..c26be62 100644
--- a/src/pages/match/list/index.vue
+++ b/src/pages/match/list/index.vue
@@ -388,6 +388,9 @@ export default {
     };
   },
   computed: {
+    ...mapState("user", [
+      "userId"
+    ]),
     ...mapState('match', [
       'eventType'
     ])
@@ -781,6 +784,7 @@ export default {
       util.cookies.set('stopTime', form.endTime)
       util.cookies.set('resultsDetails', form.resultsDetails)
       util.cookies.set('resultAnnouncementTime', form.resultAnnouncementTime)
+      util.cookies.set('mallId', form.mallId)
       util.cookies.set('fromManager', '', -1)
       util.cookies.set('isSubmit', '', -1)
       util.cookies.set('language', '', -1)
@@ -794,7 +798,7 @@ export default {
     // 进入子系统
     toSub () {
       const form = this.curItem
-      const { systemId, projectId, cid, stageId, endTime } = form.curStage
+      const { systemId, projectId, cid, stageId, startTime, endTime, mallId } = form.curStage
       const competitionId = form.id
       const teamId = form.teamId
       let token = util.local.get(Setting.tokenKey);
@@ -803,7 +807,7 @@ export default {
         location.href = `${Setting.systemPath}/#/index/list?curriculumName=${this.curriculumName}&token=${token}&cid=${cid}&systemId=${systemId}&projectId=${projectId}&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}&assessmentId=&classId=&stopTime=&test=true`
       } else if (systemId == 12) {
         // 众筹系统
-        window.open(`http://120.78.139.126:8879?systemId=${systemId}&courseId=${cid}&projectId=${projectId}&token=${token}&userId=${this.userId}&classId=1&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}&endTime=${endTime}`);
+        window.open(`http://120.78.139.126:8879?systemId=${systemId}&courseId=${cid}&projectId=${projectId}&token=${token}&userId=${this.userId}&classId=1&competitionId=${competitionId}&stageId=${stageId}&teamId=${teamId}&startTime=${startTime}&endTime=${endTime}&mallId=${mallId}`);
       } else {
         // python系统
         this.toPython()
diff --git a/src/pages/record/list/ass.vue b/src/pages/record/list/ass.vue
index c5650de..7281c34 100644
--- a/src/pages/record/list/ass.vue
+++ b/src/pages/record/list/ass.vue
@@ -75,12 +75,11 @@ export default {
   },
   watch: {
     mallId: function (val) {
-      this.initData();
+      this.initData()
     },
   },
   mounted () {
-    this.page = 1
-    this.getData()
+
   },
   methods: {
     ...mapActions({
@@ -108,6 +107,10 @@ export default {
         this.total = res.page.total;
       }).catch(err => { });
     },
+    initData () {
+      this.page = 1
+      this.getData()
+    },
     toReport (row) {
       this.setCurriculum(this.curriculumId)
       this.$router.push(`show?reportId=${row.reportId}`);
diff --git a/src/pages/record/list/index.vue b/src/pages/record/list/index.vue
index a60f575..edae8f4 100644
--- a/src/pages/record/list/index.vue
+++ b/src/pages/record/list/index.vue
@@ -49,13 +49,13 @@
           </div>
           <li style="margin-right: 0">
             <label>课程选择：</label>
-            <el-cascader v-model="mallIds"
-                         :options="curs"
-                         :props="{ checkStrictly: true, value: 'id' }"
-                         popper-class="course-cas"
-                         @expand-change="curChange"
-                         @change="curChange"></el-cascader>
-
+            <el-select v-model="mallId"
+                       @change="curChange">
+              <el-option v-for="(item, i) in curs"
+                         :key="i"
+                         :label="item.curriculumName"
+                         :value="item.mallId"></el-option>
+            </el-select>
             <el-button style="margin-left: 20px;"
                        type="primary"
                        @click="exportData">导出数据</el-button>
@@ -67,12 +67,12 @@
                 ref="list0"
                 :mallId.sync="mallId"
                 :curriculumId.sync="curriculumId"
-                :key="mallId"></practice>
+                :key="1"></practice>
       <ass v-else
            ref="list1"
            :curriculumId.sync="curriculumId"
            :mallId.sync="mallId"
-           :key="mallId"></ass>
+           :key="2"></ass>
     </div>
   </div>
 </template>
@@ -121,14 +121,6 @@ export default {
       'lastRecordType', 'currId'
     ])
   },
-  watch: {
-    mallId: {
-      handler (val) {
-        this.curriculumId = this.curs.find(e => e.mallId == val).cid
-      },
-      deep: true
-    }
-  },
   created () {
     this.active = this.lastRecordType ? this.lastRecordType : 0;
   },
@@ -142,27 +134,16 @@ export default {
     }),
     // 获取课程
     async getCourse () {
-      const { data } = await this.$get(this.api.getSystemIdBySchool)
-      const res = await this.$get(this.api.getSchoolEffectiveCourse)
-      if (res.data.length) {
-        res.data.map(e => {
-          e.id = e.mallId
-          e.label = e.curriculumName
-          e.children = data.filter(n => e.systemId.split(',').includes(n.id + '')) // 筛选出该课程下的系统
-        })
-        this.curs = res.data
-        this.mallIds = [res.data[0].mallId, data[0].id]
-        this.mallId = res.data[0].mallId
+      const { data } = await this.$get(this.api.getSchoolEffectiveCourse)
+      if (data.length) {
+        this.curs = data
+        this.mallId = data[0].mallId
+        this.curriculumId = data[0].cid
       }
     },
     // 课程选择回调
-    curChange (val) {
-      const id = val[0]
-      if (val.length === 1) {
-        // 如果选择的是课程，则默认选中下面第一个系统
-        this.mallIds = [id, this.curs.find(e => e.id == id).children[0].id]
-      }
-      this.mallId = id
+    curChange (id) {
+      this.curriculumId = this.curs.find(e => e.mallId == id).cid
     },
 
     getData () { // 获取实验概览数据
@@ -196,6 +177,9 @@ export default {
     tabChange (id) {
       this.active = id
       this.setRecord(id)
+      this.$nextTick(() => {
+        this.$refs['list' + id].initData()
+      })
     }
   },
 
diff --git a/src/pages/record/list/practice.vue b/src/pages/record/list/practice.vue
index a81eb0a..0124cd5 100644
--- a/src/pages/record/list/practice.vue
+++ b/src/pages/record/list/practice.vue
@@ -63,11 +63,11 @@ export default {
   },
   watch: {
     mallId: function (val) {
-      this.initData();
+      this.initData()
     },
   },
   mounted () {
-    this.initData()
+
   },
   methods: {
     ...mapActions({
diff --git a/src/pages/record/show/index.vue b/src/pages/record/show/index.vue
index 0df6e14..3095d11 100644
--- a/src/pages/record/show/index.vue
+++ b/src/pages/record/show/index.vue
@@ -1,25 +1,30 @@
 <template>
   <!--  实验报告  -->
   <div class="wrap">
-    <div class="breadcrumb">
-      <el-breadcrumb separator=">">
-        <template v-for="(item, i) in breadPath">
-          <el-breadcrumb-item v-if="!i"
-                              :key="i"
-                              :to="{ path: matchId ? '/match' : 'list' }">
-            {{item}}
-          </el-breadcrumb-item>
-          <el-breadcrumb-item v-else-if="breadPath.length > 2 && i === 1"
-                              :to="{ path: matchId ? '/match/details' : 'details', query: matchId ? { id: matchId } : { curriculumId, projectId } }"
-                              :key="i">
-            {{item}}
-          </el-breadcrumb-item>
-          <el-breadcrumb-item v-else
-                              :key="i">
-            {{item}}
-          </el-breadcrumb-item>
-        </template>
-      </el-breadcrumb>
+    <div class="top">
+      <div class="breadcrumb">
+        <el-breadcrumb separator=">">
+          <template v-for="(item, i) in breadPath">
+            <el-breadcrumb-item v-if="!i"
+                                :key="i"
+                                :to="{ path: matchId ? '/match' : 'list' }">
+              {{item}}
+            </el-breadcrumb-item>
+            <el-breadcrumb-item v-else-if="breadPath.length > 2 && i === 1"
+                                :to="{ path: matchId ? '/match/details' : 'details', query: matchId ? { id: matchId } : { curriculumId, projectId } }"
+                                :key="i">
+              {{item}}
+            </el-breadcrumb-item>
+            <el-breadcrumb-item v-else
+                                :key="i">
+              {{item}}
+            </el-breadcrumb-item>
+          </template>
+        </el-breadcrumb>
+      </div>
+      <span v-if="fromPython"
+            class="back"
+            @click="back">返回实验</span>
     </div>
     <div class="content"
          :class="{loading}"
@@ -172,8 +177,7 @@
                      v-html="scope.row.referenceAnswer"></div>
               </template>
             </el-table-column>
-            <el-table-column v-if="!project"
-                             prop="userAnswer"
+            <el-table-column prop="userAnswer"
                              label="学生答案">
               <template slot-scope="scope">
                 <div v-if='scope.row.lcRuleRecords'>
@@ -192,7 +196,8 @@
                      style='white-space: pre-wrap'></div>
               </template>
             </el-table-column>
-            <el-table-column prop="runResult"
+            <el-table-column v-if="!project"
+                             prop="runResult"
                              label="学生运行结果"
                              align="center">
               <template slot-scope="scope">
@@ -249,6 +254,7 @@ import quill from "@/components/quill";
 export default {
   data () {
     return {
+      fromPython: this.$route.query.python, // 来自python子系统
       reportId: this.$route.query.reportId,
       curriculumId: this.$route.query.curriculumId,
       projectId: this.$route.query.projectId,
@@ -341,6 +347,10 @@ export default {
       }
       this.expData = list
     },
+    // 返回
+    back () {
+      history.back()
+    },
     exportPage () {
       const form = Object.assign(this.form, this.infoData)
       const list = JSON.parse(JSON.stringify(this.expData))
@@ -423,8 +433,18 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.top {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 15px;
+    .back {
+        font-size: 14px;
+        color: #007eff;
+        cursor: pointer;
+    }
+}
 .breadcrumb {
-    margin: 4px 0 16px;
     /deep/.el-breadcrumb__item {
         .is-link,
         .el-breadcrumb__separator {
diff --git a/src/pages/screen/index.vue b/src/pages/screen/index.vue
index ed69c0a..f185bf0 100644
--- a/src/pages/screen/index.vue
+++ b/src/pages/screen/index.vue
@@ -475,6 +475,9 @@ export default {
 
       // 活跃度排行榜
       this.$post(this.api.activityRanking).then(({ list }) => {
+        list.sort((a, b) => {
+          return +b.activityIndex - +a.activityIndex
+        })
         this.actives = list
       }).catch(res => { })
       this.scrollTable()
diff --git a/src/pages/station/preview/index.vue b/src/pages/station/preview/index.vue
index 292db6a..6a4fa4c 100644
--- a/src/pages/station/preview/index.vue
+++ b/src/pages/station/preview/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="wrap">
     <breadcrumb ref="breadcrumb"
-                :data="'实验台/' + courseName"></breadcrumb>
+                :data="'实验台/' + (curriculumName || courseName)"></breadcrumb>
     <div class="flex">
       <div class="cover"
            :class="{'is-word': showMask1}">
@@ -18,9 +18,11 @@
                   frameborder="0"></iframe>
           <template v-if="showMask">
             <div class="mask"
-                 style="width:100%;background: #393A3D;height: 30px;top: 53px;"></div>
+                 style="top: 0;width:100%;height: 48px;"></div>
             <div class="mask"
-                 style="width:100%;background: #393A3D;height: 30px;top: 53px;"></div>
+                 style="top: 53px;width:100%;height: 30px;"></div>
+            <div class="mask"
+                 style="bottom: 0;right: 0;width:280px;height: 22px;background-color: #444;"></div>
           </template>
           <template v-if="showMask1">
             <div class="word-mask"
@@ -71,9 +73,9 @@
                    @click="showBuy">续费</el-button>
         <a v-else
            class="entry"
-           @click="entry"></a>
+           @click="entry">进入实验</a>
         <div class="list">
-          <h4 class="title">{{ courseName }}</h4>
+          <h4 class="title">{{ curriculumName || courseName }}</h4>
           <div>
             <h6 class="pro-title">我的学习进度</h6>
             <el-progress :stroke-width="12"
@@ -346,6 +348,7 @@
         </div>
       </div>
       <div class="rank">
+        <h6 class="title">练习成绩排行</h6>
         <el-select style="width: 100%"
                    v-model="archProject"
                    placeholder="请选择"
@@ -520,7 +523,7 @@ export default {
   watch: {
     '$route': {
       handler () {
-        this.mallId = this.$route.query.mallId || ''
+        this.mallId = +this.$route.query.mallId || ''
         this.courseId = +this.$route.query.courseId
         this.curriculumName = this.$route.query.curriculumName
         this.commentId = this.$route.query.commentId // 从右上角消息通知点进来用来定位评论的
@@ -537,7 +540,7 @@ export default {
     }
   },
   mounted () {
-    this.init()
+
   },
   destroyed () {
     // 记录播放时长
@@ -555,13 +558,11 @@ export default {
       this.insertScript();
       this.getData();
       this.addRecord()
-      this.getNote()
-      this.getComment()
     },
     async getData () {
       let { data } = await this.$post(`${this.api.curriculumDetail}?cid=${this.courseId}&mallId=${this.mallId}`);
       this.courseName = data.curriculumName;
-      this.$refs.breadcrumb.update('实验台/' + data.curriculumName)
+      // this.$refs.breadcrumb.update('实验台/' + data.curriculumName)
       // this.coverUrl = data.coverUrl;
       this.briefIntroduction = data.briefIntroduction;
       this.teachingObjectives = data.teachingObjectives;
@@ -668,7 +669,7 @@ export default {
     // 教学互动列表
     getComment () {
       this.$get(this.api.commentTreeList, {
-        cid: this.courseId,
+        mallId: this.mallId,
       }).then(res => {
         this.deleteIdentity = res.deleteIdentity
         const list = res.rootComments
@@ -724,7 +725,7 @@ export default {
       const content = reply ? reply.replyContent : row ? row.replyContent : this.comment
       if (!content) return util.errorMsg('请输入内容！')
       this.$post(this.api.addComment, {
-        cid: this.courseId,
+        mallId: this.mallId,
         content,
         pid: reply ? reply.commentId : row ? row.commentId : 0,
         replyAccountId: reply ? reply.createAccountId : row.createAccountId || '',
@@ -738,7 +739,6 @@ export default {
     },
     // 评论点赞
     like (e, row, reply) {
-      console.log(11, e.pageY)
       this.$post(`${this.api[(reply ? reply.isLike : row.isLike) ? 'unlike' : 'commentAndLike']}?commentId=${reply ? reply.commentId : row.commentId}`).then(res => {
         this.curReplyId = row.commentId
         this.getComment()
@@ -774,8 +774,10 @@ export default {
       return suf
     },
     // tab切换
-    tabChange (item) {
-      this.active = item.id
+    tabChange ({ id }) {
+      this.active = id
+      id == 2 && this.getNote()
+      id == 4 && this.getComment()
     },
     // 勾选/取消勾选学习进度
     studySection (item) {
@@ -794,13 +796,13 @@ export default {
       // 如果没过期，则正常预览，否则显示购买弹框
       if (this.overdue || showDia) {
         this.curLink = `${chapterName}${row.name}`; // 章节名称+小节名称，小节名称有重复的情况，如果只用小节名称判断，会有同时选中多个的情况
-        this.playauth = "";
-        this.coverUrl = "";
-        this.pdfSrc = "";
-        this.iframeSrc = "";
-        this.isPPT = false;
-        this.isWord = false;
-        this.isExcel = false;
+        this.playauth = ''
+        this.coverUrl = ''
+        this.pdfSrc = ''
+        this.iframeSrc = ''
+        this.isPPT = false
+        this.isWord = false
+        this.isExcel = false
         if (this.transferType(row.fileType) == "视频") {
           this.$get(`${this.api.getPlayAuth}/${row.fileId}`).then(res => {
             this.playAuth = res.data.playAuth;
@@ -823,32 +825,18 @@ export default {
                 });
               }
             });
-
           }).catch(res => {
           });
         } else if (this.transferType(row.fileType) == "图片") {
-          this.coverUrl = row.fileUrl;
+          this.coverUrl = row.fileUrl
         } else if (row.fileType == "pdf") {
-          this.pdfSrc = row.fileUrl;
+          this.pdfSrc = row.fileUrl
         } else {
           this.$get(`${this.api.curriculumGetSubsection}/${row.id}`).then(res => {
-            if (row.fileType == "pptx") {
-              this.isPPT = true;
-              this.isWord = false;
-              this.isExcel = false;
-            } else if (row.fileType == "doc" || row.fileType == "docx") {
-              this.isPPT = false;
-              this.isWord = true;
-              this.isExcel = false;
-            } else if (row.fileType == "xls" || row.fileType == "xlsx") {
-              this.isExcel = true;
-              this.isPPT = false;
-              this.isWord = false;
-            } else {
-              this.isPPT = false;
-              this.isWord = false;
-              this.isExcel = false;
-            }
+            if (row.fileType == "pptx") this.isPPT = true
+            if (row.fileType == "doc" || row.fileType == "docx") this.isWord = true
+            if (row.fileType == "xls" || row.fileType == "xlsx") this.isExcel = true
+
             if (this.isPPT) {
               this.showMask = true;
             } else {
@@ -872,12 +860,12 @@ export default {
       }
     },
     closeIframe () {
-      this.iframeSrc = "";
+      this.iframeSrc = ''
       this.showMask = false;
       this.showMask1 = false;
     },
     closePdf () {
-      this.pdfSrc = "";
+      this.pdfSrc = ''
       this.currentPage = 1;
     },
     changePdfPage (val) {
@@ -1045,12 +1033,17 @@ $height: 700px;
     .renew {
         width: 100%;
         margin-bottom: 16px;
+        font-size: 17px;
     }
     .entry {
         display: block;
         width: 100%;
         height: 34px;
         margin-bottom: 16px;
+        font-size: 17px;
+        color: #fff;
+        text-align: center;
+        line-height: 34px;
         background: url(../../../assets/img/entry.png) 0 0/100% 100% no-repeat;
         cursor: pointer;
         &:hover {
@@ -1349,7 +1342,7 @@ $height: 700px;
     .item {
         padding: 0 10px;
         margin-right: 16px;
-        font-size: 17px;
+        font-size: 16px;
         text-align: center;
         color: #333;
         line-height: 50px;
@@ -1369,6 +1362,11 @@ $height: 700px;
     padding: 20px;
     margin-left: 12px;
     background-color: #fff;
+    .title {
+        margin-bottom: 10px;
+        font-size: 15px;
+        font-weight: 400;
+    }
     .arches {
         margin-top: 20px;
     }
@@ -1388,9 +1386,9 @@ $height: 700px;
         color: #007eff;
     }
 }
-@media (max-width: 1430px) {
+@media (max-width: 1700px) {
     .wrap {
-        padding: 12px 100px 20px;
+        padding: 12px 5% 20px;
     }
 }
 </style>
\ No newline at end of file
diff --git a/src/setting.js b/src/setting.js
index bd109d5..70d8efa 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -28,7 +28,7 @@ if (isPro) {
     uploadURL = `http://121.37.12.51/`
     host = "http://121.37.12.51/"; // 测试服
     // host = 'https://www.occupationlab.com/' // 正式服
-    host = "http://192.168.31.152:9000/"; // 榕
+    // host = "http://192.168.31.152:9000/"; // 榕
     // host = "http://192.168.31.51:9000/"; // 赓
 }
 
diff --git a/src/styles/page/station.scss b/src/styles/page/station.scss
index e48d274..22dac21 100644
--- a/src/styles/page/station.scss
+++ b/src/styles/page/station.scss
@@ -29,6 +29,9 @@
                     color: rgba(0, 0, 0, 0.45);
                     font-size: 14px;
                 }
+                /deep/img {
+                    max-width: 95%;
+                }
             }
             .action {
                 display: inline-flex;
@@ -121,10 +124,17 @@
         align-items: center;
         padding-bottom: 10px;
         margin: -22px 0 20px;
-        font-size: 20px;
+        font-size: 15px;
         color: #007eff;
         border-bottom: 1px dashed #bfbfbf;
     }
+    .des {
+        p,
+        span,
+        em {
+            font-size: 14px !important;
+        }
+    }
     .withdraw {
         margin-right: 10px;
         font-size: 13px;