update

client/components/player/chapterExam/chapterExam.vue

@@ -19,7 +19,7 @@
                   <el-radio-group class='radio-group' @change='radioChange' v-model="item.sel">
                     <template v-for='(item1, index1) in item.arr'>
                       <!-- checked='{{item1.selected}}' -->
-                      <el-radio v-bind:key="index1" :label='index1' :disabled='!!item.cur' :class='["radio", (item.cur && item1.checked && "success"), (item.cur && !item1.checked && item1.selected && "error")]'>{{ index1 == 0 ? "A" : (index1 == 1 ? "B" : (index1 == 2 ? "C" : (index1 == 3 ? "D" : (index1 == 4 ? "E" : (index1 == 5 ? "F" : "G"))))) }}. {{item1.option}}</el-radio>
+                      <el-radio v-bind:key="index1" :label='index1' :disabled='!!item.cur' :class='["radio", (item.cur && item1.checked && "success"), (item.cur && !item1.checked && item1.selected && "error")]'>{{ index1 == 0 ? "A" : (index1 == 1 ? "B" : (index1 == 2 ? "C" : (index1 == 3 ? "D" : (index1 == 4 ? "E" : (index1 == 5 ? "F" : (index1 == 6 ? "G" : (index1 == 7 ? "H" : (index1 == 8 ? "I" : (index1 == 9 ? "J" : "K"))))))))) }}. {{item1.option}}</el-radio>
                     </template>
                   </el-radio-group>
                   <template v-if='item.cur'><div class='result'>学生答案：<div :class='["stu", (item.is_correct ? "success" : "error")]'>{{item.stuAnswer}}</div>&nbsp;&nbsp;&nbsp;&nbsp;正确答案：{{item.cur}}</div></template>
@@ -31,7 +31,7 @@
                   <el-checkbox-group class='checkbox-group' @change='checkboxChange' v-model="item.arrSel">
                     <template v-for='(item1, index1) in item.arr'>
                       <!-- value='{{index1}}' -->
-                      <el-checkbox v-bind:key="item1.id" :label='index1' :checked='!!item1.selected' :disabled='!!item.cur' :class='["checkbox", (item.cur && item1.checked && "success"), (item.cur && !item1.checked && item1.selected && "error")]'>{{ index1 == 0 ? "A" : (index1 == 1 ? "B" : (index1 == 2 ? "C" : (index1 == 3 ? "D" : (index1 == 4 ? "E" : (index1 == 5 ? "F" : "G"))))) }}. {{item1.option}}</el-checkbox>
+                      <el-checkbox v-bind:key="item1.id" :label='index1' :checked='!!item1.selected' :disabled='!!item.cur' :class='["checkbox", (item.cur && item1.checked && "success"), (item.cur && !item1.checked && item1.selected && "error")]'>{{ index1 == 0 ? "A" : (index1 == 1 ? "B" : (index1 == 2 ? "C" : (index1 == 3 ? "D" : (index1 == 4 ? "E" : (index1 == 5 ? "F" : (index1 == 6 ? "G" : (index1 == 7 ? "H" : (index1 == 8 ? "I" : (index1 == 9 ? "J" : "K"))))))))) }}. {{item1.option}}</el-checkbox>
                     </template>
                   </el-checkbox-group>
                   <template v-if='item.cur'><div class='result'>学生答案：<div :class='["stu", (item.is_correct ? "success" : "error")]'>{{item.stuAnswer}}</div>&nbsp;&nbsp;&nbsp;&nbsp;正确答案：{{item.cur}}</div></template>
@@ -168,6 +168,10 @@ export default {
                 case 3: str += 'D,'; break
                 case 4: str += 'E,'; break
                 case 5: str += 'F,'; break
+                case 6: str += 'G,'; break
+                case 7: str += 'H,'; break
+                case 8: str += 'I,'; break
+                case 9: str += 'J,'; break
               }
             }
           })
@@ -194,6 +198,10 @@ export default {
                     case 3: stuAnswer = 'D,'; break
                     case 4: stuAnswer = 'E,'; break
                     case 5: stuAnswer = 'F,'; break
+                    case 6: stuAnswer = 'G,'; break
+                    case 7: stuAnswer = 'H,'; break
+                    case 8: stuAnswer = 'I,'; break
+                    case 9: stuAnswer = 'J,'; break
                   }
                   break
                 }
@@ -210,6 +218,10 @@ export default {
                     case 3: stuAnswer += 'D,'; break
                     case 4: stuAnswer += 'E,'; break
                     case 5: stuAnswer += 'F,'; break
+                    case 6: stuAnswer += 'G,'; break
+                    case 7: stuAnswer += 'H,'; break
+                    case 8: stuAnswer += 'I,'; break
+                    case 9: stuAnswer += 'J,'; break
                   }
                 }
               }
@@ -259,6 +271,10 @@ export default {
               case 3: str += 'D,'; break
               case 4: str += 'E,'; break
               case 5: str += 'F,'; break
+              case 6: str += 'G,'; break
+              case 7: str += 'H,'; break
+              case 8: str += 'I,'; break
+              case 9: str += 'J,'; break
             }
           }
         })
@@ -285,6 +301,10 @@ export default {
                   case 3: stuAnswer = 'D,'; break
                   case 4: stuAnswer = 'E,'; break
                   case 5: stuAnswer = 'F,'; break
+                  case 6: stuAnswer = 'G,'; break
+                  case 7: stuAnswer = 'H,'; break
+                  case 8: stuAnswer = 'I,'; break
+                  case 9: stuAnswer = 'J,'; break
                 }
                 break
               }
@@ -301,6 +321,10 @@ export default {
                   case 3: stuAnswer += 'D,'; break
                   case 4: stuAnswer += 'E,'; break
                   case 5: stuAnswer += 'F,'; break
+                  case 6: stuAnswer += 'G,'; break
+                  case 7: stuAnswer += 'H,'; break
+                  case 8: stuAnswer += 'I,'; break
+                  case 9: stuAnswer += 'J,'; break
                 }
               }
             }

client/project/actions/ScoreAction.js

@@ -20,7 +20,8 @@ export default class ScoreAction {
         myMustStr: (_data.required_credits && ((_data.my_required_credits * 1.0 / _data.required_credits * 100).toFixed(1) + '%')) || '0%',
         unmust: _data.optional_credits,
         myUnmust: _data.my_optional_credits,
-        myUnmustStr: (_data.optional_credits && ((_data.my_optional_credits * 1.0 / _data.optional_credits * 100).toFixed(1) + '%')) || '0%'
+        myUnmustStr: (_data.optional_credits && ((_data.my_optional_credits * 1.0 / _data.optional_credits * 100).toFixed(1) + '%')) || '0%',
+        list: _data.lists
       }
       // callback(json) // 可以不使用callback 因为使用then
       return json

client/project/components/style/_com.scss

@@ -54,6 +54,10 @@ body {
 .el-progress-bar__innerText { color: #313131; }
 .el-progress-bar { margin-right: -65px; padding-right: 65px; }
 .el-progress__text { margin-left: 6px; }
+
+/* 学分 页面 - 进度条样式 */
+.el-progress-bar__outer { border-radius: 0; }
+
 /* 富文本 */
 .course-assess .detail .b1 { display: block; max-width: 5rem; margin: 0.2rem auto; width: 100%; height: auto; }
 .course-assess .detail .h1 { font-size: 0.16rem; font-weight: 700; color: #313131; line-height: 0.38rem; }

client/project/pages/myGrade/credit.vue

@@ -5,21 +5,21 @@
       <div class="total-core">
         <div class="title">总计学分</div>
         <div class="core">{{score.total}}</div>
-        <el-progress :text-inside="true" :stroke-width="30" :percentage="Math.floor(score.myTotal/score.total) || 0" color="#df9d75"></el-progress>
+        <el-progress ref="credit_total" :text-inside="true" :stroke-width="30" :percentage="Math.floor(score.myTotal/score.total) || 0" color="#df9d75"></el-progress>
       </div>
       <el-row :gutter="20">
         <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
           <div class="compulsory-core">
             <div class="title">必修学分</div>
             <div class="core">{{score.must}}</div>
-            <el-progress :text-inside="true" :stroke-width="30" :percentage="Math.floor(score.myMust/score.must) || 0" color="#8ca4cf"></el-progress>
+            <el-progress ref="credit_must" :text-inside="true" :stroke-width="30" :percentage="Math.floor(score.myMust/score.must) || 0" color="#8ca4cf"></el-progress>
           </div>
         </el-col>
         <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12">
           <div class="elective-core">
             <div class="title">选修学分</div>
             <div class="core">{{score.unmust}}</div>
-            <el-progress :text-inside="true" :stroke-width="30" :percentage="Math.floor(score.myUnmust/score.unmust) || 0" color="#66c6bd"></el-progress>
+            <el-progress ref="credit_unmust" :text-inside="true" :stroke-width="30" :percentage="Math.floor(score.myUnmust/score.unmust) || 0" color="#66c6bd"></el-progress>
           </div>
         </el-col>
       </el-row>
@@ -28,6 +28,14 @@
         <div class="color" style="background: #66c6bd;"></div><div class="txt">选修学分</div>
         <div class="color" style="background: #df9d75;"></div><div class="txt">总学分</div>
       </div>
+      <m-page
+        :tableHead="tableHead"
+        :tableData="tableData"
+        :params="params"
+        :objFn="objFn"
+        :tableConfig="tableConfig"
+      />
+      <div style="height: 0.3rem;"></div>
     </div>
   </div>
 </template>
@@ -35,8 +43,10 @@
 <script>
 import { request } from '@actions'
 
+import mPage from '../../components/module/mPage.vue'
+
 export default {
-  components: { },
+  components: { mPage },
   data () {
     return {
       score: {
@@ -49,6 +59,35 @@ export default {
         unmust: 0,
         myUnmust: 0,
         myUnmustStr: '0%'
+      },
+      tableConfig: { border: '', size: '', selection: { has: false, sels: [], width: '50px', fix: 'left', align: '' } }, // 增加选择框，has设置为true
+      tableHead: [
+        { prop: 'index', label: '序号', minWidth: '50', fix: false },
+        { prop: 'semester_name', label: '学期', minWidth: '80', fix: false },
+        { prop: 'course_name', label: '课程', minWidth: '300', fix: false },
+        { prop: 'passed', label: '是否合格', minWidth: '60', fix: false },
+        { prop: 'credit', label: '学分', minWidth: '30', fix: false },
+        { prop: 'score', label: '成绩', minWidth: '40', fix: false }
+        // { prop: '', label: '', minWidth: '', fix: false, goObj: { routerName: '', params: {} } }, // 点击跳转页面并传参数
+        // { prop: 'operate-x', label: '操作', width: '160px', fix: false, commandArr: [ { command: 'activelist-show', name: '查看报告' }, { command: 'activelist-edit', name: '编辑' }, { command: 'activelist-delete', name: '删除' } ] }
+      ],
+      tableData: [],
+      params: { keywords: '', curPage: 1, pageSize: 100, total: '' },
+      objFn: {
+        paramsFn: (_this) => { return {} },
+        nameAPI: 'getMyScore',
+        actionClass: 'scoreAction',
+        // nameExcel: 'getStatSummaryExcel',
+        nameExcel: 'getExportExcel3_4_14',
+        callback: (_this, data) => {
+          _this.params.total = 100
+          data = data.list
+          data.forEach((elem, i) => {
+            elem.index = i + 1 + (_this.params.curPage - 1) * _this.params.pageSize
+            elem.passed = elem.passed ? '是' : '否'
+            _this.tableData.push(elem)
+          })
+        }
       }
     }
   },
@@ -62,7 +101,12 @@ export default {
         this.score = data
       },
       catchCallback: () => {},
-      finallyCallback: () => {}
+      finallyCallback: () => {
+        console.log(this.$refs['credit_total'])
+        this.$refs['credit_total'].$el.children[0].children[0].children[0].children[0].innerHTML = this.score.myTotal + '（分）'
+        this.$refs['credit_must'].$el.children[0].children[0].children[0].children[0].innerHTML = this.score.myMust + '（分）'
+        this.$refs['credit_unmust'].$el.children[0].children[0].children[0].children[0].innerHTML = this.score.myUnmust + '（分）'
+      }
     })
   }
 }
@@ -76,11 +120,11 @@ export default {
   line-height: 36px;
   .title {
     float: left;
-    margin-left: 10px;
+    // margin-left: 5px;
   }
   .core {
     float: right;
-    margin-right: 10px;
+    margin-right: 3px;
     font-size: 12px;
   }
 }