From 37822ffd115d99516b44ff16e4f6ff0dc72c5e48 Mon Sep 17 00:00:00 2001
From: caozc <zcz963852@qq.com>
Date: Fri, 10 Mar 2023 14:24:52 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E4=BC=98=E5=8C=96=E5=BD=B1=E8=97=8F?=
 =?UTF-8?q?=E6=97=B6=E9=95=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/drawers/AddActive.vue          | 164 +++++-------------
 src/components/drawers/AddLive.vue            |  31 ++--
 .../research/components/ResearchAddPin.vue    |   2 +-
 3 files changed, 63 insertions(+), 134 deletions(-)

diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue
index d14fcfcf..31ae5b1c 100644
--- a/src/components/drawers/AddActive.vue
+++ b/src/components/drawers/AddActive.vue
@@ -2,126 +2,76 @@
   <div @click="openDrawer">
     <slot></slot>
   </div>
-  <a-drawer
-      :visible="visible"
-      class="drawerStyle addactiveDrawer"
-      width="800"
-      title="添加活动"
-      placement="right"
-  >
+  <a-drawer :visible="visible" class="drawerStyle addactiveDrawer" width="800" title="添加活动" placement="right">
     <div class="drawerMain">
       <div class="header">
         <div class="headerTitle">{{ taskIndex >= 0 ? "编辑" : "添加" }}活动</div>
-        <img
-            style="width: 29px; height: 29px; cursor: pointer"
-            src="../../assets/images/basicinfo/close.png"
-            @click="closeDrawer"
-        />
+        <img style="width: 29px; height: 29px; cursor: pointer" src="../../assets/images/basicinfo/close.png"
+          @click="closeDrawer" />
       </div>
       <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=""
-                />
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
               </div>
               <span style="margin-right: 3px">活动名称：</span>
             </div>
             <div class="btnbox">
-              <a-input
-                  v-model:value="formData.activityName"
-                  style="width: 400px; height: 40px; border-radius: 8px"
-                  placeholder="请输入活动名称"
-                  maxlength="20"
-              />
+              <a-input v-model:value="formData.activityName" style="width: 400px; height: 40px; border-radius: 8px"
+                placeholder="请输入活动名称" maxlength="20" />
             </div>
           </div>
 
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                />
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
               </div>
               <span style="margin-right: 3px">活动时间：</span>
             </div>
             <div class="btnbox">
-              <a-range-picker
-                  :disabled-date="disabledDate"
-                 
-                  :show-time="{ format: 'HH:mm' }"
-                  format="YYYY-MM-DD HH:mm"
-                  style="width: 400px; height: 40px; border-radius: 8px"
-                  v-model:value="dateTime"
-                  @change="timeChange"
-                  :placeholder="['      开始时间', '        结束时间']"
-              />
+              <a-range-picker :disabled-date="disabledDate" :show-time="{ format: 'HH:mm' }" format="YYYY-MM-DD HH:mm"
+                style="width: 400px; height: 40px; border-radius: 8px" v-model:value="dateTime" @change="timeChange"
+                :placeholder="['      开始时间', '        结束时间']" />
             </div>
           </div>
-          <div class="main_item">
+          <!-- <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                />
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
               </div>
               <span style="margin-right: 3px">活动时长：</span>
             </div>
             <div class="btnbox">
-              <a-input-number
-                  :min="0"
-                  :max="999999"
-                  :precision="0"
-                  style="width: 400px; height: 40px; border-radius: 8px"
-                  v-model:value="formData.activityDuration"
-              />
+              <a-input-number :min="0" :max="999999" :precision="0" style="width: 400px; height: 40px; border-radius: 8px"
+                v-model:value="formData.activityDuration" />
               <span style="color: #999999; margin-left: 8px">分钟</span>
             </div>
-          </div>
+          </div> -->
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
-                <img
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                />
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
               </div>
               <span style="margin-right: 3px">活动地点：</span>
             </div>
             <div class="btnbox">
-              <a-input
-                  v-model:value="formData.activityAddress"
-                  style="width: 400px; height: 40px; border-radius: 8px"
-                  placeholder="请输入活动地点"
-                  maxlength="100"
-              />
+              <a-input v-model:value="formData.activityAddress" style="width: 400px; height: 40px; border-radius: 8px"
+                placeholder="请输入活动地点" maxlength="100" />
             </div>
           </div>
           <div class="main_item2">
             <div class="signbox">
               <div class="sign">
-                <img
-                    src="@/assets/images/coursewareManage/asterisk.png"
-                    alt=""
-                />
+                <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
               </div>
               <span style="margin-right: 3px">活动公告：</span>
             </div>
             <div class="textarea">
-              <a-textarea
-                  v-model:value="formData.activityNotice"
-                  placeholder="请输入活动公告"
-                  allow-clear
-                  :rows="6"
-                  show-count
-                  :maxlength="200"
-              />
+              <a-textarea v-model:value="formData.activityNotice" placeholder="请输入活动公告" allow-clear :rows="6" show-count
+                :maxlength="200" />
             </div>
           </div>
           <div class="main_item2">
@@ -129,14 +79,8 @@
               <span style="margin-right: 3px">活动说明：</span>
             </div>
             <div class="textarea">
-              <a-textarea
-                  v-model:value="formData.activityExplain"
-                  placeholder="请输入活动说明"
-                  allow-clear
-                  :rows="6"
-                  show-count
-                  :maxlength="200"
-              />
+              <a-textarea v-model:value="formData.activityExplain" placeholder="请输入活动说明" allow-clear :rows="6" show-count
+                :maxlength="200" />
             </div>
           </div>
           <div class="main_item2">
@@ -152,39 +96,23 @@
               <div class="setbox">
                 <div class="timerbox">
                   <span>活动开始前：</span>
-                  <a-input-number
-                      :min="0"
-                      :max="999999"
-                      :precision="0"
-                      style="
-                      width: 88px;
-                      height: 32px;
-                      border-radius: 8px;
-                      overflow: hidden;
-                    "
-                      v-model:value="formData.beforeSignIn"
-                  />
-                  <span style="color: #999999; margin-left: 8px"
-                  >分钟允许签到</span
-                  >
+                  <a-input-number :min="0" :max="999999" :precision="0" style="
+                        width: 88px;
+                        height: 32px;
+                        border-radius: 8px;
+                        overflow: hidden;
+                      " v-model:value="formData.beforeSignIn" />
+                  <span style="color: #999999; margin-left: 8px">分钟允许签到</span>
                 </div>
                 <div class="timerbox">
                   <span>活动开始后：</span>
-                  <a-input-number
-                      :min="0"
-                      :max="999999"
-                      :precision="0"
-                      style="
-                      width: 88px;
-                      height: 32px;
-                      border-radius: 8px;
-                      overflow: hidden;
-                    "
-                      v-model:value="formData.afterSignIn"
-                  />
-                  <span style="color: #999999; margin-left: 8px"
-                  >分钟允许签到</span
-                  >
+                  <a-input-number :min="0" :max="999999" :precision="0" style="
+                        width: 88px;
+                        height: 32px;
+                        border-radius: 8px;
+                        overflow: hidden;
+                      " v-model:value="formData.afterSignIn" />
+                  <span style="color: #999999; margin-left: 8px">分钟允许签到</span>
                 </div>
               </div>
             </div>
@@ -205,8 +133,8 @@
   </a-drawer>
 </template>
 <script setup>
-import {defineEmits, defineProps, ref} from "vue";
-import {Form, message} from "ant-design-vue";
+import { defineEmits, defineProps, ref } from "vue";
+import { Form, message } from "ant-design-vue";
 import dayjs from "dayjs";
 
 const props = defineProps({
@@ -267,7 +195,7 @@ const rulesRef = ref({
   ],
 });
 
-const {resetFields, validate} = Form.useForm(formData, rulesRef);
+const { resetFields, validate } = Form.useForm(formData, rulesRef);
 
 const closeDrawer = () => {
   visible.value = false
@@ -302,31 +230,31 @@ const disabledRangeTime = () => ({
 */
 async function confirm() {
   // debugger
-  await validate().catch(({errorFields}) => {
+  await validate().catch(({ errorFields }) => {
     message.warning(errorFields[0].errors.join());
     throw Error("数据校验不通过")
   });
   if (taskIndex.value === -1) {
     const list = props.taskList
-    list.push({name: formData.value.activityName, type: props.type,duration:dayjs(formData.value.activityEndTime).diff(formData.value.activityStartTime,'minutes'), info: {...formData.value}})
+    list.push({ name: formData.value.activityName, type: props.type, duration: dayjs(formData.value.activityEndTime).diff(formData.value.activityStartTime, 'minutes'), info: { ...formData.value } })
   } else {
     const data = props.taskList[taskIndex.value]
     data.name = formData.value.activityName
-    data.info = {...formData.value}
-    data.duration = dayjs(formData.value.activityEndTime).diff(formData.value.activityStartTime,'minutes')
+    data.info = { ...formData.value }
+    data.duration = dayjs(formData.value.activityEndTime).diff(formData.value.activityStartTime, 'minutes')
   }
   emit('update:taskList', [...props.taskList])
   closeDrawer()
 }
 
 function openDrawer(i, row) {
-  row && (formData.value = {...row.info});
+  row && (formData.value = { ...row.info });
   row && (dateTime.value = [dayjs(row.info.activityStartTime, "YYYY-MM-DD HH:mm"), dayjs(row.info.activityEndTime, "YYYY-MM-DD HH:mm")]);
   (i >= 0) && (taskIndex.value = i);
   visible.value = true
 }
 
-defineExpose({openDrawer})
+defineExpose({ openDrawer })
 </script>
 <style lang="scss">
 .ant-table-striped :deep(.table-striped) td {
diff --git a/src/components/drawers/AddLive.vue b/src/components/drawers/AddLive.vue
index a75b3c4c..1e1c3691 100644
--- a/src/components/drawers/AddLive.vue
+++ b/src/components/drawers/AddLive.vue
@@ -52,7 +52,7 @@
                 valueFormat="YYYY-MM-DD HH:mm" @change="timeChange" :placeholder="['      开始时间', '        结束时间']" />
             </div>
           </div>
-          <div class="main_item">
+          <!-- <div class="main_item">
             <div class="signbox">
               <div class="sign">
                 <img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
@@ -64,7 +64,7 @@
                 v-model:value="formData.liveDuration"></a-input-number>
               <span style="color: #999999; margin-left: 8px">分钟</span>
             </div>
-          </div>
+          </div> -->
           <div class="main_item">
             <div class="signbox">
               <div class="sign">
@@ -159,21 +159,21 @@
                 <div class="timerbox">
                   <span>直播开始前：</span>
                   <a-input-number :min="0" :max="999999" :precision="0" style="
-                                                width: 88px;
-                                                height: 32px;
-                                                border-radius: 8px;
-                                                overflow: hidden;
-                                              " v-model:value="formData.beforeSignIn"></a-input-number>
+                                                  width: 88px;
+                                                  height: 32px;
+                                                  border-radius: 8px;
+                                                  overflow: hidden;
+                                                " v-model:value="formData.beforeSignIn"></a-input-number>
                   <span style="color: #999999; margin-left: 8px">分钟允许签到</span>
                 </div>
                 <div class="timerbox">
                   <span>直播开始后：</span>
                   <a-input-number :min="0" :max="999999" :precision="0" style="
-                                                width: 88px;
-                                                height: 32px;
-                                                border-radius: 8px;
-                                                overflow: hidden;
-                                              " v-model:value="formData.afterSignIn"></a-input-number>
+                                                  width: 88px;
+                                                  height: 32px;
+                                                  border-radius: 8px;
+                                                  overflow: hidden;
+                                                " v-model:value="formData.afterSignIn"></a-input-number>
                   <span style="color: #999999; margin-left: 8px">分钟允许签到</span>
                 </div>
               </div>
@@ -376,7 +376,7 @@ async function confirm() {
   } else {
     const data = props.taskList[taskIndex.value];
     data.name = formData.value.liveName;
-    data.info = {...formData.value};
+    data.info = { ...formData.value };
     data.duration = dayjs(formData.value.liveEndTime).diff(formData.value.liveStartTime, 'minutes')
     console.log(data)
   }
@@ -408,7 +408,7 @@ const beforeUpload = (file) => {
     message.error("仅支持jpg、gif、png、jpeg、svg、bmp格式!");
     return false;
   }
-  
+
   let isLt1M = file.size < 2000000;
   console.log(file.size, isLt1M)
   if (!isLt1M) {
@@ -432,9 +432,10 @@ const beforeUpload = (file) => {
 };
 </script>
 <style lang="scss">
-.ant-upload { 
+.ant-upload {
   background-color: #fff !important;
 }
+
 .ant-table-striped :deep(.table-striped) td {
   background-color: #fafafa !important;
 }
diff --git a/src/views/research/components/ResearchAddPin.vue b/src/views/research/components/ResearchAddPin.vue
index fbe879b9..ebfcdbd6 100644
--- a/src/views/research/components/ResearchAddPin.vue
+++ b/src/views/research/components/ResearchAddPin.vue
@@ -83,7 +83,7 @@
           <div class="assesswhole" style="background: #ffffff">
             <a-input-number
               v-model:value="curItem.pinQuan"
-              :min="1"
+              :min="0"
               :max="100"
             />
           </div>