批量关房接口，批量关电，根据房间id拿到门锁管理字段

admin/src/api/api.js

@@ -7,9 +7,10 @@ import * as hotelStaff from './hotelStaff'
 import * as houseType from './houseType'
 import * as normalUser from './normalUser'
 import * as room from './room'
-import * as roomRealTimeStatu from './roomRealTimeStatu'
 import * as systemnotice from './systemnotice'
 import * as systemSetup from './systemSetup'
+import * as roomRealTimeStatu from './roomRealTimeStatu'
+import * as roomThirdSetting from './roomThirdSetting'
 // 
 /**
  *  @parms resquest 请求地址 例如：http://197.82.15.15:8088/request/...
@@ -47,7 +48,8 @@ export default {
     room,          // 房间
     systemnotice,  // 系统通知
     systemSetup,    // 系统设置
-    roomRealTimeStatu  // 实时房态
+    roomRealTimeStatu,  // 实时房态
+    roomThirdSetting   // 房间第三方平台设置
 };
 
 

admin/src/api/room.js

@@ -8,7 +8,7 @@ export function roomPage(params) {
 
 // 房间列表（分页分组）
 export function roomPageGroup(params) {
-    return http.get(`${resquest}/page/group`, params)
+    return http.get(`${resquest}/page/group?${params}`)
 }
 
 // 新增房间

admin/src/api/roomRealTimeStatu.js

@@ -17,4 +17,9 @@ export function clean(statuId, params) {
 // 锁定房间
 export function lock(params) {
     return http.put(`${resquest}/lock`, params)
+}
+
+// 房间转为脏房
+export function toDirty(params) {
+    return http.put(`${resquest}/toDirty`, params)
 }

admin/src/api/roomThirdSetting.js

@@ -0,0 +1,12 @@
+import http from '../utils/http'
+let resquest = "/api/ihotel/roomThirdSetting"
+
+//  根据房间id查询
+export function settingId(params) {
+    return http.get(`${resquest}/setting/${params}`)
+}
+
+//  电控制
+export function changeElectric(roomId, operType) {
+    return http.get(`${resquest}/changeElectric/${roomId}/${operType}`)
+}

admin/src/store/modules/inform.js

@@ -21,8 +21,8 @@ const mutations = {
 }
 
 const actions = {
-    setreadFlag({ commin }, number) {
-        commin('SET_readFlag', number)
+    setreadFlag({ commit }, number) {
+        commit('SET_readFlag', number)
     }
 }
 

admin/src/views/home/index.vue

@@ -69,24 +69,29 @@
             >
               <div class="tree">
                 <div class="tree-left">
-                  <el-checkbox v-model="checked" style="margin-left: 15px"
+                  <el-checkbox
+                    v-model="checked"
+                    style="margin-left: 15px"
+                    @change="chooseAll"
                     >全选</el-checkbox
                   >
-                  <span style="margin-left: 165px">100 / 200</span>
+                  <span style="margin-left: 165px"
+                    >{{ count.length }} / {{ data[0].children.length }}</span
+                  >
                 </div>
                 <el-tree
                   :data="data"
                   show-checkbox
                   node-key="id"
-                  :default-expanded-keys="[2, 3]"
-                  :default-checked-keys="[5]"
+                  ref="roomTree"
                   :props="defaultProps"
+                  @check="checkRoom"
                 >
                 </el-tree>
               </div>
               <div class="tree">
                 <div class="tree-left">
-                  <p style="margin-left: 15px">已选 ( 100 )</p>
+                  <p style="margin-left: 15px">已选 ( {{ count.length }} )</p>
                 </div>
                 <ul
                   class="infinite-list"
@@ -98,17 +103,16 @@
                     v-for="(i, index) in count"
                     :key="index"
                     class="infinite-list-item"
+                    v-show="!i.children"
                   >
-                    <span style="margin-left: 19px">{{ i }}</span
-                    ><i class="el-icon-close"></i>
+                    <span style="margin-left: 19px">{{ i.label }}</span
+                    ><i class="el-icon-close" @click="cancelCheck(i)"></i>
                   </li>
                 </ul>
               </div>
               <span slot="footer" class="dialog-footer">
                 <el-button @click="dialogVisible = false">取 消</el-button>
-                <el-button type="primary" @click="dialogVisible = false"
-                  >确 定</el-button
-                >
+                <el-button type="primary" @click="PLcloseRoom">确 定</el-button>
               </span>
             </el-dialog>
           </ul>
@@ -138,14 +142,18 @@
                   <el-button size="mini" @click="closeRoom(item)"
                     >关房</el-button
                   >
-                  <el-button size="mini">转脏房</el-button>
+                  <el-button size="mini" @click="todirty(item)"
+                    >转脏房</el-button
+                  >
                   <el-button
                     size="mini"
                     :disabled="item.statuName != '脏房'"
                     @click="leisure(item)"
                     >转空闲</el-button
                   >
-                  <el-button size="mini">关电</el-button>
+                  <el-button size="mini" @click="closeEle(item)"
+                    >关电</el-button
+                  >
                   <el-button size="mini">清扫</el-button>
                   <el-button size="mini">IC卡</el-button>
                   <el-button size="mini">指纹</el-button>
@@ -163,7 +171,7 @@
                       {{ item.statuName }}
                     </div>
                   </div>
-                  <template v-if="item.statu == 3 || item.statu == 2">
+                  <template v-if="item.statu == 3">
                     <div class="teacher">{{ item.useInfo.userName }}</div>
                     <div class="num">
                       <span>水:{{ item.useInfo.startOfWater }}吨</span
@@ -260,11 +268,22 @@
                             </div>
                           </div>
                           <div class="roomID">
-                            <div class="roomblock">
-                              <span>门锁密码:1111111</span>
-                              <span class="password" @click="sending"
-                                >下发密码</span
+                            <div class="roompassword">
+                              <span>门锁密码:</span>
+                              <div
+                                class="sendpass"
+                                v-for="item in roomPassWord"
+                                :key="item.id"
                               >
+                                <span>{{ item.lockRealtimePassword }}</span>
+                                <span class="password" @click="sending(item)"
+                                  >下发密码</span
+                                >
+                                <span style="margin-left: 10px"
+                                  >密码到期时间 :
+                                  {{ item.endTime.replace("T", " ") }}</span
+                                >
+                              </div>
                             </div>
                           </div>
                           <span slot="footer" class="dialog-footer">
@@ -358,62 +377,34 @@ export default {
       // 门锁管理
       doorLock: false,
       doorLockList: {
-        doorId: "111111",
+        doorId: "",
         doorIdshow: true,
-        waterId: "111111",
+        waterId: "",
         waterIdshow: true,
         doorNum: "111111",
         doorNumshow: true,
-        electricityId: "111111",
+        electricityId: "",
         electricityIdshow: true,
       },
+      roomPassWord: [], // 密码列表
       // 批量数据
       dialogVisible: false,
       enableEndTime: "", // 倒计时的日期
       Endtime: [],
-      count: 20,
+      count: [], // 选中的全部数据
       title: "",
-      checked: true,
+      checked: false,
       titles: ["批量开电", "批量关电"],
       titles2: ["批量开房", "批量关房"],
       data: [
         {
-          id: 1,
+          id: 15263458,
           label: "墨轩湖酒店",
           children: [
-            {
-              id: 2,
-              label: "17栋1单元02层01",
-            },
-            {
-              id: 3,
-              label: "17栋1单元02层01",
-            },
-            {
-              id: 4,
-              label: "17栋1单元02层01",
-            },
-            {
-              id: 5,
-              label: "17栋1单元02层01",
-            },
-            {
-              id: 6,
-              label: "17栋1单元02层01",
-            },
-
-            {
-              id: 7,
-              label: "17栋1单元02层01",
-            },
-            {
-              id: 8,
-              label: "17栋1单元02层01",
-            },
-            {
-              id: 9,
-              label: "17栋1单元02层01",
-            },
+            // {
+            //   id: 2,
+            //   label: "17栋1单元02层01",
+            // },
           ],
         },
       ],
@@ -485,7 +476,7 @@ export default {
   // },
   methods: {
     roomList() {
-      this.API.room.roomPageGroup().then((res) => {
+      this.API.room.roomPageGroup("pageSize=20").then((res) => {
         this.floorRoomDatas = [];
         console.log(res);
         res.data.list.forEach((item) => {
@@ -542,16 +533,24 @@ export default {
               resItem.statuName = "锁定";
             }
           });
+          this.data[0].children = [];
           this.floorRoomDatas.forEach((items) => {
             items.room.forEach((item) => {
               this.roomData.forEach((i, index) => {
                 if (item.id == i.roomId) {
                   i = Object.assign(i, item);
                   // console.log(i);
+                  let arr = {
+                    id: i.roomId,
+                    label: i.build + "栋" + i.roomno,
+                  };
+                  if (i.statu != 5) {
+                    this.data[0].children.push(arr);
+                  }
                   if (i.useInfo) {
                     this.enableEndTime = i.useInfo.enableEndTime;
                     this.showTime(index, i.useInfo.enableEndTime);
-                    console.log(i.useInfo.enableEndTime);
+                    // console.log(i.useInfo.enableEndTime);
                   }
                 }
               });
@@ -571,7 +570,6 @@ export default {
         var date1 = new Date();
         //两个日期对象直接相减就能获取两个日期相差的时间戳(以毫秒计，也就是能得出相差多少毫秒)
         var ms = newyear - date1;
-        //			console.log(ms);
         //获取天数
         var day = Math.floor(ms / 1000 / 3600 / 24);
         //获取小时数
@@ -592,10 +590,14 @@ export default {
         if (s < 10) {
           s = "0" + s;
         }
-        let enableEndTime = day + ":" + h + ":" + m + ":" + s;
-        // this.roomData[index].useInfo.EndTime = enableEndTime;
-        if (this.roomData[index].useInfo) {
-          this.$set(this.roomData[index].useInfo, "EndTime", enableEndTime);
+        if (ms < 0) {
+          this.$set(this.roomData[index].useInfo, "EndTime", "00:00:00:00");
+        } else {
+          let enableEndTime = day + ":" + h + ":" + m + ":" + s;
+          // this.roomData[index].useInfo.EndTime = enableEndTime;
+          if (this.roomData[index].useInfo) {
+            this.$set(this.roomData[index].useInfo, "EndTime", enableEndTime);
+          }
         }
       }, 0);
     },
@@ -607,29 +609,83 @@ export default {
       console.log(item);
       this.clickId = $event.currentTarget.id;
     },
-    // 控制水电
 
+    // 批量开关房start
+    chooseAll() {
+      if (this.checked) {
+        this.$refs.roomTree.setCheckedNodes(this.data[0].children);
+        this.count = this.data[0].children;
+      } else {
+        this.$refs.roomTree.setCheckedNodes([]);
+        this.count = [];
+      }
+    },
     dialogShow(e) {
       this.dialogVisible = true;
-      this.title = e.target.innerHTML;
-    },
-    handleClose(key, keyPath) {
-      console.log(key, keyPath);
+      this.title = e.target.innerText;
     },
     load() {
-      this.count += 0;
-      if (this.count < 50) {
-        this.count += 4;
+      // this.count += 0;
+      // if (this.count < 50) {
+      //   this.count += 4;
+      // }
+    },
+    // 勾选房间
+    checkRoom(data, nodes) {
+      this.count = _.cloneDeep(nodes.checkedNodes);
+      nodes.checkedNodes.forEach((item, index) => {
+        if (item.children) {
+          this.count.splice(index, 1);
+        }
+      });
+      if (this.data[0].children.length == this.count.length) {
+        this.checked = true;
+      } else {
+        this.checked = false;
       }
+      console.log(this.count);
     },
-    //门锁管理
-    roomLock(item) {
-      this.doorLock = true;
-      console.log(item);
-      this.API.doorLock.roomDoorLockRoomId(item.roomId).then((res) => {
-        console.log(res);
+    // 取消选中房间
+    cancelCheck(i) {
+      console.log(i);
+      this.count = this.count.filter((item) => {
+        return i.id != item.id;
       });
+      if (this.data[0].children.length == this.count.length) {
+        this.checked = true;
+      } else {
+        this.checked = false;
+      }
+      this.$refs.roomTree.setCheckedNodes(this.count);
+      console.log(this.count);
     },
+    PLcloseRoom() {
+      this.dialogVisible = false;
+      if (this.title == "批量关房") {
+        let roomId = [];
+        let startDate = "2022-08-23";
+        let endDate = "2022-08-24";
+        let remark = "锁定房间";
+        this.count.forEach((item) => {
+          roomId.push(item.id);
+        });
+        this.$confirm("确认关闭房间吗？")
+          .then((_) => {
+            this.API.roomRealTimeStatu
+              .lock({ roomId, startDate, endDate, remark })
+              .then((res) => {
+                console.log(res);
+                this.roomList();
+                this.room = false;
+                this.count = [];
+                this.$refs.roomTree.setCheckedNodes([]);
+              });
+          })
+          .catch((_) => {});
+      }
+    },
+    // 批量开关房end
+
     //脏房转空闲
     leisure(item) {
       this.API.roomRealTimeStatu
@@ -643,18 +699,48 @@ export default {
     closeRoom(item) {
       console.log(item);
       let roomId = [item.roomId];
-      // let startDay = dayjs(new Date()).format("YYYY-MM-DD");
-      // let endDay = dayjs(new Date()).add(1, "day").format("YYYY-MM-DD");
-      let startDay = "2022-08-23";
-      let endDay = "2022-08-24";
+      let startDate = dayjs(new Date()).format("YYYY-MM-DD");
+      let endDate = dayjs(new Date()).add(1, "day").format("YYYY-MM-DD");
+      // let startDate = "2022-08-23";
+      // let endDate = "2022-08-24";
       let remark = "锁定房间";
-      console.log(roomId, startDay, endDay);
       this.API.roomRealTimeStatu
-        .lock({ roomId, startDay, endDay, remark })
+        .lock({ roomId, startDate, endDate, remark })
         .then((res) => {
           console.log(res);
+          this.roomList();
         });
     },
+    // 转脏房
+    todirty(item) {
+      console.log(item);
+      let roomId = item.roomId;
+      let startDay = dayjs(new Date()).format("YYYY-MM-DD");
+      let endDay = dayjs(new Date()).add(1, "day").format("YYYY-MM-DD");
+      // let startDate = "2022-08-23";
+      // let endDate = "2022-08-24";
+      this.API.roomRealTimeStatu
+        .toDirty({ roomId, startDay, endDay })
+        .then((res) => {
+          console.log(res);
+          this.roomList();
+        });
+    },
+    // 关电
+    closeEle(item) {
+      console.log(item);
+      let operType = "2";
+      let roomId = item.roomId;
+      this.API.roomThirdSetting.changeElectric(roomId, operType).then((res) => {
+        console.log(res);
+        this.$message({
+          message: "关电成功",
+          type: "success",
+        });
+        this.roomList();
+      });
+    },
+
     // 房态筛查
     handleCheckAllChange(val) {
       this.checkedCities = val ? this.cities : [];
@@ -675,38 +761,26 @@ export default {
 
     //门锁管理
     lockClose(done) {
-      this.$confirm("确认关闭？")
-        .then((_) => {
-          done();
-        })
-        .catch((_) => {});
+      this.doorLock = false;
     },
-    sending(done) {
-      this.$confirm("确认下发密码吗？")
-        .then((_) => {
-          done();
-        })
+    sending(item) {
+      this.$confirm(`确认下发密码(${item.lockRealtimePassword})吗？`)
+        .then((_) => {})
         .catch((_) => {});
     },
-    // 新增房间
-    addRoom() {
-      this.addroom.addroomShow = true;
-    },
-    // 成功添加房间
-    addRoomSuccess() {
-      let roomInfo = {
-        id: this.addroom.id,
-        roomNo: this.addroom.roomNo,
-        build: this.addroom.build,
-        floor: this.addroom.floor,
-        roomTypeId: this.addroom.roomTypeId,
-        roomTypeName: this.addroom.roomTypeName,
-        enableUse: this.addroom.enableUse,
-      };
-      this.API.room.roomSave(roomInfo).then((res) => {
-        console.log(res);
-        this.addroom.addroomShow = false;
-        this.roomList();
+    roomLock(item) {
+      this.doorLock = true;
+      console.log(item);
+      this.API.doorLock.roomDoorLockRoomId(item.roomId).then((res) => {
+        console.log(res.data);
+
+        this.roomPassWord = res.data;
+      });
+      this.API.roomThirdSetting.settingId(item.roomId).then((res) => {
+        console.log(res.data);
+        this.doorLockList.electricityId = res.data.electricId;
+        this.doorLockList.waterId = res.data.waterId;
+        this.doorLockList.doorId = res.data.lockId;
       });
     },
     // 编辑门锁ID
@@ -830,6 +904,7 @@ export default {
           color: #000;
           line-height: 26px;
           text-align: center;
+
           &:hover {
             background-color: rgba(41, 109, 227, 1);
             color: #fff;
@@ -1201,13 +1276,10 @@ export default {
       display: flex;
 
       height: 49px;
-      .roomblock {
+      .roompassword {
         margin: 10px 19px;
-        width: 262px;
-        display: flex;
-        align-items: center;
-        .number {
-          display: flex;
+        .sendpass {
+          margin: 5px;
         }
         .password {
           margin-left: 10px;
@@ -1219,6 +1291,21 @@ export default {
           background-color: rgba(41, 109, 227, 1);
         }
       }
+      .roomblock {
+        margin: 10px 19px;
+        width: 262px;
+        display: flex;
+        align-items: center;
+        span {
+          margin-right: 5px;
+        }
+        .number {
+          display: flex;
+          span {
+            margin-right: 5px;
+          }
+        }
+      }
 
       .el-input {
         width: 150px;
@@ -1321,6 +1408,7 @@ export default {
       border: 1px solid rgba(230, 230, 230, 1);
       box-sizing: border-box;
       padding-left: 9px;
+      overflow: auto;
     }
 
     ul {
@@ -1331,10 +1419,15 @@ export default {
       margin: 0;
       border: 1px solid rgba(230, 230, 230, 1);
       box-sizing: border-box;
+      overflow: auto;
       li {
         display: flex;
         justify-content: space-between;
         padding-right: 17px;
+        align-items: center;
+        i {
+          cursor: pointer;
+        }
       }
     }
   }

admin/src/views/inform/index.vue

@@ -78,7 +78,6 @@
                   @click="handleInfo(scope.$index, scope.row)"
                   class="operate"
                   style="color: #296de3; cursor: pointer"
-                  v-show="scope.row.readFlag == 0 ? false : true"
                 >
                   查看
                 </span>
@@ -93,7 +92,9 @@
                     {{ info.title }}
                   </span>
                   <h3>消息:</h3>
-                  <span>{{ info.content }}</span>
+                  <span style="padding: 10px 20px 20px">{{
+                    info.content
+                  }}</span>
                   <h3>时间:</h3>
                   <span>{{ info.createTime }}</span>
                 </el-dialog>
@@ -161,6 +162,8 @@ export default {
           if (item.readFlag == 0) {
             number += 1;
             this.$store.dispatch("inform/setreadFlag", number);
+          } else {
+            this.$store.dispatch("inform/setreadFlag", "");
           }
           item.createTime = item.createTime.replace("T", " ");
         });
@@ -410,7 +413,7 @@ export default {
     }
     span {
       text-align: left;
-      padding: 30px 20px;
+      padding: 10px 20px 20px;
     }
   }
 }