From 7b59d78ce3fd27186ba1a7735ca12360869a4e21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com>
Date: Mon, 2 Dec 2024 17:30:24 +0800
Subject: [PATCH 1/2] 1

---
 src/renderer/src/hooks/useProcessList.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/renderer/src/hooks/useProcessList.js b/src/renderer/src/hooks/useProcessList.js
index 8cd80ad..bb2b0c3 100644
--- a/src/renderer/src/hooks/useProcessList.js
+++ b/src/renderer/src/hooks/useProcessList.js
@@ -36,13 +36,13 @@ export const processList = (row, aloneOption=false) => {
       row[i].method = jjj.method
       row[i].discuss = jjj.discuss
       //row[i].discusscollapse = false;
-      if (row[i].examdate !== null && row[i].examdate !== undefined) {
+      if (row[i].examdate && row[i].examdate != "") {
         row[i].examdate = row[i].examdate.substring(0, 10)
       }
 
       // 具体题型数据结构处理
       if (row[i].worktype == '复合题') {
-        // 旧类型
+        // 复合题 - 旧格式
         if (row[i].title.indexOf('!@#$%') !== -1) {
           // 1.选项解析替换
           const options = JSON.parse(row[i].workdesc)
@@ -129,7 +129,9 @@ export const processList = (row, aloneOption=false) => {
 
           row[i].workanswerFormat = answer
         } else {
-          // 处理[题干显示] - 不再需要处理
+          // 复合题 - 现格式
+
+          // 处理[题干显示] - 不再需要处理(头部已处理)
           // row[i].titleFormat = row[i].title;   // 仅占位提示
 
           /**
@@ -222,6 +224,7 @@ export const processList = (row, aloneOption=false) => {
           row[i].workanswerFormat = workAnswerHtml
         }
       } else if (
+        /** 主观题/非基础题(其中主要为第三方的各类解答题) */ 
         row[i].worktype == '主观题' ||
         (row[i].worktype !== '单选题' &&
           row[i].worktype !== '多选题' &&
@@ -236,7 +239,7 @@ export const processList = (row, aloneOption=false) => {
           row[i].workanswerFormat = JSON.parse(row[i].workanswer)
         }
       } else {
-        // 单选题|多选题|填空题|判断题|主观题?(待确认是否归在这里)
+        // 基础题: 单选题|多选题|填空题|判断题|主观题?(待确认是否归在这里)
         // 通用选项结构 ['ABC123','ABC123'] | ['ABC123','ABC123'] | [](填空题无选项) | [](判断题无选项)
         let workDescArr = []
         if (

From 028eb0f752eebaae7c7c64c41d963a3d05fcce28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com>
Date: Thu, 5 Dec 2024 14:36:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E8=80=83=E8=AF=95=E5=88=86=E6=9E=90]=20-?=
 =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=E5=88=86=E9=A1=B5=E5=8F=8A=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E9=A2=98=E5=9E=8B=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../newClassTaskAssign/myQuestion/index.vue   |  2 +-
 .../views/examReport/container/examReview.vue | 20 +++++++-
 src/renderer/src/views/examReport/index.vue   | 46 +++++++++++++++++--
 3 files changed, 62 insertions(+), 6 deletions(-)

diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
index e605b51..905c211 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
@@ -19,7 +19,7 @@
       </el-col>
       <el-col :span="7">
         <el-form-item label="年份" label-width="70">
-          <el-select v-model="entpCourseWorkQueryParams.yearStr" placeholder="请选择" >
+          <el-select v-model="entpCourseWorkQueryParams.yearStr" placeholder="请选择">
             <el-option v-for="(item, index) in entpCourseWorkYearList" :key="index" :label="item.label" :value="item.value"></el-option>
           </el-select>
         </el-form-item>
diff --git a/src/renderer/src/views/examReport/container/examReview.vue b/src/renderer/src/views/examReport/container/examReview.vue
index 6503399..0df3a9d 100644
--- a/src/renderer/src/views/examReport/container/examReview.vue
+++ b/src/renderer/src/views/examReport/container/examReview.vue
@@ -16,6 +16,16 @@
     <el-table-column align="center" prop="worktype" width="100"></el-table-column>
     <el-table-column align="center" prop="worktag" width="120"></el-table-column>
   </el-table>
+  <!-- 分页-->
+  <div style="height: 48px;">
+    <el-pagination
+      v-show="paginationParams.total > 0"
+      v-model:page="paginationParams.pageNum"
+      v-model:limit="paginationParams.pageSize"
+      :total="paginationParams.total"
+      :style="{ position: 'relative', 'padding': '8px 20px 0 0' }"
+      @change="changePageNum" />
+  </div>
 
   <!-- 试题详细信息 -->
   <examDetailsDrawer ref="examDetailsDrawerRef"></examDetailsDrawer>
@@ -54,11 +64,13 @@ const { proxy } = getCurrentInstance()
 
 const props = defineProps({
   listExamQuestion: {type: Array},
-  loading: {type: Boolean}
+  loading: {type: Boolean},
+  paginationParams: {type: Object},
 })
 
 const activeExamInfoDrawer = ref(false);
 const activeExam = ref({});
+const emit = defineEmits(['updatePageNum'])
 
 const showExamAnalyseDrawer = (row) => {
   nextTick(() => {
@@ -69,13 +81,17 @@ const showExamAnalyseDrawer = (row) => {
   })
 }
 
+const changePageNum = (pageNum) => {
+  emit('updatePageNum', pageNum);
+}
+
 
 </script>
 
 <style lang="scss" scoped>
   .table-main {
     width: 100%;
-    height: 100%;
+    height: calc(100% - 48px);
     text-align: left;
 
     .main-title {
diff --git a/src/renderer/src/views/examReport/index.vue b/src/renderer/src/views/examReport/index.vue
index e42669c..227a135 100644
--- a/src/renderer/src/views/examReport/index.vue
+++ b/src/renderer/src/views/examReport/index.vue
@@ -47,10 +47,13 @@
           </el-select>
       </div>
 
-      <div :style="{'width': (viewportWidth - 400) + 'px','height': (viewportHeight-38) + 'px','overflow-y': 'auto'}">
+      <!-- <div :style="{'width': (viewportWidth - 400) + 'px','height': (viewportHeight-38) + 'px','overflow-y': 'auto'}"> -->
+      <div style="width: 100%; height: 100%; overflow-y: auto; border-radius: 10px;">
         <examReview
           :loading="loading"
           :listExamQuestion="listExamQuestion"
+          :paginationParams="paginationParams"
+          @updatePageNum="updatePageNum"
           v-if="curTask.viewkey=='真题回顾' "
         />
 
@@ -77,12 +80,15 @@ import ChooseTextbook from '@/components/choose-textbook/index.vue'
 import {listEntpcoursework, listEntpcourseworkNew} from '@/api/education/entpCourseWork'
 import { processList } from '@/hooks/useProcessList'
 import { JYApiListCT} from "@/utils/examQuestion/jyeoo"
+import useClassTaskStore from '@/store/modules/classTask'
 
 import examReview from './container/examReview.vue'
 import pointAnalysis from './container/pointAnalysis.vue'
 import examMocks from './container/examMocks.vue'
 import { ElMessage } from 'element-plus'
 
+const classTaskStore = useClassTaskStore();
+
 const {proxy} = getCurrentInstance();
 const sourceStore = useResoureStore();
 const viewportHeight = ref(0);
@@ -91,6 +97,11 @@ const viewportWidth = ref(0);
 const curNode = ref({});
 // 试题集合
 const listExamQuestion = ref([]);
+const paginationParams = reactive({
+  pageNum: 1,
+  pageSize: 10,
+  total: 0,
+});
 const loading = ref(false);
 const curTask = reactive({
   viewkey: '真题回顾',
@@ -107,6 +118,22 @@ const listWorkType = ref([{
   value: 0,
 }]);
 
+
+/**
+ * @desc: 翻页
+ * @return: {*}
+ * @param {*} pageNum
+ */
+const updatePageNum = (pageNum) => {
+  paginationParams.pageNum = pageNum;
+  queryExamQuestionByParams();
+}
+
+/**
+ * @desc: 具体获取试题及格式化
+ * @return: {*}
+ * @param {*} params
+ */
 const getCourseWorkList = async (params) => {
   const res = await listEntpcourseworkNew(params);
   if(res.data == null) {
@@ -115,7 +142,14 @@ const getCourseWorkList = async (params) => {
     return;
   }
   listExamQuestion.value = res.data;
-  // queryParams.total = res.total;
+  // 判断获取到的总数
+  const total = parseInt(res.msg)
+  if (!isNaN(total)) {
+    paginationParams.total = total;
+  } else {
+    console.error('无法将 res.msg 转换为数字');
+    paginationParams.total = 0; // 重新设置默认值
+  }
   // 格式化试题
   processList(listExamQuestion.value);
 }
@@ -132,7 +166,8 @@ const getData = async (data) => {
   loading.value = true;
 
   // 1.获取题型
-  getWorkType(data.node);
+  //getWorkType(data.node);
+  listWorkType.value = classTaskStore.entpCourseWorkTypeList;
 
   // 2.获取试题集合
   curNode.value = data.node;
@@ -166,6 +201,8 @@ const getData = async (data) => {
     edusubject: curNode.value.edusubject,
     edustage: curNode.value.edustage,
     sectionName: curNode.value.itemtitle,
+    currentPage: paginationParams.pageNum,
+    pageSize: paginationParams.pageSize,
   }
   await getCourseWorkList(params);
   loading.value = false;
@@ -181,6 +218,7 @@ const changeTaskView = (item, key) => {
   curTask.viewkey = item;
 }
 
+// 目前暂不使用, 题型已通过classTaskStore获取
 const getWorkType = async (data) => {
   const selName = `${data.edustage}${data.edusubject}`
   const curName = `${curNode.value.edustage}${curNode.value.edusubject}`
@@ -231,6 +269,8 @@ const queryExamQuestionByParams = async () => {
     edusubject: curNode.value.edusubject,
     edustage: curNode.value.edustage,
     sectionName: curNode.value.itemtitle,
+    currentPage: paginationParams.pageNum,
+    pageSize: paginationParams.pageSize,
   }
   await getCourseWorkList(params);
   loading.value = false;