From 71959109e5ff31f991692cae8745345e0d7347fa Mon Sep 17 00:00:00 2001
From: "shengwen.chen" <jellymelon13@outlook.com>
Date: Tue, 21 Oct 2025 11:43:42 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AE=B6=E5=B1=9E=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E6=8E=A5=E5=85=A5=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/scheduleList/index.vue |  1 -
 src/views/waitList/index.vue     | 47 ++++++++++++++++++++++++++++----
 2 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/src/views/scheduleList/index.vue b/src/views/scheduleList/index.vue
index 6ed74e5..fc0f192 100644
--- a/src/views/scheduleList/index.vue
+++ b/src/views/scheduleList/index.vue
@@ -247,7 +247,6 @@ export default {
           if (item['Key'] == "StayTime") {
             this.stayTime = Number(item['Value'])
           }
-          console.log(item['Key']);
           if (item['Key'] == "FooterText") {
 
             this.FooterText = item['Value']
diff --git a/src/views/waitList/index.vue b/src/views/waitList/index.vue
index 24bc790..51c1ae3 100644
--- a/src/views/waitList/index.vue
+++ b/src/views/waitList/index.vue
@@ -80,7 +80,7 @@
       <div class="absolute bottom-2 left-1/2 -translate-x-1/2 flex">
         <template v-for="(item, index) in patientList">
           <div class="w-3 h-3 rounded-full bg-[#D8D8D8] mx-1" :class="{ '!bg-[#8C8D92]': index == activeIndex }"
-            :key="index" />
+            :key="index" @click="toIndex(index)" />
         </template>
       </div>
     </main>
@@ -89,7 +89,7 @@
         <div class="logBox w-[15vh] h-[3.7vh] mr-[1.48vh]">
           <img class="h-full" src="@/assets/svg/Wait/footText.png" />
         </div>
-        <p class="text-[2.59vh]">请勿吸烟，请照顾好自己随身携带的物品，请耐心等待，我们将竭诚为您服务</p>
+        <p class="text-[2.59vh]">{{ FooterText }}</p>
       </div>
     </footer>
     <audio ref="audioRef" class="invisible"></audio>
@@ -117,7 +117,6 @@ export default {
       patientList: [],
       currentDateTime: dayjs().format('YYYY-MM-DD HH:mm dddd'),
       dateTimer: null,
-      carouselCountDown: 10,
       carouselTimer: null,
       activeIndex: 0,
       getDataTimer: null,
@@ -135,14 +134,18 @@ export default {
       groupIndex: -1,
       roomNameList: [],
       serverTimeStamp: '',
+      stayTime: 30,
+      FooterText: '请勿吸烟，请照顾好自己随身携带的物品，请耐心等待，我们将竭诚为您服务',
+      ReflushTime: 20,
+      carouselCountDown: 20,
     };
   },
   methods: {
     statusToTxt,
     textWaitToColor,
     onGetPageData() {
-      let today = dayjs().format('YYYY-MM-DD');
-      // let today = '2024-06-06';
+      // let today = dayjs().format('YYYY-MM-DD');
+      let today = '2024-06-06';
       // let today = '2025-02-26';
       const QueryFiledDic = {};
       this.queryCondition.forEach(queryItem => {
@@ -159,6 +162,19 @@ export default {
           this.patientList = [];
 
           if (res['Data']['Data']['length']) {
+            // 过滤结束时间
+            const deadline = dayjs(this.serverTimeStamp).valueOf() - (60 * this.stayTime * 1000);
+            res['Data']['Data'] = res['Data']['Data'].filter(item => {
+              if (item['ProcStatus'] == 35 && item['OutRoomDateTime']) {
+                return dayjs(item['OutRoomDateTime']).valueOf() > deadline
+              }
+              if (item['ProcStatus'] == 45 && item['OutPacuDateTime']) {
+                return dayjs(item['OutPacuDateTime']).valueOf() > deadline
+              }
+              return true
+            })
+
+            // 分区
             if (this.groupIndex >= 0) {
               if (this.roomNameList[this.groupIndex]) {
                 res['Data']['Data'] = res['Data']['Data'].filter(item => {
@@ -194,7 +210,7 @@ export default {
           this.carouselCountDown -= 1;
           if (this.carouselCountDown == 0) {
             this.$refs.carousel.next();
-            this.carouselCountDown = 10;
+            this.carouselCountDown = this.ReflushTime;
           }
         }, 1000);
       });
@@ -318,9 +334,28 @@ export default {
           if (item['Key'] == "RoomName") {
             this.roomNameList = JSON.parse(item['Value'])
           }
+          if (item['Key'] == "KinStayTime") {
+            this.stayTime = Number(item['Value'])
+          }
+          if (item['Key'] == "KinFooterText") {
+
+            this.FooterText = item['Value']
+          }
+          if (item['Key'] == "KinReflushTime") {
+            this.ReflushTime = Number(item['Value'])
+            this.carouselCountDown = Number(item['Value'])
+          }
         })
       })
     },
+    toIndex(index) {
+      this.$refs.carousel.setActiveItem(index);
+      if (this.carouselTimer) {
+        clearInterval(this.carouselTimer);
+        this.carouselCountDown = this.ReflushTime;
+        this.onCarouselTimer()
+      }
+    }
   },
   mounted() {
     this.$nextTick(() => {