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

Reviewed-on: #193

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/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/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">

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

@@ -1047,7 +1047,7 @@ export default {
     goNewClassTask(){
       // router.push({ path: '/newClassTask' });
       this.$router.push({
-        path: '/newClassTask',
+        path: '/model/newClassTaskAssign',
         query: {
           isBack: true,
         }
@@ -1074,14 +1074,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),
             }
           })
         }