From 2172900d7ec2e0873f7ca720dadcbaa8acef03bf 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 11:27:14 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0=E8=AE=A8=E8=AE=BA?=
 =?UTF-8?q?=E5=92=8C=E6=B7=BB=E5=8A=A0=E6=B4=BB=E5=8A=A8=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/{activity.js => indexActivity.js} |  0
 src/api/{discuss.js => indexDiscuss.js}   |  0
 src/api/{level.js => indexLevel.js}       |  0
 src/components/drawers/AddActive.vue      | 51 +++++++++++++++++------
 src/components/drawers/AddDiscuss.vue     | 12 ++++--
 src/views/learningpath/LevelAddDetail.vue | 18 ++++----
 6 files changed, 58 insertions(+), 23 deletions(-)
 rename src/api/{activity.js => indexActivity.js} (100%)
 rename src/api/{discuss.js => indexDiscuss.js} (100%)
 rename src/api/{level.js => indexLevel.js} (100%)

diff --git a/src/api/activity.js b/src/api/indexActivity.js
similarity index 100%
rename from src/api/activity.js
rename to src/api/indexActivity.js
diff --git a/src/api/discuss.js b/src/api/indexDiscuss.js
similarity index 100%
rename from src/api/discuss.js
rename to src/api/indexDiscuss.js
diff --git a/src/api/level.js b/src/api/indexLevel.js
similarity index 100%
rename from src/api/level.js
rename to src/api/indexLevel.js
diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index a9b148ad..53a2f6fe 100644
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -120,7 +120,7 @@
               <a-input
                 v-model:value="inputV3"
                 style="width: 424px; height: 32px"
-                placeholder="请输入授课老师"
+                placeholder="请输入活动地址"
               />
             </div>
           </div>
@@ -145,7 +145,7 @@
                       border-radius: 8px;
                       overflow: hidden;
                     "
-                    :v-model:value="inputV4"
+                    v-model:value="inputV4"
                   />
                   <span style="color: #999999; margin-left: 8px">分钟</span>
                 </div>
@@ -161,7 +161,7 @@
                       border-radius: 8px;
                       overflow: hidden;
                     "
-                    :v-model:value="inputV5"
+                    v-model:value="inputV5"
                   />
                   <span style="color: #999999; margin-left: 8px">分钟</span>
                 </div>
@@ -182,7 +182,7 @@
                       border-radius: 8px;
                       overflow: hidden;
                     "
-                    :v-model:value="inputV6"
+                    v-model:value="inputV6"
                   />
                   <span style="color: #999999; margin-left: 8px"
                     >分钟（提前签退则记为早退）</span
@@ -209,7 +209,7 @@
         </div>
       </div>
       <div class="main_btns">
-        <button class="btn1">取消</button>
+        <button class="btn1" @click="closeDrawer">取消</button>
         <button class="btn2" @click="createActivity">确定</button>
       </div>
     </div>
@@ -217,8 +217,9 @@
 </template>
 <script>
 import { reactive, toRefs, ref } from "vue";
-import * as api from "../../api/activity";
+import * as api from "../../api/indexActivity";
 import { message } from "ant-design-vue";
+import { toDate } from "../../api/method.js";
 const rowSelection = ref({
   checkStrictly: false,
   onChange: (selectedRowKeys, selectedRows) => {
@@ -261,6 +262,15 @@ export default {
     const closeDrawer = () => {
       ctx.emit("update:addactiveVisible", false);
       state.radioV1 = "";
+      state.inputV1 = "";
+      state.inputV2 = "";
+      state.inputV3 = "";
+      state.inputV4 = "";
+      state.inputV5 = "";
+      state.inputV6 = "";
+      state.textV1 = "";
+      state.textV2 = "";
+      state.time = "";
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
@@ -273,18 +283,21 @@ export default {
 
     //创建活动
     const createActivity = () => {
-      if(!state.inputV1) return message.info("请输入活动名称");
-      if(!state.inputV2) return message.info("请输入活动时长");
-      if(!state.textV1) return message.info("请输入活动公告");
-      if(!state.inputV3) return message.info("请输入活动地址");
+      if(!state.inputV1) return message.warning("请输入活动名称");
+      if(!state.inputV2) return message.warning("请输入活动时长");
+      if(!state.textV1) return message.warning("请输入活动公告");
+      if(!state.inputV3) return message.warning("请输入活动地址");
+      let startTime = toDate(new Date(state.time[0].$d).getTime() / 1000, "Y-M-D");
+      let endTime = toDate(new Date(state.time[1].$d).getTime() / 1000, "Y-M-D");
       let obj = {
           activityAddress: state.inputV3, //活动地址
           activityDuration: state.inputV2, //活动时长
-          activityEndTime: "", //活动结束时间
+          activityExplain: state.textV2, //活动说明
+          activityEndTime: endTime, //活动结束时间
           activityId: 0, //活动ID
           activityName: state.inputV1, //活动名称
           activityNotice: state.textV1, //活动公告
-          activityStartTime: "", //活动开始时间
+          activityStartTime: startTime, //活动开始时间
           activityTag: "", //活动逻辑删除标识
           afterSignIn: state.inputV5, //活动开始后多少分钟签到
           beforeSignIn: state.inputV4, //活动开始前多少分钟签到
@@ -301,6 +314,17 @@ export default {
           setTimeout(() => {
             console.log("创建成功", res);
             message.success("创建成功");
+            state.radioV1 = "";
+            state.inputV1 = "";
+            state.inputV2 = "";
+            state.inputV3 = "";
+            state.inputV4 = "";
+            state.inputV5 = "";
+            state.inputV6 = "";
+            state.textV1 = "";
+            state.textV2 = "";
+            state.time = "";
+            ctx.emit("update:addactiveVisible", false);
           }, 1000);
         })
         .catch((err) => {
@@ -341,6 +365,9 @@ export default {
     .contentMain {
       display: flex;
       justify-content: space-between;
+      .ant-picker {
+        border-radius: 8px;
+      }
       .main_left {
         padding-right: 30px;
         flex: 1;
diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue
index f81f4e19..a77c6c06 100644
--- a/src/components/drawers/AddDiscuss.vue
+++ b/src/components/drawers/AddDiscuss.vue
@@ -63,7 +63,7 @@
         </div>
       </div>
       <div class="main_btns">
-        <button class="btn1">取消</button>
+        <button class="btn1" @click="closeDrawer">取消</button>
         <button class="btn2" @click="createDiscuss">确定</button>
       </div>
     </div>
@@ -71,7 +71,7 @@
 </template>
   <script>
 import { reactive, toRefs, ref } from "vue";
-import * as api from "../../api/discuss";
+import * as api from "../../api/indexDiscuss";
 import { message } from "ant-design-vue";
 const rowSelection = ref({
   checkStrictly: false,
@@ -109,7 +109,7 @@ export default {
     const closeDrawer = () => {
       ctx.emit("update:adddiscussVisible", false);
       state.inputV1 = "";
-      state.textV2 = "";
+      state.textV1 = "";
     };
     const afterVisibleChange = (bool) => {
       console.log("state", bool);
@@ -117,7 +117,7 @@ export default {
     
     //创建讨论
     const createDiscuss = () => {
-      if(!state.inputV1) return message.info("请输入讨论名称");
+      if(!state.inputV1) return message.warning("请输入讨论名称");
       let obj = {
         discussName: state.inputV1, //讨论名称
         discussExplain: state.textV1, //讨论说明
@@ -136,8 +136,12 @@ export default {
         .then((res) => {
           setTimeout(() => {
             console.log("创建成功", res);
+            state.inputV1 = "";
+            state.textV1 = "";
             message.success("创建成功");
+            ctx.emit("update:adddiscussVisible", false);
           }, 1000);
+          
         })
         .catch((err) => {
           console.log("创建失败", err);
diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue
index 2b2e1b62..bee8fb92 100644
--- a/src/views/learningpath/LevelAddDetail.vue
+++ b/src/views/learningpath/LevelAddDetail.vue
@@ -85,7 +85,7 @@
             <div class="co1">{{ value2.length }}/100</div>
           </div>
           <div class="btn">
-            <button class="btn1">取消</button>
+            <button class="btn1" @click="closeModal">取消</button>
             <button class="btn2" @click="editChapter">确定</button>
           </div>
         </div>
@@ -504,7 +504,7 @@
 import { reactive, toRefs, onMounted, onUnmounted } from "vue";
 import AddStu from "../../components/drawers/AddLevelAddStu";
 import ImpStu from "../../components/drawers/AddLevelImportStu";
-import * as api from "../../api/level";
+import * as api from "../../api/indexLevel";
 import { message } from "ant-design-vue";
 export default {
   name: "LevelAddDetail",
@@ -813,6 +813,7 @@ export default {
 
     //新建或编辑关卡
     const editChapter = () => {
+       if(!state.value1) return message.warning("请输入关卡名称");
       let obj = {
         name: state.value1,
         remark: state.value2,
@@ -824,6 +825,9 @@ export default {
           setTimeout(() => {
             console.log("创建成功", res);
             message.success("创建成功");
+            state.value1 = "";
+            state.value2 = "";
+            state.modal = false;
             // state.createLoading = false;
             //state.currentPage = 1;
             // getLearnPath();
@@ -838,14 +842,14 @@ export default {
     };
     const closeDrawer = () => {
       state.visible = false;
-      state.value1 = "";
-      state.value2 = "";
     };
     const showModal = () => {
       state.modal = true;
     };
     const closeModal = () => {
       state.modal = false;
+      state.value1 = "";
+      state.value2 = "";
     };
     const afterVisibleChange = (bool) => {
       console.log("visible", bool);
@@ -1317,9 +1321,9 @@ export default {
                 width: 100px;
                 height: 40px;
                 border-radius: 4px;
-                border: 1px solid #387df7;
+                border: 1px solid #409EFF;
                 font-size: 14px;
-                color: #387df7;
+                color: #409EFF;
                 cursor: pointer;
                 background: #ffffff;
                 margin-right: 20px;
@@ -1332,7 +1336,7 @@ export default {
                 color: #fff;
                 cursor: pointer;
                 border: 0;
-                background: #388be1;
+                background: #409EFF;
               }
             }
           }