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] =?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