1

src/pages/classroom/Scheduling.vue

@@ -46,9 +46,9 @@
                           height="75px"
                           class=" text-white shadow-1 rounded-borders"
                           arrows
-                          control-color="grey-4"
+                          control-color="grey-1"
                           control-text-color="primary"
-                          control-type="regular"
+                          control-type="unelevated"
                         >
                           <q-carousel-slide v-for="(slide,slideIndex) in _item.TimeList" :key="slideIndex" :name="slideIndex" >
                             <div class="info-box">

src/pages/classroom/useRecord.vue

@@ -78,7 +78,10 @@
         },
         tbodayData: [],
         schoolopt: [],
-        classroomopt: [],
+        classroomopt: [{
+          RoomName: "不限",
+          RoomId: 0
+        }],
       };
     },
     created() {
@@ -120,6 +123,13 @@
           if (res.Code === 1) {
             this.navData = res.Data
             this.schoolopt = res.Data
+             if (!this.$route.query.key) {
+              this.msg.SchoolId = res.Data[0].Key
+             }
+            this.schoolopt.unshift({
+              SchoolName: "不限",
+              Key: -1
+            })
             this.schoolChange2(this.msg.SchoolId)
           }
         }).catch(() => {
@@ -127,6 +137,7 @@
         })
       },
       schoolChange(val) {
+        if (val !== -1) {
           let res = this.schoolopt.filter(item => {
             return item.Key == val
           })
@@ -137,7 +148,9 @@
             }
             this.classroomopt = [obj, ...res[0].RoomList]
           }
-        this.msg.ClassRoomId=0
+        }
+
+        this.msg.ClassRoomId = 0
         this.getClassRoomTimeList()
 
       },
@@ -193,8 +206,8 @@
         this.msg.EndTime = end;
       },
       changedate(val) {
-        if(!val){
-          val=this.dateModel
+        if (!val) {
+          val = this.dateModel
         }
         this.getEndTime(val)
         this.getClassRoomTimeList()