diff --git a/src/views/admin/meeting/MeetingCount.vue b/src/views/admin/meeting/MeetingCount.vue
index e18721b..606c805 100644
--- a/src/views/admin/meeting/MeetingCount.vue
+++ b/src/views/admin/meeting/MeetingCount.vue
@@ -72,8 +72,8 @@
         <a-card title='会议日历' bodyStyle='height: 780px'>
           <a-calendar :header-render='headerRender' @select='onSelect'>
             <ul slot='dateCellRender' slot-scope='value' class='c_meeting'
-                style='padding: 0;text-align: center; font-size: 24px;font-weight: 700; margin-top: 10px'>
-              {{ getListData(value).length == 0 ? '' : getListData(value).length }}
+                style='padding: 0;text-align: center; font-size: 30px;font-weight: 700; margin-top: 6px'>
+              {{ getListData(value).length == 0 ? '' : getListData(value).length + ' 场' }}
               <a-popover style='display: none' @click.stop='showMeeting(item.id)' :title='item.title'
                          v-for='item in getListData(value)'>
                 <template slot='content'>
diff --git a/src/views/admin/meeting/MeetingMangerList.vue b/src/views/admin/meeting/MeetingMangerList.vue
index dc36c7f..444778d 100644
--- a/src/views/admin/meeting/MeetingMangerList.vue
+++ b/src/views/admin/meeting/MeetingMangerList.vue
@@ -78,6 +78,15 @@
               </a-select>
             </a-form-item>
           </a-col>
+          <a-col :md='5' :sm='15'>
+            <a-form-item label='设备'>
+              <a-select v-model='queryParam.devices' mode="multiple" placeholder='请选择设备'>
+                <a-select-option v-for='item in itemList' :value='item.value'>
+                  {{ item.text }}
+                </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>
@@ -148,12 +157,14 @@ export default {
         meetingName: '',
         typeName: '',
         shape: '',
-        capacityNum: ''
+        capacityNum: '',
+        devices: []
       },
       capacityList: [],
       shapeList: [],
       typeList: [],
       roomList: [],
+      itemList: [],
       showDepForm: true,
       depId: '',
       dep: '',
@@ -253,6 +264,23 @@ export default {
           value: ''
         }, ..._shapeList]
         this.shapeList = _shapeList
+
+
+        // 形状
+        let _itemList = []
+        for (let key in dataObj.devices) {
+          let eachObj = dataObj.devices[key]
+          const keys = Object.keys(eachObj)
+          _itemList.push({
+            text: keys[0],
+            value: keys[0]
+          })
+        }
+        // _itemList = [{
+        //   text: '全部',
+        //   value: ''
+        // }, ..._itemList]
+        this.itemList = _itemList
       })
     },
     reset() {
@@ -260,7 +288,8 @@ export default {
         meetingName: '',
         typeName: '',
         shape: '',
-        capacityNum: ''
+        capacityNum: '',
+        devices: []
       }
       this.getAllRoomList()
     },
@@ -289,12 +318,11 @@ export default {
         minPerNum = 1
         maxPerNum = 1000
       }
-
       let param = {
         floor: this.queryParam.typeName, // 楼层
         min: minPerNum, // 最小容纳人数
         max: maxPerNum, // 最大容纳人数
-        // devices: devicesArr, // 设备
+        devices: this.queryParam.devices, // 设备
         typeName: this.queryParam.shape, // 形状
         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
@@ -315,12 +343,12 @@ export default {
               list: []
             }
           }
-          if (this.isAdmin) {
-            // 所有都可以选
-            eachObj.am = 0
-            eachObj.pm = 0
-            eachObj.night = 0
-          }
+          // if (this.isAdmin) {
+          //   // 所有都可以选
+          //   eachObj.am = 0
+          //   eachObj.pm = 0
+          //   eachObj.night = 0
+          // }
           roomArr[eachObj['floorId']]['list'].push(eachObj)
         }
         this.roomList = roomArr
@@ -359,6 +387,7 @@ export default {
       if (this.isAdmin) {
         // 管理员任意选择时间
         timeRange = 4
+        status = 0
       }
       let data = {
         date: this.nowDate,