From d40a2540964ed912c41595c5a77f6f400ffd1d11 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 15 Aug 2023 18:44:00 +0800
Subject: [PATCH] fix

---
 src/layouts/header/index.vue           |  2 +-
 src/pages/achievement/info/course.vue  | 12 ++---
 src/pages/achievement/info/project.vue |  6 +--
 src/pages/match/add/index.vue          |  3 +-
 src/pages/match/add/set.vue            |  1 +
 src/pages/match/manage/matchArch.vue   | 66 ++++++++++++++++++--------
 src/pages/product/list/index.vue       |  2 +-
 src/pages/product/show/index.vue       |  6 ++-
 src/pages/screen/index.vue             | 61 ++++++++++++------------
 src/pages/station/preview/index.vue    | 11 +++--
 src/setting.js                         |  2 +-
 11 files changed, 104 insertions(+), 68 deletions(-)

diff --git a/src/layouts/header/index.vue b/src/layouts/header/index.vue
index 6200152..0c47853 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(`${Setting.isTest ? 'ws' : '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:9100' : 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/info/course.vue b/src/pages/achievement/info/course.vue
index e6d28d0..7037925 100644
--- a/src/pages/achievement/info/course.vue
+++ b/src/pages/achievement/info/course.vue
@@ -30,11 +30,11 @@
           </div>
           <div class="item item3">
             <p class="name">实验最高分</p>
-            <p class="val">{{ maxScore }}</p>
+            <p class="val">{{ maxScore || 0 }}</p>
           </div>
           <div class="item item4">
             <p class="name">实验最低分</p>
-            <p class="val">{{ minScore }}</p>
+            <p class="val">{{ minScore || 0 }}</p>
           </div>
         </div>
         <div class="chart"
@@ -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 || 0 }}人&emsp;｜&emsp;{{ curTab == 1 ? `共${max.itemErrorCount || 0}人做错，` : '' }}错误率{{ max.errorRate || 0 }}%</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 || 0 }}人&emsp;｜&emsp;{{ curTab == 1 ? `共${min.itemErrorCount || 0}人做错，` : '' }}错误率{{ min.errorRate || 0 }}%</span>
         </div>
       </div>
       <div class="chart"
@@ -346,11 +346,11 @@ export default {
       this.peopleNum = stat.experimentalPopulation
       this.maxScore = stat.maxScore
       this.minScore = stat.minScore
-      const err = per ? res.testErrorRateUnderProduct : res.projectErrorRateAnalysisUnderProduct
+      const err = (per ? res.testErrorRateUnderProduct : res.projectErrorRateAnalysisUnderProduct) || []
       err.forEach(e => {
         e.errorRate = (+e.errorRate).toFixed(2)
       })
-      this.errorAnalysis = err
+      this.errorAnalysis = err || []
       this.max = err[0] || {}
       this.min = err[err.length - 1] || {}
       this.errorChart()
diff --git a/src/pages/achievement/info/project.vue b/src/pages/achievement/info/project.vue
index d8647f1..232ae4f 100644
--- a/src/pages/achievement/info/project.vue
+++ b/src/pages/achievement/info/project.vue
@@ -60,11 +60,11 @@
       <div class="wrong">
         <div class="line">
           <span class="jud-name">错误率最高：{{ max.judgmentName }}</span>
-          <span>参加考试{{ permissions ? max.peopleNum : peopleNum }}人&emsp;｜&emsp;{{ permissions ? `共${max.errorTotal}人做错，` : '' }}错误率{{ max.errorRate }}%</span>
+          <span>参加考试{{ permissions ? max.peopleNum : peopleNum }}人&emsp;｜&emsp;{{ permissions ? `共${max.errorTotal || 0}人做错，` : '' }}错误率{{ max.errorRate }}%</span>
         </div>
         <div class="line">
           <span class="jud-name">错误率最低：{{ min.judgmentName }}</span>
-          <span>参加考试{{ permissions ? min.peopleNum : peopleNum }}人&emsp;｜&emsp;{{ permissions ? `共${min.errorTotal}人做错，` : '' }}错误率{{ min.errorRate }}%</span>
+          <span>参加考试{{ permissions ? min.peopleNum : peopleNum }}人&emsp;｜&emsp;{{ permissions ? `共${min.errorTotal || 0}人做错，` : '' }}错误率{{ min.errorRate }}%</span>
         </div>
       </div>
       <div class="chart"
@@ -365,7 +365,7 @@ export default {
       this.peopleNum = res.peopleNum
       this.maxScore = res.maxScore
       this.minScore = res.minScore
-      this.errorAnalysis = res.errorAnalysis
+      this.errorAnalysis = res.errorAnalysis || {}
       this.max = res.highestErrorRate || {}
       this.min = res.minimumErrorRate || {}
       this.handlePage()
diff --git a/src/pages/match/add/index.vue b/src/pages/match/add/index.vue
index bb2eb2d..d995a8f 100644
--- a/src/pages/match/add/index.vue
+++ b/src/pages/match/add/index.vue
@@ -157,7 +157,7 @@ export default {
   // 离开的时候判断是否有保存更改的信息,没有则拦截并提示
   beforeRouteLeave (to, from, next) {
     const { updateTime } = this.$refs['step' + this.step]
-    if (this.$refs['step' + this.step] && updateTime) {
+    if (this.step < 4 && this.$refs['step' + this.step] && updateTime) {
       this.$confirm(`您所更改的内容未更新，是否更新？`, '提示', {
         type: 'warning'
       }).then(() => {
@@ -275,6 +275,7 @@ export default {
     back () {
       // 更改了信息才需要提示
       const { updateTime } = this.$refs['step' + this.step]
+      console.log("🚀 ~ file: index.vue:278 ~ back ~ updateTime:", updateTime)
       if (this.step < 4 && this.$refs['step' + this.step] && updateTime) {
         this.$confirm(`编辑的内容未保存，是否保存？`, '提示', {
           type: 'warning'
diff --git a/src/pages/match/add/set.vue b/src/pages/match/add/set.vue
index 483f83b..58fca1e 100644
--- a/src/pages/match/add/set.vue
+++ b/src/pages/match/add/set.vue
@@ -228,6 +228,7 @@ export default {
     toProject () {
       const { form, curStep } = this.$parent
       form[curStep] = this.form
+      this.$parent.pass = 1
       this.$store.commit('match/setCache', {
         form,
         curStep
diff --git a/src/pages/match/manage/matchArch.vue b/src/pages/match/manage/matchArch.vue
index a47f9ba..04cd8d6 100644
--- a/src/pages/match/manage/matchArch.vue
+++ b/src/pages/match/manage/matchArch.vue
@@ -2,26 +2,52 @@
   <!-- 报名人员 -->
   <div class="page-content"
        style="padding: 24px">
-    <el-collapse v-if="list.length"
-                 v-model="curStep">
-      <el-collapse-item v-for="(item, i) in list"
-                        :key="i"
-                        :title="item.stageName"
-                        :name="item.stageId">
-        <div class="line">
-          <span>比赛方式：{{ item.methodName }}</span>
-          <span>比赛形式：{{ item.competitionType ? '团队赛' : '个人赛' }}</span>
-          <span>赛制：{{ item.ruleName }}</span>
-          <span>状态：{{ item.status }}</span>
-          <span>竞赛起止时间：{{ item.startTime + ' ~ ' + item.endTime }}</span>
-          <div>
-            <el-button type="primary"
-                       @click="toRank(item, i)">排名</el-button>
-            <el-button @click="toArch(item)">成绩管理</el-button>
-          </div>
-        </div>
-      </el-collapse-item>
-    </el-collapse>
+    <el-table ref="table"
+              :data="list"
+              class="table"
+              stripe
+              header-align="center"
+              row-key="stageId">
+      <el-table-column type="index"
+                       width="60"
+                       label="序号"
+                       align="center">
+        <template slot-scope="scope">
+          {{ scope.$index + 1 }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="methodName"
+                       label="比赛方式"
+                       align="center"></el-table-column>
+      <el-table-column prop="founderName"
+                       label="比赛形式"
+                       align="center">
+        <template slot-scope="scope">
+          {{ scope.row.competitionType ? '团队赛' : '个人赛' }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="ruleName"
+                       label="赛制"
+                       align="center"></el-table-column>
+      <el-table-column prop="status"
+                       label="状态"
+                       align="center"></el-table-column>
+      <el-table-column label="竞赛起止时间"
+                       align="center">
+        <template slot-scope="scope">
+          {{ scope.row.startTime + ' ~ ' + scope.row.endTime }}
+        </template>
+      </el-table-column>
+      <el-table-column label="操作"
+                       align="center"
+                       width="260">
+        <template slot-scope="scope">
+          <el-button type="primary"
+                     @click="toRank(scope.row, scope.$index)">排名</el-button>
+          <el-button @click="toArch(scope.row)">成绩管理</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
   </div>
 </template>
 
diff --git a/src/pages/product/list/index.vue b/src/pages/product/list/index.vue
index 3c05ec7..87e9126 100644
--- a/src/pages/product/list/index.vue
+++ b/src/pages/product/list/index.vue
@@ -356,7 +356,7 @@ export default {
           el.innerHTML = e.productIntroduction
           e.productIntroduction = el.innerText
           const cid = e.classificationId
-          e.isCourse = (cid === 1 || cid === 2) && !e.isAssociatedProduct
+          e.isCourse = (cid === 1 || cid === 2) && !e.isAssociatedProduct // 产品分类为实训或者理论，并且已经关联了产品
         })
         this.list = list ? list : []
         this.total = page.total
diff --git a/src/pages/product/show/index.vue b/src/pages/product/show/index.vue
index 8fa9bef..bd74c69 100644
--- a/src/pages/product/show/index.vue
+++ b/src/pages/product/show/index.vue
@@ -141,7 +141,7 @@
                              alt="">
                         {{ section.name }}
                       </div>
-                      <i v-if="!form.goodsRes.logoOfOurSchool"
+                      <i v-if="!form.goodsRes.logoOfOurSchool && j"
                          class="icon el-icon-lock"></i>
                     </div>
                   </div>
@@ -310,7 +310,9 @@ export default {
     },
     // 跳转播放资源
     toPreview (i, j) {
-      this.form.goodsRes.logoOfOurSchool ?
+      const bought = this.form.goodsRes.logoOfOurSchool
+      // 购买了 || 没购买但是是第一个课程，就可以查看课程
+      bought || (!bought && !j) ?
         this.$router.push(`/station/preview?courseId=${this.form.mall.associatedProduct}&curriculumName=${this.form.mall.productName}&mallId=${this.id}&chapter=${i}&section=${j}&admin=1`) :
         this.toTrail()
     },
diff --git a/src/pages/screen/index.vue b/src/pages/screen/index.vue
index f185bf0..eeb0554 100644
--- a/src/pages/screen/index.vue
+++ b/src/pages/screen/index.vue
@@ -718,11 +718,11 @@ export default {
         },
         {
           color1: '#e71872',
-          color2: 'rgba(243, 147, 189, 0.4)'
+          color2: 'rgba(40, 147, 189, 0.4)'
         },
         {
           color1: '#f9d437',
-          color2: 'rgba(255, 234, 144, 0.4)'
+          color2: 'rgba(50, 234, 144, 0.4)'
         },
         {
           color1: '#912892',
@@ -730,11 +730,11 @@ export default {
         },
         {
           color1: '#f21259',
-          color2: 'rgba(213, 22, 11, 0.4)'
+          color2: 'rgba(40, 176, 97, 0.4)'
         },
         {
           color1: '#7343fe',
-          color2: 'rgba(243, 123, 2, 0.4)'
+          color2: 'rgba(50, 240, 140, 0.4)'
         },
         {
           color1: '#ea7321',
@@ -746,8 +746,24 @@ export default {
         },
         {
           color1: '#672313',
-          color2: 'rgba(156, 163, 2, 0.4)'
-        }
+          color2: 'rgba(156, 40, 100, 0.4)'
+        },
+        {
+          color1: '#0184d5',
+          color2: 'rgba(60, 132, 60, 0.4)'
+        },
+        {
+          color1: '#00d887',
+          color2: 'rgba(60, 42, 244, 0.4)'
+        },
+        {
+          color1: '#e71872',
+          color2: 'rgba(90, 147, 180, 0.4)'
+        },
+        {
+          color1: '#f9d437',
+          color2: 'rgba(150, 20, 144, 0.4)'
+        },
       ]
       // 登录前登录后调的课程接口不一样
       const cousrseRes = await this.$post(this.api.listOfGoods, {
@@ -758,22 +774,20 @@ export default {
         hotTag: 1,
       })
       if (cousrseRes) {
-        const courseList =
-          cousrseRes.page.records
+        const courseList = cousrseRes.page.records
         const ids = courseList.map(e => e.mallId)
         times.map(e => {
           e.mallId = ids
         })
         const courseData = {}
-        courseList.map(e => {
-          // e.productName = e.productName.substring(0, 10)
-          courseData[e.productName] = []
-        })
         this.$post(this.api.studentAssessSchievement, times).then(({ data }) => {
-          const times = []
+          const xData = data.map(e => e.time)
+          const len = xData.length
+          courseList.map(e => {
+            courseData[e.productName] = new Array(len).fill(0, 0)
+          })
           const series = []
           data.map((e, i) => {
-            times.push(e.time)
             e.assesScoreRespList.map(n => {
               const item = courseList.find(j => j.mallId == n.mallId)
               if (item) {
@@ -790,7 +804,7 @@ export default {
             series.push({
               name: i,
               type: 'line',
-              smooth: true,
+              // smooth: true,
               symbol: 'circle',
               symbolSize: 5,
               lineStyle: {
@@ -799,23 +813,10 @@ export default {
                   width: 2
                 }
               },
-              areaStyle: {
-                normal: {
-                  color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
-                    offset: 0,
-                    color: colors[index].color2
-                  }, {
-                    offset: 0.8,
-                    color: colors[index].color2
-                  }], false),
-                  shadowColor: 'rgba(0, 0, 0, 0.1)',
-                }
-              },
               itemStyle: {
                 normal: {
                   color: colors[index].color1,
-                  borderColor: 'rgba(221, 220, 107, .1)',
-                  borderWidth: 12
+                  borderWidth: 8
                 }
               },
               data: courseData[i]
@@ -871,7 +872,7 @@ export default {
                   color: 'rgba(255,255,255,.2)'
                 }
               },
-              data: times
+              data: xData
             },
             yAxis: [{
               type: 'value',
diff --git a/src/pages/station/preview/index.vue b/src/pages/station/preview/index.vue
index 8f445d4..54f9146 100644
--- a/src/pages/station/preview/index.vue
+++ b/src/pages/station/preview/index.vue
@@ -159,7 +159,7 @@
         </template>
         <template v-if="active === 2">
           <div class="page">
-            <template v-if="showNoteAdd">
+            <template v-if="showNoteAdd || !notes.length">
               <el-form class="form"
                        ref="form"
                        label-width="120px"
@@ -179,7 +179,8 @@
                 </el-form-item>
               </el-form>
               <div class="text-right">
-                <el-button @click="showNoteAdd = false">取消</el-button>
+                <el-button v-if="notes.length"
+                           @click="showNoteAdd = false">取消</el-button>
                 <el-button type="primary"
                            @click="submitNote">保存</el-button>
               </div>
@@ -638,13 +639,17 @@ export default {
     // 保存笔记
     submitNote () {
       const form = this.noteForm
-      console.log(33, form, this.noteContent)
       if (!form.noteName) return util.errorMsg('请输入笔记标题')
       if (!form.noteContent) return util.errorMsg('请输入笔记内容')
       this.$post(this.api[form.noteId ? 'updateNote' : 'addNote'], form).then(res => {
         this.getNote()
         util.successMsg(form.noteId ? '修改成功' : '添加成功')
         this.showNoteAdd = false
+        this.noteForm = {
+          cid: this.courseId,
+          noteContent: '',
+          noteName: '',
+        }
       }).catch(res => { })
     },
     // 删除笔记
diff --git a/src/setting.js b/src/setting.js
index 1f5cb2c..1af814e 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -27,7 +27,7 @@ if (isPro) {
     host = "http://121.37.12.51/"; // 中台测试服
     // host = 'https://www.occupationlab.com/' // 正式服
     // host = "http://192.168.31.217:9000/"; // 榕
-    // host = 'http://192.168.31.51:9000/'; // 赓
+    host = 'http://192.168.31.51:9000/'; // 赓
 }
 
 const Setting = {