From 80fcf394a0d4011075ffc105ace7d324d0ed2861 Mon Sep 17 00:00:00 2001
From: wuyx <wuyx@dongwu-inc.com>
Date: Tue, 29 Nov 2022 16:03:28 +0800
Subject: [PATCH] =?UTF-8?q?style:=E5=A2=9E=E5=8A=A0=E5=AD=A6=E4=B9=A0?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=9B=BE=E7=BC=96=E8=BE=91=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=BC=B9=E6=A1=86=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddFaceteach.vue |  8 ++-
 src/components/drawers/AddOnline.vue    |  6 ++
 src/components/drawers/AddProject.vue   |  8 ++-
 src/components/drawers/AddTest.vue      | 78 ++++++++++++++++++++++++-
 src/components/drawers/UnlockMode.vue   |  4 +-
 5 files changed, 99 insertions(+), 5 deletions(-)

diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue
index fadb1caa..00ce0aee 100644
--- a/src/components/drawers/AddFaceteach.vue
+++ b/src/components/drawers/AddFaceteach.vue
@@ -331,7 +331,7 @@
         </div>
       </div>
       <div class="main_btns">
-        <button class="btn1">取消</button>
+        <button class="btn1" @click="exitAdd">取消</button>
         <button class="btn2" @click="updateFaceTeach">确定</button>
       </div>
   
@@ -545,6 +545,11 @@ export default {
       });
     };
 
+    // 点击取消按钮
+    const exitAdd = () => {
+      closeDrawer();
+    }
+
     //新建或编辑面授
     // 新增任务
     const updateFaceTeach = () => {
@@ -748,6 +753,7 @@ export default {
       afterVisibleChange,
       closeDrawer,
       updateFaceTeach,
+      exitAdd,
       updateTask,
       clear,
       handleChange,
diff --git a/src/components/drawers/AddOnline.vue b/src/components/drawers/AddOnline.vue
index 47316a2e..bdbd2677 100644
--- a/src/components/drawers/AddOnline.vue
+++ b/src/components/drawers/AddOnline.vue
@@ -405,6 +405,12 @@ export default {
             message.error(`${props.edit ? "编辑" : "新增"}模板库任务失败`);
           });
       }
+
+
+      if(state.addOnlineList.Target==undefined){
+        closeDrawer();
+      }
+
     };
     //搜索在线列表
     const searchList = ()=> {
diff --git a/src/components/drawers/AddProject.vue b/src/components/drawers/AddProject.vue
index ab77eec8..ec3d36f3 100644
--- a/src/components/drawers/AddProject.vue
+++ b/src/components/drawers/AddProject.vue
@@ -435,7 +435,13 @@ export default {
       state.selectedRows.forEach((item) => {
         let origin = JSON.parse(props.chooseProjectList);
         console.log("ccxx", origin);
-
+        if(origin==null){
+           closeSameModal();
+           closeDrawer();
+           message.destroy();
+           message.info("添加成功");
+           return;
+        }
         if (origin.length == 0) {
           //可以直接添加到任务列表里
           updateTask(item);
diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue
index 20fe558a..8f1858e0 100644
--- a/src/components/drawers/AddTest.vue
+++ b/src/components/drawers/AddTest.vue
@@ -32,7 +32,9 @@
           外部考试
         </button>
       </div>
+
       <a-form
+        v-if="isOuter == 1"
         ref="formRef"
         name="custom-validation"
         :model="formState"
@@ -48,7 +50,7 @@
               <div class="btnbox">
                 <a-form-item
                   has-feedback
-                  label="作业名称"
+                  label="考试名称"
                   name="examinationName"
                 >
                   <a-input
@@ -308,6 +310,80 @@
           <a-button class="btn2" html-type="submit">确定</a-button>
         </div>
       </a-form>
+
+      <a-form
+        v-else
+        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="btnbox">
+                <a-form-item
+                  has-feedback
+                  label="考试名称"
+                  name="examinationName"
+                >
+                  <a-input
+                    v-model:value="formState.examinationName"
+                    style="width: 424px; height: 32px; margin-left: 35px"
+                    autocomplete="off"
+                    placeholder="请输入考试名称"
+                    maxlength="20"
+                  />
+                </a-form-item>
+              </div>
+            </div>
+
+            <div class="main_item">
+              <div class="btnbox">
+                <a-form-item
+                  has-feedback
+                  label="数据来源"
+                  name="examinationName"
+                >
+                  <a-input
+                    v-model:value="请输入数据来源"
+                    style="width: 424px; height: 32px; margin-left: 35px"
+                    autocomplete="off"
+                    placeholder="数据来源"
+                    maxlength="20"
+                  />
+                </a-form-item>
+              </div>
+            </div>
+            
+            <div class="main_item2">
+              <a-form-item
+                has-feedback
+                label="考试说明"
+                name="examinationExplain"
+              >
+                <a-textarea
+                  v-model:value="formState.examinationExplain"
+                  placeholder="请输入考试说明"
+                  allow-clear
+                  style="margin-left: 35px"
+                  maxlength="150"
+                />
+              </a-form-item>
+            </div>
+          </div>
+        </div>
+        <div class="main_btns">
+          <a-button class="btn1" @click="closeDrawer">取消</a-button>
+          <a-button class="btn2" html-type="submit">确定</a-button>
+        </div>
+      </a-form>
+
+
     </div>
     <!--  加载动画 -->
     <div class="aeLoading" :style="{ display: addLoading ? 'flex' : 'none' }">
diff --git a/src/components/drawers/UnlockMode.vue b/src/components/drawers/UnlockMode.vue
index 22e5c839..58f7d382 100644
--- a/src/components/drawers/UnlockMode.vue
+++ b/src/components/drawers/UnlockMode.vue
@@ -72,8 +72,8 @@
         </div>
       </div>
       <div class="btnn">
-        <button class="btn1">取消</button>
-        <button class="btn2">确定</button>
+        <button class="btn1" @click="closeDrawer">取消</button>
+        <button class="btn2" @click="closeDrawer">确定</button>
       </div>
     </div>
   </a-drawer>