From a7fa9b2aa702f653d90e272b1e1f72ab274ea67b Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 3 Aug 2021 16:56:15 +0800
Subject: [PATCH] add comment

---
 src/pages/account/login/index.vue              |  4 ++--
 src/pages/achievement/list/examResults.vue     |  4 +---
 src/pages/achievement/list/practiceResults.vue |  4 +---
 src/pages/achievement/list/wrongBook.vue       |  3 ---
 src/pages/achievement/statistics/index.vue     |  2 ++
 src/pages/assessment/monitor/index.vue         |  2 +-
 src/pages/assessment/show/index.vue            |  4 +---
 src/pages/practice/scoreQuery/index.vue        |  4 +---
 src/pages/setting/person/index.vue             |  1 -
 src/pages/student/list/index.vue               |  2 +-
 src/pages/system/list/index.vue                |  2 +-
 src/pages/system/list/role.vue                 |  7 -------
 src/pages/testPaper/add/index.vue              | 17 +++++++----------
 src/pages/testPaper/review/index.vue           |  4 +---
 src/setting.js                                 |  6 +++---
 15 files changed, 22 insertions(+), 44 deletions(-)

diff --git a/src/pages/account/login/index.vue b/src/pages/account/login/index.vue
index 3719a08..49786d7 100644
--- a/src/pages/account/login/index.vue
+++ b/src/pages/account/login/index.vue
@@ -29,8 +29,8 @@ export default {
     data: function() {
         return {
             loginForm: {
-                username: 'manage',
-                password: '111aaa',
+                username: '',
+                password: '',
             },
             loginRules: {
                 username: [{ required: true, message: '请输入用户名', trigger: 'blur' }],
diff --git a/src/pages/achievement/list/examResults.vue b/src/pages/achievement/list/examResults.vue
index 9f4c6bd..88f3061 100644
--- a/src/pages/achievement/list/examResults.vue
+++ b/src/pages/achievement/list/examResults.vue
@@ -187,7 +187,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-    /deep/.no-mb.el-form-item{
-        margin-bottom: 0;
-    }
+    
 </style>
\ No newline at end of file
diff --git a/src/pages/achievement/list/practiceResults.vue b/src/pages/achievement/list/practiceResults.vue
index 6f44508..322b6cb 100644
--- a/src/pages/achievement/list/practiceResults.vue
+++ b/src/pages/achievement/list/practiceResults.vue
@@ -221,7 +221,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-    /deep/.no-mb.el-form-item{
-        margin-bottom: 0;
-    }
+    
 </style>
\ No newline at end of file
diff --git a/src/pages/achievement/list/wrongBook.vue b/src/pages/achievement/list/wrongBook.vue
index d75224e..00aca07 100644
--- a/src/pages/achievement/list/wrongBook.vue
+++ b/src/pages/achievement/list/wrongBook.vue
@@ -263,9 +263,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-    /deep/.no-mb.el-form-item{
-        margin-bottom: 0;
-    }
     .ques{
         .key{
             font-weight: bold;
diff --git a/src/pages/achievement/statistics/index.vue b/src/pages/achievement/statistics/index.vue
index 9a8ed41..79f0c02 100644
--- a/src/pages/achievement/statistics/index.vue
+++ b/src/pages/achievement/statistics/index.vue
@@ -174,6 +174,7 @@ export default {
                     n.classId == this.classId && list.push(n)
                 })
                 let len = list.length - 1
+                // 用冒泡做名次排序
                 for(let i = 0; i < len; i++){
                     for(let j = 0; j < len; j++){
                         if(list[j].rank && list[j].rank > list[j + 1].rank){
@@ -192,6 +193,7 @@ export default {
             })
             .catch(err => {})
         },
+        // 前端分页
         handlePage(){
             let list = this.listDataAll
             this.listData = list.slice((this.page - 1) * this.pageSize,this.page * this.pageSize)
diff --git a/src/pages/assessment/monitor/index.vue b/src/pages/assessment/monitor/index.vue
index 0c6d830..8ee7aab 100644
--- a/src/pages/assessment/monitor/index.vue
+++ b/src/pages/assessment/monitor/index.vue
@@ -159,7 +159,7 @@ export default {
     },
     mounted() {
         this.getData()
-        this.addLeaveEvent()
+        this.addLeaveEvent()// 每秒钟调一次接口查询该考核是否已结束
     },
     methods: {
         getData() {
diff --git a/src/pages/assessment/show/index.vue b/src/pages/assessment/show/index.vue
index 7334da0..1855814 100644
--- a/src/pages/assessment/show/index.vue
+++ b/src/pages/assessment/show/index.vue
@@ -13,9 +13,7 @@
         </div>
 
         <ul class="tab">
-            <!-- <template v-for="(item,index) in tabs"> -->
-                <li v-for="(item,index) in tabs" :key="index" :class="{active: active == item.id}" @click="tabChange(item.id)">{{item.name}}</li>
-            <!-- </template> -->
+            <li v-for="(item,index) in tabs" :key="index" :class="{active: active == item.id}" @click="tabChange(item.id)">{{item.name}}</li>
         </ul>
 
         <div class="wrap">
diff --git a/src/pages/practice/scoreQuery/index.vue b/src/pages/practice/scoreQuery/index.vue
index 7f10ac3..c48a044 100644
--- a/src/pages/practice/scoreQuery/index.vue
+++ b/src/pages/practice/scoreQuery/index.vue
@@ -209,7 +209,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-    /deep/.no-mb.el-form-item{
-        margin-bottom: 0;
-    }
+    
 </style>
\ No newline at end of file
diff --git a/src/pages/setting/person/index.vue b/src/pages/setting/person/index.vue
index 03c9def..a21d000 100644
--- a/src/pages/setting/person/index.vue
+++ b/src/pages/setting/person/index.vue
@@ -179,7 +179,6 @@
 <script>
 import { mapState,mapActions } from 'vuex'
 import _ from 'lodash';
-import bus from '@/libs/bus'
 import util from '@/libs/util'
 export default {
     data() {
diff --git a/src/pages/student/list/index.vue b/src/pages/student/list/index.vue
index bec7a2b..2814043 100644
--- a/src/pages/student/list/index.vue
+++ b/src/pages/student/list/index.vue
@@ -61,6 +61,6 @@ export default {
 };
 </script>
 
-<style lang="scss" scopted>
+<style lang="scss" scoped>
 
 </style>
\ No newline at end of file
diff --git a/src/pages/system/list/index.vue b/src/pages/system/list/index.vue
index 6506eb2..7a1e945 100644
--- a/src/pages/system/list/index.vue
+++ b/src/pages/system/list/index.vue
@@ -69,6 +69,6 @@ export default {
 };
 </script>
 
-<style lang="scss" scopted>
+<style lang="scss" scoped>
 
 </style>
\ No newline at end of file
diff --git a/src/pages/system/list/role.vue b/src/pages/system/list/role.vue
index 9432504..164c84e 100644
--- a/src/pages/system/list/role.vue
+++ b/src/pages/system/list/role.vue
@@ -277,13 +277,6 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-    .no-mb /deep/.el-form-item{
-        margin-bottom: 0;
-    }
-    /deep/.el-row{
-        padding: 0 !important;
-        margin-bottom: 0;
-    }
     .per-wrap{
         max-height: 400px;
         overflow: auto;
diff --git a/src/pages/testPaper/add/index.vue b/src/pages/testPaper/add/index.vue
index dfb9247..7bdbeab 100644
--- a/src/pages/testPaper/add/index.vue
+++ b/src/pages/testPaper/add/index.vue
@@ -641,8 +641,9 @@ export default {
             let fillBlankCount = selected.filter(n => n.name == '填空题').length
             let judgeCount = selected.filter(n => n.name == '判断题').length
             let briefCount = selected.filter(n => n.name == '简答题').length
-
+                
             if(this.id && this.isFirstSubmitMana){
+                // 计算每种题型的数量
                 this.singleCount = Number(this.singleCount) + singleCount
                 this.multipleCount = Number(this.multipleCount) + multipleCount
                 this.fillBlankCount = Number(this.fillBlankCount) + fillBlankCount
@@ -751,6 +752,7 @@ export default {
             let invalid = false
             let everyUnchecked = true
             let everyIsZero = true
+            // 检测每种题型输入的数量是否都是0，必须要有至少一种题型的数量大于0
             for(let i in this.countCheck){
                 if(this.countCheck[i]){
                     everyUnchecked = false
@@ -758,12 +760,6 @@ export default {
                     if(this[`countNumberInput${index}`]){
                         everyIsZero = false
                         invalid = true
-                        // if(this[`countNumberInput${index}`] < this.pointRules[index-1]){
-                        //     invalid = true
-                        // }else if(this[`countNumberInput${index}`] > this.pointRules[index-1]){
-                        //     util.errorMsg('题目数量不能大于可选题数')
-                        //     return false
-                        // }
                     }
                 }else{
                     invalid = true
@@ -777,8 +773,8 @@ export default {
                     let index = i.replace('countCheck','')
                     if(this.countCheck[i]) totalCount += this[`countNumberInput${index}`]
                 }
-                let remainder = 100 % totalCount
-                let avgPoint = 100 / totalCount
+                let remainder = 100 % totalCount // 计算余数
+                let avgPoint = 100 / totalCount // 计算平均给每个题型分配的分数
                 if(remainder) avgPoint = (100 - remainder) / totalCount
                 this.singleCount = ''
                 this.multipleCount = ''
@@ -831,10 +827,11 @@ export default {
                         return false
                     }
                 }
-                if(remainder){
+                if(remainder){// 如果有余数，就是未满100分
                     let remainScore = 0
                     let remainPlusAvg = remainder + avgPoint
                     let invalid = false
+                    // 把多余的分数分配给剩余题型
                     if(this.typeValid(5)){
                         remainScore = this.briefCount * avgPoint + remainder
                         if(remainScore % this.briefCount){
diff --git a/src/pages/testPaper/review/index.vue b/src/pages/testPaper/review/index.vue
index 4e8a566..853c51d 100644
--- a/src/pages/testPaper/review/index.vue
+++ b/src/pages/testPaper/review/index.vue
@@ -155,7 +155,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-    /deep/.no-mb.el-form-item{
-        margin-bottom: 0;
-    }
+    
 </style>
\ No newline at end of file
diff --git a/src/setting.js b/src/setting.js
index 102a706..898d155 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -15,8 +15,8 @@ const Setting = {
     // 页面切换时，是否显示模拟的进度条
     showProgressBar: true,
     // 接口请求地址
-    // apiBaseURL: env === 'development' ? 'http://192.168.31.151:9000' : 'http://8.134.8.197:9000',
-    apiBaseURL: env === 'development' ? 'http://192.168.31.151:9000' : 'http://8.134.8.197:9000',
+    // apiBaseURL: env === 'development' ? 'http://192.168.31.151:9000' : 'http://112.74.110.92:9000',
+    apiBaseURL: env === 'development' ? 'http://112.74.110.92:9000' : 'http://112.74.110.92:9000',
     // 接口请求返回错误时，弹窗的持续时间，单位：秒
     modalDuration: 3,
     // 接口请求返回错误时，弹窗的类型，可选值为 Message 或 Notice
@@ -58,7 +58,7 @@ const Setting = {
     sameRouteForceUpdate: false,
     // 文件上传
     upload: {
-        apiURL: 'http://8.134.8.197:8001',
+        apiURL: 'http://112.74.110.92:8001',
         maxSize: 30,
     },
     // 是否使用动态路由