From 421850cb173dd02fe1f67f9ca3df0a8264c38e5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B2=B3=E4=BD=B3=E9=91=AB?= <yuejx@dongwu-inc.com>
Date: Tue, 1 Nov 2022 16:37:21 +0800
Subject: [PATCH 1/5] =?UTF-8?q?feat:=E8=AE=A8=E8=AE=BA=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/TaskAdd.vue | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index d84b63f8..803a1919 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -539,6 +539,7 @@ import AddVote from "../../components/drawers/AddVote.vue";
 import { message } from "ant-design-vue";
 import * as api from "../../api/indexTaskadd";
 import * as apilive from "../../api/indexLiveBroadcast";
+import * as apidiscuss from "../../api/indexDiscuss";
 const drawercolumns = [
   {
     title: "项目名称",
@@ -854,6 +855,7 @@ export default {
       isactive: -1,
       isActive: false,
       deleteLiveID: null, //删除直播id
+      deleteDiscussID: null, //删除讨论id
     });
     const selectProjectName = (value, index) => {
       console.log("value", value, index);
@@ -1024,6 +1026,23 @@ export default {
           console.log(err);
         });
     };
+    //删除讨论
+    const deleteDiscuss = () => {
+      let obj = {
+        discussId: state.deleteDiscussID,
+      };
+      apidiscuss
+        .deleteDiscuss(obj)
+        .then((res) => {
+          console.log("删除成功", res);
+          message.success("删除成功");
+          //重新获取列表
+          getTask();
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    };
     const onSelectChange = (selectedRowKeys) => {
       console.log("selectedRowKeys changed: ", selectedRowKeys);
       state.selectedRowKeys = selectedRowKeys;
@@ -1146,6 +1165,7 @@ export default {
       changebgc,
       getTask,
       deleteLiveBroadcast,
+      deleteDiscuss,
     };
   },
 };

From 2de2f609b179fbe651d708d87f0857acfaeb0040 Mon Sep 17 00:00:00 2001
From: dongwug <guoys@dongwu-inc.com>
Date: Tue, 1 Nov 2022 17:02:26 +0800
Subject: [PATCH 2/5] =?UTF-8?q?feat:=E5=88=A0=E9=99=A4=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/TaskAdd.vue | 31 +++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue
index 96753fa5..8c4127fc 100644
--- a/src/views/projectcenter/TaskAdd.vue
+++ b/src/views/projectcenter/TaskAdd.vue
@@ -540,6 +540,7 @@ import { message } from "ant-design-vue";
 import * as api from "../../api/indexTaskadd";
 import * as apilive from "../../api/indexLiveBroadcast";
 import * as apieval from "../../api/indexEval";
+import * as apiinvist from "../../api/indexInvist";
 const drawercolumns = [
   {
     title: "项目名称",
@@ -855,6 +856,8 @@ export default {
       isactive: -1,
       isActive: false,
       deleteLiveID: null, //删除直播id
+      deleteEvalID: null, //测评
+      deleteInvistID: null, //评估
     });
     const selectProjectName = (value, index) => {
       console.log("value", value, index);
@@ -979,7 +982,8 @@ export default {
                     style="color:#4EA6FF;cursor:pointer"
                     onClick={() => {
                       showDelete();
-                      {/* deleteEvalText(); */}
+                      deleteEvalText();
+                      deleteInvistText();
                     }}
                   >
                     删除
@@ -1027,17 +1031,16 @@ export default {
         });
     };
     
-    //删除评估测试
+    //删除测评测试
     const deleteEvalText = () => {
       let obj = {
-        evaluationId:state.deleteLiveID,
+        evaluationId:state.deleteEvalID,
       };
       apieval
         .deleteEvaluationById(obj)
         .then((res) => {
           console.log("删除成功", res);
           message.success("删除成功");
-          state.deleteModal = false;
           //重新获取列表
           getTask();
         })
@@ -1045,6 +1048,25 @@ export default {
           console.log("删除失败", err);
         });
     };
+
+    //删除评估测试
+    const deleteInvistText = () => {
+      let obj = {
+        evaluationId:state.deleteInvistID,
+      };
+      apiinvist
+        .deleteAppraise(obj)
+        .then((res) => {
+          console.log("删除成功", res);
+          message.success("删除成功");
+          //重新获取列表
+          getTask();
+        })
+        .catch((err) => {
+          console.log("删除失败", err);
+        });
+    };
+    
     const onSelectChange = (selectedRowKeys) => {
       console.log("selectedRowKeys changed: ", selectedRowKeys);
       state.selectedRowKeys = selectedRowKeys;
@@ -1173,6 +1195,7 @@ export default {
       getTask,
       deleteLiveBroadcast,
       deleteEvalText,
+      deleteInvistText,
     };
   },
 };

From b0fe8b7fa3e99d622152dba9904b6c0df614b0aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E4=B8=9C?= <2195178163@qq.com>
Date: Tue, 1 Nov 2022 17:11:58 +0800
Subject: [PATCH 3/5] =?UTF-8?q?Fix:=20=E4=BD=9C=E4=B8=9A&=E8=80=83?=
 =?UTF-8?q?=E8=AF=95=E8=A1=A8=E5=8D=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddHomework.vue | 172 +++++++----
 src/components/drawers/AddTest.vue     | 387 ++++++++++++++++---------
 2 files changed, 368 insertions(+), 191 deletions(-)

diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue
index f1fb1d21..8b1df370 100644
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -16,56 +16,52 @@
           @click="closeDrawer"
         />
       </div>
+      <a-form
+
+            ref="formRef"
+            name="custom-validation"
+            :model="formState"
+            :rules="rules"
+            v-bind="layout"
+            @finish="handleFinish"
+            @validate="handleValidate"
+            @finishFailed="handleFinishFailed"
+          >
       <div class="contentMain">
         <div class="main_left">
+          
           <div class="main_item">
-            <div class="signbox">
-              <div class="sign">
-                <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-              </div>
-              <span style="margin-right: 3px">作业名称：</span>
-            </div>
             <div class="btnbox">
-              <a-input
-                v-model:value="inputV1"
-                style="width: 424px; height: 32px"
+              <a-form-item has-feedback label="作业名称" name="workName">
+                <a-input v-model:value="formState.workName"
+                style="width: 424px; height: 32px;margin-left: 35px;"
                 placeholder="请输入作业名称"
-                maxlength="20"
-              />
+                autocomplete="off" />
+              </a-form-item>
+             
             </div>
           </div>
           <div class="main_item2">
-            <div class="signbox">
-              <div class="sign">
-                <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-              </div>
-              <span style="margin-right: 3px">作业要求：</span>
-            </div>
-            <div class="textarea">
+              <a-form-item has-feedback label="作业要求" name="workRequirement">
               <a-textarea
-                v-model:value="textV1"
-                placeholder="请输入作业名称"
+                v-model:value="formState.workRequirement"
+                placeholder="请输入作业要求"
+                autocomplete="off"
                 allow-clear
+                style="margin-left: 35px"
                 maxlength="150"
               />
-            </div>
+              </a-form-item>
           </div>
           <div class="main_item">
-            <div class="signbox">
-              <span style="margin-right: 3px">提交时间：</span>
-            </div>
             <div class="btnbox">
+              <a-form-item has-feedback label="提交时间" name="choosedTime">
               <a-range-picker
-              style="width: 424px"
-              v-model:value="choosedTime"
+              style="width: 424px;margin-left: 35px;"
+              v-model:value="formState.choosedTime"
                 :placeholder="['      开始时间', '        结束时间']"
               />
+            </a-form-item>
             </div>
           </div>
           <div class="main_item">
@@ -83,7 +79,6 @@
                 v-model:file-list="fileList"
                 name="file"
                 action="/api/file/upload"
-                :headers="headers"
                 @change="handleChange"
               >
               <button class="xkbtn">上传附件</button>
@@ -100,14 +95,16 @@
         </div>
       </div>
       <div class="main_btns">
-        <button class="btn1" @click="closeDrawer">取消</button>
-        <button class="btn2" @click="addHomework">确定</button>
+        <a-button class="btn1"  @click="closeDrawer">取消</a-button>
+        <a-button class="btn2" html-type="submit">确定</a-button>
       </div>
+    </a-form>
+
     </div>
   </a-drawer>
 </template>
 <script>
-import { reactive, toRefs, ref } from "vue";
+import { reactive, ref } from "vue";
 import {message} from"ant-design-vue";
 import {createWorkTask} from "@/api/indexWork"
 import  dayjs from 'dayjs';
@@ -139,11 +136,75 @@ export default {
     },
   },
   setup(props, ctx) {
-    const state = reactive({
-      inputV1: "",
-      textV1:"",
-      choosedTime:[],
+    const formState = reactive({
+      workName: '',
+      workRequirement: '',
+      choosedTime: '',
     });
+    const formRef = ref();
+    let checkWorkName = async (_rule, value) => {
+      if (!value) {
+        message.warning("请输入作业名称");
+        return Promise.reject('请输入作业名称');
+      }
+    };
+
+    let checkWorkRequirement = async (_rule, value) => {
+      if (!value) {
+        message.warning("请输入作业要求");
+        return Promise.reject('请输入作业要求');
+      }
+    };
+
+    let checkTime = async (_rule, value) => {
+      if (!value) {
+        message.warning("请选择时间");
+        return Promise.reject('请选择时间');
+      }
+    };
+
+    const rules = {
+      workName: [{
+        required: true,
+        validator: checkWorkName,
+        trigger: 'change',
+      }],
+      workRequirement: [{
+        required: true,
+        validator: checkWorkRequirement,
+        trigger: 'change',
+      }],
+      choosedTime: [{
+        required: true,
+        validator: checkTime,
+        trigger: 'change',
+      }],
+    };
+    // const layout = {
+    //   labelCol: {
+    //     span: 4,
+    //   },
+    //   wrapperCol: {
+    //     span: 14,
+    //   },
+    // };
+    const handleFinish = values => {
+      console.log(values);
+      addHomework()
+    };
+
+    const handleFinishFailed = errors => {
+      console.log(errors);
+      // message.error("handleFinishFailed");
+    };
+
+    const resetForm = () => {
+      formRef.value.resetFields();
+    };
+
+    const handleValidate = (...args) => {
+      console.log(args);
+    };
     const handleChange = info => {
       if (info.file.status !== 'uploading') {
         console.log(info.file, info.fileList);
@@ -158,49 +219,48 @@ export default {
 
     const fileList = ref([]);
     const closeDrawer = () => {
+      resetForm();
       ctx.emit("update:addhomeworkVisible", false);
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
     };
     const addHomework = () => {
-      if(state.choosedTime.length && state.inputV1 && state.textV1){
         createWorkTask({
           "createTime": "",
           "createUser": 0,
-          "submitEndTime": dayjs(state.choosedTime[1]).format("YYYY-MM-DD"),
-          "submitStartTime": dayjs(state.choosedTime[0]).format("YYYY-MM-DD"),
+          "submitEndTime": dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
+          "submitStartTime": dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
           "updateTime": "",
           "updateUser": 0,
           "workEnclosureAddress": "",
           "workFlag": "",
           "workId": 0,
-          "workName": state.inputV1,
-          "workRequirement": state.textV1,
+          "workName": formState.workName,
+          "workRequirement": formState.workRequirement,
           "workTag": ""
           }).then((res)=>{
         message.success(`添加成功${res}`)
-        ctx.emit("update:addhomeworkVisible", false);
+        closeDrawer();
       }).catch((err)=>{
         message.error(`添加失败${err}`)
       })
-      }
-      else{ 
-        message.error(`字段不能为空`)
-        return 0
-      }
     }
     return {
-      ...toRefs(state),
       afterVisibleChange,
       closeDrawer,
       rowSelection,
       addHomework,
       handleChange,
       fileList,
-      headers: {
-        "token":"123"
-      },
+      formState,
+      handleFinish,
+      handleFinishFailed,
+      resetForm,
+      handleValidate,
+      formRef,
+      // layout,
+      rules,
     };
   },
 };
@@ -313,6 +373,7 @@ export default {
       }
     }
     .main_btns {
+      position: absolute;
       height: 72px;
       width: 100%;
       bottom: 0;
@@ -344,3 +405,4 @@ export default {
   }
 }
 </style>
+
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index c65e9e46..e68320e7 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -16,154 +16,134 @@
           @click="closeDrawer"
         />
       </div>
+      <a-form
+            ref="formRef"
+            name="custom-validation"
+            :model="formState"
+            :rules="rules"
+            v-bind="layout"
+            @finish="handleFinish"
+            @validate="handleValidate"
+            @finishFailed="handleFinishFailed"
+          >
       <div class="contentMain">
         <div class="main_left">
           <div class="main_item">
-            <div class="signbox">
-              <div class="sign">
-                <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-              </div>
-              <span style="margin-right: 3px">考试名称：</span>
-            </div>
             <div class="btnbox">
+              <a-form-item has-feedback label="作业名称" name="examinationName">
               <a-input
-                v-model:value="inputV1"
-                style="width: 424px; height: 32px"
+                v-model:value="formState.examinationName"
+                style="width: 424px; height: 32px;margin-left: 35px;"
+                autocomplete="off"
                 placeholder="请输入考试名称"
-                maxlength="20"
-              />
+                maxlength="20"/>
+              </a-form-item>
             </div>
           </div>
           <div class="main_item2">
-            <div class="signbox">
-              <span style="margin-right: 3px">考试说明：</span>
-            </div>
-            <div class="textarea">
+            <a-form-item has-feedback label="考试说明" name="examinationExplain">
               <a-textarea
-                v-model:value="testV1"
+                v-model:value="formState.examinationExplain"
                 placeholder="请输入考试说明"
                 allow-clear
+                style="margin-left: 35px;"
                 maxlength="150"
               />
-            </div>
+            </a-form-item>
           </div>
           <div class="main_item">
-            <div class="signbox">
-              <div class="sign">
-                <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-              </div>
-              <span style="margin-right: 3px">选择考试：</span>
-            </div>
             <div class="btnbox">
+              <a-form-item has-feedback label="选择考试" name="choosedTest">
               <a-select
                 dropdownClassName="dropdown-style"
-                style="width: 424px"
+                style="width: 424px;margin-left: 35px;"
                 placeholder="请输入考试名称"
                 :options="options1"
-                v-model:value="choosedTest"
+                v-model:value="formState.choosedTest"
                 allowClear
                 showSearch
               />
+            </a-form-item>
+ 
             </div>
           </div>
           <div class="main_item">
-            <div class="signbox">
-              <div class="sign">
-                <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-              </div>
-              <span style="margin-right: 3px">考试时间：</span>
-            </div>
             <div class="btnbox">
+              <a-form-item has-feedback label="考试时间" name="choosedTime">
+
               <a-range-picker
-              v-model:value="testTime"
-                style="width: 424px"
+              v-model:value="formState.choosedTime"
+                style="width: 424px;margin-left: 35px;"
                 :placeholder="['      开始时间', '        结束时间']"
               />
+            </a-form-item>
             </div>
           </div>
           <div class="main_item">
-            <div class="signbox">
-              <div class="sign">
-                <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-              </div>
-              <span style="margin-right: 3px">考试时长：</span>
-            </div>
             <div class="btnbox">
+              <a-form-item has-feedback label="考试时长" name="examinationDuration">
+
               <a-input
-                v-model:value="inputV2"
-                style="width: 388px; height: 32px"
+                v-model:value="formState.examinationDuration"
+                style="width: 388px; height: 32px;
+                margin-left: 35px;"
               />
               <span style="margin-left: 5px">分钟</span>
+            </a-form-item>
             </div>
           </div>
           <div class="main_item">
-            <div class="signbox">
-              <div class="sign">
-                <img
-                  src="@/assets/images/coursewareManage/asterisk.png"
-                  alt=""
-                />
-              </div>
-              <span style="margin-right: 3px">考试限制：</span>
-            </div>
             <div class="btnbox">
-              <span style="margin-right: 8px">允许重复考试</span>
+              <span style="margin-right: 43px">考试限制</span>
+              <a-form-item has-feedback label="允许重复考试" name="examinationLimit">
+
               <a-input-number
                 :min="-1" :precision="0"
-                v-model:value="inputV3"
-                style="width: 88px; height: 32px;border-radius: 8px;overflow: hidden;"
+                v-model:value="formState.examinationLimit"
+                style="width: 88px; height: 32px;
+                border-radius: 8px;overflow: hidden;"
               />
               <span style="margin-left: 8px">次</span>
               <span style="margin-left: 24px; color: #999999"
-                >-1表示无限制</span
-              >
+                >-1表示无限制</span>
+            </a-form-item>
+              
+              
             </div>
           </div>
           <div class="main_item">
-            <div class="signbox">
-              <span style="margin-right: 3px">显示答案：</span>
-            </div>
             <div class="btnbox">
-              <a-radio-group v-model:value="radioV1">
+              <a-form-item has-feedback label="显示答案" name="showAnswers">
+
+              <a-radio-group style="margin-left: 35px;" v-model:value="formState.showAnswers">
                 <a-radio v-model:checked="checked" :value="1" @click="cloradio1">允许查看</a-radio>
                 <a-radio v-model:checked="checked" :value="2" @click="cloradio1"
                   >不允许查看</a-radio
                 >
               </a-radio-group>
+            </a-form-item>
+
             </div>
           </div>
           <div class="main_item">
-            <div class="signbox">
-              <span style="margin-right: 3px">显示解析：</span>
-            </div>
             <div class="btnbox">
-              <a-radio-group v-model:value="radioV2">
+              <a-form-item has-feedback label="显示解析" name="showAnalysis">
+
+              <a-radio-group style="margin-left: 35px;" v-model:value="formState.showAnalysis">
                 <a-radio v-model:checked="checked" :value="1" @click="cloradio2">允许查看</a-radio>
                 <a-radio v-model:checked="checked" :value="2" @click="cloradio2"
                   >不允许查看</a-radio
                 >
               </a-radio-group>
+            </a-form-item>
+
             </div>
           </div>
           <div class="main_item">
-            <div class="signbox">
-              <span style="margin-right: 3px">评分模式：</span>
-            </div>
             <div class="btnbox">
-              <div class="btnbox">
-                <a-radio-group v-model:value="radioV3">
+              <a-form-item has-feedback label="评分模式" name="scoringModel">
+
+                <a-radio-group style="margin-left: 35px;" v-model:value="formState.scoringModel">
                   <a-radio v-model:checked="checked" :value="1" @click="cloradio3"
                     >最高一次</a-radio
                   >
@@ -171,44 +151,47 @@
                     >最后一次</a-radio
                   >
                 </a-radio-group>
-              </div>
+              </a-form-item>
             </div>
           </div>
           <div class="main_item">
-            <div class="signbox">
-              <span style="margin-right: 3px">及格线：</span>
-            </div>
             <div class="btnbox">
+              <a-form-item has-feedback label="及格线" name="passLine">
+
               <a-input
-                v-model:value="inputV4"
-                style="width: 88px; height: 32px"
+                v-model:value="formState.passLine"
+                style="width: 88px; height: 32px;margin-left: 35px;"
               />
+            </a-form-item>
+
               <span style="margin-left: 8px">分</span>
             </div>
           </div>
           <div class="main_item">
-            <div class="signbox">
-              <span style="margin-right: 3px">试题排列：</span>
-            </div>
             <div class="btnbox">
-              <a-radio-group v-model:value="radioV4">
+              <a-form-item has-feedback label="作业要求" name="questionArrangement">
+
+              <a-radio-group v-model:value="formState.questionArrangement">
                 <a-radio v-model:checked="checked" :value="1" @click="cloradio4">试题乱序</a-radio>
                 <a-radio v-model:checked="checked" :value="2" @click="cloradio4">试题排序</a-radio>
                 <a-radio v-model:checked="checked" :value="3" @click="cloradio4">全部乱序</a-radio>
               </a-radio-group>
+            </a-form-item>
+
             </div>
           </div>
         </div>
       </div>
       <div class="main_btns">
-        <button class="btn1" @click="closeDrawer">取消</button>
-        <button class="btn2" @click="addTest">确定</button>
+        <a-button class="btn1" @click="closeDrawer">取消</a-button>
+        <a-button class="btn2" html-type="submit" >确定</a-button>
       </div>
+    </a-form>
     </div>
   </a-drawer>
 </template>
   <script>
-import { reactive, toRefs, ref } from "vue";
+import { reactive, ref } from "vue";
 import {message} from"ant-design-vue";
 import {createExamination} from "@/api/indexExam"
 import  dayjs from 'dayjs';
@@ -239,19 +222,138 @@ export default {
     },
   },
   setup(props, ctx) {
-    const state = reactive({
-      inputV1: "",
-      inputV2: "",
-      inputV3: "",
-      inputV4: "60",
-      testV1: "",
-      radioV1: "",
-      radioV2: "",
-      radioV3: "",
-      radioV4: "",
-      choosedTest: "",
-      testTime:"",
+    const formState = reactive({
+      examinationName:'',
+      examinationDuration:"",
+      examinationLimit:"",
+      passLine:60,
+      examinationEndTime:"",
+      examinationExplain:"",
+      questionArrangement:1,
+      scoringModel:2,
+      showAnalysis:2,
+      showAnswers:2,
     });
+    const formRef = ref();
+    let checkExaminationName = async (_rule, value) => {
+      if (!value) {
+        message.warning("请输入考试名称");
+        return Promise.reject('请输入考试名称');
+      }
+    };
+    let checkExaminationExplain = async (_rule, value) => {
+      if (!value) {
+        message.warning("请输入考试说明");
+        return Promise.reject('请输入考试说明');
+      }
+    };
+    let checkChoosedTest = async (_rule, value) => {
+      if (!value) {
+        message.warning("请选择考试");
+        return Promise.reject('请选择考试');
+      }
+    };
+    let checkChoosedTime = async (_rule, value) => {
+      if (!value) {
+        message.warning("请选择时间");
+        return Promise.reject('请选择时间');
+      }
+    };
+    let checkExaminationDuration = async (_rule, value) => {
+      if (!value) {
+        message.warning("请输入考试时长");
+        return Promise.reject('请输入考试时长');
+      }
+    };
+    let checkLimit = async (_rule, value) => {
+      if (!value) {
+        message.warning("请输入考试限制");
+        return Promise.reject('请输入考试限制');
+      }
+    };
+    let checkShowAnswers = async (_rule, value) => {
+      if (!value) {
+        message.warning("请输入作业名称");
+        return Promise.reject('请输入作业名称');
+      }
+    };
+    let checkShowAnalysis = async (_rule, value) => {
+      if (!value) {
+        message.warning("请输入作业名称");
+        return Promise.reject('请输入作业名称');
+      }
+    };
+    let checkScoringModel = async (_rule, value) => {
+      if (!value) {
+        message.warning("请输入作业名称");
+        return Promise.reject('请输入作业名称');
+      }
+    };
+    let checkPassLine = async (_rule, value) => {
+      if (!value) {
+        message.warning("请输入及格线");
+        return Promise.reject('请输入及格线');
+      }
+    };
+    let checkQuestionArrangement = async (_rule, value) => {
+      if (!value) {
+        message.warning("请输入作业名称");
+        return Promise.reject('请输入作业名称');
+      }
+    };
+    const rules = {
+      examinationName: [{
+        required: true,
+        validator: checkExaminationName,
+        trigger: 'change',
+      }],
+      examinationExplain: [{
+        validator: checkExaminationExplain,
+        trigger: 'change',
+      }],
+      choosedTest: [{
+        required: true,
+        validator: checkChoosedTest,
+        trigger: 'change',
+      }],
+      choosedTime: [{
+        required: true,
+        validator: checkChoosedTime,
+        trigger: 'change',
+      }],
+      examinationDuration: [{
+        required: true,
+        validator: checkExaminationDuration,
+        trigger: 'change',
+      }],
+      limit: [{
+        required: true,
+        validator: checkLimit,
+        trigger: 'change',
+      }],
+      showAnswers: [{
+        validator: checkShowAnswers,
+        trigger: 'change',
+      }],
+      showAnalysis: [{
+        validator: checkShowAnalysis,
+        trigger: 'change',
+      }],
+      scoringModel: [{
+        validator: checkScoringModel,
+        trigger: 'change',
+      }],
+      passLine: [{
+        required: true,
+        validator: checkPassLine,
+        trigger: 'change',
+      }],
+      questionArrangement: [{
+        validator: checkQuestionArrangement,
+        trigger: 'change',
+      }],
+    };
+
     const options1 = ref([
       {
         label:'math',
@@ -262,76 +364,82 @@ export default {
         value:'eng',
       },
     ])
+    const handleFinish = values => {
+      console.log(values);
+      addTest()
+    };
+
+    const handleFinishFailed = errors => {
+      console.log(errors);
+      // message.error("handleFinishFailed");
+    };
+
+    const resetForm = () => {
+      formRef.value.resetFields();
+    };
+
+    const handleValidate = (...args) => {
+      console.log(args);
+    };
     const closeDrawer = () => {
+      resetForm();
       ctx.emit("update:addtestVisible", false);
-      state.radioV1 = "";
-        state.radioV2 = "";
-        state.radioV3 = "";
-        state.radioV4 = "";
     };
     const addTest = () => {
-      if(state.testTime.length
-      && state.inputV1&& state.inputV2&& state.inputV3&& state.inputV4
-      && state.radioV1&& state.radioV2&& state.radioV3
-      ){
         createExamination({
             "createTime": "",
             "createUser": 0,
-            "examinationDuration": state.inputV2,
-            "examinationEndTime": dayjs(state.testTime[1]).format("YYYY-MM-DD"),
-            "examinationExplain": state.testV1,
+            "examinationDuration": formState.examinationDuration,
+            "examinationEndTime": dayjs(formState.choosedTime[1]).format("YYYY-MM-DD"),
+            "examinationExplain": formState.examinationExplain,
             "examinationFlag": "",
             "examinationId": 0,
-            "examinationLimit": state.inputV3,
-            "examinationName": state.inputV1,
+            "examinationLimit": formState.examinationLimit,
+            "examinationName": formState.examinationName,
             "examinationPaperId": 0,
-            "examinationPaperName": state.choosedTest,
-            "examinationStartTime": dayjs(state.testTime[0]).format("YYYY-MM-DD"),
+            "examinationPaperName": formState.choosedTest,
+            "examinationStartTime": dayjs(formState.choosedTime[0]).format("YYYY-MM-DD"),
             "examinationTag": "",
-            "passLine": state.inputV4,
-            "questionArrangement": state.radioV4,
-            "scoringModel": state.radioV3,
-            "showAnalysis": state.radioV2,
-            "showAnswers": state.radioV1,
+            "passLine": formState.passLine,
+            "questionArrangement": formState.questionArrangement,
+            "scoringModel": formState.scoringModel,
+            "showAnalysis": formState.showAnalysis,
+            "showAnswers": formState.showAnswers,
             "updateTime": "",
             "updateUser": 0
           }).then((res)=>{
         message.success(`添加成功${res}`)
-        ctx.emit("update:addtestVisible", false);
+        closeDrawer();
       }).catch((err)=>{
         message.error(`添加失败${err}`)
       })
-      }
-      else{ 
-        message.error(`字段不能为空`)
-        return 0
-      }
+      
     }
     const afterVisibleChange = (bool) => {
-      console.log("state", bool);
+      console.log("formState", bool);
     };
     const cloradio1 = (value) => {
       if (value != "") {
-        state.radioV1 = "";
+        formState.showAnswers = "";
       }
     }
     const cloradio2 = (value) => {
       if (value != "") {
-        state.radioV2 = "";
+        formState.showAnalysis = "";
       }
     }
     const cloradio3 = (value) => {
       if (value != "") {
-        state.radioV3 = "";
+        formState.scoringModel = "";
       }
     }
     const cloradio4 = (value) => {
       if (value != "") {
-        state.radioV4 = "";
+        formState.questionArrangement = "";
       }
     }
     return {
-      ...toRefs(state),
+      formState,
       afterVisibleChange,
       closeDrawer,
       rowSelection,
@@ -341,6 +449,13 @@ export default {
       cloradio4,
       addTest,
       options1,
+      handleFinish,
+      handleFinishFailed,
+      resetForm,
+      handleValidate,
+      formRef,
+      // layout,
+      rules,
     };
   },
 };

From 250c8c341fe35e817345eb92f74c7861f0114f72 Mon Sep 17 00:00:00 2001
From: wuyx <wuyx@dongwu-inc.com>
Date: Tue, 1 Nov 2022 17:28:32 +0800
Subject: [PATCH 4/5] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E5=8D=95=E5=B1=82=E9=A1=B9=E7=9B=AEtype=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/projectcenter/ProjectAdd.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/projectcenter/ProjectAdd.vue b/src/views/projectcenter/ProjectAdd.vue
index b0cecf07..42af2981 100644
--- a/src/views/projectcenter/ProjectAdd.vue
+++ b/src/views/projectcenter/ProjectAdd.vue
@@ -389,7 +389,7 @@ export default {
 
 		const errorMsgs = {
 			"name": "请输入项目名称",
-			"type": "请选择项目分类",
+			"category": "请选择项目分类",
 			"picUrl": "请上传项目封面图",
 			"beginTime": "请选择项目开始时间",
 			"endTime": "请选择项目结束时间",
@@ -405,7 +405,7 @@ export default {
 		const createProject = () => {
 			let obj = {
 				"name": projectName["value"],
-				"type": projectType,
+				"category": projectType,
 				"picUrl": picUrl,
 				"beginTime": beginTime,
 				"endTime": endTime,
@@ -418,9 +418,9 @@ export default {
 				"systemId": 4,
 				"boeFlag": boeFlag,
 				"attach": attach,
+				"type": 3,
 				"templateId": 10,
 				"parentId": 0,
-				"category": 0,
 				"notice": "",
 				"noticeFlag": 0,
 				"status": 0
@@ -428,7 +428,7 @@ export default {
 			console.log('提交的数据格式 %o', obj)
 			for (let i in errorMsgs) {
 				console.log(obj[i])
-				if (obj[i] === "") {
+				if (obj[i] === "" || obj[i] === undefined) {
 					message.destroy()
 					message.warning(errorMsgs[i])
 					return

From 52c16bb64060685876b14dae5ee01af8baeb6651 Mon Sep 17 00:00:00 2001
From: dongwug <guoys@dongwu-inc.com>
Date: Tue, 1 Nov 2022 17:31:02 +0800
Subject: [PATCH 5/5] =?UTF-8?q?style:=E6=8A=BD=E5=B1=89header=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddActive.vue    | 1 +
 src/components/drawers/AddDiscuss.vue   | 1 +
 src/components/drawers/AddEval.vue      | 1 +
 src/components/drawers/AddFaceteach.vue | 1 +
 src/components/drawers/AddHomework.vue  | 1 +
 src/components/drawers/AddLive.vue      | 1 +
 src/components/drawers/AddOnline.vue    | 1 +
 src/components/drawers/AddRef.vue       | 1 +
 src/components/drawers/AddTest.vue      | 1 +
 src/components/drawers/AddVote.vue      | 1 +
 10 files changed, 10 insertions(+)

diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index 53a2f6fe..5388f71c 100644
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -354,6 +354,7 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      flex-shrink: 0;
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue
index a77c6c06..ca4a7749 100644
--- a/src/components/drawers/AddDiscuss.vue
+++ b/src/components/drawers/AddDiscuss.vue
@@ -169,6 +169,7 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      flex-shrink: 0;
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue
index 6c8c4f29..16922bf3 100644
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -374,6 +374,7 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      flex-shrink: 0;
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index 412dfb7a..cd42ca90 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -380,6 +380,7 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      flex-shrink: 0;
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue
index 8b1df370..e5f6f5fc 100644
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -277,6 +277,7 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      flex-shrink: 0;
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index 65cdc135..041b0857 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -634,6 +634,7 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      flex-shrink: 0;
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue
index 746c63dc..a7b5e9bb 100644
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -295,6 +295,7 @@ export default {
         display: flex;
         justify-content: space-between;
         align-items: center;
+        flex-shrink: 0;
         .headerTitle {
           font-size: 18px;
           font-weight: 600;
diff --git a/src/components/drawers/AddRef.vue b/src/components/drawers/AddRef.vue
index 8b782a28..3fcefa09 100644
--- a/src/components/drawers/AddRef.vue
+++ b/src/components/drawers/AddRef.vue
@@ -169,6 +169,7 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      flex-shrink: 0;
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index e68320e7..b661709a 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -472,6 +472,7 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      flex-shrink: 0;
       .headerTitle {
         font-size: 18px;
         font-weight: 600;
diff --git a/src/components/drawers/AddVote.vue b/src/components/drawers/AddVote.vue
index e6389232..b76a4ba7 100644
--- a/src/components/drawers/AddVote.vue
+++ b/src/components/drawers/AddVote.vue
@@ -177,6 +177,7 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
+      flex-shrink: 0;
       .headerTitle {
         font-size: 18px;
         font-weight: 600;