Merge branch 'master' of http://49.4.53.36:3000/hotel/hotel-saas-tenant-frontend

src/views/room/fangtailive.vue

@@ -892,10 +892,10 @@ export default {
     });
     getAction("/rooms/cesRooms/realtime-rooms", {}).then((res) => {
       if (res.success) {
-        this.roomList = res.result;
         res.result.forEach((row) => {
           this.$set(row, "collapse", 1);
         });
+        this.roomList = res.result;
       }
     });
   },
@@ -913,6 +913,18 @@ export default {
     // this.$refs.ModalEditScheduleRoom.disableSubmit = false;
   },
   methods: {
+    tabsClick(e) {
+      if (e == "1") {
+        getAction("/rooms/cesRooms/realtime-rooms", {}).then((res) => {
+          if (res.success) {
+            res.result.forEach((row) => {
+              this.$set(row, "collapse", 1);
+            });
+            this.roomList = res.result;
+          }
+        });
+      }
+    },
     getRoomStatusColor(roomStatus) {
       var find = this.roomStatusColorList.find((t) => t.value == roomStatus);
       return find ? find.extend : "";
@@ -1025,7 +1037,7 @@ export default {
         } else {
           this.$router.push({
             name: "room-scheduledetail",
-            params: { id: roomLive.bookingData.bookingOrder.bookingOrdersNo},
+            params: { id: roomLive.bookingData.bookingOrder.bookingOrdersNo },
           });
         }
       } else {
@@ -1055,12 +1067,6 @@ export default {
       });
     },
     onChange() {},
-    tabsClick(e) {
-      // this.$router.push({
-      //   name: "room-scheduledetail",
-      //   params: { id: "YD20230331112026203" },
-      // });
-    },
     collapseClick(row, value) {
       this.$set(row, "collapse", value);
     },