From df84893509dff5181894ab20e08d4d2206dbe965 Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Fri, 2 Aug 2024 10:01:05 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=B8=83=E7=BD=AE=E4=BD=9C=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/api/teaching/classwork.js    |   9 ++
 .../src/components/move-file/index.vue        |   6 +
 .../views/prepare/container/set-homework.vue  | 110 ++++++++++++++----
 src/renderer/src/views/prepare/index.vue      |   9 +-
 4 files changed, 106 insertions(+), 28 deletions(-)

diff --git a/src/renderer/src/api/teaching/classwork.js b/src/renderer/src/api/teaching/classwork.js
index caeea2d..db353f3 100644
--- a/src/renderer/src/api/teaching/classwork.js
+++ b/src/renderer/src/api/teaching/classwork.js
@@ -16,4 +16,13 @@ export function listEntpcourse(query) {
     method: 'get',
     params: query
   })
+}
+
+// 布置作业
+export function saveByClassWorkArray(data) {
+  return request({
+    url: '/education/classwork/saveByClassWorkArray',
+    method: 'post',
+    data: data
+  })
 }
\ No newline at end of file
diff --git a/src/renderer/src/components/move-file/index.vue b/src/renderer/src/components/move-file/index.vue
index c53f726..ebf1524 100644
--- a/src/renderer/src/components/move-file/index.vue
+++ b/src/renderer/src/components/move-file/index.vue
@@ -158,6 +158,12 @@ const getSubject = async () => {
   curBookId.value = subjectList.value[0].id
 }
 
+const isHaveUnit = (id) => {
+  return evaluationList.value.some(item => {
+    return item.rootid == id
+  })
+}
+
 const getTreeData = () => {
   //数据过滤
   let upData = transData(volumeOne.value)
diff --git a/src/renderer/src/views/prepare/container/set-homework.vue b/src/renderer/src/views/prepare/container/set-homework.vue
index e23f526..94bd531 100644
--- a/src/renderer/src/views/prepare/container/set-homework.vue
+++ b/src/renderer/src/views/prepare/container/set-homework.vue
@@ -11,26 +11,28 @@
     <div>
       <el-form :model="form" label-width="80px">
         <el-form-item label="班级">
-          <el-tree ref="treeRef" :data="treeData" :props="defaultProps" :load="getLoad" node-key="id"
-            @check="handleCheckChange" lazy show-checkbox />
+          <el-scrollbar max-height="200px" style="width: 100%;">
+            <el-tree ref="treeRef" :data="treeData" :props="defaultProps" :load="getLoad" node-key="id"
+              @check="handleCheckChange" lazy show-checkbox />
+          </el-scrollbar>
         </el-form-item>
         <el-form-item label="选中学生">
           <el-scrollbar max-height="200px">
-          <el-tag v-for="(tag, index) in studentList" :key="tag.studentid" closable type="primary"
-            @close="delStudent(index)">
-            {{ tag.name }}
-          </el-tag>
-        </el-scrollbar>
+            <el-tag v-for="(tag, index) in studentList" :key="tag.studentid" closable type="primary"
+              @close="delStudent(index)">
+              {{ tag.name }}
+            </el-tag>
+          </el-scrollbar>
         </el-form-item>
         <el-form-item label="完成要求">
-          <el-radio-group v-model="form.feedtype">
+          <el-radio-group v-model="form.feedback">
             <el-radio value="必做" size="large">必做</el-radio>
             <el-radio value="选做" size="large">选做</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="截至时间">
-          <el-date-picker v-model="endTime" value-format="YYYY-MM-DD HH:mm:ss" type="datetime" placeholder="请选择截至时间"
-            @change="changeTime" />
+        <el-form-item label="截止时间">
+          <el-date-picker v-model="form.deaddate" value-format="YYYY-MM-DD HH:mm" format="YYYY-MM-DD HH:mm"
+            time-format="HH:mm" type="datetime" placeholder="请选择截止时间" @change="changeTime" />
         </el-form-item>
         <el-form-item label="推荐用时">
           <el-input-number v-model="form.timelength" :min="1" :max="500" />
@@ -41,7 +43,7 @@
     <template #footer>
       <div class="dialog-footer">
         <el-button @click="cloneDialog">取消</el-button>
-        <el-button type="primary" @click="dialogVisible = false">
+        <el-button type="primary" @click="onSubmit">
           确定
         </el-button>
       </div>
@@ -50,14 +52,22 @@
 </template>
 
 <script>
+import { ElMessage } from 'element-plus'
 import { listClassmain, listClassgroup } from '@/api/classManage/index'
+import { saveByClassWorkArray } from '@/api/teaching/classwork'
 import useUserStore from '@/store/modules/user'
-import { uniqBy, cloneDeep } from 'lodash'
+import { uniqBy } from 'lodash'
 export default {
   props: {
     modelValue: {
       type: Boolean,
       default: false
+    },
+    entpcourseid: {
+      default: ''
+    },
+    row: {
+      default: ''
     }
   },
   data() {
@@ -80,19 +90,18 @@ export default {
       studentList: [],
       // 表单
       form: {
-        feedtype: '必做',
-        endTime: '',
+        feedback: '必做',
+        deaddate: '',
         timelength: 1
       },
-      endTime: ''
 
     }
   },
   created() {
     //截至时间默认值
-    this.endTime = this.getCurrentDate() + ' ' + '10:00:00'
+    this.form.deaddate = this.getCurrentDate() + ' ' + '10:00:00'
     this.userInfo = useUserStore().user
-    this.getGradeList()
+
   },
   methods: {
     // 获取班级列表
@@ -104,6 +113,9 @@ export default {
           item.level = 0
           item.children = []
           item.classstudentlist = JSON.parse("[" + item.classstudentlist + "]")
+          item.classstudentlist.forEach(el => {
+            el.classId = item.id
+          })
         })
         console.log(list)
         this.gradeList = list
@@ -111,21 +123,22 @@ export default {
       })
     },
     getLoad(node, resolve) {
-      console.log(node.level)
       if (node.level == 0) return resolve([])
+      // 获取二级节点 小组
       if (node.level == 1) {
         listClassgroup({ classid: node.key, orderby: 'orderidx', pageSize: 100 }).then(res => {
-          console.log(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,
@@ -135,7 +148,6 @@ export default {
                 })
               }
             })
-            // console.log(ary)
             resolve(ary)
           }
           else {
@@ -143,6 +155,7 @@ export default {
           }
         })
       }
+      // 三级节点 小组学生
       if (node.level == 2) {
         resolve(node.data.children)
       }
@@ -170,14 +183,58 @@ export default {
     delStudent(index) {
       this.studentList.splice(index, 1)
     },
-    // 关闭弹窗
-    cloneDialog() {
-      this.$emit('on-close')
-    },
+
     //
     changeTime(value) {
       console.log(value, 100)
     },
+    onSubmit() {
+
+      /**
+       * studentlist
+       * deaddate
+       * feedtype
+       * timelength
+       */
+      // 这些参数 是按照AIx web端传入的
+      let ary = [
+        {
+          id: 0,
+          parentid: this.row.id,
+          classid: this.studentList[0].classId,
+          classcourseid: 0,
+          entpcourseid: this.entpcourseid,
+          studentlist: JSON.stringify(this.studentList),
+          feedback: this.form.feedback,
+          workkey: "",
+          timelength: this.form.timelength,
+          weights: 1,
+          deaddate: this.form.deaddate,
+          workdate: this.getCurrentDate(),
+          uniquekey: this.row.id,
+          entpcourseworklist: "[" + this.row.entpcourseworklist + "]",
+          needMsgNotifine: 'false',
+          msgkey: 'newclasswork',
+          title: "作业任务",
+          msgcontent: '',
+          teachername: this.userInfo.nickName,
+          unixstamp: new Date().getTime(),
+        }
+      ]
+
+      let obj = {
+        classworkarray: JSON.stringify(ary)
+      }
+      saveByClassWorkArray(obj).then(() => {
+        ElMessage.success('操作成功')
+        this.cloneDialog()
+      })
+
+    },
+    // 关闭弹窗
+    cloneDialog() {
+      this.$emit('on-close')
+    },
     // 获取当前年月日
     getCurrentDate() {
       const now = new Date();
@@ -190,6 +247,9 @@ export default {
   watch: {
     modelValue(val) {
       this.dialogVisible = val
+      if (val) {
+        this.getGradeList()
+      }
     }
   }
 }
diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue
index 1e6ba87..8036064 100644
--- a/src/renderer/src/views/prepare/index.vue
+++ b/src/renderer/src/views/prepare/index.vue
@@ -58,7 +58,7 @@
     </div>
     <MoveFile v-model="isMoveDialogOpen" @on-submit="chooseMoveCata" />
     <uploadDialog v-model="isDialogOpen" @submit-file="submitFile" />
-    <SetHomework v-model="setDialog" @on-close="closeHomework" />
+    <SetHomework v-model="setDialog" :entpcourseid="entpcourseid" :row="row" @on-close="closeHomework" />
   </div>
 </template>
 <script setup>
@@ -115,7 +115,8 @@ export default {
       entpcourseid: '',
       timerId: null,
       // 布置作业弹窗
-      setDialog: false
+      setDialog: false,
+      row: ''
     }
   },
   computed: {
@@ -363,12 +364,14 @@ export default {
         }
         // 去重
         let ary = uniqBy([...this.currentFileList, ...list], 'id')
+        console.log(ary,1000)
         // 深度克隆
         this.currentFileList = cloneDeep(ary)
       })
     },
     // 打开布置作业窗口
-    openSet(){
+    openSet(row){
+      this.row = row
       this.setDialog = true
     },
     closeHomework(){

From 0ba717de6eb0ffa591d9e2a51338674d8d049d68 Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Fri, 2 Aug 2024 10:32:09 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BD=9C=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/src/api/teaching/classwork.js      |  8 ++++++++
 .../views/prepare/container/file-list-item.vue  | 10 +++++++---
 src/renderer/src/views/prepare/index.vue        | 17 +++++++++++++++--
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/renderer/src/api/teaching/classwork.js b/src/renderer/src/api/teaching/classwork.js
index db353f3..9412901 100644
--- a/src/renderer/src/api/teaching/classwork.js
+++ b/src/renderer/src/api/teaching/classwork.js
@@ -25,4 +25,12 @@ export function saveByClassWorkArray(data) {
     method: 'post',
     data: data
   })
+}
+
+// 删除classwork 作业
+export function delClasswork(id) {
+  return request({
+    url: '/education/classwork/' + id,
+    method: 'delete'
+  })
 }
\ No newline at end of file
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 07e3489..51a98f2 100644
--- a/src/renderer/src/views/prepare/container/file-list-item.vue
+++ b/src/renderer/src/views/prepare/container/file-list-item.vue
@@ -70,7 +70,7 @@
                   </el-button>
                 </div>
                 <div class="item-popover-item">
-                  <el-button text @click="deleteTalk(item)">
+                  <el-button text @click="deleteHomework(item)">
                     <i class="iconfont icon-shanchu"></i>
                     <span>删除</span>
                   </el-button>
@@ -142,7 +142,7 @@ export default {
       }
     }
   },
-  emits: { 'on-move': null, 'on-delete': null, 'on-set': null },
+  emits: { 'on-move': null, 'on-delete': null, 'on-set': null, 'on-delhomework': null },
   data() {
     return {
       listenList: [],
@@ -228,9 +228,13 @@ export default {
         })
       })
     },
-    //布置
+    // 打开布置作业窗口
     setHomeWork(item){
       this.$emit('on-set', item)
+    },
+    // 删除作业
+    deleteHomework(item){
+      this.$emit('on-delhomework', item)
     }
   }
 }
diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue
index e4a9fee..86093b6 100644
--- a/src/renderer/src/views/prepare/index.vue
+++ b/src/renderer/src/views/prepare/index.vue
@@ -65,6 +65,7 @@
           @on-move="onMoveSingleFile"
           @on-delete="deleteTalk"
           @on-set="openSet"
+          @on-delhomework="delhomework"
         >
           <el-checkbox label="" :value="item" />
         </file-list-item>
@@ -106,6 +107,7 @@ import SetHomework from './container/set-homework.vue'
 import outLink from '@/utils/linkConfig'
 import { createWindow } from '@/utils/tool'
 import { uniqBy, cloneDeep } from 'lodash'
+import { delClasswork } from '@/api/teaching/classwork'
 
 const { ipcRenderer } = window.electron || {}
 
@@ -340,7 +342,7 @@ export default {
         pageSize: 500
       })
     },
-    //
+    // 清除查询作业列表定时器
     createTimer() {
       this.timerId = setInterval(() => {
         this.getHomeWorkList()
@@ -408,7 +410,6 @@ export default {
         }
         // 去重
         let ary = uniqBy([...this.currentFileList, ...list], 'id')
-        console.log(ary,1000)
         // 深度克隆
         this.currentFileList = cloneDeep(ary)
       })
@@ -418,6 +419,18 @@ export default {
       this.row = row
       this.setDialog = true
     },
+    // 删除作业
+    delhomework(item){
+      this.isLoading = true
+      delClasswork(item.id).then( async res =>{
+        ElMessage.success('操作成功')
+        this.isLoading = false
+        await this.asyncAllFile()
+        this.getHomeWorkList()
+      }).catch(()=>{
+        this.isLoading = false
+      })
+    },
     closeHomework() {
       this.setDialog = false
     },

From ae4f7d3b49e9b7d52009a59591c0b77bb818ad44 Mon Sep 17 00:00:00 2001
From: zhuhao <979263092@qq.com>
Date: Fri, 2 Aug 2024 14:18:11 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BA=8C=E6=9C=9F=EF=BC=9A=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../prepare/container/file-list-item.vue      |  61 ++++++----
 .../views/resource/container/resoure-list.vue | 108 ++++++++++++------
 src/renderer/src/views/resource/index.vue     |  46 ++++----
 3 files changed, 137 insertions(+), 78 deletions(-)

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 07e3489..353a7e6 100644
--- a/src/renderer/src/views/prepare/container/file-list-item.vue
+++ b/src/renderer/src/views/prepare/container/file-list-item.vue
@@ -6,36 +6,53 @@
     </div>
     <div class="prepare-body-main-item-info" @click="openFileWin(item)">
       <div class="prepare-item-info-title" :title="item.fileShowName">
-        {{ item.fileShowName }}
+        <div></div>
+        <div
+          style="
+            flex: 1;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            width: 200px;
+          "
+        >
+          {{ item.fileShowName }}
+        </div>
       </div>
       <div class="prepare-item-info-message">
         <div style="width: 60px">
           <template v-if="item.uniquekey">
-           {{ item.worktype }}
+            {{ item.worktype }}
           </template>
           <template v-else>
-          <el-icon
-            v-loading="item.async === 'on'"
-            style="background-color: green; border-radius: 20px; color: white; top: 2px"
-          >
-            <Check v-if="item.async === true" />
-            <UploadFilled v-if="!item.async" />
-          </el-icon>
-          {{ item.async === true ? '已同步' : '' }}
-          {{ !item.async ? '待同步' : '' }}
-          {{ item.async === 'on' ? '同步中' : '' }}
-        </template>
+            <el-icon
+              v-loading="item.async === 'on'"
+              style="background-color: green; border-radius: 20px; color: white; top: 2px"
+            >
+              <Check v-if="item.async === true" />
+              <UploadFilled v-if="!item.async" />
+            </el-icon>
+            {{ item.async === true ? '已同步' : '' }}
+            {{ !item.async ? '待同步' : '' }}
+            {{ item.async === 'on' ? '同步中' : '' }}
+          </template>
         </div>
         <template v-if="item.fileSize">|</template>
-        <div style="width: 70px" v-if="item.fileSize">{{ formatFileSize(item.fileSize) }}</div>
+        <div v-if="item.fileSize" style="width: 70px">{{ formatFileSize(item.fileSize) }}</div>
         <template v-if="item.uploadTime">|</template>
-        <div style="width: 70px" v-if="item.uploadTime">{{ toTimeText(item.uploadTime, true) }}</div>
+        <div v-if="item.uploadTime" style="width: 70px">
+          {{ toTimeText(item.uploadTime, true) }}
+        </div>
         <template v-if="item.levelFirstName">|&nbsp;</template>
         <div
-        v-if="item.levelFirstName"
+          v-if="item.levelFirstName"
           style="
             flex: 1;
             text-align: left;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            width: 200px;
           "
           :title="
             item.levelFirstName +
@@ -145,7 +162,7 @@ export default {
   emits: { 'on-move': null, 'on-delete': null, 'on-set': null },
   data() {
     return {
-      listenList: [],
+      listenList: []
     }
   },
   methods: {
@@ -229,7 +246,7 @@ export default {
       })
     },
     //布置
-    setHomeWork(item){
+    setHomeWork(item) {
       this.$emit('on-set', item)
     }
   }
@@ -259,9 +276,9 @@ export default {
     display: flex;
     justify-content: center;
     align-items: center;
-    .icon-zuoye{
+    .icon-zuoye {
       font-size: 40px;
-      color: #707070
+      color: #707070;
     }
   }
 
@@ -281,9 +298,7 @@ export default {
     .prepare-item-info-title {
       text-align: left;
       font-size: 16px;
-      white-space: nowrap;
-      overflow: hidden;
-      text-overflow: ellipsis;
+      display: flex;
     }
 
     .prepare-item-info-message {
diff --git a/src/renderer/src/views/resource/container/resoure-list.vue b/src/renderer/src/views/resource/container/resoure-list.vue
index 06fd33c..00f8460 100644
--- a/src/renderer/src/views/resource/container/resoure-list.vue
+++ b/src/renderer/src/views/resource/container/resoure-list.vue
@@ -1,13 +1,31 @@
 <template>
-  <div class="resource-list" v-loading="sourceStore.loading">
-    <el-scrollbar height="400px">
-      <el-empty description="暂无数据" v-if="!sourceStore.result.list.length" />
+  <div v-loading="sourceStore.loading" class="resource-list">
+    <el-scrollbar>
+      <el-empty v-if="!sourceStore.result.list.length" description="暂无数据" />
       <ul>
-        <li class="list-item" v-for="item in sourceStore.result.list" :key="item.id" @click="handleRow">
+        <li
+          v-for="item in sourceStore.result.list"
+          :key="item.id"
+          class="list-item"
+          @click="handleRow"
+        >
           <div class="item-left flex">
-            <FileImage :fileName="item.fileShowName" :size="50" />
+            <FileImage :file-name="item.fileShowName" :size="50" />
             <div class="flex item-left-content">
-              <div class="name flex">{{ item.fileShowName }}</div>
+              <div class="name flex" :title="item.fileShowName">
+                <div></div>
+                <div
+                  style="
+                    flex: 1;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                    white-space: nowrap;
+                    width: 200px;
+                  "
+                >
+                  {{ item.fileShowName }}
+                </div>
+              </div>
               <div class="item-tags flex">
                 <el-tag type="info" class="mr-10">{{ item.fileFlag }}</el-tag>
                 <el-tag type="info" class="mr-10">{{ getFileSuffix(item.fileShowName) }}</el-tag>
@@ -18,10 +36,16 @@
             </div>
           </div>
           <div class="item-btns" @click.stop>
-            <el-popover placement="bottom-end" trigger="hover" popper-class="custom-popover"
-              :visible="item.showPopover">
+            <el-popover
+              placement="bottom-end"
+              trigger="hover"
+              popper-class="custom-popover"
+              :visible="item.showPopover"
+            >
               <template #reference>
-                <el-button link type="primary"> <i class="iconfont icon-shenglvehao"></i></el-button>
+                <el-button link type="primary">
+                  <i class="iconfont icon-shenglvehao"></i
+                ></el-button>
               </template>
               <template #default>
                 <div class="item-popover">
@@ -29,7 +53,11 @@
                     <i class="iconfont icon-bianji"></i>
                     <span>编辑</span>
                   </div>
-                  <div class="item-popover-item" v-if="userInfo.userId == item.uploadUserId" @click="delRow(item)">
+                  <div
+                    v-if="userInfo.userId == item.uploadUserId"
+                    class="item-popover-item"
+                    @click="delRow(item)"
+                  >
                     <i class="iconfont icon-shanchu"></i>
                     <span>删除</span>
                   </div>
@@ -37,24 +65,29 @@
                     <i class="iconfont icon-xiazai"></i>
                     <span>下载</span>
                   </div>
-
                 </div>
               </template>
             </el-popover>
             <el-button size="small" plain round type="primary" @click="addLesson(item)">
               <i class="iconfont icon-jiahao"></i>
-              备课</el-button>
+              备课</el-button
+            >
           </div>
         </li>
       </ul>
-
     </el-scrollbar>
     <div class="pagination-box">
-      <el-pagination v-model:current-page="sourceStore.query.pageNum" v-model:page-size="sourceStore.query.pageSize"
-        :page-sizes="[10, 20, 30, 50]" background layout="total, sizes, prev, pager, next, jumper"
-        :total="sourceStore.result.total" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+      <el-pagination
+        v-model:current-page="sourceStore.query.pageNum"
+        v-model:page-size="sourceStore.query.pageSize"
+        :page-sizes="[10, 20, 30, 50]"
+        background
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="sourceStore.result.total"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
     </div>
-
   </div>
 </template>
 
@@ -69,17 +102,17 @@ import useUserStore from '@/store/modules/user'
 import useResoureStore from '../store'
 
 const { ipcRenderer } = window.electron || {}
-const userstore  = useUserStore()
+const userstore = useUserStore()
 const sourceStore = useResoureStore()
 
 const userInfo = userstore.user
 
 // 分页change
-const handleSizeChange = (limit) => { 
+const handleSizeChange = (limit) => {
   sourceStore.query.pageSize = limit
   sourceStore.handleQuery()
 }
-const handleCurrentChange = (page) => { 
+const handleCurrentChange = (page) => {
   sourceStore.query.pageNum = page
   sourceStore.handleQuery()
 }
@@ -108,7 +141,7 @@ const editRow = (item) => {
         }
       })
     })
-    .catch(() => { })
+    .catch(() => {})
 }
 // 删除
 const delRow = (item) => {
@@ -128,7 +161,7 @@ const addLesson = ({ id }) => {
   let data = {
     id,
     fileRoot: '备课',
-    ...(toRaw(sourceStore.nodeData)),
+    ...toRaw(sourceStore.nodeData)
   }
   // 过滤空值
   for (let key in data) {
@@ -136,19 +169,18 @@ const addLesson = ({ id }) => {
       delete data[key]
     }
   }
-  
+
   try {
     sourceStore.loading = true
     addFileToPrepare(data).then(() => {
       ElMessage.success('操作成功')
     })
-  }
-  finally {
+  } finally {
     sourceStore.loading = false
   }
 }
-// 
-const handleRow = () =>{
+//
+const handleRow = () => {
   ElMessage.warning('请先加入备课，在备课里面进行预览！')
 }
 </script>
@@ -181,6 +213,10 @@ const handleRow = () =>{
 }
 
 .resource-list {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  overflow: auto;
   .list-item {
     flex: 1;
     padding: 10px 20px;
@@ -189,10 +225,13 @@ const handleRow = () =>{
     justify-content: space-between;
     align-items: center;
     cursor: pointer;
-
+    &:hover {
+      background-color: rgba(144, 147, 153, 0.2);
+      cursor: pointer;
+    }
     .item-left {
       align-items: center;
-
+      flex: 1;
       .icon {
         font-size: 50px;
       }
@@ -200,12 +239,14 @@ const handleRow = () =>{
       .item-left-content {
         margin-left: 10px;
         flex-direction: column;
+        flex: 1;
+        text-align: left;
       }
 
       .name {
         font-size: 14px;
         color: #3b3b3b;
-        margin-bottom: 10px
+        margin-bottom: 10px;
       }
 
       .line {
@@ -226,7 +267,6 @@ const handleRow = () =>{
         color: #909399;
         font-size: 13px;
       }
-
     }
 
     &:last-child {
@@ -258,15 +298,13 @@ const handleRow = () =>{
         margin-right: 3px;
         font-weight: bold;
       }
-
     }
-
   }
 
   .pagination-box {
-    margin-top: 20px;
     display: flex;
     justify-content: center;
+    height: 65px;
   }
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/renderer/src/views/resource/index.vue b/src/renderer/src/views/resource/index.vue
index d4565dd..4f66881 100644
--- a/src/renderer/src/views/resource/index.vue
+++ b/src/renderer/src/views/resource/index.vue
@@ -1,21 +1,28 @@
 <template>
   <div class="page-resource flex">
     <!--左侧 教材 目录-->
-    <ChooseTextbook @changeBook="getData" @nodeClick="getData" />
+    <ChooseTextbook @change-book="getData" @node-click="getData" />
 
     <div class="page-right">
       <!-- 搜索 -->
       <ResoureSearch #add>
-        <el-button v-if="sourceStore.isCreate" type="primary" round @click="openDialog" class="create-btn">
+        <el-button
+          v-if="sourceStore.isCreate"
+          type="primary"
+          round
+          class="create-btn"
+          @click="openDialog"
+        >
           <i class="iconfont icon-jiahao"></i>
-          新建资源</el-button>
+          新建资源</el-button
+        >
       </ResoureSearch>
       <!-- 列表 -->
       <ResoureList />
     </div>
   </div>
   <!-- 上传弹窗 -->
-  <uploadDialog v-model="isDialogOpen" @submitFile="submitFile" />
+  <uploadDialog v-model="isDialogOpen" @submit-file="submitFile" />
   <!-- <el-button @click="testClick">测试</el-button> -->
 </template>
 
@@ -40,7 +47,7 @@ onMounted(async () => {
   // const res = await ipcMsgSend('tool-sphere:create', params)
   // console.log('消息返回：', res)
 })
-const testClick = async() => {
+const testClick = async () => {
   const win = await createWindow('tool-sphere', { url: '/tool/sphere' })
   console.log('消息返回：', win)
 }
@@ -48,12 +55,11 @@ const testClick = async() => {
 const getData = (data) => {
   const { textBook, node } = data
   let textbookId = textBook.curBookId
-  let levelSecondId  = node.id
+  let levelSecondId = node.id
   let levelFirstId
-  if(node.parentNode){
-    levelFirstId =  node.parentNode.id
-  }
-  else{
+  if (node.parentNode) {
+    levelFirstId = node.parentNode.id
+  } else {
     levelFirstId = node.id
     levelSecondId = ''
   }
@@ -63,7 +69,7 @@ const getData = (data) => {
   sourceStore.nodeData = {
     textbookId,
     levelFirstId,
-    levelSecondId,
+    levelSecondId
   }
   sourceStore.handleQuery()
 }
@@ -73,7 +79,7 @@ const submitFile = (data) => {
   let fileList = toRaw(data)
   const { textbookId, levelFirstId, levelSecondId, fileSource, fileRoot } = sourceStore.query
   // 给每个文件添加属性
-  fileList.forEach(item => {
+  fileList.forEach((item) => {
     let fileData = { textbookId, levelFirstId, levelSecondId, fileSource, fileRoot }
     fileData.fileShowName = item.fileData.fileShowName
     fileData.fileFlag = item.fileData.fileFlag
@@ -83,17 +89,15 @@ const submitFile = (data) => {
   uploaderState().pushFile(fileList)
 }
 
-
 const fileCallBack = (res) => {
   if (res.code == 200) {
     sourceStore.handleQuery()
   }
 }
 
-onMounted(()=>{
+onMounted(() => {
   sourceStore.getCreate()
 })
-
 </script>
 
 <style lang="scss" scoped>
@@ -103,6 +107,8 @@ onMounted(()=>{
 
   .page-right {
     min-width: 0;
+    display: flex;
+    flex-direction: column;
     flex: 1;
     margin-left: 20px;
     height: 100%;
@@ -111,12 +117,12 @@ onMounted(()=>{
     box-shadow: 0px 0px 20px 0px rgba(99, 99, 99, 0.06);
   }
   .icon-jiahao {
-      font-size: 12px;
-      margin-right: 3px;
-      font-weight: bold;
-    }
+    font-size: 12px;
+    margin-right: 3px;
+    font-weight: bold;
+  }
 }
-.create-btn{
+.create-btn {
   font-size: 13px;
   padding: 5px 13px;
 }

From e53eab0c31b08afcb03ea07d0d053332841e1bbb Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Fri, 2 Aug 2024 14:30:27 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/prepare/container/set-homework.vue  | 153 +++++++++++-------
 src/renderer/src/views/prepare/index.vue      |   2 +-
 2 files changed, 94 insertions(+), 61 deletions(-)

diff --git a/src/renderer/src/views/prepare/container/set-homework.vue b/src/renderer/src/views/prepare/container/set-homework.vue
index 94bd531..d880c91 100644
--- a/src/renderer/src/views/prepare/container/set-homework.vue
+++ b/src/renderer/src/views/prepare/container/set-homework.vue
@@ -1,7 +1,6 @@
 <template>
-  <el-dialog v-model="dialogVisible" center top="10vh" width="600px" :show-close="false"
+  <el-dialog v-model="dialogVisible" center top="10vh" width="600px" :show-close="false" append-to-body
     style="border-radius: 10px; padding: 10px 15px;">
-
     <template #header>
       <div class="homerwork-header flex">
         <span>布置作业</span>
@@ -9,14 +8,14 @@
       </div>
     </template>
     <div>
-      <el-form :model="form" label-width="80px">
-        <el-form-item label="班级">
+      <el-form :model="form" label-width="80px" ref="ruleForm" :rules="rules">
+        <el-form-item label="班级" prop="grade">
           <el-scrollbar max-height="200px" style="width: 100%;">
-            <el-tree ref="treeRef" :data="treeData" :props="defaultProps" :load="getLoad" node-key="id"
+            <el-tree ref="treeRef" :data="gradeList" :props="defaultProps" :load="getLoad" node-key="id"
               @check="handleCheckChange" lazy show-checkbox />
           </el-scrollbar>
         </el-form-item>
-        <el-form-item label="选中学生">
+        <el-form-item label="选中学生" prop="student">
           <el-scrollbar max-height="200px">
             <el-tag v-for="(tag, index) in studentList" :key="tag.studentid" closable type="primary"
               @close="delStudent(index)">
@@ -24,17 +23,17 @@
             </el-tag>
           </el-scrollbar>
         </el-form-item>
-        <el-form-item label="完成要求">
+        <el-form-item label="完成要求" prop="feedback">
           <el-radio-group v-model="form.feedback">
             <el-radio value="必做" size="large">必做</el-radio>
             <el-radio value="选做" size="large">选做</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="截止时间">
+        <el-form-item label="截止时间" prop="deaddate">
           <el-date-picker v-model="form.deaddate" value-format="YYYY-MM-DD HH:mm" format="YYYY-MM-DD HH:mm"
-            time-format="HH:mm" type="datetime" placeholder="请选择截止时间" @change="changeTime" />
+            time-format="HH:mm" type="datetime" placeholder="请选择截止时间" />
         </el-form-item>
-        <el-form-item label="推荐用时">
+        <el-form-item label="推荐用时" prop="timelength">
           <el-input-number v-model="form.timelength" :min="1" :max="500" />
         </el-form-item>
       </el-form>
@@ -43,7 +42,7 @@
     <template #footer>
       <div class="dialog-footer">
         <el-button @click="cloneDialog">取消</el-button>
-        <el-button type="primary" @click="onSubmit">
+        <el-button type="primary" @click="onSubmit('ruleForm')">
           确定
         </el-button>
       </div>
@@ -56,7 +55,8 @@ import { ElMessage } from 'element-plus'
 import { listClassmain, listClassgroup } from '@/api/classManage/index'
 import { saveByClassWorkArray } from '@/api/teaching/classwork'
 import useUserStore from '@/store/modules/user'
-import { uniqBy } from 'lodash'
+import { uniqBy, groupBy } from 'lodash'
+
 export default {
   props: {
     modelValue: {
@@ -71,6 +71,7 @@ export default {
     }
   },
   data() {
+
     return {
       dialogVisible: false,
       defaultProps: {
@@ -94,6 +95,15 @@ export default {
         deaddate: '',
         timelength: 1
       },
+      // 表单规则
+      rules: {
+        grade: [
+          { validator: this.validateGrade, trigger: 'blur' }
+        ],
+        student: [
+          { validator: this.validateStudent, trigger: 'blur' }
+        ]
+      }
 
     }
   },
@@ -104,6 +114,7 @@ export default {
 
   },
   methods: {
+
     // 获取班级列表
     getGradeList() {
       listClassmain({ classuserid: this.userInfo.userId, pageSize: 100, status: 'open' }).then(res => {
@@ -117,11 +128,10 @@ export default {
             el.classId = item.id
           })
         })
-        console.log(list)
         this.gradeList = list
-        this.treeData = list
       })
     },
+    // 获取节点下一级
     getLoad(node, resolve) {
       if (node.level == 0) return resolve([])
       // 获取二级节点 小组
@@ -161,18 +171,22 @@ export default {
       }
 
     },
+    //节点勾选后触发  拿学生
     handleCheckChange(data, checked) {
       this.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]
         }
@@ -183,57 +197,59 @@ export default {
     delStudent(index) {
       this.studentList.splice(index, 1)
     },
+    onSubmit(formName) {
 
-    //
-    changeTime(value) {
-      console.log(value, 100)
-    },
-    onSubmit() {
-
-      /**
-       * studentlist
-       * deaddate
-       * feedtype
-       * timelength
-       */
-      // 这些参数 是按照AIx web端传入的
-      let ary = [
-        {
-          id: 0,
-          parentid: this.row.id,
-          classid: this.studentList[0].classId,
-          classcourseid: 0,
-          entpcourseid: this.entpcourseid,
-          studentlist: JSON.stringify(this.studentList),
-          feedback: this.form.feedback,
-          workkey: "",
-          timelength: this.form.timelength,
-          weights: 1,
-          deaddate: this.form.deaddate,
-          workdate: this.getCurrentDate(),
-          uniquekey: this.row.id,
-          entpcourseworklist: "[" + this.row.entpcourseworklist + "]",
-          needMsgNotifine: 'false',
-          msgkey: 'newclasswork',
-          title: "作业任务",
-          msgcontent: '',
-          teachername: this.userInfo.nickName,
-          unixstamp: new Date().getTime(),
+      this.$refs[formName].validate(valid => {
+        if (valid) {
+          /**
+ * 分班
+ * studentList 为选中的所有学生 这些学生可能来自不同班级
+ */
+          let gradeObj = groupBy(this.studentList, 'classId')
+          // 处理要提交的参数
+          let ary = []
+          for (const value in gradeObj) {
+            //这些参数 参照AIx web端 作业推送
+            let obj = {
+              id: 0,
+              parentid: this.row.id,
+              classid: value,
+              classcourseid: 0,
+              entpcourseid: this.entpcourseid,
+              studentlist: JSON.stringify(gradeObj[value]),
+              feedback: this.form.feedback,
+              workkey: "",
+              timelength: this.form.timelength,
+              weights: 1,
+              deaddate: this.form.deaddate,
+              workdate: this.getCurrentDate(),
+              uniquekey: this.row.uniquekey,
+              entpcourseworklist: "[" + this.row.entpcourseworklist + "]",
+              needMsgNotifine: 'false',
+              msgkey: 'newclasswork',
+              title: "作业任务",
+              msgcontent: '',
+              teachername: this.userInfo.nickName,
+              unixstamp: new Date().getTime(),
+            }
+            ary.push(obj)
+          }
+          saveByClassWorkArray({
+            classworkarray: JSON.stringify(ary)
+          }).then(() => {
+            ElMessage.success('操作成功')
+            this.cloneDialog()
+          })
+        } else {
+          return false
         }
-      ]
-
-      let obj = {
-        classworkarray: JSON.stringify(ary)
-      }
-      saveByClassWorkArray(obj).then(() => {
-        ElMessage.success('操作成功')
-        this.cloneDialog()
       })
-
     },
     // 关闭弹窗
     cloneDialog() {
       this.$emit('on-close')
+      this.studentList = []
+      this.$refs['ruleForm'].resetFields();
     },
     // 获取当前年月日
     getCurrentDate() {
@@ -242,7 +258,23 @@ export default {
       const month = now.getMonth() + 1; // 月份是从0开始的，所以需要+1
       const day = now.getDate()
       return `${year}-${month.length == 2 ? month : '0' + month}-${day.length == 2 ? day : '0' + day}`;
-    }
+    },
+    validateGrade(rule, value, callback) {
+      if (this.studentList.length == 0) {
+        callback(new Error('请勾选班级或者学生'));
+      }
+      else {
+        callback()
+      }
+    },
+    validateStudent(rule, value, callback) {
+      if (this.studentList.length == 0) {
+        callback(new Error('学生不能为空'));
+      }
+      else {
+        callback()
+      }
+    },
   },
   watch: {
     modelValue(val) {
@@ -251,7 +283,8 @@ export default {
         this.getGradeList()
       }
     }
-  }
+  },
+
 }
 </script>
 
diff --git a/src/renderer/src/views/prepare/index.vue b/src/renderer/src/views/prepare/index.vue
index 86093b6..53ed049 100644
--- a/src/renderer/src/views/prepare/index.vue
+++ b/src/renderer/src/views/prepare/index.vue
@@ -67,7 +67,7 @@
           @on-set="openSet"
           @on-delhomework="delhomework"
         >
-          <el-checkbox label="" :value="item" />
+          <el-checkbox label="" :value="item"  v-if="!item.uniquekey"/>
         </file-list-item>
       </el-checkbox-group>
       <file-oper-batch

From 921ce6ecb05b0c16a6ac895d2bd3797abfe6c5a4 Mon Sep 17 00:00:00 2001
From: lyc <ly_cheng2023@163.com>
Date: Fri, 2 Aug 2024 15:08:36 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=AD=A6=E7=94=9Fcheckbo?=
 =?UTF-8?q?x=20=E5=A4=A7=E5=B0=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/move-file/index.vue        |  2 +-
 .../views/prepare/container/set-homework.vue  | 28 +++++++++++++------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/renderer/src/components/move-file/index.vue b/src/renderer/src/components/move-file/index.vue
index ebf1524..4fd42d8 100644
--- a/src/renderer/src/components/move-file/index.vue
+++ b/src/renderer/src/components/move-file/index.vue
@@ -169,8 +169,8 @@ const getTreeData = () => {
   let upData = transData(volumeOne.value)
   let downData = transData(volumeTwo.value)
   treeData.value = upData.length ? upData : downData
-  defaultExpandedKeys.value = [treeData.value[0].id]
   nextTick(() => {
+    defaultExpandedKeys.value = [treeData.value[0].id]
     currentNodeId.value = getLastLevelData(treeData.value)[0].id
     currentNodeName.value = getLastLevelData(treeData.value)[0].label
     emitChangeBook()
diff --git a/src/renderer/src/views/prepare/container/set-homework.vue b/src/renderer/src/views/prepare/container/set-homework.vue
index d880c91..7e821ac 100644
--- a/src/renderer/src/views/prepare/container/set-homework.vue
+++ b/src/renderer/src/views/prepare/container/set-homework.vue
@@ -7,7 +7,7 @@
         <i class="iconfont icon-guanbi" @click="cloneDialog"></i>
       </div>
     </template>
-    <div>
+    <div v-loading="setLoading">
       <el-form :model="form" label-width="80px" ref="ruleForm" :rules="rules">
         <el-form-item label="班级" prop="grade">
           <el-scrollbar max-height="200px" style="width: 100%;">
@@ -31,7 +31,7 @@
         </el-form-item>
         <el-form-item label="截止时间" prop="deaddate">
           <el-date-picker v-model="form.deaddate" value-format="YYYY-MM-DD HH:mm" format="YYYY-MM-DD HH:mm"
-            time-format="HH:mm" type="datetime" placeholder="请选择截止时间" />
+            time-format="HH:mm" type="datetime" :clearable="false" placeholder="请选择截止时间" />
         </el-form-item>
         <el-form-item label="推荐用时" prop="timelength">
           <el-input-number v-model="form.timelength" :min="1" :max="500" />
@@ -79,7 +79,7 @@ export default {
         label: 'label',
         isLeaf: 'leaf',
       },
-      treeData: [],
+      setLoading: false,
       // 用户信息
       userInfo: null,
       // 班级列表
@@ -111,10 +111,8 @@ export default {
     //截至时间默认值
     this.form.deaddate = this.getCurrentDate() + ' ' + '10:00:00'
     this.userInfo = useUserStore().user
-
   },
   methods: {
-
     // 获取班级列表
     getGradeList() {
       listClassmain({ classuserid: this.userInfo.userId, pageSize: 100, status: 'open' }).then(res => {
@@ -202,9 +200,9 @@ export default {
       this.$refs[formName].validate(valid => {
         if (valid) {
           /**
- * 分班
- * studentList 为选中的所有学生 这些学生可能来自不同班级
- */
+         * 根据学生列表中的classId分班
+         * studentList 为选中的所有学生 这些学生可能来自不同班级
+         */
           let gradeObj = groupBy(this.studentList, 'classId')
           // 处理要提交的参数
           let ary = []
@@ -234,11 +232,15 @@ export default {
             }
             ary.push(obj)
           }
+          this.setLoading = true
           saveByClassWorkArray({
             classworkarray: JSON.stringify(ary)
           }).then(() => {
+            this.setLoading = false
             ElMessage.success('操作成功')
             this.cloneDialog()
+          }).catch(()=>{
+            this.setLoading = false
           })
         } else {
           return false
@@ -305,4 +307,14 @@ export default {
   margin-right: 10px;
   margin-bottom: 10px;
 }
+.dialog-footer{
+  padding-bottom: 10px
+}
+
+:deep(.el-checkbox){
+    transform : scale(1.3) 
+}
+:deep(.el-icon){
+  transform : scale(1.3) 
+}
 </style>
\ No newline at end of file