Merge pull request 'zouyf_dev' (#63) from zouyf_dev into main

Reviewed-on: #63

src/renderer/src/api/education/knowledgePoint.js

@@ -9,6 +9,15 @@ export function listKnowlegepoint(query) {
   })
 }
 
+// 查询知识点列表
+export function listKnowlegepointFormat(query) {
+  return request({
+    url: '/point/formatList',
+    method: 'get',
+    params: query
+  })
+}
+
 
 // 查询一级知识点查下级所有层级
 export function childKnowlegepoint(query) {

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>

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>';
               }

src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue

@@ -489,6 +489,10 @@ watch(() => props.bookobj.levelSecondId, (newVal, oldVal) => {
     height: calc(100% - 100px);
   }
   
+  :deep(.format-work-desc > :is(div):first-child){
+    display: inline-block;
+  }
+
   // :deep(.el-dialog .question-dialog){
   //   height: 80vh !important;
   //   width: 80% !important;

src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/index.vue

@@ -99,6 +99,8 @@ const router = useRouter()
 const { proxy } = getCurrentInstance()
 const props = defineProps({
 })
+
+const curLessionList = ref([]);
 const activeParams = reactive({
   version: {},
   lession: {},

src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue

@@ -407,7 +407,8 @@ import { ElMessage, ElNotification } from 'element-plus'
 import { Search } from '@element-plus/icons-vue'
 import { onMounted, ref, watch, reactive, getCurrentInstance,nextTick } from 'vue'
 
-import { getBindlist } from '@/api/education/knowledgePoint'
+import { getBindlist, listKnowlegepointFormat } 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,56 @@ const myMessageShow=(title, msg, status)=>{
 //     },
 //   },
 
-watch(() => props.bookobj.levelSecondId, (newVal, oldVal) => {
+/**
+ * @desc: 遍历原知识点数据, 将title字段转为knowTitle以供knowledgePointProps进行tree的格式转换显示
+ * @return: {*}
+ * @param {*} list
+ */
+const updateKnowledgePoint = (list) => {
+  list.forEach(item => {
+    if (item.title &&  item.title != '') {
+      item.knowTitle = item.title;
+    }
+    if (item.children && Array.isArray(item.children)) {
+      updateKnowledgePoint(item.children);
+    }
+  });
+  return list;
+};
+
+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;
+
+  /**
+   * 格式化知识点: 分两种情况
+   * 1. 语文/英语: 获取学科下的所有知识点(该学科对应无章节与知识点绑定, 故只获取全知识点)
+   * 2. 其他: 获取当前章节下的所有知识点
+   */
+  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;
+    if (id) {
+      listKnowlegepointFormat({evalId: id, pageNum: 1, pageSize: 5000,}).then(res => {
+        //console.log('listKnowlegepointFormat->', res.rows);
+        curKnowledgePointList.value = updateKnowledgePoint(res.rows);
+      });
+    }
+  }else{
+    getBindlist({ eid: id }).then(res => {
+      if (!res.data || res.data.length < 1) {
+        ElMessage.warning('当前章节下未绑定知识点，暂不更新该试题知识点！');
+        curKnowledgePointList.value = [];
+      }
+      else {
+        curKnowledgePointList.value = res.data;
+      }
+    })
+  }
+  
 })
 
 
@@ -1680,7 +1730,20 @@ defineExpose({
   cropperFormItemCallBack,
 })
 </script>
+
+<style lang="scss">
+.el-cascader-panel {
+  li[aria-haspopup="true"] {
+    .el-checkbox {
+      display: none;
+    }
+  }
+}
+
+</style>
+
 <style scoped lang="scss">
+
 .questForm-item-cover{
   position: relative;
 
@@ -1698,6 +1761,4 @@ defineExpose({
     z-index: 9999;
   }
 }
-
-
 </style>