From a1155c7e8518faf23e8ed8fc3e57b2db9b66f31e Mon Sep 17 00:00:00 2001
From: "471615499@qq.com" <sy996996@>
Date: Thu, 10 Oct 2024 19:38:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AD=9B=E9=80=89=E4=BA=BA?=
 =?UTF-8?q?=E6=95=B0=EF=BC=9B=20=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=83=A8=E5=88=86=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/admin/meeting/MeetingCount.vue    |  8 ++---
 src/views/admin/meeting/RoomContentList.vue | 39 +++++++++------------
 2 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/src/views/admin/meeting/MeetingCount.vue b/src/views/admin/meeting/MeetingCount.vue
index 4b3c961..467739a 100644
--- a/src/views/admin/meeting/MeetingCount.vue
+++ b/src/views/admin/meeting/MeetingCount.vue
@@ -69,7 +69,7 @@
     </a-card>
     <a-row>
       <a-col :span='18'>
-        <a-card title='会议日历'>
+        <a-card title='会议日历' bodyStyle='height: 780px'>
           <a-calendar :header-render='headerRender'>
             <ul slot='dateCellRender' slot-scope='value' class='c_meeting' style='padding: 0'>
               <a-popover :title='item.title' v-for='item in getListData(value)'>
@@ -127,7 +127,7 @@
             </a-col>
           </a-row>
         </a-card>
-        <a-card title='任务代办（小程序审核）'>
+        <a-card title='任务代办（小程序审核）'  bodyStyle='height: 554px'>
           <a-list item-layout='horizontal' :data-source='waitList'>
             <a-list-item slot='renderItem' slot-scope='item, index'>
               <!--              <a slot='actions'>审核</a>-->
@@ -506,7 +506,7 @@ export default {
           {
             name: '服务情况',
             type: 'pie',
-            radius: ['70%', '100%'],
+            radius: ['50%', '70%'],
             avoidLabelOverlap: false,
             label: {
               show: true
@@ -562,7 +562,7 @@ export default {
           {
             name: '会议室形式',
             type: 'pie',
-            radius: ['70%', '100%'],
+            radius: ['50%', '70%'],
             avoidLabelOverlap: false,
             label: {
               show: true
diff --git a/src/views/admin/meeting/RoomContentList.vue b/src/views/admin/meeting/RoomContentList.vue
index 63a41e3..097b98d 100644
--- a/src/views/admin/meeting/RoomContentList.vue
+++ b/src/views/admin/meeting/RoomContentList.vue
@@ -33,24 +33,15 @@
                   全部
                 </a-select-option>
                 <a-select-option value='1'>
-                  0-10
+                  0-20
                 </a-select-option>
                 <a-select-option value='2'>
-                  11-20
+                  21-50
                 </a-select-option>
                 <a-select-option value='3'>
-                  21-30
-                </a-select-option>
-                <a-select-option value='4'>
-                  31-40
-                </a-select-option>
-                <a-select-option value='5'>
-                  41-50
-                </a-select-option>
-                <a-select-option value='6'>
                   51-100
                 </a-select-option>
-                <a-select-option value='7'>
+                <a-select-option value='4'>
                   100以上
                 </a-select-option>
               </a-select>
@@ -234,24 +225,28 @@ export default {
         let minPerNum = 0
         let maxPerNum = 1000
         let perNumValue = this.queryParam.capacityNum
-        if (perNumValue == 6) {
+        if (perNumValue == 1) {
+          // 1-20
+          maxPerNum = 20
+          minPerNum = 1
+        } else if (perNumValue == 2) {
+          // 21-50
+          minPerNum = 21
+          maxPerNum = 50
+        } else if (perNumValue == 3) {
           // 51-100
-          maxPerNum = 100
           minPerNum = 51
-        } else if (perNumValue == 7) {
-          // 100以上
+          maxPerNum = 100
+        } else if (perNumValue == 4) {
+          // 51-100
           minPerNum = 101
           maxPerNum = 1000
-        } else if (perNumValue == '') {
+        } else {
           // 全部
           minPerNum = 1
           maxPerNum = 1000
-        } else {
-          // 其余，符合规则即可
-          // perNumValue * 10 - 9 ~ perNumValue * 10
-          maxPerNum = parseInt(perNumValue) * 10
-          minPerNum = maxPerNum - 9
         }
+
         const param = {
           name: this.queryParam.meetingName, // 名称
           floor: this.queryParam.typeName, // 楼层名称