From 93d526d6d2a57ae1c7dbcedf1bf171ffa7f19edc Mon Sep 17 00:00:00 2001
From: "471615499@qq.com" <sy996996@>
Date: Sun, 3 Nov 2024 21:48:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E7=BB=9F=E8=AE=A1=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E4=B8=8B=E9=92=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/admin/meeting/MeetingCount.vue      | 20 +++++------
 src/views/admin/meeting/MeetingMangerList.vue | 33 +++++++++++++++++--
 2 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/src/views/admin/meeting/MeetingCount.vue b/src/views/admin/meeting/MeetingCount.vue
index 606c805..d57cbc8 100644
--- a/src/views/admin/meeting/MeetingCount.vue
+++ b/src/views/admin/meeting/MeetingCount.vue
@@ -11,10 +11,10 @@
               <a-icon type='ordered-list' style='font-size: 50px;color: #FFF' />
             </div>
             <div class='des'>
-              <div class='title' @click='goOrder'>
+              <div class='title' @click='goOrder("already")'>
                 已预约会议室
               </div>
-              <div class='num' @click='goOrder'>
+              <div class='num' @click='goOrder("already")'>
                 {{ roomNum.alreadyBooking }}
               </div>
             </div>
@@ -26,10 +26,10 @@
               <a-icon type='unordered-list' style='font-size: 50px;color: #FFF' />
             </div>
             <div class='des'>
-              <div class='title' @click='goOrder'>
+              <div class='title' @click='goOrder("without")'>
                 未预约会议室
               </div>
-              <div class='num' @click='goOrder'>
+              <div class='num' @click='goOrder("without")'>
                 {{ roomNum.noBooking }}
               </div>
             </div>
@@ -41,10 +41,10 @@
               <a-icon type='team' style='font-size: 50px;color: #FFF' />
             </div>
             <div class='des'>
-              <div class='title' @click='goOrder'>
+              <div class='title' @click='goOrder("going")'>
                 开会中会议室
               </div>
-              <div class='num' @click='goOrder'>
+              <div class='num' @click='goOrder("going")'>
                 {{ roomNum.going }}
               </div>
             </div>
@@ -56,10 +56,10 @@
               <a-icon type='profile' style='font-size: 50px;color: #FFF' />
             </div>
             <div class='des'>
-              <div class='title' @click='goOrder'>
+              <div class='title' @click='goOrder("free")'>
                 空闲中会议室
               </div>
-              <div class='num' @click='goOrder'>
+              <div class='num' @click='goOrder("free")'>
                 {{ roomNum.free }}
               </div>
             </div>
@@ -297,8 +297,8 @@ export default {
       this.$router.push({ name: 'reservation', query: query })
     },
     // 跳转到会议预约页面
-    goOrder() {
-      this.$router.push({ name: 'manger' })
+    goOrder(type) {
+      this.$router.push({ name: 'manger', query: { date: this.nowDate, type: type } })
     },
     /**
      * 改变会议室管理统计日期
diff --git a/src/views/admin/meeting/MeetingMangerList.vue b/src/views/admin/meeting/MeetingMangerList.vue
index 444778d..9fd5e71 100644
--- a/src/views/admin/meeting/MeetingMangerList.vue
+++ b/src/views/admin/meeting/MeetingMangerList.vue
@@ -87,6 +87,27 @@
               </a-select>
             </a-form-item>
           </a-col>
+          <a-col :md='5' :sm='15' v-if='isAdmin'>
+            <a-form-item label='会议室状态'>
+              <a-select v-model='queryParam.type' placeholder='请选择状态'>
+                <a-select-option value=''>
+                  全部
+                </a-select-option>
+                <a-select-option value='already'>
+                  已预约
+                </a-select-option>
+                <a-select-option value='without'>
+                  未预约
+                </a-select-option>
+                <a-select-option value='going'>
+                  开会中
+                </a-select-option>
+                <a-select-option value='free'>
+                  空闲
+                </a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
           <a-col :md='8' :sm='24'>
             <span class='table-page-search-submitButtons'>
               <a-button type='primary' @click='getAllRoomList'>查询会议室</a-button>
@@ -158,7 +179,8 @@ export default {
         typeName: '',
         shape: '',
         capacityNum: '',
-        devices: []
+        devices: [],
+        type: ''
       },
       capacityList: [],
       shapeList: [],
@@ -212,6 +234,11 @@ export default {
     // 会议管理员，不需要认证
     if (this.isAdmin) {
       this.showDepForm = false
+      // 管理员可能存在统计
+      let type = this.$route.query.type || ''
+      let chooseDate = this.$route.query.date || this.nowDate
+      this.queryParam.type = type
+      this.nowDate = chooseDate
     }
     this.getDict()
     this.getAllRoomList()
@@ -289,7 +316,8 @@ export default {
         typeName: '',
         shape: '',
         capacityNum: '',
-        devices: []
+        devices: [],
+        type: ''
       }
       this.getAllRoomList()
     },
@@ -324,6 +352,7 @@ export default {
         max: maxPerNum, // 最大容纳人数
         devices: this.queryParam.devices, // 设备
         typeName: this.queryParam.shape, // 形状
+        type: this.queryParam.type, // 状态
         timeFormat: 1, // 预约时间格式：0 任意时间（管理员），1上午，2下午，3晚上 4 全天。值为0时，读取startTime和endTime为预约会议时间范围；其他值读取mrdate，再拼接时间为预约会议时间范围。返回值为1时；读取 am，上午  0可预约 1不可预约  pm，下午 0可预约 1不可预约  night，晚上 0可预约 1不可预约，这里默认全部为1
         mrdate: this.nowDate
       }