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

---
 src/api/index.js                       |   9 +-
 src/pages/achievement/info/course.vue  |  29 +-
 src/pages/achievement/info/project.vue |  19 +-
 src/pages/achievement/list/project.vue |   4 +-
 src/pages/match/add/set.vue            |   1 +
 src/pages/match/manage/matchReport.vue | 553 ++++++++++++++-----------
 src/pages/product/list/index.vue       |  76 +---
 src/pages/project/add/index.vue        |   4 +-
 src/pages/project/list/index.vue       |   6 +-
 src/pages/screen/index.vue             |   3 +
 src/pages/station/preview/index.vue    |   3 +-
 src/setting.js                         |   2 +-
 src/styles/page/station.scss           |   3 +
 13 files changed, 383 insertions(+), 329 deletions(-)

diff --git a/src/api/index.js b/src/api/index.js
index ddf2c7a..a12652d 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -1,7 +1,7 @@
 import Setting from "@/setting";
 const host = Setting.apiBaseURL
 const uploadURL = Setting.upload.apiURL;
-const host2 = 'http://192.168.31.52:9000/'
+const host2 = 'http://121.37.12.51/'
 
 export default {
     queryToken: `liuwanr/userInfo/queryToken`,
@@ -411,9 +411,10 @@ export default {
     detailsOfGoods: `nakadai/mall/detailsOfGoods`,
     addLearningRecord: `nakadai/mallCourseLearningRecord/addLearningRecord`,
     // 课程管理三级联查
-    courseDiscipline: `nakadai/nakadai/subject/courseDiscipline`, //课程学科类别
-    courseProfessionalClass: `nakadai/nakadai/subject/courseProfessionalClass`, //课程专业类
-    courseProfessional: `nakadai/nakadai/subject/courseProfessional`, //课程专业
+    courseDiscipline: `nakadai/nakadai/subject/courseDiscipline`,
+    courseProfessionalClass: `nakadai/nakadai/subject/courseProfessionalClass`,
+    courseProfessional: `nakadai/nakadai/subject/courseProfessional`,
+    subjectCategoryCited: `nakadai/nakadai/subject/subjectCategoryCited`,
     
     // 营销推广
     listMarketing: `nakadai/nakadai/mall/marketing/promotion/pagingQueryList`,
diff --git a/src/pages/achievement/info/course.vue b/src/pages/achievement/info/course.vue
index 5496c1b..e6d28d0 100644
--- a/src/pages/achievement/info/course.vue
+++ b/src/pages/achievement/info/course.vue
@@ -48,11 +48,11 @@
       <div class="wrong">
         <div class="line">
           <span class="jud-name">错误率最高：{{ max.projectName }}</span>
-          <span>参加考试{{ max.numberOfParticipants }}人&emsp;｜&emsp;{{ curTab == 1 ? `共${max.itemErrorCount}人做错，` : '' }}错误率{{ max.errorRate }}%</span>
+          <span>参加考试{{ max.numberOfParticipants }}人&emsp;｜&emsp;{{ curTab == 1 ? `共${max.itemErrorCount || ''}人做错，` : '' }}错误率{{ max.errorRate }}%</span>
         </div>
         <div class="line">
           <span class="jud-name">错误率最低：{{ min.projectName }}</span>
-          <span>参加考试{{ min.numberOfParticipants }}人&emsp;｜&emsp;{{ curTab == 1 ? `共${min.itemErrorCount}人做错，` : '' }}错误率{{ min.errorRate }}%</span>
+          <span>参加考试{{ min.numberOfParticipants }}人&emsp;｜&emsp;{{ curTab == 1 ? `共${min.itemErrorCount || ''}人做错，` : '' }}错误率{{ min.errorRate }}%</span>
         </div>
       </div>
       <div class="chart"
@@ -259,6 +259,7 @@
 </template>
 
 <script>
+import { Loading } from "element-ui";
 import Setting from "@/setting";
 import util from "@/libs/util";
 import echarts from "echarts";
@@ -295,7 +296,7 @@ export default {
       avgScore: 0, // 平均分
       maxScore: 0,
       minScore: 0,
-      errorAnalysis: {},
+      errorAnalysis: [],
       max: {},
       min: {},
       token: util.local.get(Setting.tokenKey),
@@ -306,15 +307,16 @@ export default {
       pageSizeDetail: 5,
       totalDetail: 0,
       curRow: {},
-      stageNumber: []
+      stageNumber: [],
+      loadIns: null
     };
   },
   watch: {
     keyword: function (val) {
       clearTimeout(this.searchTimer);
       this.searchTimer = setTimeout(() => {
-        this.initData();
-      }, 500);
+        this.initData()
+      }, 500)
     }
   },
   mounted () {
@@ -324,6 +326,9 @@ export default {
   methods: {
     // 成绩
     async getData () {
+      this.loadIns = Loading.service({
+        background: "rgba(255,255,255,.6)"
+      })
       const per = +this.curTab
       const res = await this.$post(this.api.productReadScore, {
         pageNum: this.page,
@@ -346,8 +351,9 @@ export default {
         e.errorRate = (+e.errorRate).toFixed(2)
       })
       this.errorAnalysis = err
-      this.max = err[0]
-      this.min = err[err.length - 1]
+      this.max = err[0] || {}
+      this.min = err[err.length - 1] || {}
+      this.errorChart()
       const { row } = this.$store.state.achievement
       row && this.$nextTick(() => {
         window.scrollTo(0, document.documentElement.scrollHeight)
@@ -356,7 +362,6 @@ export default {
       })
       this.handlePage()
       this.getChart()
-      this.errorChart()
     },
     initData () {
       this.page = 1
@@ -520,7 +525,7 @@ export default {
     toReport (row) {
       this.$store.commit('achievement/setRow', this.curRow)
       // 考核跳实验报告，练习跳项目维度的成绩详情
-      this.$router.push(this.curTab == 1 ? `show?reportId=${row.reportId}` : `project?id=${row.projectId}&projectName=${row.goodsName}&classId=${this.curRow.classId || ''}&workNumber=${row.workNumber || row.userName}`)
+      this.$router.push(this.curTab == 1 ? `show?reportId=${row.reportId}` : `project?id=${row.projectId}&projectName=${row.goodsName}&classId=${this.curRow.classId || ''}&workNumber=${row.workNumber || row.userName}&mallId=${this.id}`)
     },
     getChart () { // 初始化折线图
       const data = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]
@@ -575,11 +580,13 @@ export default {
           areaStyle: {},
           color: ["#8191fd"]
         }]
-      });
+      })
+      this.loadIns.close()
     },
     // 错误率统计图
     errorChart () {
       const data = this.errorAnalysis
+      console.log("🚀 ~ file: course.vue:585 ~ errorChart ~ data:", data)
       const maxFontLength = data.length > 13 ? 6 : 10
       const option = {
         tooltip: {
diff --git a/src/pages/achievement/info/project.vue b/src/pages/achievement/info/project.vue
index 1da1f36..d8647f1 100644
--- a/src/pages/achievement/info/project.vue
+++ b/src/pages/achievement/info/project.vue
@@ -268,6 +268,7 @@
 </template>
 
 <script>
+import { Loading } from "element-ui";
 import Setting from "@/setting";
 import util from "@/libs/util";
 import echarts from "echarts";
@@ -281,6 +282,7 @@ export default {
       permissions: +this.$route.query.permissions,
       experimentalName: this.$route.query.projectName,
       id: this.$route.query.id,
+      mallId: this.$route.query.mallId,
       workNumber: this.$route.query.workNumber,
       keyword: "",
       searchTimer: null,
@@ -310,6 +312,7 @@ export default {
       pageActivation: 1,
       pageSizeActivation: 10,
       totalActivation: 0,
+      loadIns: null
     };
   },
   components: {
@@ -349,10 +352,13 @@ export default {
     },
     // 成绩
     async getData () {
+      this.loadIns = Loading.service({
+        background: "rgba(255,255,255,.6)"
+      })
       // 考核和练习调不同接口
       const res = this.permissions ?
-        await this.$post(`${this.api.getAssessmentDetail}?pageNum=${this.page}&pageSize=10000&assessmentId=${this.id}&classId=${this.classId}&keyword=${this.keyword}`) :
-        await this.$post(`${this.api.getPracticeDetail}?pageNum=${this.page}&pageSize=10000&projectId=${this.id}&keyWord=${this.keyword}&classId=${this.classId}`)
+        await this.$post(`${this.api.getAssessmentDetail}?pageNum=${this.page}&pageSize=10000&assessmentId=${this.id}&classId=${this.classId}&keyword=${this.keyword}&mallId=${this.mallId}`) :
+        await this.$post(`${this.api.getPracticeDetail}?pageNum=${this.page}&pageSize=10000&projectId=${this.id}&keyWord=${this.keyword}&classId=${this.classId}&mallId=${this.mallId}`)
       this.listDataAll = res.page.records
       this.total = res.page.total
       this.avgScore = (+res.avgScore).toFixed(2)
@@ -369,7 +375,7 @@ export default {
     // 活跃度
     async getActivity () {
       // 考核和练习调不同接口
-      const { message } = await this.$post(`${this.api.practiceActivity}?pageNum=${this.pageActivation}&pageSize=${this.pageSizeActivation}&projectId=${this.id}&keyWord=${this.keyword}&classId=${this.classId}`)
+      const { message } = await this.$post(`${this.api.practiceActivity}?pageNum=${this.pageActivation}&pageSize=${this.pageSizeActivation}&projectId=${this.id}&keyWord=${this.keyword}&classId=${this.classId}&mallId=${this.mallId}`)
       this.activations = message.records
       this.totalActivation = message.total
     },
@@ -393,7 +399,7 @@ export default {
       // 考核和练习的接口不一样
       let url = this.permissions
         ? `${this.api.exportAssessmentInfo}?assessmentId=${this.id}&classId=${this.classId}`
-        : `${this.api.exportPracticeInfo}?projectId=${this.id}`
+        : `${this.api.exportPracticeInfo}?projectId=${this.id}&mallId=${this.mallId}`
       // 有勾选，就带上勾选的id
       if (this.multipleSelection.length) {
         const ids = this.multipleSelection.map(e => e.reportId)
@@ -493,7 +499,7 @@ export default {
           responseType: 'blob'
         })
       } else {
-        res = await axios.get(`${this.api.exportAllActivity}?projectId=${this.id}`, {
+        res = await axios.get(`${this.api.exportAllActivity}?projectId=${this.id}&mallId=${this.mallId}`, {
           headers: {
             token: this.token
           },
@@ -535,7 +541,8 @@ export default {
           areaStyle: {},
           color: ["#8191fd"]
         }]
-      });
+      })
+      this.loadIns.close()
     },
     // 错误率统计图
     errorChart () {
diff --git a/src/pages/achievement/list/project.vue b/src/pages/achievement/list/project.vue
index 9192198..10758ed 100644
--- a/src/pages/achievement/list/project.vue
+++ b/src/pages/achievement/list/project.vue
@@ -268,7 +268,7 @@ export default {
     getData () {
       this.loadIns = Loading.service({
         background: "rgba(255,255,255,.6)"
-      });
+      })
       const per = this.projectPermissions
       const { mallId } = this
       const cur = this.curs.find(e => e.mallId == mallId) || {}
@@ -353,7 +353,7 @@ export default {
     },
     // 进入实验记录
     entry (row) {
-      this.$router.push(`project?id=${row.assessmentId || row.projectId}&projectName=${row.projectName}&permissions=${row.permissions || 0}`)
+      this.$router.push(`project?id=${row.assessmentId || row.projectId}&projectName=${row.projectName}&permissions=${row.permissions || 0}&mallId=${this.mallId}`)
     },
     handleDelete (row) { // 删除
       this.$confirm("该项目下的所有成绩报告将会删除，是否继续？", "提示", {
diff --git a/src/pages/match/add/set.vue b/src/pages/match/add/set.vue
index 087f009..483f83b 100644
--- a/src/pages/match/add/set.vue
+++ b/src/pages/match/add/set.vue
@@ -176,6 +176,7 @@ export default {
         // 查询项目
         const first = res.data[0]
         this.mallIds = [mallId || first.mallId, systemId || data[0].id]
+        this.form.mallId = mallId || first.mallId
         this.form.cid = cid || first.cid
         this.sysId = systemId || first.systemId
         this.loadIns = Loading.service()
diff --git a/src/pages/match/manage/matchReport.vue b/src/pages/match/manage/matchReport.vue
index 758e28f..5c09899 100644
--- a/src/pages/match/manage/matchReport.vue
+++ b/src/pages/match/manage/matchReport.vue
@@ -1,239 +1,303 @@
 <template>
-    <div class="wrap">
-        <el-card shadow="hover" class="m-b-20">
-            <el-page-header @back="$router.back()" content="查看报告"></el-page-header>
-        </el-card>
+  <div class="wrap">
+    <el-card shadow="hover"
+             class="m-b-20">
+      <el-page-header @back="$router.back()"
+                      content="查看报告"></el-page-header>
+    </el-card>
 
-        <div class="content">
-            <div class="text-right">
-              <el-button type="primary" @click="exportPage">导出报告</el-button>
+    <div class="content">
+      <div class="text-right">
+        <el-button type="primary"
+                   @click="exportPage">导出报告</el-button>
+      </div>
+      <h6 class="r-title">标准实验报告</h6>
+      <div class="info">
+        <h6 class="l-title">
+          <img src="@/assets/img/info1.png"
+               alt="">
+          基本信息
+        </h6>
+        <ul :class="['info-list', {edit: editing}]">
+          <li>
+            <label>学生姓名：</label>
+            <el-input v-if="editing"
+                      v-model="infoData.userName"
+                      disabled></el-input>
+            <span v-else>{{ infoData.userName }}</span>
+          </li>
+          <li>
+            <label>学生学号：</label>
+            <el-input v-if="editing"
+                      v-model="infoData.workNumber"
+                      disabled></el-input>
+            <span v-else>{{ infoData.workNumber }}</span>
+          </li>
+          <li>
+            <label>实验时间：</label>
+            <el-input v-if="editing"
+                      v-model="infoData.submitTime"
+                      disabled></el-input>
+            <span v-else>{{ infoData.submitTime }}</span>
+          </li>
+          <li>
+            <label>实验成绩：</label>
+            <el-input v-if="editing"
+                      v-model="infoData.score"
+                      disabled></el-input>
+            <div v-else
+                 class="score-wrap">
+              <em>{{ infoData.score }}</em>
+              <img src="@/assets/img/point.png"
+                   alt="">
             </div>
-            <h6 class="r-title">标准实验报告</h6>
-            <div class="info">
-                <h6 class="l-title">
-                    <img src="@/assets/img/info1.png" alt="">
-                    基本信息
-                </h6>
-                <ul :class="['info-list', {edit: editing}]">
-                    <li>
-                        <label>学生姓名：</label>
-                        <el-input v-if="editing" v-model="infoData.userName" disabled></el-input>
-                        <span v-else>{{ infoData.userName }}</span>
-                    </li>
-                    <li>
-                        <label>学生学号：</label>
-                        <el-input v-if="editing" v-model="infoData.workNumber" disabled></el-input>
-                        <span v-else>{{ infoData.workNumber }}</span>
-                    </li>
-                    <li>
-                        <label>实验时间：</label>
-                        <el-input v-if="editing" v-model="infoData.submitTime" disabled></el-input>
-                        <span v-else>{{ infoData.submitTime }}</span>
-                    </li>
-                    <li>
-                        <label>实验成绩：</label>
-                        <el-input v-if="editing" v-model="infoData.score" disabled></el-input>
-                        <div v-else class="score-wrap">
-                            <em>{{ infoData.score }}</em>
-                            <img src="@/assets/img/point.png" alt="">
-                        </div>
-                    </li>
-                    <li>
-                        <label>学生班级：</label>
-                        <el-input v-if="editing" v-model="infoData.className"></el-input>
-                        <span v-else>{{ infoData.className }}</span>
-                    </li>
-                    <li>
-                        <label>指导老师：</label>
-                        <el-input v-if="editing" v-model="infoData.instructor"></el-input>
-                        <span v-else>{{ infoData.instructor }}</span>
-                    </li>
-                    <li>
-                        <label>实验学时：</label>
-                        <el-input v-if="editing" v-model="infoData.period"></el-input>
-                        <span v-else>{{ infoData.period }}</span>
-                    </li>
-                </ul>
-                <div class="m-b-20">
-                    <h6 class="l-title">
-                        <img src="@/assets/img/report2.png" alt="">
-                        实验项目名称
-                    </h6>
-                    <el-input v-if="editing" v-model="form.projectName" type="textarea"></el-input>
-                    <div v-else class="pre-wrap" v-html="form.projectName"></div>
-                </div>
-                <div class="m-b-20">
-                    <h6 class="l-title">
-                        <img src="@/assets/img/report3.png" alt="">
-                        实验目的
-                    </h6>
-                    <div :class="['pre-wrap', {edit: editing}]" v-html="form.purpose"></div>
+          </li>
+          <li>
+            <label>学生班级：</label>
+            <el-input v-if="editing"
+                      v-model="infoData.className"></el-input>
+            <span v-else>{{ infoData.className }}</span>
+          </li>
+          <li>
+            <label>指导老师：</label>
+            <el-input v-if="editing"
+                      v-model="infoData.instructor"></el-input>
+            <span v-else>{{ infoData.instructor }}</span>
+          </li>
+          <li>
+            <label>实验学时：</label>
+            <el-input v-if="editing"
+                      v-model="infoData.period"></el-input>
+            <span v-else>{{ infoData.period }}</span>
+          </li>
+        </ul>
+        <div class="m-b-20">
+          <h6 class="l-title">
+            <img src="@/assets/img/report2.png"
+                 alt="">
+            实验项目名称
+          </h6>
+          <el-input v-if="editing"
+                    v-model="form.projectName"
+                    type="textarea"></el-input>
+          <div v-else
+               class="pre-wrap"
+               v-html="form.projectName"></div>
+        </div>
+        <div class="m-b-20">
+          <h6 class="l-title">
+            <img src="@/assets/img/report3.png"
+                 alt="">
+            实验目的
+          </h6>
+          <div :class="['pre-wrap', {edit: editing}]"
+               v-html="form.purpose"></div>
+        </div>
+        <div class="m-b-20">
+          <h6 class="l-title">
+            <img src="@/assets/img/report4.png"
+                 alt="">
+            实验数据
+          </h6>
+          <el-table :data="expData"
+                    class="table"
+                    border
+                    stripe
+                    header-align="center">
+            <el-table-column type="index"
+                             label="序号"
+                             align="center"
+                             width="60">
+              <template slot-scope="scope">
+                {{ scope.$index + 1 }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="judgmentName"
+                             label="判分点"
+                             width="270"
+                             align="center"></el-table-column>
+            <el-table-column v-if='project'
+                             prop="judgmentName"
+                             label="考核点"
+                             align="center"
+                             width="150">
+              <template slot-scope="scope">
+                <div v-for="(item, index) in scope.row.lcRuleRecords"
+                     :key="index">
+                  <span>
+                    <span>{{index+1}}. </span>{{item.name}}
+                  </span>
                 </div>
-                <div class="m-b-20">
-                    <h6 class="l-title">
-                        <img src="@/assets/img/report4.png" alt="">
-                        实验数据
-                    </h6>
-                    <el-table :data="expData" class="table" border stripe header-align="center">
-                        <el-table-column type="index" label="序号" align="center" width="60">
-                            <template slot-scope="scope">
-                                {{ scope.$index + 1 }}
-                            </template>
-                        </el-table-column>
-                        <el-table-column prop="judgmentName" label="判分点" width="270" align="center"></el-table-column>
-                        <el-table-column v-if='project' prop="judgmentName" label="考核点" align="center" width="150">
-                            <template slot-scope="scope">
-                                <div v-for="(item, index) in scope.row.lcRuleRecords" :key="index">
-                                    <span>
-                                        <span>{{index+1}}. </span>{{item.name}}
-                                    </span>
-                                </div>
-                            </template>
-                        </el-table-column>
-                        <el-table-column prop="ruleAnswer" label="参考答案" style='word-wrap: break-word'>
-                            <template slot-scope="scope">
-                                <div v-if='scope.row.lcRuleRecords'>
-                                    <div v-for="(item, index) in scope.row.lcRuleRecords" :key="index">
-                                    <span>
-                                        <span>{{index+1}}. </span>{{item.ruleAnswer}}
-                                    </span>
-                                    </div>
-                                </div>
-                                <div v-else v-html="scope.row.referenceAnswer"></div>
-                            </template>
-                        </el-table-column>
-                        <el-table-column prop="userAnswer" label="学生答案">
-                            <template slot-scope="scope">
-                                <div v-if='scope.row.lcRuleRecords'>
-                                    <div v-for="(item, index) in scope.row.lcRuleRecords" :key="index">
-                                        <span v-if='item.userAnswer'>
-                                            <span>{{index+1}}. </span>{{item.userAnswer}}
-                                        </span>
-                                        <span v-else>
-                                            <span>{{index+1}}. </span>未填写
-                                        </span>
-                                    </div>
-                                </div>
-                                <div v-else v-html='scope.row.answer' style='white-space: pre-wrap'></div>
-                                <template v-if="scope.row.runThePictureList">
-                                  <img v-for="(img, i) in scope.row.runThePictureList" :key="i" width="200" class="result-pic" :src="img" alt="">
-                                </template>
-                            </template>
-                        </el-table-column>
-                        <el-table-column prop="score" label="得分" width="80" align="center"></el-table-column>
-                    </el-table>
+              </template>
+            </el-table-column>
+            <el-table-column prop="ruleAnswer"
+                             label="参考答案"
+                             style='word-wrap: break-word'>
+              <template slot-scope="scope">
+                <div v-if='scope.row.lcRuleRecords'>
+                  <div v-for="(item, index) in scope.row.lcRuleRecords"
+                       :key="index">
+                    <span>
+                      <span>{{index+1}}. </span>{{item.ruleAnswer}}
+                    </span>
+                  </div>
                 </div>
-                <div class="m-b-20">
-                    <h6 class="l-title">
-                        <img src="@/assets/img/report5.png" alt="">
-                        实验总结与体会
-                    </h6>
-                    <quill v-if="editing" :border="true" v-model="form.summarize" :minHeight="150" :height="150" />
-                    <div v-else class="pre-wrap" v-html="form.summarize"></div>
+                <div v-else
+                     v-html="scope.row.referenceAnswer"></div>
+              </template>
+            </el-table-column>
+            <el-table-column prop="userAnswer"
+                             label="学生答案">
+              <template slot-scope="scope">
+                <div v-if='scope.row.lcRuleRecords'>
+                  <div v-for="(item, index) in scope.row.lcRuleRecords"
+                       :key="index">
+                    <span v-if='item.userAnswer'>
+                      <span>{{index+1}}. </span>{{item.userAnswer}}
+                    </span>
+                    <span v-else>
+                      <span>{{index+1}}. </span>未填写
+                    </span>
+                  </div>
                 </div>
-            </div>
+                <div v-else
+                     v-html='scope.row.answer'
+                     style='white-space: pre-wrap'></div>
+                <template v-if="scope.row.runThePictureList">
+                  <img v-for="(img, i) in scope.row.runThePictureList"
+                       :key="i"
+                       width="200"
+                       class="result-pic"
+                       :src="img"
+                       alt="">
+                </template>
+              </template>
+            </el-table-column>
+            <el-table-column prop="score"
+                             label="得分"
+                             width="80"
+                             align="center"></el-table-column>
+          </el-table>
+        </div>
+        <div class="m-b-20">
+          <h6 class="l-title">
+            <img src="@/assets/img/report5.png"
+                 alt="">
+            实验总结与体会
+          </h6>
+          <quill v-if="editing"
+                 :border="true"
+                 v-model="form.summarize"
+                 :minHeight="150"
+                 :height="150" />
+          <div v-else
+               class="pre-wrap"
+               v-html="form.summarize"></div>
         </div>
+      </div>
     </div>
+  </div>
 </template>
 
 <script>
 import util from "@/libs/util";
 export default {
-    data() {
-        return {
-            reportId: this.$route.query.reportId,
-            title: "实验报告",
-            form: {
-                className: "",
-                instructor: "",
-                period: "",
-                projectName: "",
-                summarize: "",
-            },
-            infoData: {},
-            expData: [],
-            editing: false,
-            loadIns: null,
-            loading: false,
-            project:false,
-            userScores: []
-        };
-    },
-    mounted() {
-        this.getData()
+  data () {
+    return {
+      reportId: this.$route.query.reportId,
+      title: "实验报告",
+      form: {
+        className: "",
+        instructor: "",
+        period: "",
+        projectName: "",
+        summarize: "",
+      },
+      infoData: {},
+      expData: [],
+      editing: false,
+      loadIns: null,
+      loading: false,
+      project: false,
+      userScores: []
+    };
+  },
+  mounted () {
+    this.getData()
+  },
+  methods: {
+    getData () { // 查询详情
+      this.$get(`${this.api.reportDetail}?reportId=${this.reportId}`).then(({ report, userScores }) => {
+        this.form = report
+        this.expData = userScores
+        this.project = this.expData.find(e => e.lcRuleRecords) // 银行系统才有lcRuleRecords
+        let form = this.form;
+        this.infoData = {
+          workNumber: form.workNumber,
+          experimentalClassName: form.experimentalClassName,
+          instructor: form.instructor,
+          period: form.period,
+          laboratory: form.laboratory,
+          submitTime: form.submitTime,
+          score: form.score,
+          className: form.className,
+          userName: form.userName
+        }
+        const data = report.data
+        this.userScores = userScores
+        // 如果没有data，则添加，否则，直接使用
+        if (!data) {
+          this.handleList(userScores)
+          this.$post(this.api.editExperimentalData, {
+            reportId,
+            data: JSON.stringify(userScores)
+          }).then(res => { }).catch(err => { })
+        } else {
+          this.handleList(userScores.find(e => e.lcRuleRecords) ? userScores : JSON.parse(data))
+        }
+      }).catch(res => { })
     },
-    methods: {
-        getData() { // 查询详情
-            this.$get(`${this.api.reportDetail}?reportId=${this.reportId}`).then(({ report, userScores }) => {
-                this.form = report
-                this.expData = userScores
-                this.project = this.expData.find(e => e.lcRuleRecords) // 银行系统才有lcRuleRecords
-                let form = this.form;
-                this.infoData = {
-                    workNumber: form.workNumber,
-                    experimentalClassName: form.experimentalClassName,
-                    instructor: form.instructor,
-                    period: form.period,
-                    laboratory: form.laboratory,
-                    submitTime: form.submitTime,
-                    score: form.score,
-                    userName: form.userName
-                }
-                const data = report.data
-                this.userScores = userScores
-                // 如果没有data，则添加，否则，直接使用
-                if (!data) {
-                  this.handleList(userScores)
-                  this.$post(this.api.editExperimentalData, {
-                    reportId,
-                    data: JSON.stringify(userScores)
-                  }).then(res => {}).catch(err => {})
-                } else {
-                  this.handleList(userScores.find(e => e.lcRuleRecords) ? userScores : JSON.parse(data))
-                }
-            }).catch(res => {})
-        },
-        // 处理实验数据
-        handleList(list) {
-          this.project = list.find(e => e.lcRuleRecords) // 银行系统才有lcRuleRecords
-          if (this.project) {
-            list.map(e => {
-              e.assessmentPoint = ''
-              e.referenceAnswer = ''
-              e.answer = ''
-              e.lcRuleRecords.map((n, i) => {
-                e.assessmentPoint += `${i + 1}.${n.name}`
-                e.referenceAnswer += `${i + 1}.${n.ruleAnswer}`
-                e.answer += `${i + 1}.${n.userAnswer}`
-              })
-            })
-          }
-          this.expData = list
-        },
-        exportPage() {
-          const form = Object.assign(this.form, this.infoData)
-          const list = JSON.parse(JSON.stringify(this.expData))
-          list.map((e, i) => {
-            const item = this.userScores.find(n => n.judgmentId == e.judgmentId)
-            if (item && item.runThePicture) e.runThePicture = item.runThePicture
-            if (item && item.runThePictureList) e.runThePictureList = item.runThePictureList
-            e.id = i + 1
-            // if (e.referenceAnswer && typeof e.referenceAnswer === 'string') e.referenceAnswer = e.referenceAnswer.replace(/<[^>]+>/g, '').replace(/(&nbsp;|&amp;|%s)/g, '').replace(/>/g, '&gt;').replace(/</g, '&lt;')
-            if (e.answer && typeof e.answer === 'string') e.answer = e.answer.replace(/<[^>]+>/g, '').replace(/(&nbsp;|&amp;|%s)/g, '').replace(/>/g, '&gt;').replace(/</g, '&lt;')
+    // 处理实验数据
+    handleList (list) {
+      this.project = list.find(e => e.lcRuleRecords) // 银行系统才有lcRuleRecords
+      if (this.project) {
+        list.map(e => {
+          e.assessmentPoint = ''
+          e.referenceAnswer = ''
+          e.answer = ''
+          e.lcRuleRecords.map((n, i) => {
+            e.assessmentPoint += `${i + 1}.${n.name}`
+            e.referenceAnswer += `${i + 1}.${n.ruleAnswer}`
+            e.answer += `${i + 1}.${n.userAnswer}`
           })
-          for (const i in form) {
-            if (form[i] && typeof form[i] === 'string') form[i] = form[i].replace(/<[^>]+>/g, '')
-          }
-          form.purpose = form.purpose.replace(/<[^>]+>/g, '')
-          this.$post(this.project ? this.api.exportBankExperimentReport : this.api.exportLabReport, {
-            ...form,
-            experimentalData: list
-          }).then(res => {
-            console.log(res)
-            util.downloadFileDirect(`实验报告.docx`,new Blob([res]))
-          }).catch(res => {})
-        },
-    }
+        })
+      }
+      this.expData = list
+    },
+    exportPage () {
+      const form = Object.assign(this.form, this.infoData)
+      const list = JSON.parse(JSON.stringify(this.expData))
+      list.map((e, i) => {
+        const item = this.userScores.find(n => n.judgmentId == e.judgmentId)
+        if (item && item.runThePicture) e.runThePicture = item.runThePicture
+        if (item && item.runThePictureList) e.runThePictureList = item.runThePictureList
+        e.id = i + 1
+        // if (e.referenceAnswer && typeof e.referenceAnswer === 'string') e.referenceAnswer = e.referenceAnswer.replace(/<[^>]+>/g, '').replace(/(&nbsp;|&amp;|%s)/g, '').replace(/>/g, '&gt;').replace(/</g, '&lt;')
+        if (e.answer && typeof e.answer === 'string') e.answer = e.answer.replace(/<[^>]+>/g, '').replace(/(&nbsp;|&amp;|%s)/g, '').replace(/>/g, '&gt;').replace(/</g, '&lt;')
+      })
+      for (const i in form) {
+        if (form[i] && typeof form[i] === 'string') form[i] = form[i].replace(/<[^>]+>/g, '')
+      }
+      form.purpose = form.purpose.replace(/<[^>]+>/g, '')
+      this.$post(this.project ? this.api.exportBankExperimentReport : this.api.exportLabReport, {
+        ...form,
+        experimentalData: list
+      }).then(res => {
+        console.log(res)
+        util.downloadFileDirect(`实验报告.docx`, new Blob([res]))
+      }).catch(res => { })
+    },
+  }
 };
 </script>
 
@@ -242,24 +306,26 @@ export default {
     padding: 12px 300px 20px;
 }
 .text-right {
-  text-align: right;
+    text-align: right;
 }
-code, kbd, samp{
-    font-family: 'PingFang SC', "Helvetica Neue", Helvetica, "microsoft yahei", arial, STHeiTi, sans-serif;
+code,
+kbd,
+samp {
+    font-family: 'PingFang SC', 'Helvetica Neue', Helvetica, 'microsoft yahei', arial, STHeiTi, sans-serif;
     word-wrap: break-word;
     white-space: pre-wrap;
 }
-/deep/ pre{
-    white-space: pre-wrap;       /* css-3 */
-    white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
-    white-space: pre-wrap;      /* Opera 4-6 */
-    white-space: -o-pre-wrap;    /* Opera 7 */
-    word-wrap: break-word;       /* Internet Explorer 5.5+ */
-    word-break:break-all;
-    overflow:hidden;
+/deep/ pre {
+    white-space: pre-wrap; /* css-3 */
+    white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
+    white-space: pre-wrap; /* Opera 4-6 */
+    white-space: -o-pre-wrap; /* Opera 7 */
+    word-wrap: break-word; /* Internet Explorer 5.5+ */
+    word-break: break-all;
+    overflow: hidden;
     font-size: 12px;
-    font-weight:400;
-    font-family:'PingFang SC', "Helvetica Neue", Helvetica, "microsoft yahei", arial, STHeiTi, sans-serif
+    font-weight: 400;
+    font-family: 'PingFang SC', 'Helvetica Neue', Helvetica, 'microsoft yahei', arial, STHeiTi, sans-serif;
 }
 .content {
     padding: 16px 40px;
@@ -275,7 +341,7 @@ code, kbd, samp{
     }
     .info {
         padding: 20px 16px;
-        border: 1px solid #E1E6F2;
+        border: 1px solid #e1e6f2;
     }
     .l-title {
         display: flex;
@@ -309,7 +375,7 @@ code, kbd, samp{
         span {
             min-width: 150px;
             padding: 0 10px 3px;
-            border-bottom: 1px solid #E1E6F2;
+            border-bottom: 1px solid #e1e6f2;
         }
         /deep/.el-input {
             width: 174px;
@@ -318,7 +384,7 @@ code, kbd, samp{
     .score-wrap {
         position: relative;
         min-width: 150px;
-        border-bottom: 1px solid #E1E6F2;
+        border-bottom: 1px solid #e1e6f2;
         em {
             position: absolute;
             top: -12px;
@@ -326,7 +392,7 @@ code, kbd, samp{
             font-family: din;
             font-size: 30px;
             font-weight: 600;
-            color: #0B1D30;
+            color: #0b1d30;
         }
         img {
             position: absolute;
@@ -334,16 +400,17 @@ code, kbd, samp{
             left: 0;
         }
     }
-    /deep/.el-textarea .el-textarea__inner, .pre-wrap {
+    /deep/.el-textarea .el-textarea__inner,
+    .pre-wrap {
         min-height: 72px;
         padding: 10px 16px;
         font-size: 14px;
         color: #333;
         &.edit {
-            color: #ABB3C6;
-            border: 1px solid #CACFDB;
+            color: #abb3c6;
+            border: 1px solid #cacfdb;
             border-radius: 4px;
-            background-color: #F6F7F9;
+            background-color: #f6f7f9;
         }
     }
     /deep/ .table th {
@@ -355,7 +422,7 @@ code, kbd, samp{
     }
 }
 .result-pic {
-  margin: 10px 0;
+    margin: 10px 0;
 }
 @media (max-width: 1650px) {
     .wrap {
diff --git a/src/pages/product/list/index.vue b/src/pages/product/list/index.vue
index 5a27f38..3c05ec7 100644
--- a/src/pages/product/list/index.vue
+++ b/src/pages/product/list/index.vue
@@ -379,46 +379,32 @@ export default {
     // 获取学科类别
     async getSubject () {
       // 学科类别
-      this.$get(this.api.courseDiscipline).then(({ list }) => {
-        list = list.filter(e => e.level > 1).slice(1) // 被引用了的才需要展示（level>1）
+      this.$get(this.api.subjectCategoryCited).then(({ list }) => {
         const result = []
         const promises = []
+        list = list.filter(e => e.disciplineId != 1)
         list.map((e, i) => {
-          promises.push(new Promise((resolve, reject) => {
-            // 专业类
-            this.$get(this.api.courseProfessionalClass, {
-              disciplineId: e.disciplineId
-            }).then(({ list }) => {
-              list = list.filter(e => e.level > 1)
-              list.map(e => {
-                e.value = e.professionalClassId
-                e.label = e.professionalClassName
+          // 专业类
+          e.professionalClasses.map(e => {
+            e.value = e.professionalClassId
+            e.label = e.professionalClassName
 
-                // 专业
-                this.$get(this.api.courseProfessional, {
-                  professionalClassId: e.value
-                }).then(({ list }) => {
-                  list = list.filter(e => e.level > 1)
-                  list.map(e => {
-                    e.value = e.professionalId
-                    e.label = e.professionalName
-                  })
-                  if (list.length) e.children = list
-                  resolve()
-                }).catch(err => { })
-              })
-              result.push({
-                val: [],
-                disciplineId: e.disciplineId,
-                name: e.disciplineName,
-                categoryName: e.disciplineName,
-                list
-              })
-            }).catch(err => { })
-          }))
+            // 专业
+            e.professionals.map(e => {
+              e.value = e.professionalId
+              e.label = e.professionalName
+            })
+            e.children = e.professionals
+          })
+          result.push({
+            val: [],
+            disciplineId: e.disciplineId,
+            name: e.disciplineName,
+            categoryName: e.disciplineName,
+            list: e.professionalClasses
+          })
         })
 
-
         Promise.all(promises).then(_ => {
           console.log("🚀 ~ file: index.vue:378 ~ this.$get ~ result:", result)
           this.category = result
@@ -451,28 +437,6 @@ export default {
       this.professionalId = val[1] || ''
       this.initData()
     },
-    getProfessionalClassData (id) {
-      const i = id === 1 ? 1 : 0
-      this.$get(this.api.courseProfessionalClass, {
-        disciplineId: id || this.categoryId
-      }).then(({ list }) => {
-        this.professionalClassList = list.slice(i)
-        if (id) this.professionalCategoryId = list[i].professionalClassId
-        this.getProfessionalData(list[i].professionalClassId)
-      }).catch(err => { })
-    },
-    // 获取专业
-    getProfessionalData (id) {
-      const i = id === 1 ? 1 : 0
-      this.$get(this.api.courseProfessional, {
-        professionalClassId: id || this.professionalCategoryId
-      }).then(({ list }) => {
-        this.professionalList = list.slice(i)
-        if (id) this.professionalId = list[i].professionalId
-        this.handleCategoryName()
-        this.initData()
-      }).catch(err => { })
-    },
     // 返回学科name
     handleCategoryName () {
       if (this.subjectList.length) {
diff --git a/src/pages/project/add/index.vue b/src/pages/project/add/index.vue
index 60e8ca7..0aac8e1 100644
--- a/src/pages/project/add/index.vue
+++ b/src/pages/project/add/index.vue
@@ -47,7 +47,7 @@
                           placeholder="20个字符以内"
                           @blur="projectNameExistis"></el-input>
               </el-form-item>
-              <el-form-item label="项目权限">
+              <el-form-item label="项目用途">
                 <el-select v-model="projectManage.permissions"
                            placeholder="请选择"
                            @change="permissionChange">
@@ -302,7 +302,7 @@ export default {
       projectManage: {
         founder: 1, // 创建人角色(0、系统 1、老师)
         projectName: "", // 项目名称
-        permissions: 0, // 项目权限(0、练习 1、考核 2、竞赛)
+        permissions: 0, // 项目用途(0、练习 1、考核 2、竞赛)
         systemId: this.$store.state.project.lastSystemId, // 系统id
         mallId: '',
         hintOpen: 0, // 实验提示是否开启(0开启 1不开启 默认0)
diff --git a/src/pages/project/list/index.vue b/src/pages/project/list/index.vue
index 6545176..cc40af4 100644
--- a/src/pages/project/list/index.vue
+++ b/src/pages/project/list/index.vue
@@ -34,7 +34,7 @@
             </el-select>
           </li>
           <li>
-            <label>权限</label>
+            <label>用途</label>
             <el-select v-model="queryData.permissions"
                        placeholder="请选择"
                        @change="initData">
@@ -99,7 +99,7 @@
             {{ founderKeys[scope.row.founder] }}
           </template>
         </el-table-column>
-        <el-table-column label="权限"
+        <el-table-column label="用途"
                          min-width="120"
                          align="center">
           <template slot-scope="scope">
@@ -225,7 +225,7 @@ export default {
         platformId: 1, // 平台：职站:1 中台:3
         founder: +this.$route.query.founder || 2, // 创建人角色(0:系统 1:老师 2:全部)
         state: "", // 状态(0:草稿箱 1:已发布)
-        permissions: "", // 项目权限(0:练习 1:考核 2:竞赛)
+        permissions: "", // 项目用途(0:练习 1:考核 2:竞赛)
         cid: '',
         mallId: ''
       },
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 0e2bdb4..8f445d4 100644
--- a/src/pages/station/preview/index.vue
+++ b/src/pages/station/preview/index.vue
@@ -1300,7 +1300,8 @@ $height: 700px;
     background-color: #fff;
     .title {
         margin-bottom: 10px;
-        font-size: 16px;
+        font-size: 15px;
+        font-weight: 400;
     }
     .arches {
         margin-top: 20px;
diff --git a/src/setting.js b/src/setting.js
index 92e95aa..1f5cb2c 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -26,7 +26,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.217:9000/"; // 榕
+    // host = "http://192.168.31.217:9000/"; // 榕
     // host = 'http://192.168.31.51:9000/'; // 赓
 }
 
diff --git a/src/styles/page/station.scss b/src/styles/page/station.scss
index 3af4a59..508a6ee 100644
--- a/src/styles/page/station.scss
+++ b/src/styles/page/station.scss
@@ -26,6 +26,9 @@
                     color: rgba(0, 0, 0, 0.45);
                     font-size: 14px;
                 }
+                /deep/img {
+                    max-width: 95%;
+                }
             }
             .reply-name {
                 color: #9076ff;