From 8ec96109d2345bff917b6a1ac3d4d9c32fca90e3 Mon Sep 17 00:00:00 2001
From: Pengxiansen <2422914688@qq.com>
Date: Tue, 25 Feb 2025 14:36:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/growthpath/GrowthFaceStu.vue |  9 ++--
 src/views/growthpath/PathManage.vue         | 58 ++++++++++++---------
 2 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/src/components/growthpath/GrowthFaceStu.vue b/src/components/growthpath/GrowthFaceStu.vue
index 2b057b2a..75bd2377 100644
--- a/src/components/growthpath/GrowthFaceStu.vue
+++ b/src/components/growthpath/GrowthFaceStu.vue
@@ -513,13 +513,15 @@ watch(
   () => {
     coursePlanIndex.value = 0;
     params.value.pid = data.value[coursePlanIndex.value]?.id || 0;
-    if (data.value[coursePlanIndex.value].type !== 4) {
+    if (
+      data.value[coursePlanIndex.value] &&
+      data.value[coursePlanIndex.value].type !== 4
+    ) {
       columns.value = [...columns2];
     } else {
       columns.value = [...columns2, ...columns1];
     }
     tableRef.value.fetch();
-    console.log(1111111);
   }
 );
 
@@ -599,6 +601,7 @@ const batchSignAll = () => {
         })
         .then((res) => {
           message.success("签到成功");
+          tableRef.value.fetch();
         })
         .catch((err) => {
           message.error("签到失败");
@@ -671,7 +674,7 @@ function afterVisibleChange(bool) {
 function resetStudentPage() {
   tableRef.value.reset({
     pid: data.value[coursePlanIndex.value]?.id,
-    type: 18,
+    type: 3,
   });
 }
 
diff --git a/src/views/growthpath/PathManage.vue b/src/views/growthpath/PathManage.vue
index 6123706e..c0dded03 100644
--- a/src/views/growthpath/PathManage.vue
+++ b/src/views/growthpath/PathManage.vue
@@ -402,18 +402,20 @@
                                 <DownOutlined />
                               </a>
                               <template #overlay>
-                                <a-menu @click="handleMenuClickpg">
-                                  <template
-                                    v-for="(item, index) in qrCodeItemspg"
-                                    :key="index"
-                                  >
-                                    <a-menu-item>
-                                      <div>
-                                        <p>{{ item.name }}</p>
-                                      </div>
-                                    </a-menu-item>
-                                  </template>
-                                </a-menu>
+                                <div style="height: 200px; overflow: auto">
+                                  <a-menu @click="handleMenuClickpg">
+                                    <template
+                                      v-for="(item, index) in qrCodeItemspg"
+                                      :key="index"
+                                    >
+                                      <a-menu-item>
+                                        <div>
+                                          <p>{{ item.name }}</p>
+                                        </div>
+                                      </a-menu-item>
+                                    </template>
+                                  </a-menu>
+                                </div>
                               </template>
                             </a-dropdown>
                           </div>
@@ -443,18 +445,20 @@
                                 <DownOutlined />
                               </a>
                               <template #overlay v-if="qrCodeItems.length > 0">
-                                <a-menu @click="handleMenuClick">
-                                  <template
-                                    v-for="(item, index) in qrCodeItems"
-                                    :key="index"
-                                  >
-                                    <a-menu-item>
-                                      <div>
-                                        <p>{{ item.name }}</p>
-                                      </div>
-                                    </a-menu-item>
-                                  </template>
-                                </a-menu>
+                                <div style="height: 200px; overflow: auto">
+                                  <a-menu @click="handleMenuClick">
+                                    <template
+                                      v-for="(item, index) in qrCodeItems"
+                                      :key="index"
+                                    >
+                                      <a-menu-item>
+                                        <div>
+                                          <p>{{ item.name }}</p>
+                                        </div>
+                                      </a-menu-item>
+                                    </template>
+                                  </a-menu>
+                                </div>
                               </template>
                             </a-dropdown>
                           </div>
@@ -528,7 +532,9 @@
 
                         <template
                           v-if="
-                          element.taskType != 3 &&  element.taskType != 2 && checkMenu('growthQRCode')
+                            element.taskType != 3 &&
+                            element.taskType != 2 &&
+                            checkMenu('growthQRCode')
                           "
                         >
                           <div
@@ -2117,7 +2123,7 @@ export default {
     .taskSyllabus {
       // flex: 1;
       overflow-x: auto;
-
+      min-height: 400px;
       .ant-collapse {
         border: 0px;
         background-color: rgba(255, 255, 255, 0);