From 630a7b4c5089a4ed2e254a07fe8863ec99b80e3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com>
Date: Fri, 22 Nov 2024 16:57:19 +0800
Subject: [PATCH] 1

---
 .../exam-question/examDetailsDrawer.vue       |  5 +++
 src/renderer/src/hooks/useProcessList.js      | 12 +++----
 .../newClassTaskAssign/myQuestion/index.vue   |  4 +++
 .../questionUpload/quesItem/index.vue         | 36 +++++++++++++++++--
 4 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/src/renderer/src/components/exam-question/examDetailsDrawer.vue b/src/renderer/src/components/exam-question/examDetailsDrawer.vue
index 12de43c..28ea8d8 100644
--- a/src/renderer/src/components/exam-question/examDetailsDrawer.vue
+++ b/src/renderer/src/components/exam-question/examDetailsDrawer.vue
@@ -71,4 +71,9 @@ defineExpose({
     justify-content: flex-end;
     box-sizing: border-box;
   }
+
+  :deep(.format-work-desc > :is(div):first-child){
+    display: inline-block;
+  }
+  
 </style>
\ No newline at end of file
diff --git a/src/renderer/src/hooks/useProcessList.js b/src/renderer/src/hooks/useProcessList.js
index e7329eb..8cd80ad 100644
--- a/src/renderer/src/hooks/useProcessList.js
+++ b/src/renderer/src/hooks/useProcessList.js
@@ -59,14 +59,14 @@ export const processList = (row, aloneOption=false) => {
             for(; j<workDescArr.length; j++){
               const char = String.fromCharCode(65+j);
               if (aloneOption) {
-                tmp += `<div style='width:100%;display:flex;padding: 2px 0'>${char}.${workDescArr[j]}</div>`;
+                tmp += `<div class="format-work-desc" style='width:100%;display:flex;padding: 2px 0'>${char}.${workDescArr[j]}</div>`;
               }
               else {
                 if(j%2 == 0){
                   tmp += `<div style='width:100%;display:flex;'>`;
                 }
                 
-                tmp += `<div style='padding-left:10px;width:50%;overflow:hidden;text-overflow:ellipsis;font-size:0.9em;'>${char}.${workDescArr[j]}</div>`;
+                tmp += `<div class="format-work-desc" style='padding-left:10px;width:50%;overflow:hidden;text-overflow:ellipsis;font-size:0.9em;'>${char}.${workDescArr[j]}</div>`;
                 if(j%2 == 1){
                   tmp += '</div>';
                 }
@@ -153,14 +153,14 @@ export const processList = (row, aloneOption=false) => {
               for(; j<optionsArr.length; j++){
                 const char = String.fromCharCode(65+j);
                 if (aloneOption) {
-                  tmp += `<div style='width:100%;display:flex;padding: 2px 0'>${char}.${optionsArr[j]}</div>`;
+                  tmp += `<div class="format-work-desc" style='width:100%;display:flex;padding: 2px 0'>${char}.${optionsArr[j]}</div>`;
                 }
                 else {
                   if(j%2 == 0){
                     tmp += `<div style='width:100%;display:flex;'>`;
                   }
                   
-                  tmp += `<div style='padding-left: 10px; width: 50%'>${char}.${optionsArr[j]}</div>`;
+                  tmp += `<div class="format-work-desc" style='padding-left: 10px; width: 50%'>${char}.${optionsArr[j]}</div>`;
                   if(j%2 == 1){
                     tmp += '</div>';
                   }
@@ -280,14 +280,14 @@ export const processList = (row, aloneOption=false) => {
           for(; j<workDescArr.length; j++){
             const char = String.fromCharCode(65+j);
             if (aloneOption) {
-              tmp += `<div style='width:100%;display:flex;padding: 2px 0'>${char}.${workDescArr[j]}</div>`;
+              tmp += `<div class="format-work-desc" style='width:100%;display:flex;padding: 2px 0'>${char}.${workDescArr[j]}</div>`;
             }
             else {
               if(j%2 == 0){
                 tmp += `<div style='width:100%;display:flex;'>`;
               }
               
-              tmp += `<div style='padding-left: 10px; width: 50%'>${char}.${workDescArr[j]}</div>`;
+              tmp += `<div class="format-work-desc" style='padding-left: 10px; width: 50%'>${char}.${workDescArr[j]}</div>`;
               if(j%2 == 1){
                 tmp += '</div>';
               }
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
index 234693f..27be20e 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
@@ -488,6 +488,10 @@ watch(() => props.bookobj.levelSecondId, (newVal, oldVal) => {
     width: 100%;
     height: calc(100% - 100px);
   }
+  
+  :deep(.format-work-desc > :is(div):first-child){
+    display: inline-block;
+  }
 
   // :deep(.el-dialog .question-dialog){
   //   height: 80vh !important;
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue
index 52d87fc..88147d1 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue
@@ -405,9 +405,10 @@
 <script setup>
 import { ElMessage, ElNotification } from 'element-plus'
 import { Search } from '@element-plus/icons-vue'
-import { onMounted, ref,watch, reactive, getCurrentInstance,nextTick } from 'vue'
+import { onMounted, ref, watch, reactive, getCurrentInstance,nextTick } from 'vue'
 
-import { getBindlist } from '@/api/education/knowledgePoint'
+import { getBindlist, listKnowlegepoint } from '@/api/education/knowledgePoint'
+import { listEvaluation } from '@/api/subject'
 import { listEntpcoursework, getEntpcoursework, delEntpcoursework, addEntpcoursework, updateEntpcoursework, uploadEntpcourseworkFile } from "@/api/education/entpCourseWork";
 import { isJson } from "@/hooks/useProcessList";
 
@@ -611,10 +612,13 @@ onMounted(() => {
     }
     yearList.value.push(s)
   };
+
+  // 拿到当前章节下得所有知识点
 })
 
 
 
+
 const checkBoxChange=(v)=>{
   // 单选 v: []
   console.log(v,'vvvvvv')
@@ -1666,10 +1670,36 @@ const myMessageShow=(title, msg, status)=>{
 //     },
 //   },
 
-watch(() => props.bookobj.levelSecondId, (newVal, oldVal) => {
+watch(() => props.bookobj.levelSecondId, async (newVal, oldVal) => {
   console.log(props.bookobj,'课程选择')
   // props.bookobj.levelSecondId? props.bookobj.levelSecondId : props.bookobj.levelFirstId
   lessionid.value = props.bookobj.levelSecondId? props.bookobj.levelSecondId : props.bookobj.levelFirstId;
+
+  // 
+  console.log('123', props.bookobj.node.edusubject == '语文' );
+  let id = props.bookobj.levelSecondId;
+  if(props.bookobj.node.edusubject == '语文' || props.bookobj.node.edusubject == '英语'){
+    id = props.bookobj.node.rootid;
+    const res = await listEvaluation({ edusubject: props.bookobj.node.edusubject, edustage: props.bookobj.node.edustage, itemkey: "subject", pageSize: 10 });
+    id = res.rows[0]?.id;
+    listKnowlegepoint({evalId: id}).then(res => {
+      curKnowledgePointList.value = res.rows;
+      curKnowledgePointList.value.forEach(item => {
+        item.knowTitle = item.title;
+      });
+    });
+  }else{
+    getBindlist({ eid: id }).then(res => {
+      if (!res.data || res.data.length < 1) {
+        ElMessage.warning('当前章节下未绑定知识点，暂不更新该试题知识点！');
+        curKnowledgePointList.value = [];
+      }
+      else {
+        curKnowledgePointList.value = res.data;
+      }
+    })
+  }
+  
 })