Merge branch 'main' into lyc-dev

package.json

@@ -1,6 +1,6 @@
 {
   "name": "aix-win-ws",
-  "version": "2.5.10",
+  "version": "2.5.11",
   "description": "",
   "main": "./out/main/index.js",
   "author": "上海交大重庆人工智能研究院",

src/renderer/src/App.vue

@@ -15,7 +15,7 @@ const size = ref('default')
   font-family: Avenir, Helvetica, Arial, sans-serif;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-  text-align: center;
+  /* text-align: center; */
   color: #2c3e50;
   width: 100%;
 }

src/renderer/src/components/choose-textbook/index.vue

@@ -7,11 +7,20 @@
         <i class="iconfont icon-xiangyou"></i>
       </div>
       <div class="book-list" v-loading="treeLoading">
-        <el-tree :data="treeData" accordion :props="defaultProps" node-key="id" :render-content="renderContent"
+        <el-tree :data="treeData" accordion :props="defaultProps" node-key="id"
           :default-expanded-keys="defaultExpandedKeys" :current-node-key="curNode.data.id" highlight-current
           @node-click="handleNodeClick">
-          <template #default="{ node }">
+          <template #default="{ node, data }">
-            <span :title="node.label" class="tree-label">{{ node.label }}</span>
+            <div v-if="props.isClassTask && (data.bookId == '' || data.bookId == '0')">
+              <el-tooltip effect="light" placement="right" content="该单元章节无自主试题">
+                <span class="tree-label" style="color: #A5B3CA">
+                  {{ node.label }}
+                </span>
+              </el-tooltip>
+            </div>
+            <div v-else>
+              <span class="tree-label">{{ node.label }}</span>
+            </div>
           </template>
         </el-tree>
       </div>
@@ -51,6 +60,13 @@ import useUserStore from '@/store/modules/user'
 const userStore = useUserStore()
 
 const BaseUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH
+
+const props = defineProps({
+  // 是否为[教学大模型]中使用(作业设计中对应该章节是否存在第三方试题)
+  isClassTask: {
+    default: false
+  },
+})
 const isStadium = () => {
   let roles = userStore.user.roles
   return  roles.some(item => item.roleKey === 'stadium')
@@ -179,17 +195,6 @@ const handleNodeClick = (data) => {
   emit('nodeClick', curData)
 }
 
-const renderContent = (h, { node, data, store }) => {
-  return h(
-    'span',
-    {
-      style: {
-        color: data.bookId==''||data.bookId=='0' ? '#A5B3CA' : 'black',
-      },
-    },
-    node.label
-  );
-}
 onMounted( async () => {
   treeLoading.value = true
   try{

src/renderer/src/store/modules/classTask.js

@@ -2,6 +2,8 @@ import { defineStore } from 'pinia'
 import {  } from '@/api/classTask/index.js'
 import { listClassmain } from '@/api/classManage/index'
 import { JYApiListCT, JYApiListOriginYear, JYApiListSO} from "@/utils/examQuestion/jyeoo"
+import { listEvaluation } from '@/api/subject'
+import { getBindlist, listKnowlegepointFormat } from '@/api/education/knowledgePoint'
 
 const useClassTaskStore = defineStore('classTask',{
   state: () => ({
@@ -38,6 +40,7 @@ const useClassTaskStore = defineStore('classTask',{
       {label: '2021', value: '2021'},
       {label: '2020', value: '2020'},
     ], // 习题查询条件 - 年份
+    entpCourseWorkPointList: [], // 习题查询条件 - 知识点
   }),
   actions: {
     listClassmain(params) {
@@ -69,6 +72,36 @@ const useClassTaskStore = defineStore('classTask',{
           console.error('更新第三方题源+题型err:', error);
         });
     },
+
+    // 根据学科和学段获取知识点
+    initJYPoint(params) {
+      /**
+       * 格式化知识点: 分两种情况
+       * 1. 语文/英语: 获取学科下的所有知识点(该学科对应无章节与知识点绑定, 故只获取全知识点)
+       * 2. 其他: 获取当前章节下的所有知识点
+       */
+      this.entpCourseWorkPointList = [];
+      let id = params.levelSecondId!='' ? params.levelSecondId : params.levelFirstId;
+      if( params.edusubject == '语文' || params.edusubject == '英语'){
+        id = params.textbookId;
+        listEvaluation({ edusubject: params.edusubject, edustage: params.edustage, itemkey: "subject", pageSize: 10 }).then((res => {
+          id = res.rows[0]?.id;
+          if (id) {
+            listKnowlegepointFormat({evalId: id, pageNum: 1, pageSize: 5000,}).then(res => {
+              this.entpCourseWorkPointList = formatKnowledgePoint(res.rows);
+              console.log('1.entpCourseWorkPointList->', this.entpCourseWorkPointList);
+            });
+          }
+        }))
+      }else{
+        getBindlist({ eid: id }).then(res => {
+          if (res.data && res.data.length > 0) {
+            this.entpCourseWorkPointList = res.data;
+            console.log('2.entpCourseWorkPointList->', this.entpCourseWorkPointList);
+          }
+        })
+      }
+    },
   },
   persist: true
 })
@@ -108,4 +141,21 @@ const getJYCT = (params) => {
         reject(error)
       })
   })
-}
+}
+
+/**
+ * @desc: 遍历原知识点数据, 将title字段转为knowTitle以供knowledgePointProps进行tree的格式转换显示
+ * @return: {*}
+ * @param {*} list
+ */
+const formatKnowledgePoint = (list) => {
+  list.forEach(item => {
+    if (item.title &&  item.title != '') {
+      item.knowTitle = item.title;
+    }
+    if (item.children && Array.isArray(item.children)) {
+      formatKnowledgePoint(item.children);
+    }
+  });
+  return list;
+};

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

@@ -169,6 +169,10 @@ const emits = defineEmits(['getData'])
 // 这个代表的是是否从ppt里面添加的作业
 const isShow = ref(false)
 
+const propsQueryTask = {
+  id: route.query.classTaskId,      // 需编辑的作业任务id
+  isInit: false,                   // 是否已编辑
+}
 const propsQueryCourseObj = route.query.courseObj;//作业布置的内容对象
 const courseObj = reactive({
   // 课程相关参数: 教材id,单元id,章节id,课程名称
@@ -198,7 +202,7 @@ const boardLoading = ref(false);
 const fileLoading = ref(false); // 常规作业loading
 
 onMounted(() => {
-  console.log("----onMounted-------")
+  //console.log("----onMounted-------");
   currentRow.value.id = 0
   if(propsQueryCourseObj){
     if(JSON.parse(propsQueryCourseObj)){
@@ -311,7 +315,7 @@ const selectable=(row, index)=>{
 /**
  * 获取 entpcourseid 获取作业列表
  */
-const initHomeWork = async()=> {
+const initHomeWork = async ()=> {
   tasklist_loading.value = true;
   // const { res, chapterId } = await useGetHomework(courseObj.node);
   const { res, chapterId } = await useGetHomework(sessionStore.get('subject.curNode'));
@@ -319,6 +323,16 @@ const initHomeWork = async()=> {
   console.log('res', res);
   entpcourseid.value = chapterId;
   taskList.value = res;
+  // 判断当前是否存在其他页面跳转编辑, 如果初次且存在id，则选中该任务
+  const taskId = propsQueryTask?.id ?? 0;
+  if (!propsQueryTask.isInit && taskId!=0){
+    const activeRow = taskList.value.find(o => o.id == taskId);
+    if (activeRow){
+      propsQueryTask.isInit = true;  // 清空避免重新保存后再次选中该任务
+      taskTable.value.setCurrentRow(activeRow);
+      handleCurrentChange(activeRow);
+    }
+  }
   tasklist_loading.value = false;
 }
 
@@ -414,7 +428,6 @@ const successHomework = () => {
     initHomeWork();
   })
 }
-
 // --------------------作业编辑
 let classWorkForm =  reactive({
   id: '',// cloneDeep(props.propsformobj.id),
@@ -814,11 +827,12 @@ const editWork = async (cform) =>{
   let res = await updateClasswork(cform);
   if (res.code == 200) {
     ElMessage.success('更新成功');
-    taskList.value = []
+    taskList.value = [];
     // 清空左侧 选中的布置列表 并刷新列表
     if(isShow.value){
       currentRow.value.id = 1;
     }else{
+      handleNewAllClass();
       currentRow.value.id = 0;
     }
     initHomeWork();

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

@@ -17,6 +17,13 @@
           </el-select>
         </el-form-item>
       </el-col>
+      <el-col :span="4" :offset="2">
+        <el-button v-if="!props.isHtml2canvas" type="primary" @click="goToQuestUpload()">添加习题</el-button>
+      </el-col>
+      
+    </el-row>
+    <!-- 习题筛选2 -->
+    <el-row style="width: 100%; height: 50px;">
       <el-col :span="7">
         <el-form-item label="年份" label-width="70">
           <el-select v-model="entpCourseWorkQueryParams.yearStr" placeholder="请选择">
@@ -24,9 +31,6 @@
           </el-select>
         </el-form-item>
       </el-col>
-    </el-row>
-    <!-- 习题筛选2 -->
-    <el-row style="width: 100%; height: 50px;">
       <el-col :span="12">
         <el-form-item label="关键词" label-width="70">
           <el-input
@@ -39,9 +43,6 @@
       <el-col :span="5">
         <el-button @click="handleQueryParamFromEntpCourseWork(1)"><el-icon><Search /></el-icon> 查找</el-button>
       </el-col>
-      <el-col :span="5">
-        <el-button v-if="!props.isHtml2canvas" type="primary" @click="goToQuestUpload()">添加习题</el-button>
-      </el-col>
     </el-row>
     <!-- 习题表格 -->
     <div class="page-table" >

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

@@ -50,7 +50,7 @@
     <el-form-item label="知识点" prop="knowledgePointIdArr">
       <el-cascader 
         v-model="questForm.knowledgePointIdArr" 
-        :options="curKnowledgePointList"
+        :options="entpCourseWorkPointList"
         :props="knowledgePointProps"
         popper-class="my-popper"
         @change="onchange"
@@ -432,7 +432,8 @@ const userStore = useUserStore().user
 const {
   entpCourseWorkTypeList,
   entpCourseWorkGroupList,
-  entpCourseWorkYearList
+  entpCourseWorkYearList,
+  entpCourseWorkPointList
 } = useClassTaskStore();
 
 const { proxy } = getCurrentInstance()
@@ -489,9 +490,9 @@ const fromOptions = reactive({
   ],
 });
   // 单题纠错时是否需要重新获取知识点的标识(目前仅用于UpdateForm中)
-const initKonwPointFlagByUpdateForm = ref(true);
+//const initKonwPointFlagByUpdateForm = ref(true);
   // 表单[知识点]显示内容集合
-const curKnowledgePointList = ref([]);
+//const curKnowledgePointList = ref([]);
   // 表单数据参数
 const questForm = reactive({
   id: 0,
@@ -1018,41 +1019,41 @@ const updateForm= async(item, submitIndex=0, submitType=1) =>{
 
 
   // 更新表单[知识点]回显
-  if (initKonwPointFlagByUpdateForm.value) {
+  // if (initKonwPointFlagByUpdateForm.value) {
-    // 避免重复调用
+  //   // 避免重复调用
-    initKonwPointFlagByUpdateForm.value = false;
+  //   initKonwPointFlagByUpdateForm.value = false;
 
-    lessionid.value = props.bookobj.levelSecondId? props.bookobj.levelSecondId : props.bookobj.levelFirstId;
+  //   lessionid.value = props.bookobj.levelSecondId? props.bookobj.levelSecondId : props.bookobj.levelFirstId;
-    console.log('lessionid', lessionid.value);
+  //   console.log('lessionid', lessionid.value);
-    // 拿到当前章节下得所有知识点
+  //   // 拿到当前章节下得所有知识点
-    if( props.bookobj.node.edusubject == '语文' || props.bookobj.node.edusubject == '英语' ){
+  //   if( props.bookobj.node.edusubject == '语文' || props.bookobj.node.edusubject == '英语' ){
-      const res = await listEvaluation({ edusubject: props.bookobj.node.edusubject, edustage: props.bookobj.node.edustage, itemkey: "subject", pageSize: 10 });
+  //     const res = await listEvaluation({ edusubject: props.bookobj.node.edusubject, edustage: props.bookobj.node.edustage, itemkey: "subject", pageSize: 10 });
-      const id = res.rows[0]?.id;
+  //     const id = res.rows[0]?.id;
-      if (id) {
+  //     if (id) {
-        const res = await listKnowlegepointFormat({evalId: id, pageNum: 1, pageSize: 5000,});
+  //       const res = await listKnowlegepointFormat({evalId: id, pageNum: 1, pageSize: 5000,});
-        curKnowledgePointList.value = updateKnowledgePoint(res.rows);
+  //       curKnowledgePointList.value = formatKnowledgePoint(res.rows);
-        //console.log('updateKnowledgePoint->', res.rows);
+  //       console.log('updateKnowledgePoint->', curKnowledgePointList.value);
-      }
+  //     }
-    } else {
+  //   } else {
-      const res = await getBindlist({ eid: lessionid.value })
+  //     const res = await getBindlist({ eid: lessionid.value })
-      if (!res.data || res.data.length < 1) {
+  //     if (!res.data || res.data.length < 1) {
-        ElMessage.warning('当前章节下未绑定知识点，暂不更新该试题知识点！');
+  //       ElMessage.warning('当前章节下未绑定知识点，暂不更新该试题知识点！');
-        curKnowledgePointList.value = [];
+  //       curKnowledgePointList.value = [];
-      }
+  //     }
-      else {
+  //     else {
-        curKnowledgePointList.value = res.data;
+  //       curKnowledgePointList.value = res.data;
-      }
+  //     }
-    }
+  //   }
-  }
+  // }
 
   //item.evalnodeid = '3772b,374112,374233';
   let knowledgePointIdArr = [];
   const pointArr = item.evalnodeid.split(',');
-  if (curKnowledgePointList.value.length > 0 && pointArr.length > 0) {
+  if (entpCourseWorkPointList.length > 0 && pointArr.length > 0) {
     pointArr.forEach(element => {
       element = element.trim();
       let point = [];
-      if (getCurKnowledgePointToForm(point, element, curKnowledgePointList.value)) {
+      if (getCurKnowledgePointToForm(point, element, entpCourseWorkPointList)) {
         point = point.reverse();
         knowledgePointIdArr.push(point);
       }
@@ -1747,33 +1748,33 @@ watch([
   // props.bookobj.levelSecondId? props.bookobj.levelSecondId : props.bookobj.levelFirstId
   lessionid.value = props.bookobj.levelSecondId!='' ? props.bookobj.levelSecondId : props.bookobj.levelFirstId;
 
-  /**
+  // /**
-   * 格式化知识点: 分两种情况
+  //  * 格式化知识点: 分两种情况
-   * 1. 语文/英语: 获取学科下的所有知识点(该学科对应无章节与知识点绑定, 故只获取全知识点)
+  //  * 1. 语文/英语: 获取学科下的所有知识点(该学科对应无章节与知识点绑定, 故只获取全知识点)
-   * 2. 其他: 获取当前章节下的所有知识点
+  //  * 2. 其他: 获取当前章节下的所有知识点
-   */
+  //  */
-  let id = lessionid.value;
+  // let id = lessionid.value;
-  if( props.bookobj.node.edusubject == '语文' || props.bookobj.node.edusubject == '英语'){
+  // if( props.bookobj.node.edusubject == '语文' || props.bookobj.node.edusubject == '英语'){
-    id = props.bookobj.node.rootid;
+  //   id = props.bookobj.node.rootid;
-    const res = await listEvaluation({ edusubject: props.bookobj.node.edusubject, edustage: props.bookobj.node.edustage, itemkey: "subject", pageSize: 10 });
+  //   const res = await listEvaluation({ edusubject: props.bookobj.node.edusubject, edustage: props.bookobj.node.edustage, itemkey: "subject", pageSize: 10 });
-    id = res.rows[0]?.id;
+  //   id = res.rows[0]?.id;
-    if (id) {
+  //   if (id) {
-      listKnowlegepointFormat({evalId: id, pageNum: 1, pageSize: 5000,}).then(res => {
+  //     listKnowlegepointFormat({evalId: id, pageNum: 1, pageSize: 5000,}).then(res => {
-        //console.log('listKnowlegepointFormat->', res.rows);
+  //       //console.log('listKnowlegepointFormat->', res.rows);
-        curKnowledgePointList.value = formatKnowledgePoint(res.rows);
+  //       curKnowledgePointList.value = formatKnowledgePoint(res.rows);
-      });
+  //     });
-    }
+  //   }
-  }else{
+  // }else{
-    getBindlist({ eid: id }).then(res => {
+  //   getBindlist({ eid: id }).then(res => {
-      if (!res.data || res.data.length < 1) {
+  //     if (!res.data || res.data.length < 1) {
-        ElMessage.warning('当前章节下未绑定知识点，暂不更新该试题知识点！');
+  //       ElMessage.warning('当前章节下未绑定知识点，暂不更新该试题知识点！');
-        curKnowledgePointList.value = [];
+  //       curKnowledgePointList.value = [];
-      }
+  //     }
-      else {
+  //     else {
-        curKnowledgePointList.value = res.data;
+  //       curKnowledgePointList.value = res.data;
-      }
+  //     }
-    })
+  //   })
-  }
+  // }
   
 })
 

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

@@ -18,9 +18,9 @@
         </el-form-item>
       </el-col>
       <el-col :span="10">
-        <el-form-item label="知识点" label-width="70">
+        <!-- <el-form-item label="知识点" label-width="70">
           <el-cascader
-            disabled
+            :disabled="entpCourseWorkPointList.length==0"
             v-model="entpCourseWorkQueryParams.point"
             clearable
             style="width: 100%"
@@ -31,7 +31,7 @@
             collapse-tags
             collapse-tags-tooltip
           />
-        </el-form-item>
+        </el-form-item> -->
       </el-col>
     </el-row>
     <!-- 习题筛选2 -->
@@ -132,7 +132,8 @@ const userStore = useUserStore().user
 const {
   entpCourseWorkTypeList,
   entpCourseWorkGroupList,
-  entpCourseWorkYearList
+  entpCourseWorkYearList,
+  entpCourseWorkPointList
 } = useClassTaskStore();
 
 const props = defineProps({
@@ -146,12 +147,11 @@ const props = defineProps({
   },
 })
 
-const entpCourseWorkPointList = ref([
+// const entpCourseWorkPointList = ref([
-  {label: '不限', value: []},
+//   {label: '不限', value: []},
-]); // 习题查询条件 - 知识点
+// ]); // 习题查询条件 - 知识点
-const knowledgePointProps = ref({value: 'thirdId', label: 'title'});
+const knowledgePointProps = reactive({value: 'thirdId', label: 'knowTitle'});
-//const knowledgePointProps = ref({value: 'thirdId', label: 'knowTitle'});
+//const knowledgePointProps = ref({value: 'thirdId', label: 'title'});
-
 
 // 习题查询参数条件
 const entpCourseWorkQueryParams = reactive({
@@ -193,7 +193,7 @@ const workResource = reactive({
 onMounted(() => {
   console.log('entpCourseWorkTypeList', entpCourseWorkTypeList);
   // 知识点 (仅用更新一次)
-  getEntpCourseWorkPointList();
+  //getEntpCourseWorkPointList();
   debounceQueryData(); // 查询习题列表
 })
 
@@ -258,7 +258,7 @@ const t = function(name, time) {
       // 年份
       yearStr: entpCourseWorkQueryParams.yearStr !== '-1' ? entpCourseWorkQueryParams.yearStr:'',
       // 知识点
-      thirdId: entpCourseWorkQueryParams.point&&entpCourseWorkQueryParams.point.length > 0 ? entpCourseWorkQueryParams.point[0]:'',
+      thirdId: entpCourseWorkQueryParams.point&&entpCourseWorkQueryParams.point.length > 0 ? entpCourseWorkQueryParams.point[entpCourseWorkQueryParams.point.length-1]:'',
       // 关键字
       keyword: entpCourseWorkQueryParams.keyWord && entpCourseWorkQueryParams.keyWord !== '' ? entpCourseWorkQueryParams.keyWord:'',
 
@@ -351,6 +351,7 @@ const handleQueryFromEntpCourseWork= async (queryType) => {
 }
 
 /**
+ * 注意: 该方法已不再使用, 具体知识点初始化方法查看 useClassTaskStore - 241230
  * 3、知识点
  */
  const getEntpCourseWorkPointList = async () => {

src/renderer/src/views/model/index.vue

@@ -1,7 +1,7 @@
 <template>
   <el-row class="model-wrap">
     <!-- 左侧 选择教材 目录 -->
-    <ChooseTextbook @change-book="changeBook" @node-click="changeBook" />
+    <ChooseTextbook :isClassTask="true" @change-book="changeBook" @node-click="changeBook" />
     <!-- 右侧 展示内容 -->
     <div class="right-content">
       <div class="content-header-wrap">
@@ -451,6 +451,14 @@ const changeBook = async(data) => {
   }).then((res) => {
     currentFileList.value = [...res.rows]
   })
+
+  // 更新单元章节对应的知识点
+  const pointParams = {
+    ...uploadData.value,
+    edustage: data.node.edustage,
+    edusubject: data.node.edusubject,
+  }
+  await classTaskStore.initJYPoint(pointParams);
 }
 const onchange = (item) => {
   let path = item.path

src/renderer/src/views/prepare/index.vue

@@ -209,10 +209,12 @@ import * as commUtils from "@/utils/comm";
 import msgUtils from "@/plugins/modal";
 import * as Api_server from "@/api/apiService";
 import * as API_entpcoursefile from "@/api/education/entpcoursefile";
+import useClassTaskStore from '@/store/modules/classTask'
 import { slidesToImg } from '@/utils/ppt' // ppt相关工具
 import ChatWs from '@/plugins/socket' // 聊天socket
 if (!ChatWs.ws) ChatWs.init()
 
+const classTaskStore = useClassTaskStore();
 const toolStore = useToolState()
 const fs = require('fs')
 const { ipcRenderer } = window.electron || {}
@@ -992,8 +994,8 @@ export default {
       let cata = parseCataByNode(data.node)
       this.currentNode = data.node
       this.uploadData.levelFirstId = cata[0]
-      this.uploadData.levelSecondId = cata[1]
+      this.uploadData.levelSecondId = cata[1] ?? ''
-      this.uploadData.levelThirdId = cata[2]
+      this.uploadData.levelThirdId = cata[2] ?? ''
       this.uploadData.textbookId = data.textBook.curBookId
       toolStore.curSubjectNode.querySearch = this.uploadData
       this.initHomeWork()
@@ -1003,6 +1005,14 @@ export default {
       const res = await listEntpcourse(params)
       this.entp = res?.rows?.[0] || null
       sessionStore.set('curr.entp', this.entp) // 缓存当前课程信息
+
+      // 更新单元章节对应的知识点
+      const pointParams = {
+        ...this.uploadData,
+        edustage: data.node.edustage,
+        edusubject: data.node.edusubject,
+      }
+      await classTaskStore.initJYPoint(pointParams);
     },
     // 获取作业
     async initHomeWork() {
@@ -1047,7 +1057,7 @@ export default {
     goNewClassTask(){
       // router.push({ path: '/newClassTask' });
       this.$router.push({
-        path: '/newClassTask',
+        path: '/model/newClassTaskAssign',
         query: {
           isBack: true,
         }
@@ -1074,14 +1084,13 @@ export default {
         coursetitle: this.currentNode.itemtitle,  // (单元/章节) 名称,
         node: this.currentNode, // 选择的课程节点
       }
-      console.log('courseObj', courseObj)
       editListItem(row, courseObj).then((obj) => {
         if(obj){
           //前往作业设计
           this.$router.push({
-            path: '/newClassTask',
+            path: '/model/newClassTaskAssign',
             query: {
-              classtaskObj: JSON.stringify(obj),
+              classTaskId: parseInt(obj.id),
             }
           })
         }