From cca07aa193106433c2bf65c17bf0a42cf27099e7 Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Fri, 23 Aug 2024 20:10:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=83=E4=B9=A0-=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/eduApp/index.js                |  73 +++++-
 config.js                          |   2 +-
 pages/YNEduApp/prac/exercises.vue  | 345 +++++++++++++++--------------
 pages/YNEduApp/prac/prac.vue       |  21 +-
 pages/YNEduApp/prac/pracDetail.vue | 113 +++++++++-
 static/images/顺序练习.png         | Bin 5903 -> 5882 bytes
 6 files changed, 369 insertions(+), 185 deletions(-)

diff --git a/api/eduApp/index.js b/api/eduApp/index.js
index a1daf44..615c77b 100644
--- a/api/eduApp/index.js
+++ b/api/eduApp/index.js
@@ -72,7 +72,6 @@ export function getExamRankById(params) {
   })
 }
 
-
 // 练习-列表 /personalCenter/getStudentPracticeList
 export function getStudentPracticeList(params) {
   return request({
@@ -81,3 +80,75 @@ export function getStudentPracticeList(params) {
     data: params
   })
 }
+
+// 练习-总览 /studentPractice/getPracticeQuestionRate
+export function getPracticeQuestionRate(params) {
+  return request({
+    url: '/studentPractice/getPracticeQuestionRate',
+    method: 'post',
+    data: params
+  })
+}
+
+// 练习-聚合数据 /studentPractice/getPracticeItData
+export function getPracticeItData(params) {
+  return request({
+    url: '/studentPractice/getPracticeItData',
+    method: 'post',
+    data: params
+  })
+}
+
+// 练习-题目 studentPractice/getPracticeQuestion
+export function getPracticeQuestion(params) {
+  return request({
+    url: '/studentPractice/getPracticeQuestion',
+    method: 'post',
+    data: params
+  })
+}
+
+// 练习-答题 studentPractice/insertPracticeAnswerById
+export function insertPracticeAnswerById(params) {
+  return request({
+    url: '/studentPractice/insertPracticeAnswerById',
+    method: 'post',
+    data: params
+  })
+}
+
+// 练习-前后题-跳题 studentPractice/changeQuestion
+export function changeQuestion(params) {
+  return request({
+    url: '/studentPractice/changeQuestion',
+    method: 'post',
+    data: params
+  })
+}
+
+// 练习-弹框序号跳题 /studentPractice/getPracticeQuestionList
+export function getPracticeQuestionList(params) {
+  return request({
+    url: '/studentPractice/getPracticeQuestionList',
+    method: 'post',
+    data: params
+  })
+}
+
+// 练习-保存练习时长 /studentPractice/savePracticeDuration
+export function savePracticeDuration(params) {
+  return request({
+    url: '/studentPractice/savePracticeDuration',
+    method: 'post',
+    data: params
+  })
+}
+
+// 练习-错题消除 studentPractice/updateRemoveRecordData
+export function updateRemoveRecordData(params) {
+  return request({
+    url: '/studentPractice/updateRemoveRecordData',
+    method: 'post',
+    data: params
+  })
+}
diff --git a/config.js b/config.js
index aa253f8..072534a 100644
--- a/config.js
+++ b/config.js
@@ -2,7 +2,7 @@
 module.exports = {
   // baseUrl:'/prod-api',
   // baseUrl:'http://112.29.103.165:1616/ynuw',
-  baseUrl:'http://192.168.0.32:2900/exam-student',
+  baseUrl:'http://192.168.0.137:2900/exam-student',
   // 上传文件地址
   uploadUrl: 'http://192.168.0.137:2909/exam-file/file/uploadBase64',
   bmwUrl: 'http://192.168.0.137:2911/exam-bmw',
diff --git a/pages/YNEduApp/prac/exercises.vue b/pages/YNEduApp/prac/exercises.vue
index 6ea9bdf..83bbf46 100644
--- a/pages/YNEduApp/prac/exercises.vue
+++ b/pages/YNEduApp/prac/exercises.vue
@@ -4,25 +4,25 @@
     <div class="num-wrapper">
       <div class="correct">
         <u-icon name="/static/images/true.png" size="15" />
-        <div class="num">{{ correctNum }}</div>
+        <div class="num">{{ trueNum }}</div>
       </div>
       <div class="error">
         <u-icon name="/static/images/error.png" size="15" />
-        <div class="num">{{ errorNum }}</div>
+        <div class="num">{{ falseNum }}</div>
       </div>
       <div class="total" @click="openSelect">
         <u-icon name="/static/images/quanbufenlei.png" size="15" />
-        <div class="num">{{ currentIndex + 1 }}/{{ questionList.length }}</div>
+        <div class="num">{{ allNum }}</div>
       </div>
     </div>
 
-    <div class="question-wrapper" v-for="(item, index) in questionList" :key="index" v-show="index == currentIndex">
-      <div v-if="item.type !== 2">
-        <div class="title">{{ index + 1 }}. {{ item.title }}{{ item.type == 3 ? '（判断题）' : '（单选题）' }}</div>
+    <div class="question-wrapper" v-for="(item, index) in questionList" :key="index">
+      <div v-if="item.examType !== 2">
+        <div class="title">{{ item.paperTopic }}{{ item.examType == 1 ? '（单选题）' : '(判断题)' }}</div>
         <u--image
-          v-if="item.img"
+          v-if="item.analyUrl"
           :showLoading="true"
-          :src="item.img"
+          :src="item.analyUrl"
           width="60px"
           height="60px"
           style="margin-bottom: 10px"
@@ -31,39 +31,39 @@
         <div class="options">
           <div
             class="option"
-            v-for="(option, index) in item.options"
+            v-for="(option, index) in item.listOption"
             :key="index"
             @click="handleOption(option, index)"
             :class="{ active: option.isCorrect || option.isError }"
           >
-            <div class="label">{{ option.value }}.{{ option.label }}</div>
+            <div class="label">{{ option.optionIdent }}.{{ option.optionContent }}</div>
             <u-icon v-if="option.isCorrect" name="/static/images/对.png" size="25" />
             <u-icon v-if="option.isError" name="/static/images/错.png" size="25" />
           </div>
         </div>
 
         <div v-if="item.isSelect">
-          <div>正确答案：{{ item.answer }}</div>
+          <div>正确答案：{{ item.correctGrade }}</div>
           <div>你的答案：{{ item.select }}</div>
 
           <div v-if="item.analysis">
             <div class="analysis">答案解析：</div>
-            <div class="analysis-container">{{ item.analysis }}</div>
+            <div class="analysis-container">{{ item.answerAnaly }}</div>
           </div>
         </div>
       </div>
       <!-- 多选 -->
-      <div v-else-if="item.type === 2">
-        <div class="title">{{ index + 1 }}. {{ item.title }}（多选题）</div>
+      <div v-else-if="item.examType === 2">
+        <div class="title">{{ index + 1 }}. {{ item.paperTopic }}（多选题）</div>
         <div class="options">
           <div
             class="option"
-            v-for="(option, index) in item.options"
+            v-for="(option, index) in item.listOption"
             :key="index"
             @click="handleCheckbox(option, index)"
             :class="{ active: option.isCheck }"
           >
-            <div class="label">{{ option.value }}.{{ option.label }}</div>
+            <div class="label">{{ option.optionIdent }}.{{ option.optionContent }}</div>
             <u-icon v-if="option.isCorrect" name="/static/images/对.png" size="25" />
             <u-icon v-if="option.isError" name="/static/images/错.png" size="25" />
           </div>
@@ -71,7 +71,7 @@
 
         <div class="btn">
           <u-button
-            v-show="item.options.some(option => option.isCheck)"
+            v-show="item.listOption.some(option => option.isCheck)"
             text="选好了"
             shape="circle"
             size="small"
@@ -81,11 +81,11 @@
         </div>
 
         <div v-if="item.isSelect">
-          <div>正确答案：{{ item.answer.join('、') }}</div>
+          <div>正确答案：{{ item.correctGrade.join('、') }}</div>
           <div>你的答案：{{ item.select.join('、') }}</div>
 
           <div class="analysis">知识点</div>
-          <div class="analysis-container">{{ item.knowledge }}</div>
+          <div class="analysis-container">{{ item.answerAnaly }}</div>
         </div>
       </div>
     </div>
@@ -104,24 +104,22 @@
       </div>
       <div class="btn">
         <u-button
-          v-show="currentIndex !== 0"
           type="primary"
           size="small"
           shape="circle"
           text="上一题"
           color="linear-gradient(to right, rgba(47, 195, 255, 1), rgba(5, 70, 173, 1))"
-          @click="currentIndex--"
+          @click="handleJump('prev')"
         />
       </div>
       <div class="btn">
         <u-button
-          v-show="currentIndex !== questionList.length - 1"
           type="primary"
           size="small"
           shape="circle"
           text="下一题"
           color="linear-gradient(to right, rgba(47, 195, 255, 1), rgba(5, 70, 173, 1))"
-          @click="currentIndex++"
+          @click="handleJump('next')"
         />
       </div>
     </div>
@@ -144,7 +142,7 @@
             <div>答题数</div>
           </div>
           <div class="item">
-            <div class="num">{{ correctNum }}</div>
+            <div class="num">{{ trueNum }}</div>
             <div>正确数</div>
           </div>
           <div class="item">
@@ -160,11 +158,11 @@
       <view class="slot-content">
         <div class="topic-content">
           <div
-            v-for="(item, index) in questionList"
+            v-for="(item, index) in questionListSelect"
             :key="index"
             class="topic-wrapper"
             :class="{ correct: item.isCorrect, error: item.isError }"
-            @click="currentIndex = index"
+            @click="handleJump(null, index)"
           >
             <div v-if="currentIndex == index">*</div>
             <div class="topic">{{ index + 1 }}</div>
@@ -176,9 +174,24 @@
 </template>
 
 <script>
+import {
+  getPracticeItData, // 获取练习上方题数
+  getPracticeQuestion, // 获取练习题目
+  insertPracticeAnswerById, // 提交答案
+  changeQuestion, // 切换题目
+  getPracticeQuestionList, // 获取题目列表-弹框
+  getPracticeQuestionRate, // 获取练习正确率
+  savePracticeDuration, // 保存练习时长
+  updateRemoveRecordData // 错题消除记录
+} from '@/api/eduApp'
 export default {
   data() {
     return {
+      practiceId: '', // 练习id
+      recordId: '', // 记录id
+      isNew: 1, // 是否新练习
+      isOutOfOrder: 1, // 是否乱序
+      isError: false, // 是否错题消除
       showModal: false,
       showModalSelect: false,
       // 正确率
@@ -186,126 +199,89 @@ export default {
       // 已用时间 - 计时器 - 用于显示已用时间 格式 00:00:00
       usedTime: '00:00:00',
       // 正确题数
-      correctNum: 0,
+      trueNum: 0,
       // 错误题数
-      errorNum: 0,
+      falseNum: 0,
+      allNum: 0, // 总题数
       // 答题数
       answerNum: 0,
       // 当前题目索引
       currentIndex: 0,
       // 题目列表
-      questionList: [
-        // 单选题
-        {
-          type: 1,
-          title: '只有发生在短路事故时或者在负荷电流较大时，变流器中才会有足够的二次电流作为继电保护跳闸之用。',
-          options: [
-            { label: '变流器供给操作电源', value: 'A' },
-            { label: '交流电压供给操作电源', value: 'B' },
-            { label: '直流操作电源', value: 'C' },
-            { label: '选项4', value: 'D' }
-          ],
-          answer: 'A',
-          // 答案分析
-          analysis: '这是答案解析'
-        },
-        // 多选题
-        {
-          type: 2,
-          title:
-            '只有发生在短路事故时或者在负荷电流较大时，变流器中才会有足够的二次电流作为继电保护跳闸之用。（多选题）',
-          options: [
-            { label: '变流器供给操作电源', value: 'A' },
-            { label: '交流电压供给操作电源', value: 'B' },
-            { label: '直流操作电源', value: 'C' },
-            { label: '选项4', value: 'D' }
-          ],
-          answer: ['A', 'B'],
-          // 知识点
-          knowledge: '这是知识点'
-        },
-        // 判断题
-        {
-          type: 3,
-          title:
-            '只有发生在短路事故时或者在负荷电流较大时，变流器中才会有足够的二次电流作为继电保护跳闸之用。（判断题）',
-          options: [
-            { label: '正确', value: 'A' },
-            { label: '错误', value: 'B' }
-          ],
-          answer: 'A'
-        },
-        // 带图片单选题
-        {
-          type: 4,
-          title:
-            '只有发生在短路事故时或者在负荷电流较大时，变流器中才会有足够的二次电流作为继电保护跳闸之用。（单选题）',
-          img: '/static/images/题目-bg.png',
-          options: [
-            { label: '变流器供给操作电源', value: 'A' },
-            { label: '交流电压供给操作电源', value: 'B' },
-            { label: '直流操作电源', value: 'C' },
-            { label: '选项4', value: 'D' }
-          ],
-          answer: 'A'
-        },
-        {
-          id: 5
-        },
-        {
-          id: 6
-        },
-        {
-          id: 6
-        },
-        {
-          id: 6
-        },
-        {
-          id: 6
-        },
-        {
-          id: 6
-        },
-        {
-          id: 6
-        },
-        {
-          id: 6
-        },
-        {
-          id: 6
-        },
-        {
-          id: 6
-        },
-        {
-          id: 6
-        },
-        {
-          id: 6
-        },
-        {
-          id: 6
-        },
-        {
-          id: 6
-        },
-        {
-          id: 6
-        }
-      ]
+      questionList: [],
+      // 题目列表-弹框
+      questionListSelect: []
     }
   },
+  onLoad(opt) {
+    opt = JSON.parse(opt.params)
+    this.practiceId = opt.practiceId
+    this.recordId = opt.recordId
+    this.isNew = opt.isNew
+    this.isOutOfOrder = opt.isOutOfOrder
+    this.isError = opt.isError
+    console.log('🚀 ~ onLoad ~ opt:', opt)
+  },
   mounted() {
     // 开始计时
     this.startTimer()
+    this.getPracticeItData()
+    this.getPracticeQuestion()
   },
   unmounted() {
     // 清除计时器
     clearInterval()
   },
   methods: {
+    // 获取题目-上方数量
+    async getPracticeItData() {
+      const params = {
+        practiceId: this.practiceId,
+        recordId: this.recordId,
+        isNew: this.isNew
+      }
+      const res = await getPracticeItData(params)
+      this.trueNum = res.data.trueNum
+      this.falseNum = res.data.falseNum
+      this.allNum = res.data.allNum
+      console.log('🚀 ~ getPracticeItData ~ res:', res)
+    },
+    // 获取题目
+    async getPracticeQuestion() {
+      this.questionList = []
+      const params = {
+        practiceId: this.practiceId,
+        recordId: this.recordId,
+        isNew: this.isNew,
+        isOutOfOrder: this.isOutOfOrder
+      }
+      const res = await getPracticeQuestion(params)
+      // this.questionList = res.data
+      this.questionList.push(res.data)
+      console.log('🚀 ~ getPracticeQuestion ~ res:', res)
+      console.log('🚀 ~ getPracticeQuestion ~ this.questionList:', this.questionList)
+    },
+    // 跳题
+    async handleJump(item, index) {
+      this.currentIndex = index
+      this.questionList = []
+      const params = {
+        recordId: this.recordId,
+        operate: item || '',
+        sort: index + 1 || ''
+      }
+      const res = await changeQuestion(params)
+      this.questionList.push(res.data)
+      console.log('🚀 ~ handleJump ~ res:', res)
+    },
+    // 获取题目列表-弹框
+    async getPracticeQuestionList() {
+      const params = {
+        id: this.practiceId
+      }
+      const res = await getPracticeQuestionList(params)
+      console.log('🚀 ~ getPracticeQuestionList ~ res:', res)
+    },
     // 开始计时 - 实时更新已用时间
     startTimer() {
       setInterval(() => {
@@ -329,44 +305,54 @@ export default {
     },
     clickImg() {
       uni.previewImage({
-        urls: [this.questionList[this.currentIndex].img]
+        urls: [this.questionList[0].img]
       })
     },
     // 处理选项点击事件
     handleOption(option, index) {
-      console.log(option, index)
+      console.log(option, index, this.questionList[0])
       // 判断是否已经选择过
-      if (this.questionList[this.currentIndex].isSelect) {
+      if (this.questionList[0].isSelect) {
         return
       } else {
         // 标记已选择
-        this.questionList[this.currentIndex].isSelect = true
+        this.questionList[0].isSelect = true
         // 判断是否正确
-        if (option.value === this.questionList[this.currentIndex].answer) {
+        if (option.optionIdent === this.questionList[0].correctGrade) {
           // 当前选择
-          this.questionList[this.currentIndex].select = option.value
+          this.questionList[0].select = option.optionIdent
           // 给当前题目添加正确标记
-          this.questionList[this.currentIndex].isCorrect = true
+          this.questionList[0].isCorrect = true
           // 正确 - 给当前选项添加正确标记
-          this.questionList[this.currentIndex].options[index].isCorrect = true
+          this.questionList[0].listOption[index].isCorrect = true
           // 正确题数+1
-          this.correctNum++
+          // this.trueNum++
         } else {
           // 当前选择
-          this.questionList[this.currentIndex].select = option.value
+          this.questionList[0].select = option.optionIdent
           // 给当前题目添加错误标记
-          this.questionList[this.currentIndex].isError = true
+          this.questionList[0].isError = true
           // 错误 - 给当前选项添加错误标记
-          this.questionList[this.currentIndex].options[index].isError = true
+          this.questionList[0].listOption[index].isError = true
           // 并将正确选项标记
-          this.questionList[this.currentIndex].options.forEach(item => {
-            if (item.value === this.questionList[this.currentIndex].answer) {
+          this.questionList[0].listOption.forEach(item => {
+            if (item.optionIdent === this.questionList[0].correctGrade) {
               item.isCorrect = true
             }
           })
           // 错误题数+1
-          this.errorNum++
+          // this.falseNum++
         }
+        const params = {
+          practiceId: this.practiceId,
+          recordId: this.recordId,
+          questionId: this.questionList[0].questionId,
+          selectAnswer: option.optionIdent,
+          isTrue: option.optionIdent == this.questionList[0].correctGrade ? 1 : 0
+        }
+        console.log('🚀 ~ handleOption ~ params:', params)
+        // 提交答案
+        insertPracticeAnswerById(params)
       }
     },
     // 处理多选题选项点击事件
@@ -374,53 +360,50 @@ export default {
       console.log('🚀 ~ handleCheckbox ~ option, index:', option, index)
       // 给当前点击的增加边框 再次点击取消
       if (!option.isCheck) {
-        this.questionList[this.currentIndex].options[index].isCheck = !option.isCheck
+        this.questionList[0].listOption[index].isCheck = !option.isCheck
       } else {
-        this.questionList[this.currentIndex].options[index].isCheck = false
+        this.questionList[0].listOption[index].isCheck = false
       }
       // 将 isCheck: true 的选项的 value 放入 select 数组
-      this.questionList[this.currentIndex].select = this.questionList[this.currentIndex].options
+      this.questionList[0].select = this.questionList[0].listOption
         .filter(item => item.isCheck)
-        .map(item => item.value)
-      console.log(
-        '🚀 ~ handleCheckbox ~ this.questionList[this.currentIndex].select:',
-        this.questionList[this.currentIndex].select
-      )
+        .map(item => item.optionIdent)
+      console.log('🚀 ~ handleCheckbox ~ this.questionList[0].select:', this.questionList[0].select)
     },
     handleOk() {
       // 判断是否已经选择过
-      if (this.questionList[this.currentIndex].isSelect) {
+      if (this.questionList[0].isSelect) {
         return
       } else {
         // 标记已选择
-        this.questionList[this.currentIndex].isSelect = true
-        const select = this.questionList[this.currentIndex].select
-        const answer = this.questionList[this.currentIndex].answer
+        this.questionList[0].isSelect = true
+        const select = this.questionList[0].select
+        const correctGrade = this.questionList[0].correctGrade
         // 判断是否正确
-        const isCorrect = select.sort().toString() === answer.sort().toString()
+        const isCorrect = select.sort().toString() === correctGrade.sort().toString()
         if (isCorrect) {
           // 正确题数+1
-          this.correctNum++
+          // this.trueNum++
           // 给当前题目添加正确标记
-          this.questionList[this.currentIndex].options.forEach(item => {
+          this.questionList[0].listOption.forEach(item => {
             if (item.isCheck) {
               item.isCorrect = true
             }
           })
           // 给正确选项添加标记
-          this.questionList[this.currentIndex].options.forEach(item => {
-            if (answer.includes(item.value)) {
+          this.questionList[0].listOption.forEach(item => {
+            if (correctGrade.includes(item.value)) {
               item.isCorrect = true
             }
           })
         } else {
           // 错误题数+1
-          this.errorNum++
+          // this.falseNum++
           // 给当前题目添加错误标记
-          this.questionList[this.currentIndex].isError = true
+          this.questionList[0].isError = true
           // 给错误选项添加标记
-          this.questionList[this.currentIndex].options.forEach(item => {
-            if (answer.includes(item.value)) {
+          this.questionList[0].listOption.forEach(item => {
+            if (correctGrade.includes(item.value)) {
               item.isCorrect = true
             } else if (item.isCheck) {
               item.isError = true
@@ -430,9 +413,20 @@ export default {
       }
     },
     // 提交
-    handleSubmit() {
+    async handleSubmit() {
       console.log('提交')
       this.showModal = true
+      const params = {
+        id: this.practiceId
+      }
+      const res = await getPracticeQuestionRate(params)
+      // trueRate 正确率
+      this.correctRate = res.data.trueRate
+      // allQuestionNum 答题数
+      this.answerNum = res.data.allQuestionNum
+      // trueQuestionNum 正确数
+      this.trueNum = res.data.trueQuestionNum
+      console.log('🚀 ~ handleSubmit ~ res:', res)
     },
     handleConfirm() {
       console.log('确认')
@@ -440,12 +434,29 @@ export default {
     },
     // 结束答题
     handleClose() {
+      // 停止计时
+      clearInterval()
       console.log('结束')
+      // 保存练习时长
+      savePracticeDuration({
+        id: this.practiceId,
+        practiceDuration: Math.ceil(this.usedTime.split(':')[0] * 60 + this.usedTime.split(':')[1] / 60)
+      })
+      if (this.isError) {
+        // 错题消除
+        updateRemoveRecordData({
+          practiceId: this.practiceId
+        })
+      }
       this.showModal = false
+      uni.navigateBack()
     },
     // 打开题目选择弹框
-    openSelect() {
+    async openSelect() {
       this.showModalSelect = true
+      const res = await this.getPracticeQuestionList()
+      console.log('🚀 ~ openSelect ~ res:', res)
+      this.questionListSelect = res.data
     }
   }
 }
diff --git a/pages/YNEduApp/prac/prac.vue b/pages/YNEduApp/prac/prac.vue
index 0bf22ca..830371c 100644
--- a/pages/YNEduApp/prac/prac.vue
+++ b/pages/YNEduApp/prac/prac.vue
@@ -22,7 +22,7 @@
         <div class="bt-wrapper">
           <div class="score">完成率：{{ item.completionRate }}</div>
           <div class="btn-wrapper">
-            <div class="btn" @click="handleExercise(item.id)">开始练习</div>
+            <div class="btn" @click="handleExercise(item)">开始练习</div>
             <div class="btn" @click="handleError(item)">错题消除({{ item.missNum }})</div>
           </div>
         </div>
@@ -68,7 +68,7 @@ export default {
       // 根据 alreadyNum 字段判断待练习和已练习
       this.waitList = res.data.filter(item => item.alreadyNum === 0)
       this.alreadyList = res.data.filter(item => item.alreadyNum > 0)
-      console.log('🚀 ~ getList ~ res:', res)
+      // console.log('🚀 ~ getList ~ res:', res)
     },
     handleTab(item, index) {
       this.activeIndex = index
@@ -81,9 +81,13 @@ export default {
       }
     },
     // 开始练习
-    handleExercise(id) {
+    handleExercise(item) {
+      const params = {
+        practiceId: item.id,
+        title: item.name,
+      }
       uni.navigateTo({
-        url: '/pages/YNEduApp/prac/pracDetail?id=' + id
+        url: '/pages/YNEduApp/prac/pracDetail?params=' + JSON.stringify(params)
       })
       uni.removeStorageSync('from')
       uni.setStorageSync('from', '/pages/YNEduApp/prac/prac')
@@ -95,8 +99,15 @@ export default {
     },
     // 错题消除
     handleError(item) {
+      const params = {
+        practiceId: item.id,
+        recordId: item.recordId,
+        isNew: 0,
+        isOutOfOrder: 1,
+        isError: true
+      }
       uni.navigateTo({
-        url: '/pages/YNEduApp/prac/exercises?id=' + item.id
+        url: '/pages/YNEduApp/prac/exercises?params=' + JSON.stringify(params)
       })
     }
   }
diff --git a/pages/YNEduApp/prac/pracDetail.vue b/pages/YNEduApp/prac/pracDetail.vue
index 5dff407..becbf83 100644
--- a/pages/YNEduApp/prac/pracDetail.vue
+++ b/pages/YNEduApp/prac/pracDetail.vue
@@ -31,13 +31,53 @@
         </div>
       </div>
       <div class="right">
-        <div class="right-top" @click="handleExercises(1)">
+        <div class="right-top">
           <div class="right-text">顺序练习</div>
-          <u-icon class="top-icon" name="/static/images/顺序练习.png" width="84" height="73" />
+          <!-- <u-icon class="top-icon" name="/static/images/顺序练习.png" width="84" height="73" /> -->
+          <div class="btn">
+            <u-button
+              type="primary"
+              plain
+              shape="circle"
+              text="继续上次练习"
+              size="small"
+              @click="handleExercises(1)"
+            ></u-button>
+          </div>
+          <div class="btn">
+            <u-button
+              type="primary"
+              plain
+              shape="circle"
+              text="开始新的练习"
+              size="small"
+              @click="handleExercises(2)"
+            ></u-button>
+          </div>
         </div>
-        <div class="right-bottom" @click="handleExercises(2)">
+        <div class="right-bottom">
           <div class="right-text">随机练习</div>
-          <u-icon class="bottom-icon" name="/static/images/随机练习.png" width="84" height="73" />
+          <!-- <u-icon class="bottom-icon" name="/static/images/随机练习.png" width="84" height="73" /> -->
+          <div class="btn">
+            <u-button
+              type="primary"
+              plain
+              shape="circle"
+              text="继续上次练习"
+              size="small"
+              @click="handleExercises(3)"
+            ></u-button>
+          </div>
+          <div class="btn">
+            <u-button
+              type="primary"
+              plain
+              shape="circle"
+              text="开始新的练习"
+              size="small"
+              @click="handleExercises(4)"
+            ></u-button>
+          </div>
         </div>
       </div>
     </div>
@@ -50,28 +90,72 @@
 </template>
 
 <script>
+import { getPracticeQuestionRate } from '@/api/eduApp'
+
 export default {
   data() {
     return {
+      practiceId: '', // 练习id
+      recordId: '', // 记录id
       // 头像
-      avatar: 'https://cdn.uviewui.com/uview/album/1.jpg',
+      avatar: '/static/images/user.png',
       // 姓名
       name: '张三',
       // 练习标题
-      title: '送配电线路架设(初级)',
+      title: '',
       // 正确率
-      correctRate: '80%',
+      correctRate: '',
       // 累计作答
-      totalAnswer: 100,
+      totalAnswer: 0,
       // 累计答对
-      totalCorrect: 80
+      totalCorrect: 0
     }
   },
+  onLoad(opt) {
+    opt = JSON.parse(opt.params)
+    console.log('🚀 ~ onLoad ~ opt:', opt)
+    this.practiceId = opt.practiceId
+    this.title = opt.title
+  },
+  mounted() {
+    this.getData()
+  },
   methods: {
+    async getData() {
+      const params = {
+        id: this.practiceId
+      }
+      const res = await getPracticeQuestionRate(params)
+      this.title = res.data.name
+      this.correctRate = res.data.trueRate
+      this.totalAnswer = res.data.allQuestionNum
+      this.totalCorrect = res.data.trueQuestionNum
+      this.recordId = res.data.recordId
+      console.log('🚀 ~ getData ~ res:', res)
+    },
     handleExercises(type) {
       console.log('type', type)
+      const params = {
+        practiceId: this.practiceId,
+        recordId: this.recordId,
+        isError: false
+      }
+      if (type === 1) {
+        params.isOutOfOrder = 0
+        params.isNew = 0
+      } else if (type === 2) {
+        params.isOutOfOrder = 0
+        params.isNew = 1
+      } else if (type === 3) {
+        params.isOutOfOrder = 1
+        params.isNew = 0
+      } else if (type === 4) {
+        params.isOutOfOrder = 1
+        params.isNew = 1
+      }
+      console.log('params', params)
       uni.navigateTo({
-        url: `/pages/YNEduApp/prac/exercises?type=${type}`
+        url: `/pages/YNEduApp/prac/exercises?params=${JSON.stringify(params)}`
       })
     },
     leftClick() {
@@ -154,9 +238,16 @@ export default {
       flex-direction: column;
       justify-content: space-between;
 
+      .btn {
+        width: 60%;
+        margin: 5px auto;
+      }
+
       .right-top {
         height: 98px;
-        background: #e7ac67;
+        // background: #e7ac67;
+        background: url('/static/images/顺序练习.png') no-repeat;
+        background-size: 100% 98px;
         border-radius: 8px;
         position: relative;
         // top-icon - 在当前位置的右下角
diff --git a/static/images/顺序练习.png b/static/images/顺序练习.png
index e3840ff50a2358042599780841748509a53f68f9..22c59bcb2f210504984cfd2118726e0e2dd8c703 100644
GIT binary patch
literal 5882
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

literal 5903
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