From 529797521d4dd58c215fdb3f4dfef2bc5fc11224 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Wed, 26 May 2021 16:05:41 +0800
Subject: [PATCH] fix

---
 src/layouts/navbar/index.vue           | 10 +++----
 src/pages/exam/do/index.vue            | 19 +++----------
 src/pages/index/list/index.vue         | 21 +++++++++-----
 src/pages/practice/do/index.vue        | 20 ++++---------
 src/pages/practice/list/myPractice.vue |  2 +-
 src/pages/practice/randomDo/index.vue  | 39 +++++++++++++++++++++++---
 src/pages/wrongBook/do/index.vue       | 37 +++++++++++++-----------
 src/setting.js                         |  2 +-
 8 files changed, 86 insertions(+), 64 deletions(-)

diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue
index c65c6e2..b370bcf 100644
--- a/src/layouts/navbar/index.vue
+++ b/src/layouts/navbar/index.vue
@@ -86,11 +86,11 @@ export default {
                     index: '/wrongBook/list',
                     title: '错题练习'
                 },
-                {
-                    icon: 'menu-icon icon-msg',
-                    index: '/messageBoard/list',
-                    title: '交流互动'
-                }
+                // {
+                //     icon: 'menu-icon icon-msg',
+                //     index: '/messageBoard/list',
+                //     title: '交流互动'
+                // }
             ],
             menus: [],
             actives: {
diff --git a/src/pages/exam/do/index.vue b/src/pages/exam/do/index.vue
index f2434bb..abe712d 100644
--- a/src/pages/exam/do/index.vue
+++ b/src/pages/exam/do/index.vue
@@ -75,16 +75,7 @@
                                         </el-checkbox-group>
                                     </template>
                                     <template v-if="item.typeId == 4">
-                                        <el-upload
-                                            class="upload"
-                                            :before-upload="file => beforeUpload(file,item)"
-                                            :on-remove="(file, fileList) => handleRemove(file, fileList, item)"
-                                            :on-error="uploadError"
-                                            :on-success="(res, file, fileList) => uploadSuccess(res, file, fileList, item)"
-                                            :before-remove="beforeRemove"
-                                            :on-exceed="handleExceed"
-                                            :action="api.fileupload"
-                                        > 
+                                        <el-upload class="upload" :before-upload="file => beforeUpload(file,item)" :on-remove="(file, fileList) => handleRemove(file, fileList, item)" :on-error="uploadError" :on-success="(res, file, fileList) => uploadSuccess(res, file, fileList, item)" :before-remove="beforeRemove" :on-exceed="handleExceed" :action="api.fileupload"> 
                                             <el-button type="primary" class="ml20">上传文件</el-button>
                                         </el-upload>
                                         <el-input type="textarea" rows="5" resize="none" v-model="item.val" @input="updateProgress"></el-input>
@@ -212,7 +203,7 @@ export default {
                 this.judgeScore = data.trueOrFalseQuestionsList.length ? data.trueOrFalseQuestionsList[0].judgeScore : 0
                 this.fillBlanksScore = data.fillInTheBlanklist.length ? data.fillInTheBlanklist[0].fillBlanksScore : 0
                 this.briefAnswerScore = data.shortAnswerList.length ? data.shortAnswerList[0].briefAnswerScore : 0
-                this.scoreList = [this.singlePoint,this.multipleChoiceScore,this.fillBlanksScore,this.briefAnswerScore,this.briefAnswerScore]
+                this.scoreList = [this.singlePoint * this.singleCount,this.multipleChoiceScore * this.multipleCount,this.judgeScore * this.judgeCount,this.fillBlanksScore * this.fillBlankCount,this.briefAnswerScore * this.briefAnswerCount]
                 
                 this.handleOptions()
             }).catch(err => {})
@@ -241,7 +232,7 @@ export default {
                             }else if(i == 3){
                                 let answer = answered.userAnswer.split('&lt;&gt;');
                                 [...document.querySelectorAll(`.stem${i}${k} input`)].map((n,j) => {
-                                    n.value = answer[j]
+                                    if(answer[j]) n.value = answer[j]
                                 })
                                 n.val = answered.userAnswer
                                 if(answer.filter(n => n).length) n.hadAnswer = 1
@@ -453,9 +444,7 @@ export default {
                 })
 
                 this.$post(`${this.api.coverGzAnswerDetails}?userId=${this.userId}&testPaperId=${this.testPaperId}&assessmentId=${this.assessmentId}`).then(res => {
-                    this.$post(`${this.api.addGzAnswerDetails}`,data1)
-                    .then(res => {})
-                    .catch(err => {})
+                    this.$post(`${this.api.addGzAnswerDetails}`,data1).then(res => {}).catch(err => {})
                 }).catch(err => {})
             }
         },
diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue
index 7fe76f8..42c3dc9 100644
--- a/src/pages/index/list/index.vue
+++ b/src/pages/index/list/index.vue
@@ -102,7 +102,7 @@
             </div>
         </div>
 
-        <div class="page">
+        <!-- <div class="page">
             <div class="tabs">
                 <a class="item active">教师回复</a>
             </div>
@@ -135,7 +135,7 @@
                 </template>
                 <div class="none" v-else>暂无教师回复</div>
             </div>
-        </div>
+        </div> -->
     </div>
 </template>
 <script>
@@ -252,15 +252,22 @@ export default {
                 this.avgScore = list.length ? (avgScore / list.length).toFixed(2) : 0
 
                 let totalDuration = 0
+                this.totalDuration = (totalDuration / 60).toFixed(2)
+                let practiceDateList = {}
                 list.map(n => {
                     if(!isNaN(n.duration)) totalDuration += n.duration
-                })
-                this.totalDuration = (totalDuration / 60).toFixed(2)
-                this.practiceDateList = list.map(n => {
                     let date = new Date(n.startTime)
-                    return `${date.getMonth() + 1}.${date.getDate()}`
+                    let time = `${date.getMonth() + 1}.${date.getDate()}`
+                    if(!isNaN(n.duration)){
+                        if(!practiceDateList[time]){
+                            practiceDateList[time] = n.duration
+                        }else{
+                            practiceDateList[time] += n.duration
+                        }
+                    }
                 })
-                this.practiceDurationList = list.map(n => n.duration)
+                this.practiceDateList = Object.keys(practiceDateList)
+                this.practiceDurationList = Object.values(practiceDateList)
                 this.getPracticeDuration()
             }).catch(res => {})
         },
diff --git a/src/pages/practice/do/index.vue b/src/pages/practice/do/index.vue
index 935c4f1..5321837 100644
--- a/src/pages/practice/do/index.vue
+++ b/src/pages/practice/do/index.vue
@@ -74,16 +74,8 @@
                                         </el-checkbox-group>
                                     </template>
                                     <template v-if="item.name == '简答题'">
-                                        <el-upload
-                                            class="upload"
-                                            :before-upload="file => beforeUpload(file,item)"
-                                            :on-remove="(file, fileList) => handleRemove(file, fileList, item)"
-                                            :on-error="uploadError"
-                                            :on-success="(res, file, fileList) => uploadSuccess(res, file, fileList, item)"
-                                            :before-remove="beforeRemove"
-                                            :on-exceed="handleExceed"
-                                            :action="api.fileupload"
-                                        > 
+                                        <el-upload class="upload" :before-upload="file => beforeUpload(file,item)" :on-remove="(file, fileList) => handleRemove(file, fileList, item)"
+                                            :on-error="uploadError" :on-success="(res, file, fileList) => uploadSuccess(res, file, fileList, item)" :before-remove="beforeRemove" :on-exceed="handleExceed" :action="api.fileupload"> 
                                             <el-button type="primary" class="ml20">上传文件</el-button>
                                         </el-upload>
                                         <el-input type="textarea" rows="5" resize="none" v-model="item.val" @input="updateProgress"></el-input>
@@ -182,7 +174,7 @@ export default {
                 this.judgeScore = data.list4.length ? data.list4[0].judgeScore : 0
                 this.fillBlanksScore = data.list3.length ? data.list3[0].fillBlanksScore : 0
                 this.briefAnswerScore = data.list5.length ? data.list5[0].briefAnswerScore : 0
-                this.scoreList = [this.singlePoint,this.multipleChoiceScore,this.fillBlanksScore,this.briefAnswerScore,this.briefAnswerScore]
+                this.scoreList = [this.singlePoint * this.singleCount,this.multipleChoiceScore * this.multipleCount,this.judgeScore * this.judgeCount,this.fillBlanksScore * this.fillBlankCount,this.briefAnswerScore * this.briefAnswerCount]
                 
                 window.updateProgress = (item) => {
                     this.updateProgress(item,1)
@@ -251,7 +243,7 @@ export default {
                                 }else if(i == 3){
                                     let answer = answered.user_answer.split('&lt;&gt;');
                                     [...document.querySelectorAll(`.stem${i}${k} input`)].map((n,j) => {
-                                        n.value = answer[j]
+                                        if(answer[j]) n.value = answer[j]
                                     })
                                     n.val = answered.user_answer
                                     if(answer.filter(n => n).length) n.hadAnswer = 1
@@ -388,9 +380,7 @@ export default {
                         })
                     })
                 })
-                this.$post(`${this.api.addPractiseExamAnswerDetails}`,data1)
-                .then(res => {})
-                .catch(err => {})
+                this.$post(`${this.api.addPractiseExamAnswerDetails}`,data1).then(res => {}).catch(err => {})
             }
         },
     },
diff --git a/src/pages/practice/list/myPractice.vue b/src/pages/practice/list/myPractice.vue
index d1efd01..ed4d4b1 100644
--- a/src/pages/practice/list/myPractice.vue
+++ b/src/pages/practice/list/myPractice.vue
@@ -31,7 +31,7 @@
             <el-table-column prop="practiceNum" label="练习次数" align="center"></el-table-column>
             <el-table-column prop="lastScore" label="最后一次得分" align="center">
                 <template slot-scope="scope">
-                    <p>{{scope.row.lastScore | defaultShow}}</p>
+                    <p>{{scope.row.lastScore == null ? '--' : (scope.row.duration == '--' ? '--' : scope.row.lastScore)}}</p>
                 </template>
             </el-table-column>
             <el-table-column label="操作" align="center" width="180">
diff --git a/src/pages/practice/randomDo/index.vue b/src/pages/practice/randomDo/index.vue
index 8e1412d..9e0c092 100644
--- a/src/pages/practice/randomDo/index.vue
+++ b/src/pages/practice/randomDo/index.vue
@@ -110,7 +110,8 @@ export default {
             avgScore: 0,
             scoreList: [],
             questionType: ['单选题','多选题','判断题','填空题','简答题'],
-            submiting: false
+            submiting: false,
+            isSubmit: false,
         };
     },
     components: {breadcrumb},
@@ -122,6 +123,9 @@ export default {
     mounted() {
         this.getData()
     },
+    beforeDestroy(){
+        this.addRecords()
+    },
     methods: {
         getData() {
             this.$post(`${this.api.randomPractice}?userId=${this.userId}&schoolId=${this.clientId}`).then(res => {
@@ -145,7 +149,7 @@ export default {
 
                     this.avgScore = parseInt(100 / qid.split(',').length)
                     console.log(11,this.avgScore,this.singleCount)
-                    this.scoreList = [this.singlePoint,this.multipleChoiceScore,this.briefAnswerScore,this.fillBlanksScore,this.briefAnswerScore]
+                    this.scoreList = [this.singleCount * this.avgScore,this.multipleCount * this.avgScore,this.judgeCount * this.avgScore,this.fillBlankCount * this.avgScore,this.briefAnswerCount * this.avgScore]
                     
                     window.updateProgress = (item) => {
                         this.updateProgress(item,1)
@@ -203,15 +207,42 @@ export default {
                 })
             })
 
-            this.$post(`${this.api.AddRandomPractiseExamAnswerDetail}`,data1)
-            .then(res => {
+            this.$post(`${this.api.AddRandomPractiseExamAnswerDetail}`,data1).then(res => {
                 this.$post(`${this.api.addPractiseRecordRandom}?userId=${this.userId}&randomId=${this.randomId}`).then(res => {
                     this.submiting = false
+                    this.isSubmit = true
                     util.successMsg('提交成功')
                     this.$router.push('list?isRandom=true')
                 }).catch(err => {})
             }).catch(err => {})
         },
+        addRecords(){
+            if(!this.isSubmit){
+                let data1 = []
+                this.subjects.map((e,i) => {
+                    e.map((n,k) => {
+                        let userAnswer = ''
+                        if(i == 1){
+                            userAnswer = n.val.join('')
+                        }else if(i == 3){
+                            userAnswer = [...document.querySelectorAll(`.stem${i}${k} input`)].map(n => n.value).join('&lt;&gt;')
+                        }else{
+                            userAnswer = n.val
+                        }
+                        data1.push({
+                            randomId: this.randomId,
+                            questionId: n.questionId,
+                            questionStatus : 1,
+                            userAnswer,
+                            userId: this.userId
+                        })
+                    })
+                })
+                this.$post(`${this.api.AddRandomPractiseExamAnswerDetail}`,data1).then(res => {
+                    this.$post(`${this.api.addPractiseRecordRandom}?userId=${this.userId}&randomId=${this.randomId}`).then(res => {}).catch(err => {})
+                }).catch(err => {})
+            }
+        },
     },
 }
 </script>
diff --git a/src/pages/wrongBook/do/index.vue b/src/pages/wrongBook/do/index.vue
index 6528287..774637b 100644
--- a/src/pages/wrongBook/do/index.vue
+++ b/src/pages/wrongBook/do/index.vue
@@ -4,34 +4,34 @@
         <div class="box">
             <div class="page left">
                 <div>
-                    <div class="item" style="border-top: 0">
-                        <p class="type">单选题(共{{singleCount}}题，合计{{singlePoint}}分)</p>
+                    <div class="item" style="border-top: 0" v-if="singleCount">
+                        <p class="type">单选题(共{{singleCount}}题)</p>
                         <div class="nums">
-                            <span v-for="n in singleCount" :class="{active: n <= singleAnsweredCount}" :key="n">{{n}}</span>
+                            <span v-for="n in singleCount" :class="{active: singleAnswered.includes(n - 1)}" :key="n">{{n}}</span>
                         </div>
                     </div>
-                    <div class="item">
-                        <p class="type">多选题(共{{multipleCount}}题，合计{{multipleChoiceScore}}分)</p>
+                    <div class="item" v-if="multipleCount">
+                        <p class="type">多选题(共{{multipleCount}}题)</p>
                         <div class="nums">
-                            <span v-for="n in multipleCount" :class="{active: n <= multipleAnsweredCount}" :key="n">{{n}}</span>
+                            <span v-for="n in multipleCount" :class="{active: multipleAnswered.includes(n - 1)}" :key="n">{{n}}</span>
                         </div>
                     </div>
-                    <div class="item">
-                        <p class="type">判断题(共{{judgeCount}}题，合计{{judgeScore}}分)</p>
+                    <div class="item" v-if="judgeCount">
+                        <p class="type">判断题(共{{judgeCount}}题)</p>
                         <div class="nums">
-                            <span v-for="n in judgeCount" :class="{active: n <= judgeAnsweredCount}" :key="n">{{n}}</span>
+                            <span v-for="n in judgeCount" :class="{active: judgeAnswered.includes(n - 1)}" :key="n">{{n}}</span>
                         </div>
                     </div>
-                    <div class="item">
-                        <p class="type">填空题(共{{fillBlankCount}}题，合计{{fillBlanksScore}}分)</p>
+                    <div class="item" v-if="fillBlankCount">
+                        <p class="type">填空题(共{{fillBlankCount}}题)</p>
                         <div class="nums">
-                            <span v-for="n in fillBlankCount" :class="{active: n <= fillBlankAnsweredCount}" :key="n">{{n}}</span>
+                            <span v-for="n in fillBlankCount" :class="{active: fillBlankAnswered.includes(n - 1)}" :key="n">{{n}}</span>
                         </div>
                     </div>
-                    <div class="item">
-                        <p class="type">简答题(共{{briefAnswerCount}}题，合计{{briefAnswerScore}}分)</p>
+                    <div class="item" v-if="briefAnswerCount">
+                        <p class="type">简答题(共{{briefAnswerCount}}题)</p>
                         <div class="nums">
-                            <span v-for="n in briefAnswerCount" :class="{active: n <= briefAnswerAnsweredCount}" :key="n">{{n}}</span>
+                            <span v-for="n in briefAnswerCount" :class="{active: briefAnswerAnswered.includes(n - 1)}" :key="n">{{n}}</span>
                         </div>
                     </div>
                     <div class="btn">
@@ -43,7 +43,7 @@
             <div class="page right">
                 <template v-for="(subject,k) in subjects">
                     <div class="item" v-if="subject.length" :key="k">
-                        <p v-if="subjects[k].length" class="title">{{questionType[k]}}（共{{subjects[k].length}}题，合计{{scoreList[k]}}分）</p>
+                        <p v-if="subjects[k].length" class="title">{{questionType[k]}}（共{{subjects[k].length}}题）</p>
                         <div class="ques-wrap">
                             <div class="ques" v-for="(item,index) in subject" :key="index">
                                 <div class="name-wrap">
@@ -119,6 +119,11 @@ export default {
             judgeAnsweredCount: 0,
             fillBlankAnsweredCount: 0,
             briefAnswerAnsweredCount: 0,
+            singleAnswered: [],
+            multipleAnswered: [],
+            judgeAnswered: [],
+            fillBlankAnswered: [],
+            briefAnswerAnswered: [],
             
             singlePoint: 0,
             multipleChoiceScore: 0,
diff --git a/src/setting.js b/src/setting.js
index feb76d6..6bc0566 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -16,7 +16,7 @@ const Setting = {
     showProgressBar: true,
     // 接口请求地址
     // apiBaseURL: env === 'development' ? 'http://192.168.31.151:8001' : 'http://39.108.250.202:8000',
-    apiBaseURL: env === 'development' ? 'http://39.108.250.202:9000' : 'http://39.108.250.202:9000',
+    apiBaseURL: env === 'development' ? 'http://192.168.31.151:8001' : 'http://39.108.250.202:9000',
     // 接口请求返回错误时，弹窗的持续时间，单位：秒
     modalDuration: 3,
     // 接口请求返回错误时，弹窗的类型，可选值为 Message 或 Notice