Merge pull request '生成图片地址修改' (#254) from lyc-dev into main

Reviewed-on: #253

src/renderer/src/api/classTask/index.js

@@ -62,12 +62,3 @@ export function updateClassworkdata(data) {
     data: data
   })
 }
-
-// 修改classwork
-export function updateClasswork(data) {
-  return request({
-    url: '/education/classwork',
-    method: 'put',
-    data: data
-  })
-}

src/renderer/src/components/ai-chart/index.vue

@@ -115,7 +115,7 @@ const outerAi = [
     title: '生成图片',
     secondTit: '文生图大模型',
     img: new URL('../../../src/assets/images/ai-01.png', import.meta.url).href,
-    path: '/ais/aisd3'
+    path: '/ais/aiwenxinyige'
   },
   {
     id: 2,

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

@@ -235,6 +235,7 @@ onMounted( async () => {
     }
     else{
       curBook.data = useSubject.subjectList[0]
+      localStorage.setItem('curBook', JSON.stringify(curBook.data))
       treeData.value = useSubject.treeData
     }
     // 设置展开并选中

src/renderer/src/layout/components/Header.vue

@@ -65,7 +65,7 @@
 <script setup>
 import { ref, watch, onMounted } from 'vue'
 import { useRouter } from 'vue-router'
-import { ElMessageBox } from 'element-plus'
+import { ElMessageBox, ElMessage } from 'element-plus'
 import { ArrowDown } from '@element-plus/icons-vue'
 import WindowTools from '@/components/window-tools/index.vue'
 import useUserStore from '@/store/modules/user'
@@ -74,6 +74,10 @@ import outLink from '@/utils/linkConfig'
 import logoIco from '@/assets/images/logo.png'
 import { listEvaluation } from '@/api/classManage/index'
 import { clearBookInfo } from '@/utils/ruoyi'
+import { sessionStore } from '@/utils/store'
+import { useToolState } from '@/store/modules/tool'
+
+const toolState = useToolState();
 let homeTitle = ref(import.meta.env.VITE_APP_TITLE)
 const { ipcRenderer } = window.electron || {}
 const userStore = useUserStore()
@@ -166,6 +170,8 @@ function handleCommand(command) {
 }
 
 function logout() {
+  const hasClass = sessionStore.has('activeClass.id')
+  if (hasClass || toolState.isToolWin) return ElMessage.warning('当前正在上课，请先结结束上课')
   ElMessageBox.confirm('确认退出系统吗?', '提示', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',

src/renderer/src/store/modules/tool.js

@@ -23,11 +23,12 @@ export const useToolState = defineStore('tool', {
   }),
   actions: {
     async resetDef() { // 重置数据-下课
-      this.model = 'select'        // 悬浮球-当前模式
+      // this.model = 'select'        // 悬浮球-当前模式
-      await sleep(20) // 休眠20ms
+      await sleep(50) // 休眠50ms
       this.showBoardAll = false    // 全屏画板-是否显示
-      await sleep(20) // 休眠20ms
+      await sleep(50) // 休眠50ms
       this.isToolWin = false       // 工具窗口是否打开
+      await sleep(50) // 休眠50ms
     }
   }
 })

src/renderer/src/views/classTask/container/newTask/taskTypeView.vue

@@ -1,10 +1,8 @@
 <template>
-  <div class="page-typeview">
+  <div class="page-typeview flex">
-    <el-form ref="classWorkFormRef" :model="classWorkForm" label-width="90" style=" height: 100%;overflow: hidden;">
+    <el-form ref="classWorkForm" :model="classWorkForm" label-width="90" style="height: calc(100% - 55px);display: flex;flex-direction: column;">
       <!-- 标题 -->
-      <div class="container">
+      <el-row>
-        <!-- 作业类型 -->
-        <el-row class="top">
         <el-col :span="24">
           <el-form-item label="作业类型:">
             <el-radio-group v-model="formType" @change="changeFormType">
@@ -14,16 +12,11 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
-        </el-row>
+        <el-col :span="24">
-        <!-- 作业资源 -->
-        <el-row class="middle">
-          <el-col :span="24" style="height: 100%; overflow: hidden;">
           <el-form-item label="作业资源:" class="el-form-work-list">
             <el-col :span="15" class="work-left">
-                <!-- 习题训练 -->
               <div v-if="classWorkForm.worktype=='习题训练'" style="height: 100%; display: flex; flex-direction: column;">
-                  <!-- 习题筛选1 -->
+                <el-row :gutter="10">
-                  <el-row :gutter="10" class="top">
                   <el-col :span="6">
                     <el-form-item label="题型" label-width="70">
                       <el-select v-model="entpCourseWorkQueryParams.worktype" placeholder="请选择" >
@@ -55,8 +48,7 @@
                     </el-form-item>
                   </el-col>
                 </el-row>
-                  <!-- 习题筛选2 -->
+                <el-row :gutter="10" style="margin-top: 4px">
-                  <el-row :gutter="10" style="margin-top: 4px" class="top">
                   <el-col :span="6">
                     <el-form-item label="年份" label-width="70">
                       <el-select v-model="entpCourseWorkQueryParams.yearStr" placeholder="请选择" >
@@ -75,9 +67,8 @@
                     </el-form-item>
                   </el-col>
                 </el-row>
-                  <!-- 习题表格 -->
+
-                  <div class="middle" > 
+                <el-table :data="workResource.entpCourseWorkList" style="width: 100%;">
-                    <el-table :data="workResource.entpCourseWorkList" style="width: 100%; height: 100%;">
                   <el-table-column type="index" width="60" />
                   <el-table-column align="left" >
                     <template #header>
@@ -102,9 +93,8 @@
                     </template>
                   </el-table-column>
                 </el-table>
-                  </div>
+                <div style="height: 55px;">
-                  <!-- 分页 这里不用-->
+                  <!-- 分页 -->
-                  <!-- <div style="height: 55px;">
                   <pagination
                     v-show="entpCourseWorkTotal > 0"
                     v-model:page="paginationParams.pageNum"
@@ -112,7 +102,7 @@
                     :total="entpCourseWorkTotal"
                     :style="{ position: 'relative', 'margin-top': '5px' }"
                     @pagination="getPaginationList" />
-                  </div> -->
+                </div>
               </div>
               <!-- <div v-if="classWorkForm.worktype!='习题训练'">
                 <div :style="{ 'overflow': 'auto'}">
@@ -196,8 +186,8 @@
                 </div>
               </div> -->
             </el-col>
-              <el-col :span="9" class="work-right">
+            <el-col :span="8" style="padding: 0 0 0 5px;height: 60vh; overflow: auto; line-height: 26px">
-                <div v-if="classWorkForm.worktype=='习题训练'" :style="{height: '100%', 'overflow': 'auto', 'border':'1px dotted blue','border-radius':'5px', 'background-color': '#f7f7f7'}">
+              <div v-if="classWorkForm.worktype=='习题训练'" :style="{ 'overflow': 'auto', 'border':'1px dotted blue','border-radius':'5px', 'background-color': '#f7f7f7'}">
                 <template v-for="(item,index) in classWorkForm.quizlist" :key="item.id">
                   <div style="margin: 5px; background-color: white">
                     <div v-html="item.titleFormat" style="padding: 15px 20px 5px 20px"></div>
@@ -236,50 +226,25 @@
           </el-form-item>
         </el-col>
       </el-row>
-        <!-- 作业说明 -->
-        <el-row class="bottom">
-          <el-col :span="12">
-            <el-form-item label="作业说明" style="margin: 10px 0;">
-              <el-col :span="15" style="padding: 0px">
-                <!-- <el-input v-model="classWorkForm.title" type="textarea" :rows="1" placeholder="请输入作业说明"/> -->
-                <el-input v-model="classWorkForm.title"  style="width: 400px"   placeholder="请输入作业说明"/>
-              </el-col>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-button type="primary" @click="handleClassWorkSave">确 定</el-button>
-          </el-col>
-        </el-row>
-      </div>
     </el-form>
   </div>
 </template>
 
 <script setup>
-import { onMounted, ref, nextTick, watch, reactive, getCurrentInstance } from 'vue'
+import { onMounted, ref, toRaw,watch, reactive } from 'vue'
-import { ElMessage } from 'element-plus'
 import { useToolState } from '@/store/modules/tool'
 import { getCurrentTime } from '@/utils/date'
 import { processList } from '@/hooks/useProcessList'
-import {listEntpcoursework, listEntpcourseworkNew, getEntpcoursework} from '@/api/education/entpCourseWork'
+import {listEntpcoursework, listEntpcourseworkNew} from '@/api/education/entpCourseWork'
-import { updateClasswork } from '@/api/classTask'
-import { useGetHomework } from '@/hooks/useGetHomework'
-import { addClassworkReturnId } from '@/api/teaching/classwork'
-
 
 import useUserStore from '@/store/modules/user'
 const userStore = useUserStore().user
-const { proxy } = getCurrentInstance()
 
 const props = defineProps({
   bookobj: {
     type: Object,
     default: () => ({})
   },
-  uniquekey: {
-    type: String,
-    default: ''
-  }
 })
 
 
@@ -288,9 +253,7 @@ const toolStore = useToolState()
 const openDialog = () => {
   isDialogOpen.value = true
 }
-const classWorkFormRef = ref(null);
 const formType = ref('习题训练')
-const newWorkSpaceEdit = ref(false);        //修改学习任务 
 // ---------------------------------------------------
 const listWorkType = ref(['习题训练', '框架梳理', '课堂展示', '常规作业']); //作业类型
 
@@ -355,17 +318,16 @@ const workResource = reactive({
   quiztype: '',
   queryForm: {},
   classWorkList: [],    // 教学分析里产生的学习任务
-  entpCourseWorkList: [], // 习题列表
+  entpCourseWorkList: [],
-  entpCourseWorkTotal: 0, // 习题总数
 }); // 作业资源
-let classWorkForm =  reactive({
+const classWorkForm =  reactive({
-  uniquekey: props.uniquekey, // 作业唯一标识 作业名称
   worktype: '习题训练', //作业类型
-  title: '',// 作业说明
+  // uniquekey: userStore.edusubject+'-' + getCurrentTime('MMDD')+'-'+(this.taskList.length+1),
-  quizlist: [], // 作业习题列表内容
+
-}); // 提交的作业内容
+})
-const chooseWorkLists = ref([]); // 选择作业资源列表? 非习题训练的list
+const entpCourseWorkList = ref([]); // 习题列表
-const whiteboardObj = ref(''); // 作业资源 - 课堂展示 白板
+const entpCourseWorkTotal = ref(0); // 习题总数
+
 
 
 /***
@@ -373,7 +335,7 @@ const whiteboardObj = ref(''); // 作业资源 - 课堂展示 白板
  */
 const changeFormType = (val) => {
   console.log(val)
-  classWorkForm.worktype = val;
+  classWorkForm.value.worktype = val;
 }
 
 const queryForm = reactive({
@@ -410,7 +372,7 @@ const queryForm = reactive({
  * 1  -  按条件查询
  * 2  -  按关键词查询
  */
-const handleQueryFromEntpCourseWork= (queryType) => {
+ const handleQueryFromEntpCourseWork= (queryType) => {
   //queryForm.pageNum = this.paginationParams.pageNum;
   //queryForm.pageSize = this.paginationParams.pageSize;
 
@@ -420,6 +382,8 @@ const handleQueryFromEntpCourseWork= (queryType) => {
   //   queryForm.edusubject = '道德与法治';
   // }
 
+
+  console.log(queryForm)
   listEntpcourseworkNew(queryForm).then(entpcourseworkres => {
     // if (queryType == 1 && this.entpCourseWorkQueryParams.worktype == '主观题') {
     //   // 因菁优网题型因学科而不固定, 故非常规题重定义定为【主观题】
@@ -430,454 +394,55 @@ const handleQueryFromEntpCourseWork= (queryType) => {
     // } else {
     //   workResource.entpCourseWorkList = entpcourseworkres.rows;
     // }
-    
+    if(entpcourseworkres.data == null) {
-    if(entpcourseworkres.data&&entpcourseworkres.data.length>0){
+      workResource.entpCourseWorkList = [];
-      workResource.entpCourseWorkList = entpcourseworkres.data;
+      entpCourseWorkTotal.value = 0
-      workResource.entpCourseWorkTotal = entpcourseworkres.data.length;
+      return;
-
+    }
+    entpCourseWorkList.value = entpcourseworkres.data;
     workResource.entpCourseWorkList.forEach(item=> {
       if (item.worktype == '选择题') {
         item.worktype = '单选题'
       }
     })
-
+    // 同步数量
+    entpCourseWorkTotal.value = 0;
+    if (entpcourseworkres.data.length > 0) {
+      entpCourseWorkTotal.value = entpcourseworkres.data.length;
+    }
 
     //格式化试题信息
     processList(workResource.entpCourseWorkList);
-    }else{
-      workResource.entpCourseWorkList = [];
-      workResource.entpCourseWorkTotal = 0
-    }
   })
 }
 
-/**
- * 添加资源
- * @param fromsrc - 试题来源
- * @param entpcourseworkid 
- */
-const handleClassWorkQuizAdd = (fromsrc, entpcourseworkid) => {
-  var exist = false;
-  for (var i=0; i< classWorkForm.quizlist.length; i++) {
-    if (classWorkForm.quizlist[i].id == entpcourseworkid) {
-      exist = true;
-      break;
-    }
-  }
-  if (exist == false) {
-    getEntpcoursework(entpcourseworkid).then(res => {
-      //res.data.titletext = res.data.title.replace(/<[^>]+>/g, '');
-      // 暂时手动新增试题的分数
-      if(res.data.score == null){
-        res.data.score = 4;
-      }
-
-
-      classWorkForm.quizlist.push(res.data);
-      // 格式化试题
-      processList(classWorkForm.quizlist);
-    })
-  } else {
-    ElMessage('试题已经存在')
-  }
-};
-
-/**
- * 作业设计-提交
- */
-const handleClassWorkSave = async () => {
-  await nextTick(); // 确保DOM更新完成
-  proxy.$refs["classWorkFormRef"].validate(async valid => {
-    if (valid) {
-      if (classWorkForm.id != null) {
-        // 当前为[编辑]状态下点进来得处理
-        updateClasswork(classWorkForm).then(response => {
-          ElMessage("修改成功");
-          // this.workConfDialogOpen = false;
-          //这里分离了，所以不需要更新表单数据了
-          // this.getClassWorkAllList(); // 更新表单数据
-        });
-      } else {
-        // 当前为[编辑]状态下点进来得处理  newWorkSpaceEdit true 为编辑状态
-        if(newWorkSpaceEdit.value ) {
-
-          // 0.右侧作业资源添加检测
-          if (this.currentTag == '习题训练') {
-            if (this.classWorkForm.quizlist.length == 0) {
-              ElMessage.error('请先添加作业资源!');
-              return;
-            }
-          }
-          else if (this.currentTag == '课堂展示' || this.currentTag == '常规作业') {
-            // 不做校验
-
-          }
-          else {
-            if (this.chooseWorkLists.length == 0) {
-              ElMessage.error('请先添加作业资源!');
-              return;
-            }
-          }
-
-          // 基础参数
-          let classWorkParams = {
-            id: this.currentTask.id,
-            uniquekey: this.classWorkForm.uniquekey,    // 更新[作业名称]
-            //title: classWorkForm.title,             // 更新[作业说明]
-          }
-          // 根据作业类型分类处理
-          if (this.currentTag=='习题训练'){
-            
-            // console.log(this.workConfObj.quizlist);
-            // console.log(this.currentTask);
-            // console.log(this.classWorkList);
-            
-            // 1.判断当前添加的作业是否与原来不同
-            let needUplEval = false;
-            if (this.classWorkForm.quizlist.length !== this.currentTask.entpcourseworklistarray.length) {
-              needUplEval = true;
-            }
-            else {
-              // 只要有一个不一致则说明需要更新
-
-              // for (let cur of this.classWorkForm.quizlist){
-              //   let isSame = false;
-              //   for (let last of this.currentTask.entpcourseworklistarray) {
-              //     if (last.id === cur.id && last.score === cur.score){
-              //       isSame = true;
-              //       break;
-              //     }
-              //   }
-              //   if (!isSame) {
-              //     needUplEval = true;
-              //     break;
-              //   }
-              // }
-              needUplEval = this.classWorkForm.quizlist.some(cur => 
-                !this.currentTask.entpcourseworklistarray.some(last => 
-                  last.id === cur.id && last.score === cur.score
-                )
-              );
-            }
-            
-            // 2.需要重新更新eval的数据
-            if (needUplEval) {
-              // 说明: 因试题分值也需修改, 故无法通过按钮的增长删除来处理, 故将原作业全部删除后再重新添加
-              // 2.1.先查询该workid下所有的id
-              let arrEvalids = [];
-              const wevalres = await listClassworkeval({'workid': this.currentTask.id});
-              wevalres.rows.forEach(element => {
-                arrEvalids.push(element.id);
-              });
-              const ids = arrEvalids.join(',');
-              
-              // 2.2.删除原作业
-              const delRes = await delClassworkeval(ids);
-
-              // 2.3.重新添加新作业
-              for(let i=0; i<this.classWorkForm.quizlist.length; i++){
-                const addRes = await addClassworkeval({
-                  'workid': this.currentTask.id,
-                  'entpcourseworkid': this.classWorkForm.quizlist[i].id,
-                  'workdataid': 0,
-                  'score': this.classWorkForm.quizlist[i].score}
-                );
-              }
-            }
-
-            // 3.更新作业任务信息
-            // const evalid = this.homeworkLesson.length==0 ? '' : this.homeworkLesson.length==1 ? this.homeworkLesson[0] : this.homeworkLesson[1];
-            // const formObj = {
-            //   id: this.currentTask.id,
-            //   uniquekey: this.classWorkForm.uniquekey,    // 更新[作业名称]
-            //   // warn: 这里需确认是否可支持修改当前作业任务更换单元章节
-            //   //evalid = evalid,        // 更新[作业范围]
-            // }
-            // let res = await updateClasswork(formObj);
-
-          }
-          else if (this.currentTag=='框架梳理') {
-            // 1.先查询该workid下所有的id
-            const wevalres = await listClassworkeval({'workid': this.currentTask.id});
-            if (wevalres.rows.length == 0) {
-              ElMessage.error('未找到原框架梳理任务，请或退出重试');
-              return;
-            }
-
-            // 2.更新作业任务下的框架梳理
-            let needUplEval = false;
-            if (this.chooseWorkLists.length !== this.currentTask.entpcourseworklistarray.length) {
-              needUplEval = true;
-            }
-            else {
-              // 只要有一个不一致则说明需要更新
-              needUplEval = this.chooseWorkLists.some(cur => 
-                !this.currentTask.entpcourseworklistarray.some(last => 
-                  last.id === cur.id && last.score === cur.score
-                )
-              );
-            }
-            if (needUplEval) {
-              const uplParams = {
-                id: wevalres.rows[0].id,
-                entpcourseworkid: this.chooseWorkLists[0].id,
-                score: this.chooseWorkLists[0].score,
-              }
-              let res = await updateClassworkeval(uplParams);
-            }
-
-          }
-          else if (this.currentTag=='课堂展示') {
-            
-
-          }
-          else if (this.currentTag=='常规作业') {
-            // 1.更新作业任务下的课堂展示内容 (这里未做校验, 直接将当前文件对象更新过去)
-            classWorkParams.workcodes = JSON.stringify(this.fileHomeworkList);
-          }
-
-          // 3.更新作业任务本身
-          let res = await updateClasswork(classWorkParams);
-          this.fileHomeworkList = [];
-          this.chooseWorkLists = [];
-          
-          // 4.操作完成后重新更新表单数据
-          //这里分离了，所以不需要更新表单数据了
-          // this.getClassWorkAllList();
-
-          this.classWorkForm.worktype = "习题训练";
-          this.newWorkSpace = false;
-          this.newWorkSpaceEdit = false;
-          this.workEdit = false;
-          return;
-        }
-
-        //
-        const { chapterId } = await useGetHomework(props.bookobj.node)
-        // this.entpcourseid = chapterId
-
-        if (classWorkForm.worktype === "课堂展示") {
-          this.boardLoading = true
-          let canvasJson = this.$refs.boardref.getCanvasJson()
-          let canvasBase64 = await this.$refs.boardref.getCanvasBase64()
-          var formObj = {};
-          formObj.id = 0;
-          formObj.workdate = this.classWorkForm.workdate;
-          formObj.deaddate = '';
-          formObj.entpid = this.userStore.deptId;
-          formObj.level = 1; 
-          formObj.parentid = 0;
-          formObj.worktype = this.classWorkForm.worktype;
-          formObj.workkey = '';
-          formObj.worktag = this.question;
-          formObj.uniquekey = this.classWorkForm.uniquekey;
-          formObj.classid = 0;
-          formObj.classcourseid = 0;
-          formObj.entpcourseid = chapterId;// 这个字段很特别 
-          formObj.slideid = 0;
-          formObj.title = this.classWorkForm.title;
-          formObj.workcodes = JSON.stringify({json: canvasJson, base64: canvasBase64});
-          formObj.edusubject = this.courseObj.edusubject;
-          formObj.evalid = this.courseObj.evalid;
-          formObj.edustage = this.userStore.edustage;
-          formObj.status = '10'; //2024-09-11 作业布置分离后的  新模版数据； 之前老版本为空
-          formObj.edituserid = this.userStore.id;
-          formObj.entpcourseworklist = JSON.stringify([{'id':-1, 'score': '10'}]);
-          try {
-            addClassworkReturnId(formObj).then(() => {
-              this.classWorkForm.worktype = "习题训练";
-              this.chooseWorkLists = [];
-              this.whiteboardObj = '';
-              // refresh the list
-              //这里分离了，所以不需要更新表单数据了
-              // this.getClassWorkAllList();
-              this.newWorkSpace = false;
-              this.newWorkSpaceEdit = false;
-              this.workEdit = false;
-            })
-          } finally {
-            this.boardLoading = false
-          }
-        } 
-        else if(classWorkForm.worktype === "常规作业"){
-          this.fileLoading = true
-          var formObj = {};
-          formObj.id = 0;
-          formObj.workdate = this.classWorkForm.workdate;
-          formObj.deaddate = '';
-          formObj.entpid = this.userStore.deptId;
-          formObj.level = 1;
-          formObj.parentid = 0;
-          formObj.worktype = this.classWorkForm.worktype;
-          formObj.workkey = '';
-          formObj.worktag = '';
-          formObj.uniquekey = this.classWorkForm.uniquekey;
-          formObj.classid = 0;
-          formObj.classcourseid = 0;
-          formObj.entpcourseid = this.courseObj.id;
-          formObj.slideid = 0;
-          formObj.title = this.classWorkForm.title;
-          formObj.workcodes = JSON.stringify(this.fileHomeworkList);
-          formObj.edusubject = this.courseObj.edusubject;
-          formObj.evalid = this.courseObj.evalid;
-          formObj.edustage = this.userStore.edustage;
-          formObj.status = '10'; //2024-09-11 作业布置分离后的  新模版数据； 之前老版本为空
-          formObj.edituserid = this.userStore.id;
-          formObj.entpcourseworklist = JSON.stringify([{'id':-2, 'score': '10'}]);
-          try {
-            addClassworkReturnId(formObj).then(() => {
-              this.classWorkForm.worktype = "习题训练";
-              this.chooseWorkLists = [];
-              this.fileHomeworkList = []
-              this.whiteboardObj = '';
-              // refresh the list
-              //这里分离了，所以不需要更新表单数据了
-              // this.getClassWorkAllList();
-              this.newWorkSpace = false;
-              this.newWorkSpaceEdit = false;
-              this.workEdit = false;
-            })
-          } finally {
-            this.fileLoading = false
-
-          }
-        }
-        else {
-          // 正常新任务
-          var ll = [];
-          if (classWorkForm.worktype === "习题训练") {
-            for (var i=0; i< classWorkForm.quizlist.length; i++) {
-              // 更新 题目分值
-              ll.push({'id': classWorkForm.quizlist[i].id, 'score': classWorkForm.quizlist[i].score});
-            }
-          }else {
-            // TODO 待定 非习题训练------------
-            // this.chooseWorkLists.filter((item, index) => {
-            //   if (item.worktype === this.classWorkForm.worktype) {
-            //     ll.push({'id':item.id, 'score': item.score});
-            //   }
-            // })
-          }
-          console.log(userStore,'userStoreuserStoreuserStore')
-          const cform = {
-            id: 0,
-            workdate: classWorkForm.workdate, // //作业类型？web端这里貌似没有这个时间
-            deaddate: '', // 截止时间
-            entpid: userStore.deptId, //
-            level: 1,
-            parentid: 0,
-            worktype: classWorkForm.worktype, // 作业类型
-            workkey: '',
-            worktag: '',
-            uniquekey: classWorkForm.uniquekey,// 作业名称、编码
-            classid: 0,
-            classcourseid: 0,
-            entpcourseid: chapterId, // 这个字段很特别 
-            slideid: 0,
-            title: classWorkForm.title, // 作业说明？
-            workcodes: JSON.stringify(classWorkForm.workcodes), // 作业内容？
-            edusubject: userStore.edusubject, // 学科  语文 数学    
-            evalid: props.bookobj.levelSecondId, //userStore.evalid, // // 单元下的课ID
-            edustage: userStore.edustage, // 学段 年纪 高中,初中,小学
-            status: '10', //2024-09-11 作业布置分离后的  新模版数据； 之前老版本为空
-            edituserid: userStore.userId, // 当前用户id
-          };
-          
-          if (ll.length > 0) {
-            cform.entpcourseworklist = JSON.stringify(ll);
-          } else {
-            cform.entpcourseworklist = '';
-          }
-
-          if(cform.entpcourseworklist == '') return ElMessage({ type: 'warning', message: '请先添加作业资源!'});
-          console.log(cform,'提交的数据');
-          addClassworkReturnId(cform).then(workres => {
-            ElMessage({ type: 'success', message: '作业设计成功!'});
-            // 重置提交表单
-            classWorkForm.worktype = "习题训练";
-            classWorkForm.uniquekey = props.uniquekey, // 作业唯一标识 作业名称
-            classWorkForm.title = "";
-            classWorkForm.quizlist = [], // 作业习题列表内容
-
-            // 情况选择的资源缓存
-            chooseWorkLists.value = [];
-            whiteboardObj.value = ''; // ? // 清空白板
-            // refresh the list
-            //这里分离了，所以不需要更新表单数据了
-            // this.getClassWorkAllList();
-
-            // TODO 后续看是否跳转到 作业布置页面
-
-            //TODO 下面3个后续看是啥
-            // this.newWorkSpace = false;
-            // this.newWorkSpaceEdit = false;
-            // this.workEdit = false;
-          })
-        }
-      }
-    }
-  });
-};
-
 onMounted(() => {
-})
-
-
-watch(() => props.bookobj.levelSecondId, (newVal) => {
-  console.log(props.bookobj,'课程选择')
-  queryForm.eid = props.bookobj.levelSecondId,
-  queryForm.sectionName = props.bookobj.coursetitle,
   handleQueryFromEntpCourseWork(0);
 })
+
+
+// watch(() => sourceStore.query.fileSource,() => {
+//   sourceStore.query.fileSource === '第三方'?isThird.value = true:isThird.value = false
+// })
 </script>
 
 <style lang="scss" scoped>
 .page-typeview{
-  // padding-top: 10px;
+  padding-top: 10px;
   height: 100%;
 
-  .container {
-    display: flex;
-    flex-direction: column;
-    height: 100%; 
-  }
-
-  .top, .bottom {
-      flex: 0 0 auto; 
-  }
-
-  .middle {
-    flex: 1; 
-    height: 100%;
-    overflow: hidden;
-  }
-
-
   .el-form-work-list{
-    height: 100%;
-    margin-bottom: 0px;
-    overflow: hidden;
-
     :deep(.el-form-item__content){
       align-items: normal;
     }
 
     .work-left{
-      height: 100%;
+      height: 50vh;
       background-color: white;
       padding-right: 0;
       padding-left: 0;
       border:1px dotted blue;
       border-radius:5px;
-      overflow: hidden;
-    }
-
-    .work-right {
-      height: 100%;
-      padding: 0 0 0 5px; 
-      overflow: auto; 
-      line-height: 26px;
-      overflow: hidden;
     }
 
 

src/renderer/src/views/classTask/newClassTask.vue

@@ -1,19 +1,19 @@
 <template>
-  <div class="page-newcalsetask flex">
+  <div class="page-resource flex">
     <el-menu
       default-active="1"
       class="el-menu-vertical-demo"
       :collapse="isCollapse"
     >
       <!--左侧 教材 目录-->
-      <div v-if="!isCollapse" style="height: 100%;overflow: hidden;"> 
+      <div v-if="!isCollapse"> 
         <ChooseTextbook @change-book="getData" @node-click="getData" />
       </div>
     </el-menu>
 
     <div class="page-right" :style="{'margin-left': isCollapse ? '0' : '20px'}">
       <!-- 标题 -->
-      <el-row style="align-items: center; margin-bottom: 0px; flex: 0 0 auto">
+      <el-row style="align-items: center; margin-bottom: 0px">
         <el-col :span="12" style="padding-left: 20px; text-align: left;">
           <div class="unit-top-left" @click="isCollapse = !isCollapse">
             <i v-if="!isCollapse" class="iconfont icon-xiangzuo"></i>
@@ -30,7 +30,7 @@
         </el-col>
       </el-row>
       <!-- 作业类型:内容 -->
-      <task-type-view :bookobj="courseObj" :uniquekey="classWorkForm.uniquekey" style="flex: 1; overflow: hidden;"/>
+      <task-type-view :bookobj="courseObj" />
     </div>
   </div>
 </template>
@@ -72,7 +72,6 @@ const courseObj = reactive({
   levelFirstId: '',
   levelSecondId: '',
   coursetitle:'',
-  node: null, // 选择的课程节点
   //
 })
 
@@ -96,7 +95,6 @@ const getData = (data) => {
   courseObj.levelFirstId = levelFirstId  // 单元
   courseObj.levelSecondId = levelSecondId // 章节
   courseObj.coursetitle = node.itemtitle  // (单元/章节) 名称
-  courseObj.node = node; // 保存当前节点
 
   // 头部 教材分析打开外部链接需要当前章节ID
   localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId}))
@@ -118,10 +116,9 @@ const init = () => {
 </script>
 
 <style lang="scss" scoped>
-.page-newcalsetask {
+.page-resource {
   padding-top: 10px;
   height: 100%;
-  overflow: hidden;
 
   .el-menu--collapse {
     width: 0px;

src/renderer/src/views/desktop/index.vue

@@ -106,9 +106,9 @@ const menuList = [{
       {
         name: '作业设计',
         icon: 'icon-jiaoxuefansi',
-        // isOuter: true,
+        isOuter: true,
-        //path: '/teaching/classtaskassign?titleName=作业布置&openDialog=newClassTask'
+        path: '/teaching/classtaskassign?titleName=作业布置&openDialog=newClassTask'
-        path: '/newClassTask'
+        //path: '/newClassTask'
         //path: '/classTaskAssign'
         //isOuter: true,
         //path: '/teaching/classtaskassign?titleName=作业布置&&openDialog=newClassTask'

src/renderer/src/views/tool/sphere.vue

@@ -243,6 +243,7 @@ const sideChange = async o => {
 
 // === 监听器 ===
 watchEffect(() => {
+  if (isOver.value) return // 下课, 不往下执行
   // 不同的时候, 更新值: 是否显示-画板
   const show = !toolStore.isPdfWin && toolStore.showBoardAll
   if (show != isShow.value) isShow.value = show

src/renderer/src/views/tool/test.vue

@@ -1,9 +1,15 @@
 <template>
-  <canvas ref="canvasRef" />
+  <canvas ref="canvasRef" style="pointer-events: none;" />
-  <button @click="eraseTo">橡皮擦
+  <div style="position: absolute;top: 0;" @click="test('click')"
-    <i class="iconfont icon-xiangpica"></i>
+  @mouseenter="test('mouseenter')" @mousemove="test('mousemove')" @mouseleave="test('mouseleave')"
-  </button>
+  @touchstart="test('touchstart')" @touchmove="test('touchmove')" @touchend="test('touchend')"
-  <button @click="close">销毁</button>
+  @touchcancel="test('touchcancel')" @mousedown="test('mousedown')" @mouseup="test('mouseup')"
+  @mouseout="test('mouseout')" @mouseover="test('mouseover')" @mousewheel="test('mousewheel')">
+    <!-- <button @click="eraseTo">橡皮擦</button> -->
+    <!-- <i class="iconfont icon-xiangpica"></i> -->
+    <!-- <button @click="close">销毁</button> -->
+    <div style="width: 100px;height: 100px;background: #ffbcbc;">小星星</div>
+  </div>
 </template>
 
 <script setup>
@@ -43,6 +49,10 @@ const eraseTo = () => { // 橡皮擦
   // canvas.dispose()
 }
 const close = () => { FabricVue.removeCanvas() }
+
+const test = (key, e) => {
+  console.log('event: ', key)
+}
 </script>
 
 <style lang="scss" scoped>