diff --git a/src/renderer/src/components/set-homework/index.vue b/src/renderer/src/components/set-homework/index.vue
index 854ade1..17127b8 100644
--- a/src/renderer/src/components/set-homework/index.vue
+++ b/src/renderer/src/components/set-homework/index.vue
@@ -62,8 +62,8 @@ const props = defineProps({
   entpcourseid: {
     default: ''
   },
-  row: {
-    default: ''
+  rows: {
+    default: []
   },
   title: {
     type: String,
@@ -225,32 +225,34 @@ const onSubmit = (formEl) => {
       let ary = []
       for (const value in gradeObj) {
         //这些参数 参照AIx web端 作业推送
-        let obj = {
-          id: 0,
-          parentid: props.row.id,
-          classid: value,
-          classcourseid: 0,           // 课堂id-ppt为字符串不能使用
-          classReservId: classRoomId, // 课堂id
-          entpcourseid: props.entpcourseid,
-          studentlist: JSON.stringify(gradeObj[value]),
-          feedback: form.feedback,
-          workkey: '',
-          timelength: form.timelength,
-          weights: 1,
-          deaddate: form.deaddate,
-          workdate: getCurrentTime('YYYY-MM-DD'),
-          uniquekey: props.row.uniquekey,
-          entpcourseworklist: '[' + props.row.entpcourseworklist + ']',
-          needMsgNotifine: 'false',
-          msgkey: 'newclasswork',
-          title: '作业任务',
-          msgcontent: '',
-          teachername: userInfo.nickName,
-          unixstamp: new Date().getTime(),
-          worktype: props.row.worktype,
-          status: '1'
+        for (var i = 0; i < props.rows.length; i++) {
+          let obj = {
+            id: 0,
+            parentid: props.rows[i].id,
+            classid: value,
+            classcourseid: 0,           // 课堂id-ppt为字符串不能使用
+            classReservId: classRoomId, // 课堂id
+            entpcourseid: props.entpcourseid,
+            studentlist: JSON.stringify(gradeObj[value]),
+            feedback: form.feedback,
+            workkey: '',
+            timelength: form.timelength,
+            weights: 1,
+            deaddate: form.deaddate,
+            workdate: getCurrentTime('YYYY-MM-DD'),
+            uniquekey: props.rows[i].uniquekey,
+            entpcourseworklist: '[' + props.rows[i].entpcourseworklist + ']',
+            needMsgNotifine: 'false',
+            msgkey: 'newclasswork',
+            title: '作业任务',
+            msgcontent: '',
+            teachername: userInfo.nickName,
+            unixstamp: new Date().getTime(),
+            worktype: props.rows[i].worktype,
+            status: '1'
+          }
+          ary.push(obj)
         }
-        ary.push(obj)
       }
       setLoading.value = true
       saveByClassWorkArray({
@@ -284,8 +286,9 @@ const cloneDialog = (formEl) => {
 }
 
 onMounted(() => {
-  // 默认当前
-  form.deaddate = getCurrentTime('YYYY-MM-DD HH:mm')
+  // 默认当前 改为 延后3小时后截止
+  // form.deaddate = getCurrentTime('YYYY-MM-DD HH:mm')
+  form.deaddate = `${getCurrentTime('YYYY-MM-DD')} ${getCurrentTime('HH+3')}:${getCurrentTime('mm')}`;
 })
 </script>
 
diff --git a/src/renderer/src/hooks/useClassTask.js b/src/renderer/src/hooks/useClassTask.js
new file mode 100644
index 0000000..85966bb
--- /dev/null
+++ b/src/renderer/src/hooks/useClassTask.js
@@ -0,0 +1,117 @@
+import { listEntpcoursework,getEvaluationclue } from '@/api/classTask';
+import { processList } from '@/hooks/useProcessList';
+
+const isJson = (str) => {
+  if (typeof str == 'string') {
+    try {
+      let obj = JSON.parse(str)
+      if (typeof obj == 'object' && obj) {
+        return true
+      } else {
+        return false
+      }
+    } catch (e) {
+      return false
+    }
+  }
+}
+
+
+/**
+ * @description  编辑作业配置
+ * @param {*} row
+ */
+export const editListItem = (row, courseObj) => {
+  return new Promise((resolve, reject) => {
+    // 作业内容编辑-跳转到设计界面-传参
+    let classtaskObj = {
+      id: '', //
+      bookName: '', // 课程名称
+      uniquekey: '', // 设计中的标题
+      title: '', // 设计中的说明
+      worktype: '', // 设计中的作业类型
+      quizlist: [], // 设计中的试题列表
+      chooseWorkLists: [],// 设计中的框架梳理list
+      fileHomeworkList: [],// 设计中的常规作业list
+      whiteboardObj: '',// 设计中的课堂展示对象
+    };
+    console.log('编辑的行', row);
+
+    //重新更新[新任务]中右侧列表数据
+    var listCourseWork = [];
+    for (var i=0; i < row.entpcourseworklistarray.length; i++) {
+      listCourseWork.push(row.entpcourseworklistarray[i]);
+    }
+
+    if (listCourseWork.length > 0) {
+      classtaskObj.id= row.id; // 
+      classtaskObj.bookObj = courseObj; // 教材对象
+      classtaskObj.bookName = row.evaltitle? row.evalparenttitle? row.evalparenttitle+'/'+row.evaltitle : row.evaltitle: row.evalparenttitle// 课程名称:单元/章节： 单元
+      classtaskObj.uniquekey= row.uniquekey; // 设计中的标题
+      classtaskObj.title= row.title; // 设计中的说明
+      classtaskObj.worktype= row.worktype; // 设计中的作业类型
+      classtaskObj.quizlist= []; // 设计中的试题列表
+      classtaskObj.chooseWorkLists = []; //设计中的 框架梳理list
+      classtaskObj.fileHomeworkList = []; //设计中的 常规作业list
+      classtaskObj.whiteboardObj = ''; //设计中的 课堂展示对象
+      
+
+      if (row.worktype == '框架梳理') {
+        // 框架梳理对应只有一个内容
+        getEvaluationclue(listCourseWork[0].id).then(res => {
+          if ( res.data==null || res.data==undefined ) {
+            return ;
+          }
+          res.data.worktype = '框架梳理';
+          res.data.score = listCourseWork[0].score;
+          classtaskObj.chooseWorkLists.push(res.data);
+          //
+          // console.log('框架梳理', classtaskObj);
+          return resolve(classtaskObj);
+        });
+      }
+      else if (row.worktype == '习题训练') {
+        const ids = listCourseWork.map(item => item.id).join(",");
+        listEntpcoursework({ids: ids, pageSize: 50}).then(idres => {
+          // for (var i=0; i<idres.rows.length; i++) {
+          //   idres.rows[i].titletext = idres.rows[i].title.replace(/<[^>]+>/g, '');
+          // }
+          // 格式化试题
+          if(idres.rows&&idres.rows.length > 0){
+            processList(idres.rows);
+            //重新将task中的分值更新
+            row.entpcourseworklistarray.forEach(item => {
+              const quizItem = idres.rows.find(quiz => quiz.id === item.id);
+              if (quizItem) {
+                quizItem.score = item.score;
+                quizItem.scoreOrigin = item.score;
+              }
+            });
+
+            classtaskObj.quizlist = idres.rows;
+            //
+            // console.log('习题训练', classtaskObj);
+            return resolve(classtaskObj);
+          }
+        })
+      } 
+      else if (row.worktype == '课堂展示') {
+        console.log('row.课堂展示', row.workcodes);
+        const workcodes = JSON.parse(row.workcodes);
+        classtaskObj.whiteboardObj = JSON.stringify(workcodes.json);
+        //
+        // console.log('课堂展示', classtaskObj);
+        return resolve(classtaskObj);
+      }
+      else if (row.worktype == '常规作业') {
+        if(isJson(row.workcodes)){
+          classtaskObj.fileHomeworkList = JSON.parse(row.workcodes);
+          //
+          // console.log('常规作业', classtaskObj);
+          return resolve(classtaskObj);
+        }
+      }
+    }
+  });
+}
+
diff --git a/src/renderer/src/hooks/useGetHomework.js b/src/renderer/src/hooks/useGetHomework.js
index c122d9f..e07a2de 100644
--- a/src/renderer/src/hooks/useGetHomework.js
+++ b/src/renderer/src/hooks/useGetHomework.js
@@ -71,6 +71,7 @@ const getHomeWorkList = async () => {
    return await homeworklist({
     entpcourseid: chapterId,
     edituserid: userStore.user.userId,
+    orderby: "timestamp DESC",
     pageSize: 100,
     status: '10'
   }).then((res) => {
@@ -79,7 +80,25 @@ const getHomeWorkList = async () => {
     for (var i = 0; i < res.rows.length; i++) {
       res.rows[i].taskconfig = []
 
-      // 找child
+      // 处理任务类型的UI
+      // if (res.rows[i].worktype == '学习目标定位') {
+      //   res.rows[i].workclass = 'success';
+      //   res.rows[i].workcodesList = JSON.parse(res.rows[i].workcodes);
+      // } else 
+      // 课标研读 目标设定 教材研读 框架梳理 学科定位  TODO 后续接入在添加
+      if (res.rows[i].worktype == '课堂展示') {
+        res.rows[i].workclass = 'primary';
+      } else if (res.rows[i].worktype == '框架梳理') {
+        res.rows[i].workclass = 'warning';
+      } else if (res.rows[i].worktype == '常规作业') {
+        res.rows[i].workclass = 'info';
+      } else if (res.rows[i].worktype == '习题训练') {
+        res.rows[i].workclass = 'danger';
+      } else {
+        res.rows[i].workclass = 'primary';
+      }
+
+      // 找child 
       for (var j = 0; j < res.rows.length; j++) {
         if (res.rows[j].parentid == res.rows[i].id) {
           var ss = []
diff --git a/src/renderer/src/views/classTask/classTask.vue b/src/renderer/src/views/classTask/classTask.vue
index b682c68..46e22c0 100644
--- a/src/renderer/src/views/classTask/classTask.vue
+++ b/src/renderer/src/views/classTask/classTask.vue
@@ -58,17 +58,17 @@
 
 <script setup>
 import { ref, onMounted, onUnmounted, computed, watch } from 'vue'
-import { listByDeadDate, listClassworkdata, listClassworkdataNew } from '@/api/classTask'
+import { listByDeadDate, listClassworkdata } from '@/api/classTask'
 
 import TaskItem from '@/views/classTask/container/classTask/task-item.vue'
 // import ItemDialog from '@/views/classTask/container/item-dialog.vue'
 import { useToolState } from '@/store/modules/tool'
-import { getCurrentTime, getTomorrow } from '@/utils/date'
+import { getCurrentTime } from '@/utils/date'
 import useUserStore from '@/store/modules/user'
 import useClassTaskStore from "@/store/modules/classTask";
 import {createWindow} from '@/utils/tool'
 import {sessionStore} from '@/utils/store'
-import {throttle,debounce } from '@/utils/comm'  
+import {debounce } from '@/utils/comm'  
 
 
 const toolState = useToolState();
@@ -141,67 +141,80 @@ const getClassWorkList = async () => {
   {
     // 班级作业数据，包含多个班级 homeworklist
     const response = await listByDeadDate({
-      //classidarray: classTaskStore.classListIds.join(','),
       edituserid: userStore.userId, // 老师的id
       edustage: userStore.edustage, // 学段
       edusubject: userStore.edusubject,//学科
-      deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
+      // deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期 弃用
+      deaddate: EndDate.value,// 进行中：明天，已结束：选择的日期
       status: '1', // 作业状态：1-已发布
-      // orderby: 'concat(deaddate,uniquekey) DESC',
       orderby: 'deaddate DESC',
       pageSize: 100,
     })
 
-    for (var i = 0; i < response.rows.length; i++) {
+    /**
+     * 2024-10-17 由于 后面截止时间加了 时分，特加判断
+     * 1、进行中、以前是以明天判断。现改为传当天的日期，并根据当前日期的时分与截止日期进行判断，
+     * 2、已结束、以前默认是以明天判断。现依然以明天为判断，并根据当前日期时分大于截止日期时分判断。
+     */
+    let list = [];
+    if(tabActive.value === '进行中'){
+      // 进行中  当前日期时间 小于  截止 日期时间
+      list = response.rows&&response.rows.filter(item => item.deaddate && getCurrentTime('YYYY-MM-DD HH:mm') < item.deaddate); // 进行中
+    }else{
+      list = response.rows&&response.rows.filter(item => item.deaddate && getCurrentTime('YYYY-MM-DD HH:mm') > item.deaddate); // 已结束
+    }
+
+
+    for (var i = 0; i < list.length; i++) {
       // 初始化部分新增字段值
-      response.rows[i].workdatalist = []
-      response.rows[i].workdatacount = 0 // 人数
-      response.rows[i].workdatalistVisible = false
-      response.rows[i].workdatafeedbackcount = 0 // 已交人数
-      response.rows[i].feedtimelength = 0
-      response.rows[i].rightAnswerCount = 0
-      response.rows[i].scoingRate = 0 + '%' // 得分率
-      response.rows[i].averagetime = 0 // 平均用时
+      list[i].workdatalist = []
+      list[i].workdatacount = 0 // 人数
+      list[i].workdatalistVisible = false
+      list[i].workdatafeedbackcount = 0 // 已交人数
+      list[i].feedtimelength = 0
+      list[i].rightAnswerCount = 0
+      list[i].scoingRate = 0 + '%' // 得分率
+      list[i].averagetime = 0 // 平均用时
 
       // ----------------------------------------------
       // 处理任务类型的UI
-      if (response.rows[i].worktype == '学习目标定位') {
-        response.rows[i].workclass = 'success'
-        response.rows[i].workcodesList = JSON.parse(response.rows[i].workcodes)
-      } else if (response.rows[i].worktype == '教材研读') {
-        response.rows[i].workclass = 'primary'
-      } else if (response.rows[i].worktype == '框架梳理') {
-        response.rows[i].workclass = 'warning'
-      } else if (response.rows[i].worktype == '学科定位') {
-        response.rows[i].workclass = 'info'
-      } else if (response.rows[i].worktype == '习题训练') {
-        response.rows[i].workclass = 'danger'
+      if (list[i].worktype == '学习目标定位') {
+        list[i].workclass = 'success'
+        list[i].workcodesList = JSON.parse(list[i].workcodes)
+      } else if (list[i].worktype == '教材研读') {
+        list[i].workclass = 'primary'
+      } else if (list[i].worktype == '框架梳理') {
+        list[i].workclass = 'warning'
+      } else if (list[i].worktype == '学科定位') {
+        list[i].workclass = 'info'
+      } else if (list[i].worktype == '习题训练') {
+        list[i].workclass = 'danger'
       } else {
-        response.rows[i].workclass = ''
+        list[i].workclass = ''
       }
       // 如果是习题训练任务，则检查一共有多少道
-      if (response.rows[i].entpcourseworklist != '') {
-        response.rows[i].entpcourseworklistarray = JSON.parse(
-          '[' + response.rows[i].entpcourseworklist + ']'
+      if (list[i].entpcourseworklist != '') {
+        list[i].entpcourseworklistarray = JSON.parse(
+          '[' + list[i].entpcourseworklist + ']'
         )
       } else {
-        response.rows[i].entpcourseworklistarray = []
+        list[i].entpcourseworklistarray = []
       }
       // 根据 classworkdatastudentids 初始化判断分配的人数
       if (
-        response.rows[i].classworkdatastudentids != '' &&
-        response.rows[i].classworkdatastudentids != null &&
-        response.rows[i].classworkdatastudentids != 'null'
+        list[i].classworkdatastudentids != '' &&
+        list[i].classworkdatastudentids != null &&
+        list[i].classworkdatastudentids != 'null'
       ) {
-        const stuList = JSON.parse('[' + response.rows[i].classworkdatastudentids + ']')
-        response.rows[i].workdatacount = stuList.length
+        const stuList = JSON.parse('[' + list[i].classworkdatastudentids + ']')
+        list[i].workdatacount = stuList.length
       }
     }
     // 显示分配人数(workdatacount)>0 的
-    if (response.rows && response.rows.length > 0) {
-      classWorkList.value = response.rows && response.rows.filter((item) => item.workdatacount > 0)
+    if (list && list.length > 0) {
+      classWorkList.value = list && list.filter((item) => item.workdatacount > 0)
       //TODO： 这里没分页，貌似这个 total 不重要，后续看
-      total.value = response.total
+      total.value = 0
     }else{
       classWorkList.value = []
       total.value = 0
@@ -222,6 +235,7 @@ const getStudentClassWorkData = async() => {
     //   classids: classTaskStore.classListIds.join(','),
     //   edusubject: userStore.edusubject,//学科
     //   deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
+    // deaddate: EndDate.value,// 进行中：明天，已结束：选择的日期
     //   //status: '1', // 作业状态：1-已发布
     //   orderby: "deaddate DESC",// TODO： 这里是否加 deaddate 的排序，后续看
     //   pageSize: 1000,
@@ -407,13 +421,28 @@ const getStudentVisible = async () => {
     edituserid: userStore.userId, // 老师的id
     edustage: userStore.edustage,// 学段
     edusubject: userStore.edusubject,//学科
-    deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
+    // deaddate: tabActive.value === '进行中'? getTomorrow() : EndDate.value,// 进行中：明天，已结束：选择的日期
+    deaddate: EndDate.value,// 进行中：明天，已结束：选择的日期
     status: '1', // 作业状态：1-已发布
     // orderby: 'concat(deaddate,uniquekey) DESC',
     orderby: 'deaddate DESC',
     pageSize: 100
   })
-  const curWorkList = response.rows
+
+  /**
+   * 2024-10-17 由于 后面截止时间加了 时分，特加判断
+   * 1、进行中、以前是以明天判断。现改为传当天的日期，并根据当前日期的时分与截止日期进行判断，
+   * 2、已结束、以前默认是以明天判断。现依然以明天为判断，并根据当前日期时分大于截止日期时分判断。
+   */
+    let list = [];
+  if(tabActive.value === '进行中'){
+    // 进行中  当前日期时间 小于  截止 日期时间
+    list = response.rows&&response.rows.filter(item => item.deaddate && getCurrentTime('YYYY-MM-DD HH:mm') < item.deaddate); // 进行中
+  }else{
+    list = response.rows&&response.rows.filter(item => item.deaddate && getCurrentTime('YYYY-MM-DD HH:mm') > item.deaddate); // 已结束
+  }
+
+  const curWorkList = list
 
   /**
    * warn: 这里仅更新了finishpercent(进度条), 且当前作业布置推送新任务时, curWorkList中会查到新的任务与当前页面中this.classWorkList长度不一致,
diff --git a/src/renderer/src/views/classTask/classTaskAssign.vue b/src/renderer/src/views/classTask/classTaskAssign.vue
index 4816e4f..4baf8a3 100644
--- a/src/renderer/src/views/classTask/classTaskAssign.vue
+++ b/src/renderer/src/views/classTask/classTaskAssign.vue
@@ -36,6 +36,7 @@
       <div style="flex: 1;overflow: hidden;"> 
         <el-table
           ref="taskTable"
+          v-loading="loading"
           :data="taskList"
           :tree-props="{checkStrictly: true}"
           row-key="id"
@@ -58,7 +59,7 @@
                 </div>
                 <div>
                   <div v-if="scope.row.status == '10'">
-                    <el-button v-hasPermi="['teaching:classwork:edit']"  text @click="newHandleWorkEdit2ClassWorkQuizAdd(scope.row, scope.$index)">编辑</el-button>
+                    <el-button v-hasPermi="['teaching:classwork:edit']"  text @click="handleWorkEditItem(scope.row)">编辑</el-button>
                   </div>
                   <div v-else>
                     <el-button v-hasPermi="['teaching:classwork:edit']"  text @click="handleWorkEdit(scope.row, scope.$index)">查看详情</el-button>
@@ -75,10 +76,10 @@
                 </div>
                 <div>
                   <div v-if="scope.row.status == '10'">
-                    <el-button v-hasPermi="['teaching:classwork:edit']"  text @click="handleWorkTitleEdit(scope.row, scope.$index)">编辑</el-button>
+                    <el-button v-hasPermi="['teaching:classwork:edit']"  text @click="handleWorkTitleEdit(scope.row, scope.$index,'edit')">编辑</el-button>
                   </div>
                   <div v-else>
-                    <el-button v-hasPermi="['teaching:classwork:edit']"  text @click="handleWorkTitleEdit(scope.row, scope.$index)">查看详情</el-button>
+                    <el-button v-hasPermi="['teaching:classwork:edit']"  text @click="handleWorkTitleEdit(scope.row, scope.$index,'query')">查看详情</el-button>
                   </div>
                 </div>
               </div>
@@ -92,10 +93,15 @@
           <el-table-column v-if="props.initDataProps.queryType!=='single'" label="推送配置" align="left" min-width="16%">
             <template #default="scope">
               <div style="display: flex">
-                <el-button v-hasPermi="['teaching:classwork:edit']" link icon="Setting" :style="formatStyle(scope.row)" @click="scope.row.status == '10' ? openClassWorkConfigDialog(scope.row, -1,'item') : ''">{{scope.row.status == '10'? '推送' : '已推送'}}</el-button>
+                <el-button v-hasPermi="['teaching:classwork:edit']" link icon="Setting" :style="formatStyle(scope.row)" @click="scope.row.status == '10' ? openSet(scope.row,'item') : ''">{{scope.row.status == '10'? '推送' : '已推送'}}</el-button>
               </div>
             </template>
           </el-table-column>
+          <el-table-column v-if="props.initDataProps.queryType!=='single'" label="历史推送" align="left" min-width="16%">
+            <template #default="scope">
+              <el-button @click="queryPushRecords(scope.row)">查看记录</el-button>
+            </template>
+          </el-table-column>
         </el-table>
       </div>
 
@@ -115,12 +121,12 @@
             </el-table-column>
             <el-table-column label="分值" align="center" width="180">
               <template #default="scope">
-                <el-input-number v-model="scope.row.score" :min="1" :max="100" :disabled="checkTaskAssigned(currentWorkEdit.currentTask)"></el-input-number >
+                <el-input-number v-model="scope.row.score" :min="1" :max="100" :disabled="currentWorkEdit.currentType == 'query'?true:false"></el-input-number >
               </template>
             </el-table-column>
             <el-table-column label="操作" align="center" width="100">
               <template #default="scope">
-                <el-button :disabled="checkTaskAssigned(currentWorkEdit.currentTask)" @click="handleWorkConfigQuizMinus(scope.$index)">删除</el-button>
+                <el-button :disabled="currentWorkEdit.currentType == 'query'?true:false" @click="handleWorkConfigQuizMinus(scope.$index)">删除</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -197,103 +203,85 @@
 
         <div slot="footer" class="dialog-footer" style="text-align: right; margin-top: 20px;">
           <div style="display: flex">
-            <!-- <el-button v-if="currentTag=='习题训练'" style="margin-right: auto" type="primary"
-                :disabled="checkTaskAssigned(currentWorkEdit.currentTask)" @click="handleWorkEdit2ClassWorkQuizAdd">添加作业</el-button> -->
-            <el-button type="primary" style="margin-left: auto" :disabled="checkTaskAssigned(currentWorkEdit.currentTask)"
-                @click="submitStudy('submit')">确 定</el-button>
+            <el-button type="primary" style="margin-left: auto" @click="workEdit = false">确 定</el-button>
           </div>
         </div>
       </el-dialog>
 
       <!-- 作业说明编辑 -->
-      <el-dialog v-model="currentWorkEdit.workTitleEdit" title="作业说明编辑" width="70%" append-to-body>
-        <el-input v-model="currentWorkEdit.currentTitle" type="textarea" rows="5" placeholder="请输入作业说明" :disabled="checkTaskAssigned(currentWorkEdit.currentTask)"/>
+      <el-dialog v-model="currentWorkEdit.workTitleEdit" title="作业说明" width="70%" append-to-body>
+        <el-input v-model="currentWorkEdit.currentTitle" type="textarea" rows="5" placeholder="请输入作业说明" :disabled="currentWorkEdit.currentType == 'query'?true:false"/>
         <div slot="footer" class="dialog-footer" style="text-align: right; margin-top: 20px;">
           <el-button type="primary" :disabled="checkTaskAssigned(currentWorkEdit.currentTask)"
               @click="submitWorkTitle('submit')">确 定</el-button>
         </div>
       </el-dialog>
 
-
-      <!-- 推送作业的配置对话框 -->
-      <el-dialog v-model="workConfDialogOpen" title="作业布置推送配置" width="60%" append-to-body>
-        <el-row>
-          <el-col :span="24">
-            <el-form ref="classWorkConfigFormRef" :model="classWorkConfigForm" label-width="100px">
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item label="班级" prop="grade">
-                    <el-scrollbar max-height="300px" style="width: 100%">
-                      <el-tree 
-                        ref="treeRef" :props="defaultProps" :load="getLoad" node-key="id" highlight-current show-checkbox
-                        lazy @check="handleCheckChange" />
-                    </el-scrollbar>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item label="选中学生">
-                    <div style="max-height: 150px; overflow: auto">
-                      <template v-for="(item, index) in classWorkConfigForm.studentlist" :key="item" >
-                        <el-tag :label="item.studentid" size="large" closable style="margin: 3px" @close="handleClassDialogClassStudentRemove(item, index)">{{ item.name }}</el-tag>
-                      </template>
-                    </div>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-
-              <el-row>
-                <el-col :span="24">
-                  <el-form-item label="完成要求">
-                    <el-radio-group v-model="classWorkConfigForm.feedtype">
-                      <el-radio label="必做">必做</el-radio>
-                      <el-radio label="选做">选做</el-radio>
-                    </el-radio-group>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item label="截止日期">
-                    <el-date-picker v-model="classWorkConfigForm.deaddate" type="date" placeholder="选择日期"></el-date-picker>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="16">
-                  <el-form-item label="截止时间">
-                    <el-input-number v-model="classWorkConfigForm.deadhour" :min="8" :max="22"></el-input-number> 点
-                    <el-input-number v-model="classWorkConfigForm.deadmin" :min="0" :max="60" :step="15" style="margin-left: 10px"></el-input-number> 分
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="12">
-                  <el-form-item label="推荐用时">
-                    <el-input-number v-model="classWorkConfigForm.timelength" :min="1"></el-input-number>分钟
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-                <el-col :span="8">
-                  <el-form-item label="分值" v-show="false">
-                    <el-input-number v-model="classWorkConfigForm.weights" :min="1"></el-input-number>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-              <el-row>
-              </el-row>
-            </el-form>
-          </el-col>
-        </el-row>
-
-        <div slot="footer" class="dialog-footer" style="text-align: right">
-          <el-button @click="handleWorkConfigUpdate('cancel')">取消</el-button>
-          <!-- <el-button type="primary" @click="handleTaskAssignToAllClassType()"  :loading="classWorkToStudent_Loading">{{classWorkToStudent_Loading?'推送中……':'推送'}}</el-button> -->
-          <el-button type="primary" @click="handleTaskAssignToAllClassType()"  >{{'推送'}}</el-button>
+      <!-- 已推送历史 -->
+      <el-dialog v-model="pushRecordsOpen" title="推送历史记录" width="80%" append-to-body>
+        <div style="flex: 1;overflow: hidden; min-height: 400px;"> 
+          <el-table
+            ref="pushRecordsRef"
+            :data="pushRecordsList"
+            v-loading="loading"
+            :tree-props="{checkStrictly: true}"
+            row-key="id"
+            style="width: 100%;height: 100%; border: 1px solid #dcdfe6;border-radius: 3px;flex:1"
+            :row-class-name="tableRowClassName"
+          >
+            <el-table-column type="index" label="序号" width="52" reserve-selection align="center" />
+            <el-table-column v-if="props.initDataProps.queryType!=='single'" label="创建时间" align="center" prop="timestamp" min-width="30%" sortable>
+              <template #default="scope">
+                <el-tag size="large">{{ scope.row.timestamp }}</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column label="作业名称" prop="uniquekey" min-width="18%" align="center">
+            </el-table-column>
+            <el-table-column label="作业类型'" align="center" prop="worktype" min-width="20%" sortable>
+              <template #default="scope">
+                <el-tag :type="scope.row.workclass" size="large">{{ scope.row.worktype }}</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column label="作业内容" align="center" min-width="20%">
+              <template #default="scope">
+                <div style="border: 1px solid #ccc; width: 100%; height: auto; display: flex; justify-content: space-between; padding-left: 10px">
+                  <div style="display: flex; margin-top: 5px">
+                    <el-tag v-if="scope.row.entpcourseworklistarray.length>0" effect="dark" type="warning" size="small" style="margin-left: 5px" round>{{ scope.row.entpcourseworklistarray.length }}</el-tag>
+                  </div>
+                  <div>
+                    <el-button text @click="handleWorkEdit(scope.row, scope.$index)">查看详情</el-button>
+                  </div>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column v-if="props.initDataProps.queryType!=='single'" label="作业说明" align="center" min-width="36%">
+              <template #default="scope">
+                <div style="border: 1px solid #ccc; width: 100%; height: auto; display: flex; justify-content: space-between; padding-left: 10px">
+                  <div style="display: flex; margin-top: 5px">
+                    <div class="singe-line" style="max-width: 200px" v-html="scope.row.title"></div>
+                  </div>
+                  <div>
+                    <el-button @click="handleWorkTitleEdit(scope.row, scope.$index, 'query')">查看详情</el-button>
+                  </div>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column v-if="props.initDataProps.queryType!=='single'" label="推送配置" align="left" min-width="16%">
+              <template #default="scope">
+                <div style="display: flex">
+                  <el-button @click="onClickItem(scope.row)">批阅详情</el-button>
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <div slot="footer" class="dialog-footer" style="text-align: right; margin-top: 20px;">
+          <el-button type="primary" @click="pushRecordsOpen = false">确 定</el-button>
         </div>
       </el-dialog>
 
+      <!-- 推送作业的配置对话框 -->
+      <SetHomework v-model="setDialog" :entpcourseid="entpcourseid" :rows="rowsList" @on-close="closeHomework" @on-success="successHomework"/>
       <!-- 预览框 -->
       <prevReadMsgDialog ref="prevReadMsgDialogRef" :bookobj="courseObj"/>
       <!-- 其他附件预览框 acceptParams-->
@@ -310,16 +298,20 @@ import { useRouter } from 'vue-router'
 import ChooseTextbook from '@/components/choose-textbook/index.vue'
 import { homeworklist, delClasswork } from '@/api/teaching/classwork'
 import { listEntpcoursework, listClassworkeval,updateClasswork,getEvaluationclue } from '@/api/classTask'
-import { listClassmain, listClassgroup } from '@/api/classManage/index'
-import { saveByClassWorkArray } from '@/api/teaching/classwork'
 
 import { useGetHomework } from '@/hooks/useGetHomework'
+import { editListItem } from '@/hooks/useClassTask'
 import { processList } from '@/hooks/useProcessList'
-import { uniqBy, groupBy } from 'lodash'
-import { getCurrentTime } from '@/utils/date'
 import prevReadMsgDialog from '@/views/classTask/container/newTask/prevReadMsg-Dialog.vue'
 import prevReadImgFileDialog from '@/views/classTask/container/classTask/prevReadImgFileDialog.vue'
+import SetHomework from '@/components/set-homework/index.vue'
+import {sessionStore} from '@/utils/store'
+import {createWindow} from '@/utils/tool'
+import { useToolState } from '@/store/modules/tool'
+import {throttle,debounce } from '@/utils/comm'  
 
+
+const toolState = useToolState();
 import useUserStore from '@/store/modules/user'
 const userStore = useUserStore().user
 const { proxy } = getCurrentInstance()
@@ -349,13 +341,17 @@ const courseObj = reactive({
   //
 })
 
-const taskList = ref([]);
-const loading = ref(false);
+const taskList = ref([]); // 作业列表
+const loading = ref(false); 
+const pushRecordsList = ref([]); // 作业推送历史
+const pushRecordsOpen = ref(false); // 推送历史记录弹窗
+const pushRecordsLoading = ref(false); // 推送历史记录loading
 
 // 作业编辑
 const workEdit = ref(false);
 const currentWorkEdit = reactive({
   workTitleEdit: false,
+  currentType:'query',
   currentTask: {},
   currentTitle: '',
   currentIndex: 0,
@@ -371,21 +367,9 @@ const workConfObj = reactive({
 });
 
 // 推送相关
-const defaultProps = ref({
-  children: 'children',
-  label: 'label',
-  isLeaf: 'leaf'
-});
-const gradeList = ref([]);// 学生节点 
-const workConfDialogOpen = ref(false);// 推送配置弹窗
-const classWorkConfigForm = reactive({
-  formRowsType: '',//
-  formRowsList: null,
-  // 
-  feedtype: '必做',
-  studentlist: [], //需要推送的学生list
-}); // 推送作业配置
-
+const setDialog = ref(false); // 推送配置 弹窗
+const rowsList = ref([]) // 当前需要推送行的数据
+const entpcourseid = ref('') // 当前课程id
 
 // ---------------------------------------------------
 
@@ -411,6 +395,89 @@ const getData = (data) => {
 
   // 头部 教材分析打开外部链接需要当前章节ID
   localStorage.setItem('unitId', JSON.stringify({ levelFirstId, levelSecondId}))
+
+  //
+  initHomeWork();
+}
+
+/**
+ * 获取 entpcourseid 获取作业列表
+ */
+const initHomeWork = async()=> {
+  loading.value = true;
+  const { res, chapterId } = await useGetHomework(courseObj.node);
+  console.log('entpcourseid', chapterId);
+  console.log('res', res);
+  entpcourseid.value = chapterId;
+  taskList.value = res;
+  loading.value = false;
+}
+/**
+ * 查看推送历史
+ * 
+ */
+const queryPushRecords = (row) => {
+  // 获取已推送历史
+  console.log(row,'查看该行推送历史')
+  pushRecordsOpen.value = true;
+  pushRecordsLoading.value = true;
+  homeworklist({
+    entpcourseid: entpcourseid.value,
+    edituserid: userStore.userId,
+    parentid: row.id,
+    orderby: "timestamp DESC",
+    pageSize: 100,
+    status: '1' // 推送状态： 1 已推送； 10 推送模版
+  }).then((res) => {
+    if(res.rows&& res.rows.length>0){
+      for (var i = 0; i < res.rows.length; i++) {
+        res.rows[i].taskconfig = []
+
+        // 处理任务类型的UI
+        // if (res.rows[i].worktype == '学习目标定位') {
+        //   res.rows[i].workclass = 'success';
+        //   res.rows[i].workcodesList = JSON.parse(res.rows[i].workcodes);
+        // } else 
+        // 课标研读 目标设定 教材研读 框架梳理 学科定位  TODO 后续接入在添加
+        if (res.rows[i].worktype == '课堂展示') {
+          res.rows[i].workclass = 'primary';
+        } else if (res.rows[i].worktype == '框架梳理') {
+          res.rows[i].workclass = 'warning';
+        } else if (res.rows[i].worktype == '常规作业') {
+          res.rows[i].workclass = 'info';
+        } else if (res.rows[i].worktype == '习题训练') {
+          res.rows[i].workclass = 'danger';
+        } else {
+          res.rows[i].workclass = 'primary';
+        }
+
+        // 如果是习题训练任务，则检查一共有多少道
+        if (res.rows[i].entpcourseworklist != '') {
+          res.rows[i].entpcourseworklistarray = JSON.parse('[' + res.rows[i].entpcourseworklist + ']')
+        } else {
+          res.rows[i].entpcourseworklistarray = []
+        }
+
+        res.rows[i].fileShowName = res.rows[i].uniquekey
+      }
+      pushRecordsList.value = res.rows;
+      pushRecordsLoading.value = false;
+    }
+  }).catch((err) => {
+    pushRecordsLoading.value = false;
+  })
+}
+
+const debounceOpenWin = debounce(() => {
+  toolState.isTaskWin=true; // 设置打开批改窗口
+  createWindow('open-taskwin',{url:'/teachClassTask'}); // 调用新窗口批改页面
+}, 1000);
+
+// 批改作业
+const onClickItem = (item) => {
+  console.log('防抖开启弹窗')
+  sessionStore.set('teachClassWorkItem', item); // 缓存点击的item 
+  debounceOpenWin();
 }
 
 /** 
@@ -427,7 +494,7 @@ const handleDelete =() => {
       return delClasswork(ids.join(','));
     }).then(() => {
       setTimeout(() => {
-        getTaskList();
+        initHomeWork();
       }, 1500);
       proxy.$modal.msgSuccess("删除成功");
     }).catch(() => {})
@@ -440,128 +507,116 @@ const handleDelete =() => {
 /**
  * 1.获取作业列表
  */
-const getTaskList = async () => {
-  const { chapterId } = await useGetHomework(courseObj.node)
-    // this.entpcourseid = chapterId
-  // 新版查询方式
-  homeworklist({entpcourseid: chapterId, orderby: "deaddate DESC" , edituserid: userStore.userId, pageSize: 500}).then(res => {
-    let model = [];
-    let mission = [];
+// const getTaskList = async () => {
+//   // 新版查询方式
+//   taskList.value = [];
+//   loading.value = true;
+//   homeworklist({entpcourseid: entpcourseid.value, orderby: "deaddate DESC" , edituserid: userStore.userId, pageSize: 500}).then(res => {
+//     let model = [];
+//     let mission = [];
 
-    if(res.rows&&res.rows.length > 0){
-      // 根据创建时间 倒序排列一下
-      res.rows.sort((a, b) => new Date(b.timestamp) - new Date(a.timestamp));
-    }
-    for (let item of res.rows){
-      item.taskconfig = [];
+//     if(res.rows&&res.rows.length > 0){
+//       // 根据创建时间 倒序排列一下
+//       res.rows.sort((a, b) => new Date(b.timestamp) - new Date(a.timestamp));
+//     }
+//     for (let item of res.rows){
+//       item.taskconfig = [];
 
-      // 赋值默认值
-      if (item.timelength == null) {
-        item.timelength = 1;
-      }
-      if (item.weights == null) {
-        item.weights = 1;
-      }
+//       // 赋值默认值
+//       if (item.timelength == null) {
+//         item.timelength = 1;
+//       }
+//       if (item.weights == null) {
+//         item.weights = 1;
+//       }
 
-      // 处理任务类型的UI
-      if (item.worktype == '学习目标定位') {
-        item.workclass = 'success';
-        item.workcodesList = JSON.parse(item.workcodes);
-      } else if (item.worktype == '教材研读') {
-        item.workclass = 'primary';
-      } else if (item.worktype == '框架梳理') {
-        item.workclass = 'warning';
-      } else if (item.worktype == '学科定位') {
-        item.workclass = 'info';
-      } else if (item.worktype == '习题训练') {
-        item.workclass = 'danger';
-      } else {
-        item.workclass = 'primary';
-      }
-      // 如果是习题训练任务，则检查一共有多少道
-      if (item.entpcourseworklist != '') {
-        item.entpcourseworklistarray = JSON.parse('['+item.entpcourseworklist+']');
-      } else {
-        item.entpcourseworklistarray = [];
-      }
+//       // 处理任务类型的UI
+//       if (item.worktype == '学习目标定位') {
+//         item.workclass = 'success';
+//         item.workcodesList = JSON.parse(item.workcodes);
+//       } else if (item.worktype == '教材研读') {
+//         item.workclass = 'primary';
+//       } else if (item.worktype == '框架梳理') {
+//         item.workclass = 'warning';
+//       } else if (item.worktype == '学科定位') {
+//         item.workclass = 'info';
+//       } else if (item.worktype == '习题训练') {
+//         item.workclass = 'danger';
+//       } else {
+//         item.workclass = 'primary';
+//       }
+//       // 如果是习题训练任务，则检查一共有多少道
+//       if (item.entpcourseworklist != '') {
+//         item.entpcourseworklistarray = JSON.parse('['+item.entpcourseworklist+']');
+//       } else {
+//         item.entpcourseworklistarray = [];
+//       }
 
-      // 根据状态，过滤之前的旧任务
-      if (item.status == '10') {
-        // 任务状态为模板, 直接添加
-        model.push(item);
-        continue;
-      }
-      else if (item.status == '1') {
-        // 任务状态为已推送的任务, 则格式化推送学生数据
-        let ss = [];
-        if (item.classworkdatastudentids != null) {
-          ss = JSON.parse('['+ item.classworkdatastudentids+']');
-        }
-        const js = {
-          id: item.id,
-          classid: item.classid,
-          classcaption: item.classcaption,
-          parentid: 0,
-          worktype: '',
-          workkey: item.workkey,
-          worktag: '',
-          entpcourseid: 0,
-          evalid: 0,
-          edusubject: '',
-          edudegree: '',
-          workdate: '',
-          title: '',
-          workcodes: '',
-          studentlist: ss,
-          deaddate: item.deaddate,
-          timelength: item.timelength,
-          weights: item.weights,
-          feedtype: item.feedtype
-        }
-        item.taskconfig.push(js);
-        mission.push(item);
-      }
-    }
+//       // 根据状态，过滤之前的旧任务
+//       if (item.status == '10') {
+//         // 任务状态为模板, 直接添加
+//         model.push(item);
+//         continue;
+//       }
+//       else if (item.status == '1') {
+//         // 任务状态为已推送的任务, 则格式化推送学生数据
+//         let ss = [];
+//         if (item.classworkdatastudentids != null) {
+//           ss = JSON.parse('['+ item.classworkdatastudentids+']');
+//         }
+//         const js = {
+//           id: item.id,
+//           classid: item.classid,
+//           classcaption: item.classcaption,
+//           parentid: 0,
+//           worktype: '',
+//           workkey: item.workkey,
+//           worktag: '',
+//           entpcourseid: 0,
+//           evalid: 0,
+//           edusubject: '',
+//           edudegree: '',
+//           workdate: '',
+//           title: '',
+//           workcodes: '',
+//           studentlist: ss,
+//           deaddate: item.deaddate,
+//           timelength: item.timelength,
+//           weights: item.weights,
+//           feedtype: item.feedtype
+//         }
+//         item.taskconfig.push(js);
+//         mission.push(item);
+//       }
+//     }
 
-    // 再根据父子关系重新排序
-    let list = [];
-    for (let item of model){
-      item.children = [];
-      for (let child of mission) {
-        if (item.id == child.parentid) {
-          item.children.push(child);
-        }
-      }
-      list.push(item);
-    }
-    // 根据 父项、子项 创建时间倒序排列一下
-    taskList.value = list;
-    loading.value = false;
-  })
-}
+//     // 再根据父子关系重新排序
+//     let list = [];
+//     for (let item of model){
+//       item.children = [];
+//       for (let child of mission) {
+//         if (item.id == child.parentid) {
+//           item.children.push(child);
+//         }
+//       }
+//       list.push(item);
+//     }
+//     // 根据 父项、子项 创建时间倒序排列一下
+//     taskList.value = list;
+//     loading.value = false;
+//   })
+// }
 
 
 // 【编辑/查看】作业说明
-const handleWorkTitleEdit = (row, index) => {
+const handleWorkTitleEdit = (row, index, type) => {
+  currentWorkEdit.currentType = type;
   currentWorkEdit.workTitleEdit = true;
   currentWorkEdit.currentTask = row;
   currentWorkEdit.currentTitle = row.title;
   currentWorkEdit.currentIndex = index;
 };
 
-
-// 作业内容编辑-跳转到设计界面-传参
-let classtaskObj = reactive({
-  id: '', //
-  bookName: '', // 课程名称
-  uniquekey: '', // 设计中的标题
-  title: '', // 设计中的说明
-  worktype: '', // 设计中的作业类型
-  quizlist: [], // 设计中的试题列表
-  chooseWorkLists: [],// 设计中的框架梳理list
-  fileHomeworkList: [],// 设计中的常规作业list
-  whiteboardObj: '',// 设计中的课堂展示对象
-})
 /**
  * 作业内容-查看详情 
  * */ 
@@ -569,10 +624,7 @@ let classtaskObj = reactive({
   console.log(row, index)
   workEdit.value = true
   currentWorkEdit.currentTask = row;
-  // currentWorkEdit.currentIndex = index;
   currentTag.value = row.worktype;
-  // this.attainmentList = row.workcodesList?.attlist;
-  // this.courseQualityList = row.workcodesList?.qualist;
   if (row.worktype == '框架梳理') {
     //包含 entpcourseworklistarray 内容
     var listCourseWork = [];
@@ -652,457 +704,58 @@ let classtaskObj = reactive({
     }
   }
 };
-// 作业内容编辑-跳转到设计界面
-const newHandleWorkEdit2ClassWorkQuizAdd = async (row, index) =>{
-  //重新更新[新任务]中右侧列表数据
-  var listCourseWork = [];
-  for (var i=0; i < row.entpcourseworklistarray.length; i++) {
-    listCourseWork.push(row.entpcourseworklistarray[i]);
-  }
-
-  if (listCourseWork.length > 0) {
-    classtaskObj.id= row.id; // 
-    classtaskObj.bookObj = courseObj; // 教材对象
-    classtaskObj.bookName = row.evaltitle? row.evalparenttitle? row.evalparenttitle+'/'+row.evaltitle : row.evaltitle: row.evalparenttitle// 课程名称:单元/章节： 单元
-    classtaskObj.uniquekey= row.uniquekey; // 设计中的标题
-    classtaskObj.title= row.title; // 设计中的说明
-    classtaskObj.worktype= row.worktype; // 设计中的作业类型
-    classtaskObj.quizlist= []; // 设计中的试题列表
-    classtaskObj.chooseWorkLists = []; //设计中的 框架梳理list
-    classtaskObj.fileHomeworkList = []; //设计中的 常规作业list
-    classtaskObj.whiteboardObj = ''; //设计中的 课堂展示对象
-    
-
-    if (row.worktype == '框架梳理') {
-      // 框架梳理对应只有一个内容
-      const res = await getEvaluationclue(listCourseWork[0].id);
-      if ( res.data==null || res.data==undefined ) {
-        return;
-      }
-      console.log('res.data', res.data);
-      // this.chooseWorkLists = [];
-      res.data.worktype = '框架梳理';
-      res.data.score = listCourseWork[0].score;
-      classtaskObj.chooseWorkLists.push(res.data);
-      //
-      ToNewClassTask(classtaskObj);
-    }
-    else if (row.worktype == '习题训练') {
-      const ids = listCourseWork.map(item => item.id).join(",");
-      listEntpcoursework({ids: ids, pageSize: 50}).then(idres => {
-        // for (var i=0; i<idres.rows.length; i++) {
-        //   idres.rows[i].titletext = idres.rows[i].title.replace(/<[^>]+>/g, '');
-        // }
-        // 格式化试题
-        if(idres.rows&&idres.rows.length > 0){
-          processList(idres.rows);
-          //重新将task中的分值更新
-          row.entpcourseworklistarray.forEach(item => {
-            const quizItem = idres.rows.find(quiz => quiz.id === item.id);
-            if (quizItem) {
-              quizItem.score = item.score;
-              quizItem.scoreOrigin = item.score;
-            }
-          });
-
-          classtaskObj.quizlist = idres.rows;
-          //
-          ToNewClassTask(classtaskObj);
+/**
+ * 作业内容-前往作业设计 编辑页面
+ * @param row 
+ */
+const handleWorkEditItem = (row) => {
+  editListItem(row, courseObj).then((obj) => {
+    if(obj){
+      //前往作业设计
+      router.push({
+        path: '/newClassTask',
+        query: {
+          classtaskObj: JSON.stringify(obj),
         }
       })
-    } 
-    else if (row.worktype == '课堂展示') {
-      console.log('row.课堂展示', row.workcodes);
-      const workcodes = JSON.parse(row.workcodes);
-      classtaskObj.whiteboardObj = JSON.stringify(workcodes.json);
-      //
-      ToNewClassTask(classtaskObj);
     }
-    else if (row.worktype == '常规作业') {
-      if(isJson(row.workcodes)){
-        classtaskObj.fileHomeworkList = JSON.parse(row.workcodes);
-        //
-        ToNewClassTask(classtaskObj);
-      }
-    }
-  }
-};
-/**
- * 跳转 作业设计 进行编辑页面
- * @param classtaskObj 
- */
-const ToNewClassTask = (classtaskObj) => {
-  router.push({
-    path: '/newClassTask',
-    query: {
-      classtaskObj: JSON.stringify(classtaskObj),
-    }
-  })
-}
-
-const isJson = (str) => {
-  if (typeof str == 'string') {
-    try {
-      let obj = JSON.parse(str)
-      if (typeof obj == 'object' && obj) {
-        return true
-      } else {
-        return false
-      }
-    } catch (e) {
-      return false
-    }
-  }
-}
-
-// 获取班级
-const getGradeList = async() =>  {
-  let { rows } = await listClassmain({
-    classuserid: userStore.userId,
-    pageSize: 100,
-    status: 'open'
-  })
-  rows.forEach((item) => {
-    item.label = item.caption
-    item.level = 0
-    item.leaf = false
-    item.children = []
-    item.classstudentlist = JSON.parse('[' + item.classstudentlist + ']')
-    item.classstudentlist.forEach((el) => {
-      el.classid = item.id
-    })
-  })
-  return rows
-};
-// 获取节点下一级
-const getLoad = async (node, resolve) =>{
-  // 获取一级节点 班级
-  if (node.level == 0) {
-    gradeList.value = await getGradeList()
-    resolve(gradeList.value)
-  }
-  // 获取二级节点 小组
-  if (node.level == 1) {
-    listClassgroup({ classid: node.key, orderby: 'orderidx', pageSize: 100 }).then((res) => {
-      if (res.rows.length > 0) {
-        let ary = []
-        res.rows.forEach((item) => {
-          if (item.parentid === 0) {
-            //studentGroup 小组学生  为三级节点
-            let studentGroup = JSON.parse('[' + item.studentlist + ']')
-            studentGroup.forEach((el) => {
-              el.label = el.name
-              el.leaf = true
-              el.level = 2
-              el.id = el.studentid
-              el.classid = item.classid
-            })
-            ary.push({
-              label: item.groupname,
-              leaf: false,
-              ...item,
-              level: 1,
-              // children 小组学生 三级节点 这样就不用再从接口拿
-              children: studentGroup
-            })
-          }
-        })
-        resolve(ary)
-      } else {
-        // 班级下面没有小组 直接取学生
-        let students = node.data.classstudentlist
-        students.forEach((item) => {
-          item.label = item.name
-          item.level = 2
-          item.leaf = true
-        })
-        resolve(students)
-      }
-    })
-  }
-  // 三级节点 小组学生
-  if (node.level == 2) {
-    resolve(node.data.children)
-  }
-}
-
-//节点勾选后触发  拿学生
-const handleCheckChange = (data, checked) => {
-  classWorkConfigForm.studentlist = [];
-  // 选中节点集合
-  let checkNodes = checked.checkedNodes
-  let ary = []
-  checkNodes.forEach((item) => {
-    // 一级节点  班级
-    if (item.level == 0) {
-      ary = [...ary, ...item.classstudentlist]
-    }
-    // 二级节点 班级下面的小组
-    if (item.level == 1) {
-      ary = [...ary, ...item.children]
-    }
-    // 三级节点 小组下面的学生
-    if (item.level == 2) {
-      ary = [...ary, item]
-    }
-  })
-  classWorkConfigForm.studentlist = uniqBy(ary, 'studentid')
-};
-// 从已经选中的学生中删除
-const handleClassDialogClassStudentRemove = (item,index) => {
-  classWorkConfigForm.studentlist.splice(index, 1);
-  // 同步删除 [班级、班级]小组]中对应的该学生
-  proxy.$refs.treeRef.setChecked(item.id, false, true);
-  //TODO 后续再看 ，待完善
-  // const ids = this.$refs.treeRef.getCheckedKeys();
-  // console.log(ids)
-  // console.log(ids.filter((_item)=>_item == item.id),'???????')
-  // if(ids&&ids.filter((_item)=>_item == item.id).length>0){
-  //   console.log(ids,'?====?')
-  //   console.log(item.id,'?=item.id===?')
-  //   // 个人多组的情况，再次删除该个人?为啥没删除掉呢
-  //   this.$refs.treeRef.setChecked(item.id, false, true);
-  //   // setCheckedKeys
-  // }
-};
-
-/**
- * 处理在作业推送前的任务配置
- */
-const openClassWorkConfigDialog = (row, configindex, type) => {
-  // 初始
-  workConfDialogOpen.value = true;
-  classWorkConfigForm.formRowsType = '';//
-  classWorkConfigForm.formRowsList = null;
-  if(type == 'list'){
-    classWorkConfigForm.formRowsType = 'list';
-    classWorkConfigForm.formRowsList = row;
-  }else{
-    classWorkConfigForm.formRowsType = 'item';
-    classWorkConfigForm.formRowsList = [row];
-  }
-  // TODO 重复推送？待完善
-  // if (configindex > -1) {
-  //   this.handleClassDialogConfigShow(configindex, 0)
-  // }
-
-  classWorkConfigForm.deaddate = getCurrentTime('YYYY-MM-DD');
-  classWorkConfigForm.deadhour = getCurrentTime('HH+3');//当前时间 往后延时3个小时；
-  classWorkConfigForm.deadmin = getCurrentTime('mm');
-  classWorkConfigForm.timelength = 1;
-};
-
-
-
-/**
- * 推送配置：保存配置
- * @param key 'cancel' or 'submit'
- */
-const handleWorkConfigUpdate = (key,row) => {
-  if (key == 'cancel') {
-    workConfDialogOpen.value = false;
-  } else if (key == 'submit') {
-
-    // 2024-04-08, by jackyshen
-    // 注意，这里的逻辑较复杂。不能以this.classWorkConfigForm.classlist为准，需要从选中的学生要找出班级列表
-    var clist = [];
-    var cidlist = [];
-    for (var i=0; i< classWorkConfigForm.studentlist.length; i++) {
-      if (cidlist.indexOf(classWorkConfigForm.studentlist[i].classid) == -1) {
-        // 再找班级名称，为了在UI上能展示出哪个班级
-        var clsname = '';
-        for (var d = 0; d<gradeList.value.length; d++) {
-          if (gradeList.value[d].id == classWorkConfigForm.studentlist[i].classid) {
-            clsname = gradeList.value[d].caption;
-          }
-        }
-        clist.push({id: classWorkConfigForm.studentlist[i].classid, caption: clsname});
-        cidlist.push(classWorkConfigForm.studentlist[i].classid);
-      }
-    }
-
-    // 20240408，酉阳教委，207
-    // 如果index > -1，则是已有的配置方案。删除后再添加
-    // 为什么尼？
-    // 因为存在多个班级的问题，在修改过程中，如果添加了新的班级学生，则需要删除原来的，再添加新的。
-    // 好，就这么愉快的决定
-    // if (classWorkConfigForm.index > -1) {
-    //   classWorkConfigForm.classWorkConfigList.splice(classWorkConfigForm.activeClassWorkIndex);
-    // }
-    // 处理小时和分钟
-    var hh = classWorkConfigForm.deadhour;
-    hh = "0"+hh;
-    hh = hh.substr(hh.length-2, 2);
-    var mm = classWorkConfigForm.deadmin;
-    mm = "0"+mm;
-    mm = mm.substr(mm.length-2, 2);
-
-    // 处理日期
-    classWorkConfigForm.deaddate = '' + classWorkConfigForm.deaddate;
-    if (isNaN(classWorkConfigForm.deaddate.substring(0,4))) {
-      var dd = new Date(classWorkConfigForm.deaddate);
-      var year = dd.getFullYear(); //年份
-      var month = dd.getMonth() + 1; //月份（0-11）
-      month = "0"+month;
-      month = month.substr(month.length-2,2);
-      var day = dd.getDate(); //天数（1到31）
-      day = "0"+day;
-      day = day.substr(day.length-2,2);
-
-      classWorkConfigForm.deaddate = year+'-'+month+'-'+day;
-    }
-
-    classWorkConfigForm.classWorkConfigList = [];
-    // 新建的配置方案
-    for (var i=0; i<clist.length; i++) {
-      // clist里面包含多个班级、多个班级的学生。选中的学生中 classWorkConfigForm.studentlist 包含多个班级的学生 studentlist赋值需要根据id判断筛选一下
-      const clsStuList = classWorkConfigForm.studentlist&&classWorkConfigForm.studentlist.filter(item=>item.classid == clist[i].id);
-      classWorkConfigForm.classWorkConfigList.push({
-        id: 0,
-        classid: clist[i].id,
-        classcaption: clist[i].caption, // 班级名称
-        parentid: 0,
-        worktype: '',
-        workkey: classWorkConfigForm.workkey,
-        worktag: '',
-        entpcourseid: 0,
-        evalid: 0,
-        edusubject: '',
-        edudegree: '',
-        workdate: '',
-        title: '',
-        workcodes: '',
-        studentlist: clsStuList,
-        timelength: classWorkConfigForm.timelength,
-        weights: classWorkConfigForm.weights,
-        feedtype: classWorkConfigForm.feedtype,
-        deaddate: classWorkConfigForm.deaddate+' '+hh+":"+mm,
-      });
-    }
-
-    if(classWorkConfigForm.formRowsType == 'list'){
-      // 一键推送：list推送
-      for(var d=0;d<classWorkConfigForm.formRowsList.length;d++){
-        classWorkConfigForm.rowid = classWorkConfigForm.formRowsList[d].id;
-
-        // 20240308，by jackyshen
-        // 注意，这是要把 classWorkConfigForm.classWorkConfigList保存给taskList[i]
-        // 这个 classWorkConfigForm.classWorkConfigList里面，包括了多个配置策略（多班级、多学生）
-        for (var i=0; i<taskList.value.length; i++) {
-          if (taskList.value[i].id == classWorkConfigForm.rowid) {
-            taskList.value[i].taskconfig = classWorkConfigForm.classWorkConfigList;
-            break;
-          }
-        }
-      }
-    }else{
-      // 单个推送：item推送
-      classWorkConfigForm.rowid = classWorkConfigForm.formRowsList[0].id;
-
-      // 20240308，by jackyshen
-      // 注意，这是要把 classWorkConfigForm.classWorkConfigList保存给taskList[i]
-      // 这个 classWorkConfigForm.classWorkConfigList里面，包括了多个配置策略（多班级、多学生）
-      for (var i=0; i<taskList.value.length; i++) {
-        if (taskList.value[i].id == classWorkConfigForm.rowid) {
-          taskList.value[i].taskconfig = classWorkConfigForm.classWorkConfigList;
-          break;
-        }
-      }
-    }
-
-    // 重置
-    classWorkConfigForm.id = 0;
-    classWorkConfigForm.index = -1;
-    classWorkConfigForm.selclassid = 0;
-    classWorkConfigForm.classlist = [];
-    classWorkConfigForm.studentlist = [];
-    classWorkConfigForm.feedtype = '必做';
-    classWorkConfigForm.workkey = '';
-    classWorkConfigForm.selgroupid = 0;
-    classWorkConfigForm.classGroups = [];
-    classWorkConfigForm.availableStudents = [];
-    classWorkConfigForm.deaddate = getCurrentTime('YYYY-MM-DD');
-    classWorkConfigForm.deadhour = getCurrentTime('HH+3');
-    classWorkConfigForm.deadmin = getCurrentTime('mm');
-    classWorkConfigForm.timelength = 1;
-    classWorkConfigForm.weights = 1;
-  }
-};
-
-/**
- * 推送
- */
-const handleTaskAssignToAllClassType = async() => {
-  if(classWorkConfigForm.studentlist.length == 0){
-    return proxy.$modal.msgWarning('请选择需要推送的学生!');
-  }
-  // this.classWorkToStudent_Loading = true;
-
-  // 保存配置
-  handleWorkConfigUpdate('submit', '')
-  const { chapterId } = await useGetHomework(courseObj.node)
-  // this.entpcourseid = chapterId
-
-  console.log(taskList.value,'===============this.taskListthis.taskList')
-  var ttt = [];
-  for (var i=0; i<taskList.value.length; i++) {
-    // 20240408, by jackyshen
-    // 这里根据taskconfig.classWorkList来优化，其中包括了多个班级、多个学生
-    for (var t=0; t<taskList.value[i].taskconfig.length; t++) {
-      if (taskList.value[i].taskconfig[t].id == 0) {
-
-        ttt.push({
-          id: 0,
-          parentid: taskList.value[i].id,
-          classid: taskList.value[i].taskconfig[t].classid,
-          classcourseid: 0,
-          entpcourseid: chapterId,
-          studentlist: JSON.stringify(taskList.value[i].taskconfig[t].studentlist),
-          feedback: taskList.value[i].taskconfig[t].feedtype,
-          workkey: taskList.value[i].taskconfig[t].workkey,
-          timelength: taskList.value[i].taskconfig[t].timelength,
-          weights: taskList.value[i].taskconfig[t].weights,
-          deaddate: taskList.value[i].taskconfig[t].deaddate,
-          workdate: getCurrentTime('YYYY-MM-DD'),
-          uniquekey: taskList.value[i].uniquekey,
-          entpcourseworklist: '['+taskList.value[i].entpcourseworklist+']',      // 当前任务所包含的题目，必须是JSON格式
-          needMsgNotifine: 'false',
-          msgkey: 'newclasswork',
-          title: taskList.value[i].title,
-          status:'1',
-          msgcontent: '',   // 这个在服务端里会写入classwork的json
-          teachername: userStore.nickName,
-          unixstamp: new Date().getTime(),
-        });
-      }
-    }
-  }
-  console.log(ttt,'===============ttt')
-
-  if(ttt.length == 0){
-    proxy.$modal.msgError('您还未进行作业配置，请配置后再推送');
-    return;
-  }
-
-  var wForm = {};
-  wForm.classworkarray = JSON.stringify(ttt);
-  console.log(wForm,'推送的配置信息------------')
-  saveByClassWorkArray(wForm).then(response => {
-    console.log(response,'===============response');
-    // this.classWorkToStudent_Loading = false;
-    workConfDialogOpen.value = false;
-    proxy.$modal.msgSuccess("作业推送成功");
-    // 清空班级树状勾选项内容
-    proxy.$refs.treeRef.setCheckedKeys([]);
-    // 刷新作业布置页面
-    nextTick(() => {
-      getTaskList();
-    })
-  }).catch((error) =>{
-    // this.classWorkToStudent_Loading = false;
-    workConfDialogOpen.value = false;
   });
-};
+}
+
+/**
+ * 推送作业配置
+ * //改为list形式，有地方需要批量布置推送
+ */
+// 打开布置作业窗口
+const openSet=(row, type)=> {
+  if(type == 'list'){
+    // 批量布置推送 row 是多个rows，直接赋值
+    rowsList.value = row;
+    setDialog.value = true;
+  }else{
+    // 单个布置推送 row 是单个row,变成数组
+    rowsList.value = [row];
+    setDialog.value = true;
+  }
+}
+/**
+ * 关闭布置作业窗口
+ */
+const closeHomework = () => {
+  rowsList.value = [];
+  setDialog.value = false;
+}
+/**
+ * 推送布置作业成功
+ */
+const successHomework = () => {
+  rowsList.value = [];
+  setDialog.value = false;
+  // 刷新布置列表
+  nextTick(() => {
+    initHomeWork();
+  })
+}
 
 /**
  * 一键推送
@@ -1113,7 +766,7 @@ const handleTaskAssignToAllClass = () => {
     proxy.$modal.confirm('是否确认推送选中的学习任务？').then(()=> {
     }).then(() => {
       // 弹出配置窗口 ，让用户配置推送策略
-      openClassWorkConfigDialog(rows, -1,'list')
+      openSet(rows,'list');
     }).catch(() => {})
   }else{
     return proxy.$modal.alertWarning("请选择需要推送的任务!");
@@ -1125,7 +778,12 @@ const handleTaskAssignToAllClass = () => {
  */
 const handleNewClassWorkDialog = () => {
   // 打开作业设计页面
-  router.push({ path: '/newClassTask' });
+  router.push({ 
+    path: '/newClassTask',
+    query: {
+      isBack: true,
+    } 
+  });
 }
 
 /**
@@ -1158,7 +816,7 @@ const submitWorkTitle = () => {
     proxy.$modal.msgSuccess("修改成功");
     currentWorkEdit.workTitleEdit = false;
     // 刷新列表，重新获取数据
-    getTaskList();
+    initHomeWork();
   });
 };
 
@@ -1214,10 +872,8 @@ const selectable=(row, index)=>{
 onMounted(() => {
 })
 
-watch(() => courseObj.node, (newVal) => {
+watch(() => courseObj.node, (newVal,oldVal) => {
   console.log(courseObj,'课程选择')
-  // 习题资源
-  getTaskList();
 })
 
 </script>
@@ -1278,3 +934,4 @@ watch(() => courseObj.node, (newVal) => {
   }
 }
 </style>
+<style src="@/assets/styles/JYStyle.css"></style>
\ No newline at end of file
diff --git a/src/renderer/src/views/classTask/container/classOverview/distribution/echarts.vue b/src/renderer/src/views/classTask/container/classOverview/distribution/echarts.vue
index 4ba8db2..5447495 100644
--- a/src/renderer/src/views/classTask/container/classOverview/distribution/echarts.vue
+++ b/src/renderer/src/views/classTask/container/classOverview/distribution/echarts.vue
@@ -74,8 +74,8 @@ function initChart() {
         position: 'top',
         formatter: params => {
           const value = dataList.value[params.dataIndex].value;
-          const percentage = ((value / total) * 100).toFixed(2); // 计算百分比并保留两位小数
-          return `${percentage}%`; // 显示为百分比形式
+          const percentage = value ? ((value / total) * 100).toFixed() : 0; // 计算百分比并保留两位小数
+          return `${value}人 ${percentage}%`; // 显示为百分比形式
         },
         color: '#333',
         fontSize: 12
diff --git a/src/renderer/src/views/classTask/container/newTask/prevReadMsg-Dialog.vue b/src/renderer/src/views/classTask/container/newTask/prevReadMsg-Dialog.vue
index a96cd04..953e677 100644
--- a/src/renderer/src/views/classTask/container/newTask/prevReadMsg-Dialog.vue
+++ b/src/renderer/src/views/classTask/container/newTask/prevReadMsg-Dialog.vue
@@ -125,7 +125,7 @@ onMounted(() => {
 
 
 watch(() => props.bookobj.levelSecondId, (newVal) => {
-  console.log(props.bookobj,'课程选择')
+  // console.log(props.bookobj,'课程选择')
   
 })
 
diff --git a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
index 022bc4d..8a3efe0 100644
--- a/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
+++ b/src/renderer/src/views/classTask/container/newTask/taskTypeView.vue
@@ -266,6 +266,10 @@ const props = defineProps({
   isedit: {
     type: Boolean,
     default: false
+  },
+  isback:{
+    type: Boolean,
+    default: false
   }
 })
 
@@ -737,14 +741,16 @@ const handleClassWorkSave = async () => {
           //这里分离了，所以不需要更新表单数据了
           // this.getClassWorkAllList();
 
-          // TODO 后续看是否跳转到 作业布置页面
-
-          //TODO 下面3个后续看是啥
-          // this.newWorkSpace = false;
-          // this.newWorkSpaceEdit = false;
-          // this.workEdit = false;
         })
       }
+      
+      if(props.isback){
+        // 其他页面进入的 返回上一页
+        router.back();
+      }else{
+        // 首页进入的，跳转到作业布置页面
+        router.push({ path: '/classTaskAssign' });
+      }
     }
   });
 };
@@ -976,3 +982,4 @@ watch(() => props.bookobj.levelSecondId, (newVal) => {
 
 }
 </style>
+<style src="@/assets/styles/JYStyle.css"></style>
diff --git a/src/renderer/src/views/classTask/newClassTask.vue b/src/renderer/src/views/classTask/newClassTask.vue
index 16e2df2..b1d8236 100644
--- a/src/renderer/src/views/classTask/newClassTask.vue
+++ b/src/renderer/src/views/classTask/newClassTask.vue
@@ -16,6 +16,7 @@
       <el-row style="align-items: center; margin-bottom: 0px; flex: 0 0 auto">
         <el-col :span="12" style="padding-left: 20px; text-align: left;">
           <div v-if="!isOpenLeftBook" class="unit-top-left cursor-pointer" @click="onOpenLeftBook">
+            <i v-if="isback" class="iconfont icon-xiangzuo cursor-pointer" style="color: blue;" @click="goBack">返回上页</i>
             <i v-if="!isCollapse" class="iconfont icon-xiangzuo" style="color: blue;"></i>
             <span>课程目录</span>
             <i v-if="isCollapse" class="iconfont icon-xiangyou" style="color: blue;"></i>
@@ -35,7 +36,7 @@
         </el-col>
       </el-row>
       <!-- 作业类型:内容 -->
-      <task-type-view :bookobj="courseObj" :propsformobj="classWorkForm" :isedit="isOpenLeftBook" style="flex: 1; overflow: hidden;"/>
+      <task-type-view :bookobj="courseObj" :isback="isback" :propsformobj="classWorkForm" :isedit="isOpenLeftBook" style="flex: 1; overflow: hidden;"/>
     </div>
   </div>
 </template>
@@ -53,6 +54,7 @@ const route = useRoute();
 const router = useRouter()
 const { proxy } = getCurrentInstance()
 
+const isback = ref(route.query.isBack?true:false);
 const classtaskObj = route.query.classtaskObj;//作业布置的内容对象
 const bookTitle = ref(classtaskObj? JSON.parse(classtaskObj).bookName: '');// 课程名称
 const isOpenLeftBook = ref(classtaskObj? JSON.parse(classtaskObj).id ? true : false: false ); // 是否打开左侧目录
@@ -183,3 +185,4 @@ onMounted(() => {
   }
 }
 </style>
+<style src="@/assets/styles/JYStyle.css"></style>
diff --git a/src/renderer/src/views/desktop/container/work-trend.vue b/src/renderer/src/views/desktop/container/work-trend.vue
index 957c59d..79a9bcd 100644
--- a/src/renderer/src/views/desktop/container/work-trend.vue
+++ b/src/renderer/src/views/desktop/container/work-trend.vue
@@ -16,6 +16,7 @@
                 <span class="name">{{ item.uniquekey }}</span>
                 <el-tag class="tag" round :type="tagType(item.deaddate)" effect="dark" size="small">{{
                   getCurrentTime('YYYY-MM-DD HH:mm') > item.deaddate ? '已结束' : '进行中' }}</el-tag>
+                  <el-tag :type="item.workclass" size="large">{{ item.worktype }}</el-tag>
               </div>
               <div class="class-time">{{ item.classcaption }} | 截止时间：{{ item.deaddate }} </div>
             </div>
@@ -50,11 +51,27 @@ const getHomework = async () => {
   loading.value = true
   const { edustage, edusubject } = user
   try {
-    const { rows } = await homeworklist({ edituserid: user.userId, edustage, edusubject, deaddate: getTomorrow(), status: '1', orderby: 'uniquekey DESC', pageSize: 500 })
+    const { rows } = await homeworklist({ edituserid: user.userId, edustage, edusubject, deaddate: getTomorrow(), status: '1', orderby: 'deaddate DESC', pageSize: 500 })
     // 只展示进行中的
-    // homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey && getCurrentTime('YYYY-MM-DD HH:mm') < item.deaddate)
-    homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey && getTomorrow() <= item.deaddate)   //大于今天的才算进行中
+    homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey && getCurrentTime('YYYY-MM-DD HH:mm') < item.deaddate) // 当前日期的时分与截止日期进行判断
+    // homeworkList.value = rows.filter(item => item.deaddate && item.uniquekey && getTomorrow() <= item.deaddate)   //大于今天的才算进行中 弃用
     homeworkList.value.forEach((item) => {
+      // 处理任务类型的UI
+      if (item.worktype == '学习目标定位') {
+        item.workclass = 'success'
+        item.workcodesList = JSON.parse(item.workcodes)
+      } else if (item.worktype == '教材研读') {
+        item.workclass = 'primary'
+      } else if (item.worktype == '框架梳理') {
+        item.workclass = 'warning'
+      } else if (item.worktype == '学科定位') {
+        item.workclass = 'info'
+      } else if (item.worktype == '习题训练') {
+        item.workclass = 'danger'
+      } else {
+        item.workclass = ''
+      }
+
       item.workdatacount = JSON.parse('[' + item.classworkdatastudentids + ']').length
       // 如果是习题训练任务，则检查一共有多少道
       if (item.entpcourseworklist != '') {
diff --git a/src/renderer/src/views/desktop/index.vue b/src/renderer/src/views/desktop/index.vue
index 065ea02..8352c8b 100644
--- a/src/renderer/src/views/desktop/index.vue
+++ b/src/renderer/src/views/desktop/index.vue
@@ -113,17 +113,17 @@ const menuList = [{
       {
         name: '作业设计',
         icon: '#icon-zuoyesheji',
-        isOuter: true,
-        path: '/teaching/classtaskassign?titleName=作业布置&openDialog=newClassTask',
-        // path: '/newClassTask',
+        // isOuter: true,
+        // path: '/teaching/classtaskassign?titleName=作业布置&openDialog=newClassTask',
+        path: '/newClassTask',
         id: '2-1'
       },
       {
         name: '作业布置',
         icon: '#icon-zuoyebuzhi',
-        isOuter: true,
-        path: '/teaching/classtaskassign?titleName=作业布置',
-        // path: '/classTaskAssign',
+        // isOuter: true,
+        // path: '/teaching/classtaskassign?titleName=作业布置',
+        path: '/classTaskAssign',
         id: '2-2'
       },
       {
diff --git a/src/renderer/src/views/prepare/container/file-list-item.vue b/src/renderer/src/views/prepare/container/file-list-item.vue
index f617afb..eeb77d0 100644
--- a/src/renderer/src/views/prepare/container/file-list-item.vue
+++ b/src/renderer/src/views/prepare/container/file-list-item.vue
@@ -22,7 +22,8 @@
       <div class="prepare-item-info-message">
         <div style="width: 60px">
           <template v-if="item.uniquekey">
-            {{ item.worktype }}
+            <!-- {{ item.worktype }} -->
+            <el-tag :type="item.workclass" size="large">{{ item.worktype }}</el-tag>
           </template>
           <template v-else>
             <el-icon
diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue
index 0f5645e..8e74903 100644
--- a/src/renderer/src/views/prepare/index.vue
+++ b/src/renderer/src/views/prepare/index.vue
@@ -95,7 +95,8 @@
            <div class="prepare-body-header">
               <div>
                 <label style="font-size: 15px">共{{ currentWorkList.length }}个作业</label>&nbsp;
-                <el-button size="small" @click="handleOutLink('homeWork')">作业设计</el-button>
+                <!-- <el-button size="small" @click="handleOutLink('homeWork')">作业设计</el-button> -->
+                <el-button size="small" @click="goNewClassTask()">作业设计</el-button>
               </div>
             </div>
             <div class="prepare-work-wrap">
@@ -105,7 +106,7 @@
                 :item="item"
                 :index="index"
                 @on-set="openSet"
-                @on-reSet="openReSet"
+                @on-reSet="openReSet" 
                 @on-delhomework="delhomework"
               >
               </file-list-item>
@@ -126,7 +127,7 @@
     </div>
     <MoveFile v-model="isMoveDialogOpen" @on-submit="chooseMoveCata" />
     <uploadDialog v-model="isDialogOpen" @submit-file="submitFile" />
-    <SetHomework v-model="setDialog" :entpcourseid="entpcourseid" :row="row" />
+    <SetHomework v-model="setDialog" :entpcourseid="entpcourseid" :rows="rows" />
   </div>
   <reserv
     ref="reservDialog"
@@ -171,6 +172,7 @@ import { delClasswork, listEntpcourse } from '@/api/teaching/classwork'
 import { updateClasscourse } from '@/api/teaching/classcourse'
 import { getClassInfo, getSelfReserv, endClass } from '@/api/classManage'
 import { useGetHomework } from '@/hooks/useGetHomework'
+import { editListItem } from '@/hooks/useClassTask'
 import { addEntpcoursefileReturnId } from '@/api/education/entpcoursefile'
 import ClassReserv from '@/views/classManage/classReserv.vue'
 import classStart from './container/class-start.vue' // 预备上课
@@ -229,7 +231,7 @@ export default {
       entpcourseid: '',
       // 布置作业弹窗
       setDialog: false,
-      row: '',
+      rows: '',
       isOpenHomework: false,
       // 当前上课课程
       activeClass: null,
@@ -655,34 +657,44 @@ export default {
       this.$refs['reservDialog'].openDialog()
     },
 
-    // 打开外部链接
-    handleOutLink(key) {
-      if (key == 'homeWork') {
-        this.isOpenHomework = true
-      }
-      // key 对应的 linkConfig.js 外部链接配置
-      let configObj = outLink()[key]
-      let fullPath = configObj.fullPath
-      //打开作业 高考 url增加unitId 章节ID
-      if (key != 'standard' && key != 'aiModel') {
-        let unitId = this.uploadData.levelSecondId
-          ? this.uploadData.levelSecondId
-          : this.uploadData.levelFirstId
-        let bookId = this.uploadData.textbookId;
-        if(fullPath.indexOf('?') == -1){
-          fullPath += `?unitId=${unitId}&bookId=${bookId}&openDialog=newClassTask`
-        }
-        else{
-          fullPath += `&unitId=${unitId}&bookId=${bookId}&openDialog=newClassTask`
-        }
-      }
+    // 打开外部链接 
+    // handleOutLink(key) {
+    //   if (key == 'homeWork') {
+    //     this.isOpenHomework = true
+    //   }
+    //   // key 对应的 linkConfig.js 外部链接配置
+    //   let configObj = outLink()[key]
+    //   let fullPath = configObj.fullPath
+    //   //打开作业 高考 url增加unitId 章节ID
+    //   if (key != 'standard' && key != 'aiModel') {
+    //     let unitId = this.uploadData.levelSecondId
+    //       ? this.uploadData.levelSecondId
+    //       : this.uploadData.levelFirstId
+    //     let bookId = this.uploadData.textbookId;
+    //     if(fullPath.indexOf('?') == -1){
+    //       fullPath += `?unitId=${unitId}&bookId=${bookId}&openDialog=newClassTask`
+    //     }
+    //     else{
+    //       fullPath += `&unitId=${unitId}&bookId=${bookId}&openDialog=newClassTask`
+    //     }
+    //   }
 
-      // 通知主进程
-      ipcRenderer.send('openWindow', {
-        key,
-        fullPath: fullPath,
-        cookieData: { ...configObj.data }
-      })
+    //   // 通知主进程
+    //   ipcRenderer.send('openWindow', {
+    //     key,
+    //     fullPath: fullPath,
+    //     cookieData: { ...configObj.data }
+    //   })
+    // },
+    // 前往作业设计页面
+    goNewClassTask(){
+      // router.push({ path: '/newClassTask' });
+      this.$router.push({ 
+        path: '/newClassTask',
+        query: {
+          isBack: true,
+        } 
+      });
     },
     getWeekday1(date) {
       const weekdays = ['周日', '周一', '周二', '周三', '周四', '周五', '周六']
@@ -691,29 +703,51 @@ export default {
     },
     // 打开布置作业窗口
     openSet(row) {
-      this.row = row
+      // 布置推送：row 这里是单个，转为list
+      this.rows = [row]
       this.setDialog = true
     },
     // 打开作业编辑窗口
     openReSet(row) {
-      // 新窗口打开标识
-      this.isOpenHomework = true;
-      // key 对应的 linkConfig.js 外部链接配置
-      let configObj = outLink()['homeWork']
-      let fullPath = configObj.fullPath
+      //跳转 作业设计 编辑页面
+      const courseObj = {
+        textbookId: this.uploadData.textbookId,
+        levelFirstId: this.uploadData.levelFirstId,
+        levelSecondId: this.uploadData.levelSecondId,
+        coursetitle: this.currentNode.itemtitle,  // (单元/章节) 名称,
+        node: this.currentNode, // 选择的课程节点
+      }
+      console.log('courseObj', courseObj)
+      editListItem(row, courseObj).then((obj) => {
+        if(obj){
+          //前往作业设计
+          this.$router.push({
+            path: '/newClassTask',
+            query: {
+              classtaskObj: JSON.stringify(obj),
+            }
+          })
+        }
+      });
+      //---------------------
+      // 暂时弃用 外链 新窗口打开标识 
+      // this.isOpenHomework = true;
+      // // key 对应的 linkConfig.js 外部链接配置
+      // let configObj = outLink()['homeWork']
+      // let fullPath = configObj.fullPath
 
-      let unitId = this.uploadData.levelSecondId
-          ? this.uploadData.levelSecondId
-          : this.uploadData.levelFirstId
-      let bookId = this.uploadData.textbookId;
-      fullPath += `&unitId=${unitId}&bookId=${bookId}&courseWorkId=${row.id}`
+      // let unitId = this.uploadData.levelSecondId
+      //     ? this.uploadData.levelSecondId
+      //     : this.uploadData.levelFirstId
+      // let bookId = this.uploadData.textbookId;
+      // fullPath += `&unitId=${unitId}&bookId=${bookId}&courseWorkId=${row.id}`
 
-      // 通知主进程
-      ipcRenderer.send('openWindow', {
-        key: 'homeWork',
-        fullPath: fullPath,
-        cookieData: { ...configObj.data }
-      })
+      // // 通知主进程
+      // ipcRenderer.send('openWindow', {
+      //   key: 'homeWork',
+      //   fullPath: fullPath,
+      //   cookieData: { ...configObj.data }
+      // })
     },
     // 删除作业
     delhomework(item) {
diff --git a/src/renderer/src/views/tool/components/homework.vue b/src/renderer/src/views/tool/components/homework.vue
index f4a053f..b5af42b 100644
--- a/src/renderer/src/views/tool/components/homework.vue
+++ b/src/renderer/src/views/tool/components/homework.vue
@@ -47,7 +47,7 @@
                     </div>
                   </div>
                 </div>
-                <el-button color="#349d44" @click="sendHomework(item)">推送</el-button>
+                <el-button color="#349d44" @click="sendHomework(item,'item')">推送</el-button>
               </li>
               <div class="no-data flex" v-if="!dataList.length && !resourceList.length">
                 <i class="iconfont icon-zanwushuju"></i>
@@ -56,7 +56,7 @@
             </ul>
           </el-scrollbar>
         </div>
-        <SetHomework v-model="setDialog" :title="'推送作业'" :entpcourseid="entpcourseid" :row="curRow"
+        <SetHomework v-model="setDialog" :title="'推送作业'" :entpcourseid="entpcourseid" :rows="curRow"
           @on-close="closeHomework" @on-success="successHomework"/>
       </div>
       <div class="homework flex"  v-else>
@@ -110,8 +110,11 @@ const curNode = reactive({
   data: {}
 })
 
-const sendHomework = (row) => {
-  curRow.value = row
+const sendHomework = (row,type) => {
+  if(type == 'item'){
+    // 布置推送单个作业
+    curRow.value = [row]
+  }
   setTimeout(() => {
     ipcMsgSend('tool-sphere:set:ignore', false)
   }, 200)