From 71bc842ecdc2a761846f793404475ff1e0e15ccf Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Wed, 19 Jul 2023 16:30:36 +0800
Subject: [PATCH] fix

---
 src/layouts/header/index.vue         |  2 +-
 src/pages/achievement/show/index.vue | 10 ++---
 src/pages/assessment/list/index.vue  | 65 +++++++++++++++++++---------
 src/pages/project/add/index.vue      |  2 +-
 src/pages/project/list/index.vue     |  4 +-
 src/pages/station/preview/index.vue  | 50 ++++++++-------------
 6 files changed, 72 insertions(+), 61 deletions(-)

diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index e2a0c61..6200152 100644
--- a/src/layouts/header/index.vue
+++ b/src/layouts/header/index.vue
@@ -153,7 +153,7 @@ export default {
     },
     initSocket ({ id, account }) {
       // 实例化socket
-      this.socket = new WebSocket(`wss://${Setting.isDev ? '192.168.31.51' : location.host}/nakadai/websocket/${id}/${account}`)
+      this.socket = new WebSocket(`${Setting.isTest ? 'ws' : 'wss'}://${Setting.isDev ? '192.168.31.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/pages/achievement/show/index.vue b/src/pages/achievement/show/index.vue
index 9bbb27e..fc76b60 100644
--- a/src/pages/achievement/show/index.vue
+++ b/src/pages/achievement/show/index.vue
@@ -55,8 +55,8 @@
           <li>
             <label>学生班级：</label>
             <el-input v-if="editing"
-                      v-model="infoData.workNumber"></el-input>
-            <span v-else>{{ infoData.workNumber }}</span>
+                      v-model="infoData.className"></el-input>
+            <span v-else>{{ infoData.className }}</span>
           </li>
           <li>
             <label>指导老师：</label>
@@ -146,8 +146,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'>
@@ -166,7 +165,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">
diff --git a/src/pages/assessment/list/index.vue b/src/pages/assessment/list/index.vue
index af5b7b5..e3b014a 100644
--- a/src/pages/assessment/list/index.vue
+++ b/src/pages/assessment/list/index.vue
@@ -50,16 +50,12 @@
         </li>
         <li>
           <label>课程</label>
-          <el-select v-model="curriculumId"
-                     placeholder="请选择"
-                     @change="initData">
-            <el-option label="不限"
-                       value=""></el-option>
-            <el-option v-for="item in curriculumList"
-                       :key="item.cid"
-                       :label="item.goodsName"
-                       :value="item.cid"></el-option>
-          </el-select>
+          <el-cascader v-model="mallIds"
+                       :options="curs"
+                       :props="{ checkStrictly: true, value: 'id' }"
+                       popper-class="course-cas"
+                       @expand-change="curChange"
+                       @change="curChange"></el-cascader>
         </li>
       </ul>
     </div>
@@ -272,12 +268,15 @@ export default {
       curriculumId: "",
       keyWord: "", // 搜索框筛选条件
       searchTimer: null,
+      mallIds: [],
+      curs: [],
       form: {
         type: "",
         status: "",
         startTime: "",
         endTime: "",
-        month: ""
+        month: "",
+
       },
       pageNum: +this.$route.query.page || 1, // 当前页数
       pageSize: 10, // 每页10条
@@ -326,8 +325,7 @@ export default {
       clearInterval(this.ticker);
       this.ticker = null;
     });
-    this.getData(1);
-    this.getschoolCourse();
+    this.getCourse();
   },
   methods: {
     pickerInput () {
@@ -368,12 +366,16 @@ export default {
     },
     getData (counddown) {
       this.listLoading = true;
+      const { mallIds } = this
+      const cur = this.curs.find(e => e.mallId == mallIds[0])
       let data = {
         ...this.form,
         keyWord: this.keyWord,
         pageNum: this.pageNum,
         pageSize: this.pageSize,
-        curriculumId: this.curriculumId
+        cid: cur.cid,
+        mallId: mallIds[0],
+        systemId: mallIds[1]
       };
       this.$post(this.api.pageByCondition, data).then(res => {
         this.listData = res.list;
@@ -409,16 +411,37 @@ export default {
     },
     initData () {
       this.$refs.table.clearSelection();
-      this.pageNum = 1;
+      this.pageNum = 1
       this.getData();
     },
-    getschoolCourse () { // 获取课程下拉框数据
-      this.$get(this.api.schoolCourse).then(res => {
-        this.curriculumList = res.data;
-      }).catch(err => {
-        console.log(err);
-      });
+
+    // 获取课程
+    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.pageNum = 1
+        this.getData(1)
+        console.log("🚀 ~ file: index.vue:431 ~ getSystemData ~ res.data:", this.mallIds)
+      }
     },
+    // 课程选择回调
+    curChange (val) {
+      const id = val[0]
+      if (val.length === 1) {
+        // 如果选择的是课程，则默认选中下面第一个系统
+        this.mallIds = [id, this.curs.find(e => e.id == id).children[0].id]
+      }
+      this.initData()
+    },
+
     add () {
       this.$router.push("add");
     },
diff --git a/src/pages/project/add/index.vue b/src/pages/project/add/index.vue
index 60e5864..60e8ca7 100644
--- a/src/pages/project/add/index.vue
+++ b/src/pages/project/add/index.vue
@@ -23,7 +23,7 @@
           <el-form label-width="80px"
                    :disabled="isDetail">
             <div class="flex">
-              <el-form-item label="系统">
+              <el-form-item label="课程">
                 <el-cascader v-if="projectManage.founder"
                              v-model="mallIds"
                              :options="curs"
diff --git a/src/pages/project/list/index.vue b/src/pages/project/list/index.vue
index 8cdd35f..6545176 100644
--- a/src/pages/project/list/index.vue
+++ b/src/pages/project/list/index.vue
@@ -187,7 +187,7 @@
                       v-model="copyForm.projectName"></el-input>
           </el-form-item>
           <el-form-item v-if="!curRow.projectManage.founder"
-                        label="系统">
+                        label="课程">
             <el-cascader v-model="copyMallId"
                          :options="curs"
                          :props="{ checkStrictly: true, value: 'id' }"
@@ -505,7 +505,7 @@ export default {
       }
       // 系统创建的才需要选择系统
       if (fromSystem && !form.mallId) {
-        util.warningMsg("请选择系统");
+        util.warningMsg("请选择课程");
         return;
       }
       row.projectManage.projectName = form.projectName
diff --git a/src/pages/station/preview/index.vue b/src/pages/station/preview/index.vue
index ad77e33..0b17eda 100644
--- a/src/pages/station/preview/index.vue
+++ b/src/pages/station/preview/index.vue
@@ -26,9 +26,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"
@@ -537,7 +539,7 @@ export default {
     }
   },
   mounted () {
-    this.init()
+
   },
   methods: {
     goBack () {
@@ -549,8 +551,6 @@ 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}`);
@@ -771,8 +771,10 @@ export default {
       return ext;
     },
     // tab切换
-    tabChange (item) {
-      this.active = item.id
+    tabChange ({ id }) {
+      this.active = id
+      id == 2 && this.getNote()
+      id == 4 && this.getComment()
     },
     // 勾选/取消勾选学习进度
     studySection (item) {
@@ -791,10 +793,10 @@ export default {
       // 如果没过期，则正常预览，否则显示购买弹框
       if (this.overdue || showDia) {
         this.curLink = `${chapterName}${row.name}`; // 章节名称+小节名称，小节名称有重复的情况，如果只用小节名称判断，会有同时选中多个的情况
-        this.playauth = "";
-        this.coverUrl = "";
-        this.pdfSrc = "";
-        this.iframeSrc = "";
+        this.playauth = ''
+        this.coverUrl = ''
+        this.pdfSrc = ''
+        this.iframeSrc = ''
         this.isPPT = false;
         this.isWord = false;
         this.isExcel = false;
@@ -829,23 +831,9 @@ export default {
           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 {
@@ -869,16 +857,16 @@ export default {
       }
     },
     closePlayer () {
-      this.playAuth = "";
+      this.playAuth = ''
       this.player.pause();
     },
     closeIframe () {
-      this.iframeSrc = "";
+      this.iframeSrc = ''
       this.showMask = false;
       this.showMask1 = false;
     },
     closePdf () {
-      this.pdfSrc = "";
+      this.pdfSrc = ''
       this.currentPage = 1;
     },
     changePdfPage (val) {