From a7af1c8d5a0a1e237e3a9d958dc381b985c8fa2c Mon Sep 17 00:00:00 2001
From: dshclm <3321914460@qq.com>
Date: Tue, 9 Jul 2024 11:05:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E6=88=90=E7=BB=A9=E3=80=81?=
 =?UTF-8?q?=E9=94=99=E9=A2=98=E8=AE=AD=E7=BB=83=E3=80=81=E9=A2=98=E7=9B=AE?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/exam/UserBookController.java   |   5 +-
 .../templates/system/elExam/qu/add.html       |   3 +
 .../templates/system/elExam/qu/edit.html      |   3 +
 .../system/elExam/userBook/book.html          |  39 +++-
 .../system/elExam/userBook/toTrain.html       | 189 ++++++++++++++++++
 .../system/elExam/userBook/view.html          | 122 +++++++++++
 .../system/elExam/userExam/myGrades.html      |   2 +-
 7 files changed, 351 insertions(+), 12 deletions(-)
 create mode 100644 ruoyi-admin/src/main/resources/templates/system/elExam/userBook/toTrain.html
 create mode 100644 ruoyi-admin/src/main/resources/templates/system/elExam/userBook/view.html

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/exam/UserBookController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/exam/UserBookController.java
index 4d40e14..9c6376a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/exam/UserBookController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/exam/UserBookController.java
@@ -72,10 +72,9 @@ public class UserBookController extends BaseController {
 
 
     @ApiOperation("错题训练")
-    @GetMapping("/toTrain/{examId}/{quId}")
-    public String toTrain(@PathVariable("examId") String examId,@PathVariable("quId") String quId, ModelMap mmap) {
+    @GetMapping("/toTrain/{examId}")
+    public String toTrain(@PathVariable("examId") String examId, ModelMap mmap) {
         mmap.put("examId", examId);
-        mmap.put("quId", quId);
         return prefix + "/toTrain";
     }
 
diff --git a/ruoyi-admin/src/main/resources/templates/system/elExam/qu/add.html b/ruoyi-admin/src/main/resources/templates/system/elExam/qu/add.html
index 3d72caf..61f7a86 100644
--- a/ruoyi-admin/src/main/resources/templates/system/elExam/qu/add.html
+++ b/ruoyi-admin/src/main/resources/templates/system/elExam/qu/add.html
@@ -52,6 +52,9 @@
 					<el-form-item label="题目内容" prop="content">
 						<el-input v-model="postForm.content" type="textarea" />
 					</el-form-item>
+					<el-form-item label="整题解析" prop="oriPrice">
+						<el-input v-model="postForm.analysis" :precision="1" :max="999999" type="textarea" />
+					</el-form-item>
 				</el-card>
 				<div v-if="postForm.quType!==4" class="filter-container" style="margin-top: 25px">
 					<el-button class="filter-item" type="primary" icon="el-icon-plus" size="small" plain @click="handleAdd">
diff --git a/ruoyi-admin/src/main/resources/templates/system/elExam/qu/edit.html b/ruoyi-admin/src/main/resources/templates/system/elExam/qu/edit.html
index 08f0fef..e52ea20 100644
--- a/ruoyi-admin/src/main/resources/templates/system/elExam/qu/edit.html
+++ b/ruoyi-admin/src/main/resources/templates/system/elExam/qu/edit.html
@@ -51,6 +51,9 @@
                 <el-form-item label="题目内容" prop="content">
                     <el-input v-model="postForm.content" type="textarea" />
                 </el-form-item>
+                <el-form-item label="整题解析" prop="oriPrice">
+                    <el-input v-model="postForm.analysis" :precision="1" :max="999999" type="textarea" />
+                </el-form-item>
             </el-card>
             <div v-if="postForm.quType!==4" class="filter-container" style="margin-top: 25px">
                 <el-button class="filter-item" type="primary" icon="el-icon-plus" size="small" plain @click="handleAdd">
diff --git a/ruoyi-admin/src/main/resources/templates/system/elExam/userBook/book.html b/ruoyi-admin/src/main/resources/templates/system/elExam/userBook/book.html
index acca53a..b8135ce 100644
--- a/ruoyi-admin/src/main/resources/templates/system/elExam/userBook/book.html
+++ b/ruoyi-admin/src/main/resources/templates/system/elExam/userBook/book.html
@@ -2,9 +2,10 @@
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
 	<th:block th:include="include :: header('考试管理')" />
+	<th:block th:include="include :: element-css" />
 </head>
 <body class="gray-bg">
-    <div class="container-div">
+    <div class="container-div" id="app">
 		<div class="row">
 			<div class="col-sm-12 search-collapse">
 				<form id="notice-form">
@@ -24,10 +25,12 @@
 			</div>
 
 	        <div class="btn-group-sm" id="toolbar" role="group">
-				<a class="btn btn-danger" onclick="closeItem()">
-					<i class="fa fa-reply-all"></i> 关闭
-				</a>
-
+				<el-button type="info" icon="el-icon-back" onclick="closeItem()">
+                    返回
+				</el-button>
+				<el-button class="filter-item" style="float: right" type="primary" icon="el-icon-magic-stick" @click="startTrain">
+					错题训练
+				</el-button>
 	        </div>
 
 	        <div class="col-sm-12 select-table table-striped">
@@ -36,6 +39,7 @@
     	</div>
     </div>
     <th:block th:include="include :: footer" />
+	<th:block th:include="include :: element-js" />
     <script th:inline="javascript">
         var prefix = ctx + "system/userBook";
         $(function() {
@@ -57,17 +61,36 @@
 		            field: 'updateTime',
 		            title: '更新时间',
 		            sortable: true
-		        }]
+		        },
+				{
+					title: '操作',
+					align: 'center',
+					formatter: function(value, row, index) {
+						var actions = [];
+						actions.push('<a class="btn btn-success btn-xs '  + '" href="javascript:void(0)" onclick="detail(\'' + row.quId + '\')"><i class="fa fa-edit"></i>详情</a> ');
+						return actions.join('');
+					}
+				}]
             };
             $.table.init(options);
         });
-
+		function detail(id) {
+			var url = prefix + '/view/' + id;
+			$.modal.openTab("题目详情", url);
+		}
 		function queryParams(params) {
 			var search = $.table.queryParams(params);
 			search.examId = [[${examId}]];
 			return search;
 		}
-
+		var app = new Vue({
+			el: '#app',
+			methods: {
+				startTrain() {
+					$.modal.openTab("错题训练", prefix + "/toTrain/"+[[${examId}]]);
+				}
+			}
+		})
     </script>
 </body>
 </html>
diff --git a/ruoyi-admin/src/main/resources/templates/system/elExam/userBook/toTrain.html b/ruoyi-admin/src/main/resources/templates/system/elExam/userBook/toTrain.html
new file mode 100644
index 0000000..628b742
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/system/elExam/userBook/toTrain.html
@@ -0,0 +1,189 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('详情')" />
+    <th:block th:include="include :: element-css" />
+</head>
+<style>
+    .qu-content div{
+        line-height: 30px;
+        font-size: 16px;
+    }
+
+    .qu-analysis p{
+        color: #555; font-size: 14px
+    }
+    .qu-analysis-line{
+        margin-top: 20px; border-bottom: #eee 1px solid
+    }
+
+    .el-checkbox-group label,.el-radio-group label{
+        width: 100%;
+    }
+</style>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
+    <div class="app-container">
+
+        <el-card style="margin-top: 20px;font-size: 16px">
+
+            <div class="qu-content">
+
+                <p>【{{ quData.quTypeData | quTypeFilter }}】{{ quData.content }}</p>
+                <p v-if="quData.image!=null && quData.image!=''">
+                    <el-image :src="quData.image" style="max-width:100%;" />
+                </p>
+
+                <div v-if="quData.quType === 1 || quData.quType===3 ">
+                    <el-radio-group v-model="answerValues[0]" readonly>
+                        <el-radio v-for="an in quData.answerList" :key="an.id" :label="an.id" readonly>
+                            {{ an.abc }}.{{ an.content }}
+                            <div v-if="an.image!=null && an.image!=''" style="clear: both">
+                                <el-image :src="an.image" style="max-width:100%;" />
+                            </div>
+                        </el-radio>
+                    </el-radio-group>
+                </div>
+
+                <!-- 多选题 -->
+                <div v-if="quData.quType === 2">
+                    <el-checkbox-group v-model="answerValues" readonly>
+                        <el-checkbox v-for="an in quData.answerList" :key="an.id" :label="an.id">
+                            {{ an.abc }}.{{ an.content }}
+                            <div v-if="an.image!=null && an.image!=''" style="clear: both">
+                                <el-image :src="an.image" style="max-width:100%;" />
+                            </div>
+                        </el-checkbox>
+                    </el-checkbox-group>
+                </div>
+
+                <div v-if="analysisShow" style="margin-top: 20px; color: #1890ff; font-weight: bold">
+                    正确答案：{{ rightTags.join(' ') }}
+                </div>
+
+            </div>
+
+        </el-card>
+
+        <el-card v-if="analysisShow" class="qu-analysis" style="margin-top: 20px">
+            整题解析：
+            <p>{{ quData.analysis }}</p>
+            <p v-if="!quData.analysis">暂无解析内容！</p>
+        </el-card>
+
+        <el-card v-if="analysisShow" class="qu-analysis" style="margin-top: 20px;">
+            选项解析：
+            <div v-for="an in quData.answerList" v-if="an.analysis" class="qu-analysis-line">
+                <p style="color: #555;">{{ an.content }}：</p>
+                <p style="color: #1890ff;">{{ an.analysis }}</p>
+            </div>
+            <p v-if="analysisCount === 0">暂无选项解析</p>
+
+        </el-card>
+
+        <div style="padding-top: 30px">
+            <el-button type="primary" @click="handNext">继续下一题</el-button>
+            <el-button type="info" onclick="closeItem()">返回</el-button>
+        </div>
+
+    </div>
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: element-js" />
+<script th:inline="javascript">
+    var app = new Vue({
+        el: '#app',
+        data: {
+            examId: '',
+            quId: '',
+            tags: ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N'],
+            analysisShow: false,
+            quData: {
+                quTypeData:''
+            },
+            answerValues: [],
+            rightValues: [],
+            rightTags: []
+        },
+        created() {
+            this.examId = [[${examId}]]
+
+            this.fetchNextQu()
+        },
+        methods: {
+            clearValues() {
+                this.answerValues = []
+                this.rightValues = []
+                this.analysisShow = false
+                this.rightTags = []
+            },
+            // 查找试卷详情
+            fetchQuDetail(id) {
+                // 当前赋值
+                this.quId = id
+                this.clearValues()
+                let that = this
+                axios.get('/system/qu/detail',{params:{quId:id}}).then(response => {
+                    // 题目信息
+                    that.quData = response.data.data
+                    if (that.quData.quType === 1) {
+                        that.quData.quTypeData = '单选题'
+                    }else if(that.quData.quType === 3){
+                        that.quData.quTypeData = '判断题'
+                    }else if(that.quData.quType === 2){
+                        that.quData.quTypeData = '多选题'
+                    }
+                    // 保存正确答案
+                    that.quData.answerList.forEach((an, index) => {
+                        an.abc = that.tags[index]
+
+                        // 用户选定的
+                        if (an.isRight) {
+                            that.rightValues.push(an.id)
+                            that.rightTags.push(an.abc)
+                        }
+                    })
+                })
+            },
+            fetchNextQu() {
+                // 查找下一个
+                let that = this
+                let param = {
+                    examId: this.examId,
+                    quId: this.quId
+                }
+                axios.post('/system/userBook/next',param).then(response => {
+                    that.fetchQuDetail(response.data.msg)
+                })
+            },
+            handNext() {
+                // 直接显示下一个
+                if (this.analysisShow) {
+                    // 正确显示下一个
+                    this.fetchNextQu()
+                } else {
+                    // 直接判断正确性
+                    if (this.rightValues.join(',') === this.answerValues.join(',')) {
+                        this.$message({
+                            message: '回答正确，你好棒哦！',
+                            type: 'success'
+                        })
+
+                        // 正确显示下一个
+                        this.fetchNextQu()
+                    } else {
+                        // 错误显示解析
+                        this.analysisShow = true
+
+                        this.$message({
+                            message: '很遗憾，做错了呢，请参考答案解析！',
+                            type: 'error'
+                        })
+                    }
+                }
+            }
+        }
+    })
+</script>
+</body>
+</html>
diff --git a/ruoyi-admin/src/main/resources/templates/system/elExam/userBook/view.html b/ruoyi-admin/src/main/resources/templates/system/elExam/userBook/view.html
new file mode 100644
index 0000000..63841b8
--- /dev/null
+++ b/ruoyi-admin/src/main/resources/templates/system/elExam/userBook/view.html
@@ -0,0 +1,122 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('详情')" />
+    <th:block th:include="include :: element-css" />
+</head>
+<style>
+    .qu-content{
+        padding-bottom: 10px;
+    }
+
+    .qu-content div{
+        line-height: 30px;
+    }
+
+    .qu-analysis p{
+        color: #555; font-size: 14px
+    }
+    .qu-analysis-line{
+        margin-top: 20px; border-bottom: #eee 1px solid
+    }
+
+    .el-checkbox-group label,.el-radio-group label{
+        width: 100%;
+    }
+</style>
+<body class="white-bg">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content" id="app">
+    <div class="app-container">
+
+        <el-card style="margin-top: 20px">
+
+            <div class="qu-content">
+
+                <p>【{{ quData.quType===1?'单选题':'多选题' }}】{{ quData.content }}</p>
+                <p v-if="quData.image!=null && quData.image!=''">
+                    <el-image :src="quData.image" style="max-width:80%;" />
+                </p>
+                <div v-if="quData.quType === 1">
+                    <el-radio-group v-model="radioValues" readonly>
+                        <el-radio v-for="an in quData.answerList" :label="an.id" readonly>{{ an.content }}</el-radio>
+                    </el-radio-group>
+                </div>
+
+                <!-- 多选题 -->
+                <div v-if="quData.quType === 2">
+                    <el-checkbox-group v-model="multiValues" readonly>
+                        <el-checkbox v-for="an in quData.answerList" :label="an.id">{{ an.content }}</el-checkbox>
+                    </el-checkbox-group>
+                </div>
+
+            </div>
+
+        </el-card>
+
+        <el-card class="qu-analysis" style="margin-top: 20px">
+            整题解析：
+            <p>{{ quData.analysis }}</p>
+            <p v-if="!quData.analysis">暂无解析内容！</p>
+        </el-card>
+
+        <el-card class="qu-analysis" style="margin-top: 20px; margin-bottom: 30px">
+            选项解析：
+            <div v-for="an in quData.answerList" v-if="an.analysis" class="qu-analysis-line">
+                <p style="color: #555;">{{ an.content }}：</p>
+                <p style="color: #1890ff;">{{ an.analysis }}</p>
+            </div>
+            <p v-if="analysisCount === 0">暂无选项解析</p>
+
+        </el-card>
+
+        <el-button type="info" onclick="closeItem()">返回</el-button>
+
+    </div>
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: element-js" />
+<script th:inline="javascript">
+    var app = new Vue({
+        el: '#app',
+        data: {
+            quData: {
+
+            },
+
+            radioValues: '',
+            multiValues: [],
+            analysisCount: 0,
+            quId:[[${quId}]],
+        },
+        created() {
+            console.log(this.quId)
+                this.fetchData()
+        },
+        methods: {
+            fetchData() {
+                let that = this
+                axios.get('/system/qu/detail/',{params:{quId: this.quId}}).then(response => {
+                    that.quData = response.data.data
+
+                    that.quData.answerList.forEach((an) => {
+                        // 解析数量
+                        if (an.analysis) {
+                            that.analysisCount += 1
+                        }
+
+                        // 用户选定的
+                        if (an.isRight) {
+                            if (that.quData.quType === 1) {
+                                that.radioValues = an.id
+                            } else {
+                                that.multiValues.push(an.id)
+                            }
+                        }
+                    })
+                })
+            },
+        }
+    })
+</script>
+</body>
+</html>
diff --git a/ruoyi-admin/src/main/resources/templates/system/elExam/userExam/myGrades.html b/ruoyi-admin/src/main/resources/templates/system/elExam/userExam/myGrades.html
index 3719146..1d12473 100644
--- a/ruoyi-admin/src/main/resources/templates/system/elExam/userExam/myGrades.html
+++ b/ruoyi-admin/src/main/resources/templates/system/elExam/userExam/myGrades.html
@@ -95,7 +95,7 @@
 		/*资产列表-详细*/
 		function toBook(id) {
 			var url = prefixBook + '/toBook/' + id;
-			$.modal.openTab("考试人员", url);
+			$.modal.openTab("考试错题", url);
 		}