From d58fc800fcf97bb2e6ecc3ec306314e02ea72789 Mon Sep 17 00:00:00 2001
From: chenze <1824191732@qq.com>
Date: Fri, 18 Oct 2024 11:34:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B7=B3=E8=BD=AC=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/admin/meeting/MeetingMangerList.vue  | 18 +++++++++++-------
 .../admin/meeting/MeetingReservationList.vue   |  7 ++++++-
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/views/admin/meeting/MeetingMangerList.vue b/src/views/admin/meeting/MeetingMangerList.vue
index 472fa35..9d5ce6c 100644
--- a/src/views/admin/meeting/MeetingMangerList.vue
+++ b/src/views/admin/meeting/MeetingMangerList.vue
@@ -68,19 +68,19 @@
             {{ item.name }}
           </div>
           <div class="nav">
-            <div class="nav-item" v-for="room in item.list" :key="room.id">
-              <div class="desc" >
+            <div class="nav-item" @click="toMeetingList(room)" v-for="room in item.list" :key="room.id">
+              <div class="desc">
                 {{ room.name }}
               </div>
-<!--              <div class="desc disabled"  >-->
-<!--                {{ room.name }}-->
-<!--              </div>-->
+              <!--              <div class="desc disabled"  >-->
+              <!--                {{ room.name }}-->
+              <!--              </div>-->
               <div class="desc-item">
                 <div class="num">
                   {{ room.capacityNum }}人
                 </div>
                 <div class="shape">
-                  {{room.typeName}}
+                  {{ room.typeName }}
                 </div>
               </div>
             </div>
@@ -114,6 +114,10 @@ export default {
     this.getAllRoomList()
   },
   methods: {
+    toMeetingList (item) {
+      this.$router.push({ name: 'reservation', params: { roomId: item.name } })
+    },
+
     getAllRoomList () {
       getAllRoom({ timeFormat: 0, min: 1, max: 1000 }).then(res => {
         const roomArr = {}
@@ -177,7 +181,7 @@ export default {
   padding-right: 10px;
 }
 
-.disabled{
+.disabled {
   background-color: #F2F2F2 !important;
 }
 
diff --git a/src/views/admin/meeting/MeetingReservationList.vue b/src/views/admin/meeting/MeetingReservationList.vue
index a294c88..c563698 100644
--- a/src/views/admin/meeting/MeetingReservationList.vue
+++ b/src/views/admin/meeting/MeetingReservationList.vue
@@ -285,11 +285,15 @@ export default {
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
+        this.queryParam.name = this.$route.params.roomId
+
         return getMeetingReservationList(Object.assign(parameter, this.queryParam))
       },
       serveLoadData: (parameter) => {
+
         let param = {
-          parkId: this.parkId
+          parkId: this.parkId,
+
         }
         return getRoomServeList(Object.assign(parameter, param))
       },
@@ -302,6 +306,7 @@ export default {
   },
   filters: {},
   created () {
+    console.log()
   },
   methods: {
     onSelectChange (selectedRowKeys, selectedRows) {