From def9433647c3dc364bb1cc204d4b021bb276f636 Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Thu, 21 Nov 2024 13:52:17 +0800
Subject: [PATCH 1/5] =?UTF-8?q?PPTist=E6=8E=A5=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/index.html b/src/renderer/index.html
index 1de810c..32958a9 100644
--- a/src/renderer/index.html
+++ b/src/renderer/index.html
@@ -8,7 +8,7 @@
       http-equiv="Content-Security-Policy"
       content="default-src 'self'; script-src 'self'; style-src 'self' 'unsafe-inline'; img-src 'self' data:"
     /> -->
-    <meta http-equiv="Content-Security-Policy" content="connect-src *; default-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src *;img-src * 'self' data: blob:" />
+    <meta http-equiv="Content-Security-Policy" content="connect-src *; default-src 'self'; script-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src * blob:;img-src * 'self' data: blob:" />
 
   </head>
 

From 2511a6cc3212ec3ce2faccfa40943f6fd9fde5be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Czouyf=E2=80=9D?= <80906036@qq.com>
Date: Thu, 21 Nov 2024 15:02:40 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9F=A5=E6=89=BE?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/api/file/img.js              | 42 +++++++++
 .../src/components/tinymce/tinymce.vue        | 91 +++++++++++--------
 .../newClassTaskAssign/myQuestion/index.vue   |  1 +
 .../questionUpload/quesItem/index.vue         | 81 ++---------------
 .../searchQuestion/index.vue                  |  4 +-
 .../Details/classroomPresentation/index.vue   |  8 +-
 6 files changed, 113 insertions(+), 114 deletions(-)
 create mode 100644 src/renderer/src/api/file/img.js

diff --git a/src/renderer/src/api/file/img.js b/src/renderer/src/api/file/img.js
new file mode 100644
index 0000000..6d833e9
--- /dev/null
+++ b/src/renderer/src/api/file/img.js
@@ -0,0 +1,42 @@
+import request from '@/utils/request'
+
+// 新增图片存eos
+export function saveUploadFile(data) {
+  return request({
+    url: '/education/uploadfile/saveUploadFile',
+    method: 'post',
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    },
+    data: data
+  })
+}
+
+// 新增批量图片存eos
+export function saveUploadFiles(data) {
+  return request({
+    url: '/education/uploadfile/saveUploadFiles',
+    method: 'post',
+    headers: {
+      'Content-Type': 'multipart/form-data'
+    },
+    data: data
+  })
+}
+
+// 修改basecomment
+export function updateUploadFile(data) {
+  return request({
+    url: '/education/uploadfile',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除basecomment
+export function delUploadFile(id) {
+  return request({
+    url: '/education/uploadfile/' + id,
+    method: 'delete'
+  })
+}
\ No newline at end of file
diff --git a/src/renderer/src/components/tinymce/tinymce.vue b/src/renderer/src/components/tinymce/tinymce.vue
index 30b84ca..4c74536 100644
--- a/src/renderer/src/components/tinymce/tinymce.vue
+++ b/src/renderer/src/components/tinymce/tinymce.vue
@@ -46,7 +46,8 @@ import "tinymce/plugins/anchor"; //锚点
 
 import { ref, reactive, defineProps, defineEmits, nextTick, onMounted, computed, watch } from 'vue'
 import { getStaticUrl } from '@/utils/tool'
-//import { listUploadfile, getUploadFile, delUploadFile, addUploadFile, saveUploadFile } from "@/api/comm/uploadfile";
+import useUserStore from '@/store/modules/user'
+import { saveUploadFile } from "@/api/file/img";
  
 const emits = defineEmits(["update:modelValue", "setHtml"]);
 //这里我选择将数据定义在props里面，方便在不同的页面也可以配置出不同的编辑器，当然也可以直接在组件中直接定义
@@ -107,6 +108,8 @@ const props = defineProps({
     default: () => ({ userId: 0, fileAlias: '单题上传' }),
   },
 });
+
+const userStore = useUserStore().user;
  
 const pasteImgName = ref('');
 const uploadUrl = ref(import.meta.env.VITE_APP_BASE_API + "/common/upload"); // 上传的图片服务器地址
@@ -212,29 +215,31 @@ const init = reactive({
 
   // 插入/编辑图片(普通) - 因此处上传可传图片和文件故仅参考, 实际以[images_upload_handler]这个为准
   file_picker_callback: function(callback, value, meta) {
+    return;
+
     //文件分类
-    let filetype='.pdf, .txt, .zip, .rar, .7z, .doc, .docx, .xls, .xlsx, .ppt, .pptx, .mp3, .mp4';
-    let upURL = '/common/upload';
-    //为不同插件指定文件类型及后端地址
-    switch(meta.filetype){
-      case 'image':
-          filetype='.jpg, .jpeg, .png, .gif';
-          //upURL='upimg.php';
-          break;
-      case 'media':
-          filetype='.mp3, .mp4';
-          //upURL='upfile.php';
-          break;
-      case 'file':
-      default:
-    }
+    // let filetype='.pdf, .txt, .zip, .rar, .7z, .doc, .docx, .xls, .xlsx, .ppt, .pptx, .mp3, .mp4';
+    // let upURL = '/common/upload';
+    // //为不同插件指定文件类型及后端地址
+    // switch(meta.filetype){
+    //   case 'image':
+    //       filetype='.jpg, .jpeg, .png, .gif';
+    //       //upURL='upimg.php';
+    //       break;
+    //   case 'media':
+    //       filetype='.mp3, .mp4';
+    //       //upURL='upfile.php';
+    //       break;
+    //   case 'file':
+    //   default:
+    // }
 
-    // 模拟出一个input用于添加本地文件
-    let input = document.createElement('input');
-    input.setAttribute('type', 'file');
-    input.setAttribute('accept', filetype);
+    // // 模拟出一个input用于添加本地文件
+    // let input = document.createElement('input');
+    // input.setAttribute('type', 'file');
+    // input.setAttribute('accept', filetype);
 
-    // 暂时屏蔽
+    // // 暂时屏蔽
     // input.onchange = function() {
     //   const file = this.files[0];
     //   const formData = new FormData();
@@ -250,7 +255,7 @@ const init = reactive({
     //   });
     // };
 
-    input.click();
+    // input.click();
   },
 
   // 插入/编辑图片(上传)
@@ -278,22 +283,25 @@ const init = reactive({
       formData.append("entpcourseid", 0);
       formData.append("filetype", "image");
       formData.append("suffix", "image");
-      formData.append("status", '0');
-      if(props.upFileParams?.hasOwnProperty('deptId')){
-        formData.append("entpid", props.upFileParams.deptId);
+      formData.append("status", '1');
+      if(userStore.deptId && userStore.deptId != null){
+        formData.append("entpid", userStore.deptId);
       }
-      if(props.upFileParams?.hasOwnProperty('userId')){
-        formData.append("userid", props.upFileParams.userId);
+      if(userStore.userId && userStore.userId != null){
+        formData.append("userid", userStore.userId);
       }
-      if(props.upFileParams?.hasOwnProperty('edudegree')){
-        let edudegree = props.upFileParams.edudegree.toString();
+      if(userStore.edudegree && userStore.edudegree != null){
+        let edudegree = userStore.edudegree.toString();
         if(edudegree != '' && edudegree.indexOf('年级') == -1){
           edudegree += '年级';
         }
         formData.append("edudegree", edudegree);
       }
-      if(props.upFileParams?.hasOwnProperty('edusubject')){
-        formData.append("edusubject", props.upFileParams.edusubject);
+      if(userStore.edusubject && userStore.edusubject != null){
+        formData.append("edusubject", userStore.edusubject);
+      }
+      if(userStore.edustage && userStore.edustage != null){
+        formData.append("edustage", userStore.edustage);
       }
       if(props.upFileParams?.hasOwnProperty('lessionId')){
         formData.append("evalid", props.upFileParams.lessionId);
@@ -301,19 +309,22 @@ const init = reactive({
       if(props.upFileParams?.hasOwnProperty('fileAlias')){
         formData.append("filegroup", props.upFileParams.fileAlias);
       }
+      
 
       loading.value = true;
+      console.log('formData->', formData);
       
       // 暂时屏蔽
-      // saveUploadFile(formData)
-      //   .then((res) => {
-      //     loading.value = false;
-      //     return resolve(res.fileurl);
-      //   })
-      //   .catch((err) => {
-      //     loading.value = false;
-      //     return reject('err:' + err);
-      // });
+      saveUploadFile(formData)
+        .then((res) => {
+          console.log('res->', res);
+          loading.value = false;
+          return resolve(res.fileurl);
+        })
+        .catch((err) => {
+          loading.value = false;
+          return reject('err:' + err);
+      });
     }
   ),
 
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
index 4661abe..9689f4f 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
@@ -94,6 +94,7 @@
   </div>
 </template>
 <script setup>
+import { Search } from '@element-plus/icons-vue'
 import { onMounted, ref,watch, reactive, getCurrentInstance,nextTick } from 'vue'
 import { useRouter, useRoute } from 'vue-router'
 
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 03c24ee..f6a8674 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue
@@ -67,18 +67,13 @@
     <div class="questForm-item-cover">
       <el-form-item :label="questForm.worktype == '复合题' ? '背景材料' : questForm.worktype == '主观题' ? '背景资料' : '题目'" prop="title">
         <Tinymce v-model="questForm.title" :upFileParams="{
-            deptId: userStore.deptId,
-            userId: userStore.userId,
-            edudegree: userStore.edudegree,
-            edusubject: userStore.edusubject,
             lessionId: lessionid,
             fileAlias: '单题上传',
           }" 
         />
       </el-form-item>
       <div class="item-cropper-btn">
-        <!-- <el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('title')"></el-button> -->
-        <el-button v-show="isCropper" circle @click="cropperFormItem('title')">识别</el-button>
+        <el-button v-show="isCropper" circle @click="cropperFormItem('title')"><el-icon><Search /></el-icon></el-button>
       </div>
     </div>
     
@@ -88,10 +83,6 @@
         <el-form-item :label=Options(1,index) :prop="`list.${index}.text`"
           :rules="{required: true, message: '选项不能为空', trigger: 'blur'}">
           <Tinymce v-model="item.text" :minHeight="150" :upFileParams="{
-              deptId: userStore.deptId,
-              userId: userStore.userId,
-              edudegree: userStore.edudegree,
-              edusubject: userStore.edusubject,
               lessionId: lessionid,
               fileAlias: '单题上传',
             }" />
@@ -107,8 +98,7 @@
         </el-form-item>
       </div>
       <div class="item-cropper-btn">
-        <!-- <el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('workdesc')"></el-button> -->
-        <el-button v-show="isCropper" circle @click="cropperFormItem('workdesc')">识别</el-button>
+        <el-button v-show="isCropper" circle @click="cropperFormItem('workdesc')"><el-icon><Search /></el-icon></el-button>
       </div>
     </div>
 
@@ -124,10 +114,6 @@
             v-model="item.text" 
             :minHeight="150" 
             :upFileParams = "{
-              deptId: userStore.deptId,
-              userId: userStore.userId,
-              edudegree: userStore.edudegree,
-              edusubject: userStore.edusubject,
               lessionId: lessionid,
               fileAlias: '单题上传',
             }" />
@@ -143,8 +129,7 @@
         </el-form-item>
       </div>
       <div class="item-cropper-btn">
-        <!-- <el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('workdesc')"></el-button> -->
-        <el-button v-show="isCropper" circle @click="cropperFormItem('workdesc')">识别</el-button>
+        <el-button v-show="isCropper" circle @click="cropperFormItem('workdesc')"><el-icon><Search /></el-icon></el-button>
       </div>
     </div>
 
@@ -154,10 +139,6 @@
         <el-form-item :label=Options(3,index) :prop="`list.${index}.text`"
           :rules="{required: true, message: '填空选项不能为空', trigger: 'blur'}">
           <Tinymce v-model="item.text" :minHeight="150" :upFileParams="{
-              deptId: userStore.deptId,
-              userId: userStore.userId,
-              edudegree: userStore.edudegree,
-              edusubject: userStore.edusubject,
               lessionId: lessionid,
               fileAlias: '单题上传',
             }" />
@@ -172,8 +153,7 @@
         </el-form-item>
       </div>
       <div class="item-cropper-btn">
-        <!-- <el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('workdesc')"></el-button> -->
-        <el-button v-show="isCropper" circle @click="cropperFormItem('workdesc')">识别</el-button>
+        <el-button v-show="isCropper" circle @click="cropperFormItem('workdesc')"></el-button>
       </div>
     </div>
 
@@ -200,17 +180,12 @@
     <div v-if="questForm.worktype.indexOf('主观题') != -1" class="questForm-item-cover">
       <el-form-item label="答案">
         <Tinymce v-model="questForm.workanswer" :upFileParams="{
-            deptId: userStore.deptId,
-            userId: userStore.userId,
-            edudegree: userStore.edudegree,
-            edusubject: userStore.edusubject,
             lessionId: lessionid,
             fileAlias: '单题上传',
           }" />
       </el-form-item>
       <div class="item-cropper-btn">
-        <!-- <el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('workanswer')"></el-button> -->
-        <el-button v-show="isCropper" circle @click="cropperFormItem('workanswer')">识别</el-button>
+        <el-button v-show="isCropper" circle @click="cropperFormItem('workanswer')"><el-icon><Search /></el-icon></el-button>
       </div>
 
       <!-- subjList -->
@@ -287,10 +262,6 @@
         <el-form-item :label="`${item.type}目${index+1}.`" :prop="`mulList.params.${index}.title`" :rules="{
             required: true, message: '题目不能为空', trigger: 'blur'}" :key='index'>
             <Tinymce v-model="item.title" :minHeight="150" :upFileParams="{
-                deptId: userStore.deptId,
-                userId: userStore.userId,
-                edudegree: userStore.edudegree,
-                edusubject: userStore.edusubject,
                 lessionId: lessionid,
                 fileAlias: '单题上传',
               }"
@@ -302,10 +273,6 @@
             <el-form-item :label=Options(1,indexOp) :prop="`mulList.params.${index}.options.${indexOp}.text`"
                 :rules="{ required: true, message: '单题不能为空', trigger: 'blur' }" :key='indexOp'>
               <Tinymce v-model="itemOp.text" :minHeight="150" :upFileParams="{
-                    deptId: userStore.deptId,
-                    userId: userStore.userId,
-                    edudegree: userStore.edudegree,
-                    edusubject: userStore.edusubject,
                     lessionId: lessionid,
                     fileAlias: '单题上传',
                   }" 
@@ -326,10 +293,6 @@
             <el-form-item :label=Options(3,indexOp) :prop="`mulList.params.${index}.options.${indexOp}.text`"
                 :rules="{required: true, message: '填空选项不能为空', trigger: 'blur'}">
               <Tinymce v-model="itemOp.text" :minHeight="150" :upFileParams="{
-                    deptId: userStore.deptId,
-                    userId: userStore.userId,
-                    edudegree: userStore.edudegree,
-                    edusubject: userStore.edusubject,
                     lessionId: lessionid,
                     fileAlias: '单题上传',
                   }" 
@@ -350,10 +313,6 @@
             <el-form-item :label=Options(1,indexOp) :prop="`mulList.params.${index}.options.${indexOp}.text`"
               :rules="{required: true, message: '多选不能为空', trigger: 'blur'}">
               <Tinymce v-model="itemOp.text" :minHeight="150" :upFileParams="{
-                  deptId: userStore.deptId,
-                  userId: userStore.userId,
-                  edudegree: userStore.edudegree,
-                  edusubject: userStore.edusubject,
                   lessionId: lessionid,
                   fileAlias: '单题上传',
                 }"
@@ -384,10 +343,6 @@
           <div v-if="item.type == '主观题'">
             <el-form-item :label=Options(6,indexOp) :prop="`mulList.params.${index}.options.${indexOp}.text`">
               <Tinymce v-model="itemOp.text" :upFileParams="{
-                  deptId: userStore.deptId,
-                  userId: userStore.userId,
-                  edudegree: userStore.edudegree,
-                  edusubject: userStore.edusubject,
                   lessionId: lessionid,
                   fileAlias: '单题上传',
                 }" />
@@ -403,17 +358,12 @@
         <Tinymce 
           v-model="questForm.method" 
           :upFileParams = "{
-            deptId: userStore.deptId,
-            userId: userStore.userId,
-            edudegree: userStore.edudegree,
-            edusubject: userStore.edusubject,
             lessionId: lessionid,
             fileAlias: '单题上传',
           }" />
       </el-form-item>
       <div class="item-cropper-btn">
-        <!-- <el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('method')"></el-button> -->
-        <el-button v-show="isCropper" circle @click="cropperFormItem('method')">识别</el-button>
+        <el-button v-show="isCropper" circle @click="cropperFormItem('method')"><el-icon><Search /></el-icon></el-button>
       </div>
     </div>
 
@@ -422,17 +372,12 @@
       <el-form-item label="答案解答" prop="analyse">
         <Tinymce v-model="questForm.analyse" 
           :upFileParams = "{
-            deptId: userStore.deptId,
-            userId: userStore.userId,
-            edudegree: userStore.edudegree,
-            edusubject: userStore.edusubject,
             lessionId: lessionid,
             fileAlias: '单题上传',
           }" />
       </el-form-item>
       <div class="item-cropper-btn">
-        <!-- <el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('analyse')"></el-button> -->
-        <el-button v-show="isCropper" circle @click="cropperFormItem('analyse')">识别</el-button>
+        <el-button v-show="isCropper" circle @click="cropperFormItem('analyse')"><el-icon><Search /></el-icon></el-button>
       </div>
     </div>
     
@@ -441,17 +386,12 @@
       <el-form-item label="答案点评" prop="discuss">
         <Tinymce v-model="questForm.discuss" 
           :upFileParams = "{
-            deptId: userStore.deptId,
-            userId: userStore.userId,
-            edudegree: userStore.edudegree,
-            edusubject: userStore.edusubject,
             lessionId: lessionid,
             fileAlias: '单题上传',
           }" />
       </el-form-item>
       <div class="item-cropper-btn">
-        <!-- <el-button v-show="isCropper" circle icon="Search" @click="cropperFormItem('discuss')"></el-button> -->
-        <el-button v-show="isCropper" circle @click="cropperFormItem('discuss')">识别</el-button>
+        <el-button v-show="isCropper" circle @click="cropperFormItem('discuss')"><el-icon><Search /></el-icon></el-button>
       </div>
     </div>
   
@@ -465,6 +405,7 @@
 </template>
 <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 { getBindlist } from '@/api/education/knowledgePoint'
@@ -658,10 +599,6 @@ const loading = ref(false);
 onMounted(() => {
   lessionid.value = props.bookobj.levelSecondId? props.bookobj.levelSecondId : props.bookobj.levelFirstId; // 获取课程id
   upFileParams.value = {
-    deptId: userStore.deptId,
-    userId: userStore.userId,
-    edudegree: userStore.edudegree,
-    edusubject: userStore.edusubject,
     lessionId: lessionid,
     fileAlias: '单题上传',
   };
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/searchQuestion/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/searchQuestion/index.vue
index 8b93d47..5fc2515 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/searchQuestion/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/searchQuestion/index.vue
@@ -52,7 +52,7 @@
         </el-form-item>
       </el-col>
       <el-col :span="5">
-        <el-button @click="handleQueryParamFromEntpCourseWork(1)"><el-icon><Search /></el-icon> 查找</el-button>
+        <el-button @click="handleQueryParamFromEntpCourseWork(1)"><el-icon><Search /></el-icon>查找</el-button>
       </el-col>
     </el-row>
     <!-- 习题表格 -->
@@ -102,6 +102,8 @@
   </div>
 </template>
 <script setup>
+import { Search } from '@element-plus/icons-vue'
+
 import { onMounted, ref,watch, reactive, getCurrentInstance,nextTick } from 'vue'
 
 import {listEntpcoursework, listEntpcourseworkNew, getEntpcoursework} from '@/api/education/entpCourseWork'
diff --git a/src/renderer/src/views/job-management/Details/classroomPresentation/index.vue b/src/renderer/src/views/job-management/Details/classroomPresentation/index.vue
index 93bde32..4c9e6d2 100644
--- a/src/renderer/src/views/job-management/Details/classroomPresentation/index.vue
+++ b/src/renderer/src/views/job-management/Details/classroomPresentation/index.vue
@@ -2,7 +2,13 @@
 	<div>
 		<div class="form-item-cover">
 			<el-form-item label="答案点评" prop="discuss">
-				<tinymce v-model="discuss"/>
+				<tinymce 
+					v-model="discuss" 
+					:upFileParams="{
+            lessionId: 123456,
+            fileAlias: '单题上传',
+          }" 
+				/>
 			</el-form-item>
 		</div>
 	</div>

From d25f2521a65ede71e9d7872cb5d097e3dfe52759 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com>
Date: Thu, 21 Nov 2024 15:06:44 +0800
Subject: [PATCH 3/5] 1

---
 .../newClassTaskAssign/myQuestion/index.vue   | 88 ++++++++++++++++++-
 .../questionUpload/quesItem/index.vue         |  1 +
 2 files changed, 86 insertions(+), 3 deletions(-)

diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
index 4661abe..96d8dbf 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div  class="page">
+  <div  class="page-myquest">
     <!-- 习题筛选1 -->
     <el-row style="width: 100%; height: 50px;">
       <el-col :span="7">
@@ -72,7 +72,9 @@
           <template #default="scope">
             <div> 
               <el-button type="primary" @click="handleClassWorkQuizAdd('entpcourseworklist', scope.row.id)">添加</el-button>
-              <div style="padding: 5px;"></div>
+              <div style="padding: 2px;"></div>
+              <el-button type="warning" @click="handleImportSingleDlg(scope.row)">纠错</el-button>
+              <div style="padding: 2px;"></div>
               <el-button type="danger" @click="handleDelete(scope.row, scope.$index)">删除</el-button>
             </div>
           </template>
@@ -91,6 +93,23 @@
     </div>
     <!-- 试题详细信息 -->
     <examDetailsDrawer ref="examDetailsDrawerRef"></examDetailsDrawer>
+    <!-- 单题上传的对话框/ 纠错对话框 close-on-click-modal|close-on-press-escape 避免误点dialog区域外，导致白填入大量题目内容-->
+    <el-dialog 
+      v-model="dlgImportSingle.open"
+      :title="dlgImportSingle.title"  
+      append-to-body
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"  
+      style="width: 70%; height: 80%; overflow: hidden"
+    >
+      <QuesItem 
+        ref="refquesItem" 
+        :bookobj="props.bookobj" 
+        @submit-exam-single-callback="onSubmitExamSingleCallback"
+        @cancel-exam-single-callback="onCancelExamSingleCallback"
+        >
+      </QuesItem>
+    </el-dialog>
   </div>
 </template>
 <script setup>
@@ -102,6 +121,7 @@ import { listEvaluationclue } from '@/api/classTask'
 import { delEntpcoursework } from "@/api/education/entpCourseWork";
 
 import examDetailsDrawer from '@/components/exam-question/examDetailsDrawer.vue'
+import QuesItem from "@/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue";
 import { useHandleData }  from "@/hooks/useHandleData";
 import { processList } from '@/hooks/useProcessList'
 
@@ -190,6 +210,11 @@ const workResource = reactive({
   entpCourseWorkTotal: 0, // 习题总数
 }); // 作业资源
 
+const dlgImportSingle = reactive({
+  title: '单题上传',
+  open: false,
+})
+
 onMounted(() => {
   debounceQueryData(); // 查询习题列表
 })
@@ -356,6 +381,44 @@ const getPaginationList = ( page, limit ) => {
   handleQueryFromEntpCourseWork(0);
 }
 
+/** 单题上传弹出框----纠错修改框 */
+const handleImportSingleDlg=(item, index) => {
+  dlgImportSingle.open = true;
+  // 获取单元科目数据
+  // this.handleImportSingle();
+  //console.log("单题上传")
+  if (item == '{}') {
+    // 新增
+    //重置表单
+    proxy.$nextTick(() => {
+      proxy.$refs.refquesItem.resetForm();
+    })
+    dlgImportSingle.title = "单题上传";
+  } else {
+    //赋值表单
+    proxy.$nextTick(() => {
+      item.status = '1';
+      proxy.$refs.refquesItem.updateForm(item, index, 1);
+    })
+    dlgImportSingle.title = "纠错上传";
+  }
+}
+// 取消
+const onCancelExamSingleCallback=()=>{
+  // 关闭弹窗
+  dlgImportSingle.open = false;
+};
+/** 单题上传/纠错 完成后的回调 */
+const onSubmitExamSingleCallback=(callback) =>{
+  if (callback.submitType !== 1) {
+    console.log('999-999');
+    return;
+  }
+  // 刷新列表
+  debounceQueryData();
+  // 关闭弹窗
+  dlgImportSingle.open = false;
+};
 
 /** 删除题目按钮操作 */
 const handleDelete = async(item, index) => {
@@ -413,7 +476,7 @@ watch(() => props.bookobj.levelSecondId, (newVal, oldVal) => {
 
 </script>
 <style scoped lang="scss">
-.page {
+.page-myquest {
   height: 100%;
   display: flex;
   flex-direction: column;
@@ -422,7 +485,26 @@ watch(() => props.bookobj.levelSecondId, (newVal, oldVal) => {
     width: 100%;
     height: calc(100% - 100px);
   }
+
+  // :deep(.el-dialog .question-dialog){
+  //   height: 80vh !important;
+  //   width: 80% !important;
+  //   overflow: hidden !important;
+
+  // }
+  // .el-dialog .question-dialog{
+  //   height: 80vh !important;
+  //   width: 80% !important;
+  //   overflow: hidden !important;
+ 
+    
+  // }
 }
+// .question-dialog{
+//   width: 80% !important;
+
+// }
+
 
 </style>
 <style src="@/assets/styles/JYStyle.css"></style>
\ No newline at end of file
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 03c24ee..629991f 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/questionUpload/quesItem/index.vue
@@ -1733,6 +1733,7 @@ watch(() => props.bookobj.levelSecondId, (newVal, oldVal) => {
 // 暴露给父组件的参数和方法(外部需要什么，都可以从这里暴露出去)
 defineExpose({
   updateForm,
+  resetForm,
   cropperFormItemCallBack,
 })
 </script>

From 14bfef69032b6622091762d8f234649f090079ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=99=BD=E4=BA=86=E4=B8=AA=E7=99=BD?= <543593352@qq.com>
Date: Thu, 21 Nov 2024 15:30:55 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E9=A2=98=E5=BA=93?=
 =?UTF-8?q?=EF=BC=9A=E9=A2=98=E7=9B=AE=E6=96=B0=E5=A2=9E=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../newClassTaskAssign/myQuestion/index.vue   | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
index d142d03..1c1ff42 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/myQuestion/index.vue
@@ -93,14 +93,15 @@
     </div>
     <!-- 试题详细信息 -->
     <examDetailsDrawer ref="examDetailsDrawerRef"></examDetailsDrawer>
-    <!-- 单题上传的对话框/ 纠错对话框 close-on-click-modal|close-on-press-escape 避免误点dialog区域外，导致白填入大量题目内容-->
+    <!-- 单题上传的对话框/ 纠错对话框 close-on-click-modal|close-on-press-escape 避免误点dialog区域外，导致白填入大量题目内容 
+      style="width: 70%; height: 80%; overflow: hidden"-->
     <el-dialog 
       v-model="dlgImportSingle.open"
+      class="my-custom-dialog"
       :title="dlgImportSingle.title"  
       append-to-body
       :close-on-click-modal="false"
       :close-on-press-escape="false"  
-      style="width: 70%; height: 80%; overflow: hidden"
     >
       <QuesItem 
         ref="refquesItem" 
@@ -476,6 +477,17 @@ watch(() => props.bookobj.levelSecondId, (newVal, oldVal) => {
 })
 
 </script>
+<style>
+.my-custom-dialog{
+  width: 60% !important;
+  height: 77vh !important;
+  overflow: hidden !important;
+}
+.my-custom-dialog .el-dialog__body {
+  height: 90% !important;
+  overflow: auto !important;
+}
+</style>
 <style scoped lang="scss">
 .page-myquest {
   height: 100%;
@@ -505,7 +517,9 @@ watch(() => props.bookobj.levelSecondId, (newVal, oldVal) => {
 //   width: 80% !important;
 
 // }
-
+// :deep(.el-dialog) {
+//   width: 80% !important;
+// }
 
 </style>
 <style src="@/assets/styles/JYStyle.css"></style>
\ No newline at end of file

From 60f2790b0ca60ae329f76ee14109bbb951492d45 Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Thu, 21 Nov 2024 15:43:28 +0800
Subject: [PATCH 5/5] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/assets/images/borderstyle.png         | Bin 0 -> 1803 bytes
 .../src/assets/images/borderwidth.png         | Bin 0 -> 2051 bytes
 .../src/assets/images/mouse-pointer.png       | Bin 0 -> 6093 bytes
 .../src/components/whiteboard/whiteboard.vue  |  39 +++++++++----
 .../classTask/newClassTaskAssign/index.vue    |  52 ++++++++++--------
 5 files changed, 55 insertions(+), 36 deletions(-)
 create mode 100644 src/renderer/src/assets/images/borderstyle.png
 create mode 100644 src/renderer/src/assets/images/borderwidth.png
 create mode 100644 src/renderer/src/assets/images/mouse-pointer.png

diff --git a/src/renderer/src/assets/images/borderstyle.png b/src/renderer/src/assets/images/borderstyle.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ac9a18b48f0454d2a79819b1e20a6f9ffc7788e
GIT binary patch
literal 1803
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k4M?tyST_$yF%}28J29*~C-ahlf$gZLi(^Pd
z+}m4*e#+Sbt`FzUb$rHPbc6qQBM(#h2IF}S#`+tUNq#MroV_YvXh~+c>GwPTFC2Sx
zebcA>^6LM)bWUHr_0{<A|J(n5eylpZ_vsC%?9bV^zklpjn9c8c)ZusY)u%CnOCIgW
zzwbEV?HNDIjknkx{W@!F%^lAju6?_XW#<|@v8I?XMG%AIQ}C}3Vy|s{E1TxD@7^BK
z&Qf!x`qJbZaV7o}CeNFH_32ywY5kS5Ymzwxo=8-E-CXCnKE3LSTa!%d`kEOEPd)mh
zJtjQ<5$ez0bmxw3NWFOco9h3yxo^uC^}n8f{hPl3?0xI!%6Rtv`f<F`XTdDT1+tA-
z{WsoH73FAbU~pv0aC;`8aAM9nRbCDOm4>twKE|dqFQYDvN)Zf=#!$yH^KyQ6iF?yi
ze^&f`cwKi(-^{y3^WRszHH_4XsB=GN`2EIy8`*i^&%b%ybm!iFz0*aeZ4(wu=G^mk
zzWn<CYz+#N`&-}Ca|j%Xba=qc#8PM@pwMC5;NW&ZSmkkA76)S!k7m@F9tKCFyk%{`
zNSd(d=ow%nVM^W5J0W0@r1U|RvHsn=289o-j7=7DKw~8x6qFxuPAW7uZDDY16VXj`
zYfz9h4|e7dNb$Isl*Ym_DupXF5<(~3ef#(ICY|t`w<i1U1x48QoaxEjYtOFFz0dAw
zHotRH<2Ux~-b?<!8(k+%`n<1_)6q=X`sINvc@|5}?^mC)Sn_}0x?AYUre6^pMUkxn
zK!(Bz|CfiO*L*g4%2_1$?p~6t(2vadvr2w`S?<l}KjHHqmCry;<^BTx6Y^~<-@1Nh
z`FZX0m;YyP$?N2Al!0gegU9y(Q{C75$6p=$en0%$ybSs4_Uqrq&oiryx3-)l_4Q*v
z^GpZRW(RAge|PrAE@cW8Qt(jq-F-_?!DF`<>nat830||xwkkVJD4WU^;@O}u)#PoK
zdxOGTEzuQ|7#y`SZ(Z$UaJ&_&6`;!46mn_HYFWmnEvrKocrmf81eSx=Oe~q<D;=h?
za0Gc?URTD#acNypqZX&Yl1a;A-*N~n8SWOY;o7u&XSIdL?|nL_kH6;MpVwG)=FPO<
zHOI62PX-<QWNp;9^Z37~FF)+5Pm33S^6g(~<h0d>Ei7|=9_0T2Q}NfFfn{cmPRf7h
z28DA>O!2_{{<x9BaSkJk5z{=<vgUzR3jY}u)RsIymsmd$Si3QJy85}Sb4q9e03FBG
AKL7v#

literal 0
HcmV?d00001

diff --git a/src/renderer/src/assets/images/borderwidth.png b/src/renderer/src/assets/images/borderwidth.png
new file mode 100644
index 0000000000000000000000000000000000000000..e071630982b69c0fea5afd31cf4975c1a5a2f8af
GIT binary patch
literal 2051
zcmeAS@N?(olHy`uVBq!ia0y~yU<?GZPjIjS$-s<DwLproILO_JVcj{ImkbQ-dp%to
zLn`9l-Zk`7i4<VD@VD0JjM;(a-)qiFKIe&97;bE_*f1<Bw9QbGf4!=fLfo`N&U1d>
zKK@ufo`pj|;lq{#md`&+TwH$F#-V|sF`mioN;inX&E)olX`VZ$fI@=HUS^=m9YBWu
zgUTrkj6fyUgp}M@{`KphJ{MDc=YjM4*IDoXyRN?O-+rm^d4G+~XO=z{IbUJ(yI5_r
z`sR6W4S)aLe!KsE{E3?dnLv9q1Pm6jx`$0<Xq?j^c=o23n!^Hz107;Ak*-WEMNDoc
z>Dn_H8krcCqY6?)IR#E|N?e??Hie0Wi=`*y;KWcB2L<&6m*Q=cIERx#=l;HZ9C#rZ
z7y=wU+;fWUdS6(qc3@(O0{Z#%(yu^2D<!xnuW{lO$PhGGq&xlEWQN9$2EpD9T&fNW
zTn}_?i;41QVo?GH-XX0i42@!p%D0L#Z8-%xI3zA|tPY@;K?lBf?Ay2B<x;DVf<waY
z18+Y*jaSRJ-&DuK;lkRJF(urBk?A&T&x>!|uiYCQLJoAeRkjK%Y=}M3k+*-tNK$m}
z@7KSn)t-NWxl=%JhwVO4><e;=djWIhQ>N#0{FQh8Iq^zRVS=#1BFpHLEF2=hXlznm
z?a|=icc9~0j;gRi05Gp|_pMQ4WU^#bp0#<ZPlH2agP^X(rY;taC%{B=F3gCLiIvH1
z%YzeILPOsmNWu~+37rTmoIW#cKYo3t|5OiPaLEBvdU3WdrvL{qh!|FRFtJnteSdzf
zsj7nlFo>8}C~*qB0A?B6?bm?$qM<>McR`nm!vgmM9pCOm1v9ZQ0kcel)}-NN(1Sbo
z?c{7rfg#XvU=Fb8zua-I(o4x<fzN@CX|ge~Oe|@@EVyR52@}gHU{KvWcvaOQA?!fM
lxhgN^QAN}Zf(Oq#{;`YdiG}7hTY;*022WQ%mvv4FO#u3y`se@v

literal 0
HcmV?d00001

diff --git a/src/renderer/src/assets/images/mouse-pointer.png b/src/renderer/src/assets/images/mouse-pointer.png
new file mode 100644
index 0000000000000000000000000000000000000000..6098aae6f62dff049c76459ed954fe55b9a24880
GIT binary patch
literal 6093
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
HE^+?@T)$!I

literal 0
HcmV?d00001

diff --git a/src/renderer/src/components/whiteboard/whiteboard.vue b/src/renderer/src/components/whiteboard/whiteboard.vue
index 53fb108..0ec6a25 100644
--- a/src/renderer/src/components/whiteboard/whiteboard.vue
+++ b/src/renderer/src/components/whiteboard/whiteboard.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="whiteboart-container">
+  <div class="whiteboart-container" :style="{ height: height + 'px' }">
     <div class="canvasBox" ref="box"></div>
 
     <div class="footerLeft" @click.stop
@@ -15,7 +15,7 @@
           </el-tooltip>
         </div>
         <div class="blockBox">
-          <el-button @click="currentType = 'selection'"><el-image src="/src/assets/icons/pngjpg/mouse-pointer.png"
+          <el-button @click="currentType = 'selection'"><el-image src="/src/assets/images/mouse-pointer.png"
               style="width: 14px; height: 14px; color: silver" /></el-button>
         </div>
         <template v-if="type == 'design'">
@@ -53,7 +53,8 @@
           </el-radio-group>
         </template>
         <div class="blockBox">
-          <el-button @click="currentType = 'selection'" style="color:#848282" :icon="Camera" disabled></el-button>
+          <!-- <el-button @click="currentType = 'selection'" style="color:#848282" :icon="Camera" disabled></el-button> -->
+          <el-button @click="handleToolTypeChange('image')">图片</el-button>
         </div>
         <div class="blockBox" v-if="!readonly">
           <el-dropdown @command="handleToolTypeChange" placement="top">
@@ -71,7 +72,7 @@
                 <template v-if="type != 'design'">
                   <el-dropdown-item command="freedraw">画笔</el-dropdown-item>
                   <el-dropdown-item command="text">文字</el-dropdown-item>
-                  <el-dropdown-item command="image">图片</el-dropdown-item>
+                  <!-- <el-dropdown-item command="image">图片</el-dropdown-item> -->
                 </template>
               </el-dropdown-menu>
             </template>
@@ -122,7 +123,7 @@
           <!-- 边框样式 -->
           <div class="blockBox">
             <el-dropdown @command="updateStyle('lineDash', $event)" placement="top">
-              <el-button><el-image src="/src/assets/icons/pngjpg/borderstyle.png"
+              <el-button><el-image src="/src/assets/images/borderstyle.png"
                   style="width: 14px; height: 14px"></el-image></el-button>
               <template #dropdown>
                 <el-dropdown-menu>
@@ -134,8 +135,7 @@
             </el-dropdown>
           </div>
           <!--透明度-->
-          <div class="blockBox" style="width: 120px"
-            v-if="type == 'design' ? true : ['image'].includes(activeElement?.type) || hasSelectedElements">
+          <div class="blockBox" style="width: 120px">
             <el-tooltip effect="light" content="透明度" placement="top">
               <el-input-number v-model="globalAlpha" :min="0" :max="1" :step="0.1"
                 @change="updateStyle('globalAlpha', $event)"></el-input-number>
@@ -145,7 +145,7 @@
           <!-- 边框粗细 -->
           <div class="blockBox">
             <el-dropdown @command="updateStyle('lineWidth', $event)" placement="top">
-              <el-button><el-image src="/src/assets/icons/pngjpg/borderwidth.png"
+              <el-button><el-image src="/src/assets/images/borderwidth.png"
                   style="width: 14px; height: 14px"></el-image></el-button>
               <template #dropdown>
                 <el-dropdown-menu>
@@ -309,11 +309,11 @@ const props = defineProps({
     default: true
   },
   height: {
-    type: Number,
+    type: [Number,String],
     default: 700,
   },
   width: {
-    type: Number,
+    type: [Number,String],
     default: 1000,
   },
   data: {
@@ -685,6 +685,20 @@ const getCanvasBase64 = async () =>{
   return base64
 }
 
+const getCanvasBlob = async () =>{
+  return await app.exportImage({
+    type: 'image/jpeg',
+    renderBg: exportRenderBackground.value,
+    paddingX: exportImagePaddingX.value,
+    paddingY: exportImagePaddingY.value,
+    onlySelected: exportOnlySelected.value,
+    useBlob: true,
+    backgroundColor: '#ffffff'
+  })
+}
+
+
+
 watch(() => props.data, (newVal) => {
   if (newVal) {
     setCanvasData(newVal)
@@ -773,7 +787,8 @@ defineExpose({
   showFit,
   getCanvasJson,
   getCanvasBase64,
-  setCanvasData
+  setCanvasData,
+  getCanvasBlob
 })
 </script>
 
@@ -895,7 +910,7 @@ ol {
     font-size: 14px;
     color: #000;
 
-    :deep(.jsontree_tree) {
+    /deep/ .jsontree_tree {
       font-family: 'Trebuchet MS', Arial, sans-serif !important;
     }
   }
diff --git a/src/renderer/src/views/classTask/newClassTaskAssign/index.vue b/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
index 910de4a..b90edd4 100644
--- a/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
+++ b/src/renderer/src/views/classTask/newClassTaskAssign/index.vue
@@ -9,11 +9,11 @@
         <el-button type="primary"  @click="handleNewAllClass">设计新作业</el-button>
       </div>
     </div>
-    <div class="page-resource"> 
+    <div class="page-resource">
       <div class="page-left">
         <el-table
           ref="taskTable"
-          v-loading="loading"
+          v-loading="tasklist_loading"
           :data="taskList"
           :tree-props="{checkStrictly: true}"
           row-key="id"
@@ -41,11 +41,11 @@
         </el-table>
       </div>
 
-      <div v-if="currentRow.id == 0" style="width: 100%; height: 100%;"> 
+      <div v-if="currentRow.id == 0" style="width: 100%; height: 100%;">
         <!-- 默认的习题类型卡片 -->
         <Right @itemClick="handleItemClick" />
       </div>
-      
+
       <div v-if="(currentRow.worktype == '习题训练' || classWorkForm.worktype == '习题训练') && currentRow.id>0" class="page-center">
         <el-tabs v-model="activeAptTab" style="height: 100%;">
           <el-tab-pane label="自主搜题" name="自主搜题" class="prepare-center-zzst">
@@ -62,7 +62,7 @@
       <div v-if="(currentRow.worktype == '课堂展示' || classWorkForm.worktype == '课堂展示') && currentRow.id>0" class="page-center">
         <div v-loading="boardLoading" class="board-wrap" style="height: 100%; flex: 1; overflow: hidden;">
           <!-- <whiteboard v-if="isShowBoard" ref="boardref" :height="mainHeight - 150" :isShowSave="false" :data="whiteboardObj"/> -->
-          <whiteboard ref="boardref" height=" 100%" :isShowSave="false" :data="classWorkForm.whiteboardObj"/>
+          <whiteboard ref="boardref" height="100%" width="100%" :isShowSave="false" :data="classWorkForm.whiteboardObj"/>
         </div>
       </div>
       <div v-if="(currentRow.worktype == '常规作业' || classWorkForm.worktype == '常规作业')&& currentRow.id>0" class="page-center">
@@ -70,20 +70,20 @@
           <FileUpload v-model="classWorkForm.fileHomeworkList" :fileSize="800" :fileType="['mp3','mp4','doc','docx','xlsx','xls','pdf','ppt','pptx','jpg','jpeg','gif','png','txt']"/>
         </div>
       </div>
-      
+
       <div v-if="currentRow.id>0 " class="page-right">
         <div class="prepare-top" >
           <el-button v-if="currentRow.id != 1 " type="success" @click="openSet(currentRow,'item')">推 送</el-button>
           <el-button type="primary" @click="handleClassWorkSave">保 存</el-button>
         </div>
         <div class="prepare-con" >
-          <el-form 
-            ref="classWorkFormRef" 
-            :model="classWorkForm" 
-            label-width="90" 
+          <el-form
+            ref="classWorkFormRef"
+            :model="classWorkForm"
+            label-width="90"
             style=" height: 100%; overflow: hidden;display: flex;flex-direction: column;"
           >
-            <div > 
+            <div >
               <el-form-item label="作业名称">
                 <el-input v-model="classWorkForm.uniquekey" type="text" placeholder="请输入作业名称"/>
               </el-form-item>
@@ -93,8 +93,8 @@
                 <el-input v-if="classWorkForm.worktype == '课堂展示'" v-model="classWorkForm.question" type="textarea"  placeholder="请输入作业说明" />
               </el-form-item>
             </div>
-            
-            <div v-if="classWorkForm.worktype == '习题训练'" class="pageRight-list"> 
+
+            <div v-if="classWorkForm.worktype == '习题训练'" class="pageRight-list">
               <div :style="{height: '100%', '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">
@@ -136,6 +136,10 @@ import whiteboard from '@/components/whiteboard/whiteboard.vue'
 import FileUpload from "@/components/FileUpload/index.vue";
 import Right from './Right/index.vue'
 
+import {
+  Delete
+} from '@element-plus/icons-vue'
+
 import SetHomework from '@/components/set-homework/index.vue'
 import { useGetHomework } from '@/hooks/useGetHomework'
 import { sessionStore } from '@/utils/store'
@@ -221,7 +225,7 @@ const selectable=(row, index)=>{
  * 获取 entpcourseid 获取作业列表
  */
 const initHomeWork = async()=> {
-  tasklist_loading.value = true; 
+  tasklist_loading.value = true;
   // const { res, chapterId } = await useGetHomework(courseObj.node);
   const { res, chapterId } = await useGetHomework(sessionStore.get('subject.curNode'));
   console.log('entpcourseid', chapterId);
@@ -233,7 +237,7 @@ const initHomeWork = async()=> {
 
 const handleNewAllClass = () => {
   taskTable.value.setCurrentRow({});// 清除表格选中项背景色
-  currentRow.value = {id:0}; // 作业设计 
+  currentRow.value = {id:0}; // 作业设计
   //--------
   classWorkForm.id = 0;
   classWorkForm.uniquekey = ""; // 作业唯一标识 作业名称
@@ -260,7 +264,7 @@ const handleDelete =() => {
       return delClasswork(ids.join(','));
     }).then(() => {
       taskTable.value.setCurrentRow({});// 清除表格选中项背景色
-      currentRow.value = {id:0}; // 作业设计 
+      currentRow.value = {id:0}; // 作业设计
       taskList.value = [];
       // initHomeWork();
       setTimeout(() => {
@@ -351,17 +355,17 @@ let propsformobj = reactive({
  * 选中的布置作业行
  */
 const handleCurrentChange = (val) => {
-  
+
   console.log(val,'???????????')
   if(val && val.id >0  ) {
     currentRow.value = val;
+    classWorkForm.worktype = val.worktype; //作业类型
     editListItem(val, courseObj).then((obj) => {
       if(obj){
         propsformobj = obj;
         // 新赋值的作业内容
         classWorkForm.id = obj.id;
         classWorkForm.uniquekey = cloneDeep(obj.uniquekey); // 作业唯一标识 作业名称
-        classWorkForm.worktype = cloneDeep(obj.worktype); //作业类型
         classWorkForm.title = cloneDeep(obj.title); // 作业说明
         classWorkForm.quizlist = cloneDeep(obj.quizlist);  // 作业习题列表内容
         classWorkForm.chooseWorkLists = cloneDeep(obj.chooseWorkLists);  // 作业框架梳理list
@@ -375,7 +379,7 @@ const handleCurrentChange = (val) => {
 
 /**
  * 添加作业
- * @param entpcourseworkid 
+ * @param entpcourseworkid
  */
 const handleClassWorkQuizAdd = (entpcourseworkid) => {
   var exist = false;
@@ -679,7 +683,7 @@ const editWork = async (cform) =>{
     // // 返回上一页
     // router.back()
   }
-  
+
 }
 //----
 
@@ -740,11 +744,11 @@ const editWork = async (cform) =>{
           text-align: left;
         }
       }
-      
+
     }
     .page-center{
       flex: 1;
-      // width: 100%;
+      //min-width: calc(100% - 675px);
       height: 100%;
       padding: 0 5px;
       margin: 0 5px;
@@ -756,8 +760,8 @@ const editWork = async (cform) =>{
         height: 100%;
         display: flex;
         flex-direction: column;
-        
-        
+
+
       }
       .prepare-center-xbtk{
         height: 100%;