1

src/App.vue

@@ -12,7 +12,7 @@ export default {
 
 <style>
 @import url('~assets/css/font.css');
-@import url('//at.alicdn.com/t/font_2077629_56b72l69rc3.css');
+@import url('//at.alicdn.com/t/font_2077629_wxr0r4jnp3.css');
 
 html,
 body,

src/pages/classroom/Scheduling.vue

@@ -5,12 +5,12 @@
             <div class="classroom-box">
               <div v-for="(_item,_index) in item.RoomList" :key="item.RoomId" >
              <div class="classroom-item q-mr-lg q-mb-lg" :class="{'classroom-item-noUse':_item.UserRate===1}" >
-                 <div @click="goUrl">
+                 <div @click="goUrl(item,_item)">
                       <el-image class="classroom-img" :src="_item.RoomPicList[0]" fit="contain" >
-                    <div slot="error" class="image-slot">
-                         <i class="el-icon-picture-outline"></i>
-                    </div>
-                 </el-image>
+                            <div slot="error" class="image-slot">
+                               <img src="../../assets/images/classroom/bg-img.jpg" alt="" srcset="" style=" opacity: 0.8;">
+                            </div>
+                      </el-image>
                  </div>
                 
                  <div class="classroom-name" >{{_item.RoomName}}
@@ -99,12 +99,12 @@ import {
       this.getList();
     },
     methods:{
-        goUrl(){
-            console.log('tag', '1111')
+        goUrl(x,y){
             this.$router.push({
                 path:"/classroom/useRecord",
                 query:{
-
+                    key:x.Key,
+                    roomId:y.RoomId
                 }
             })
         },
@@ -130,6 +130,7 @@ import {
 <style lang="scss" scoped>
  .school-item{
       margin-bottom: 10px;
+     
      .school-name{
         font-size: 16px;
         font-family: Microsoft YaHei;

src/pages/classroom/courseInfo.vue

@@ -249,6 +249,9 @@
       <div class="col scroll schScroll">
         <schedulHead :dataList="dataList"></schedulHead>
         <div class="Sche_Bottom">
+          <div>
+
+          </div>
           <schedulVisit  :tabledata="dataList.GuestList"></schedulVisit> 
         </div>
       </div>
@@ -280,7 +283,7 @@
 
     methods: {
       getdata(){
-        getTimeDetail({id:this.id}).then(res=>{
+        getTimeDetail({ID:this.id}).then(res=>{
           if(res.Code===1){
             this.dataList=res.Data
           }

src/pages/classroom/useRecord.vue

@@ -43,7 +43,6 @@
         schoolId:0,
         navData:[],
        
-        
         msg:{
           RoomId:0,
           SchoolId:0,
@@ -54,7 +53,10 @@
       };
     },
     created(){
-       let d=new Date();
+      this.msg.SchoolId=this.$route.query.key
+      this.msg.RoomId=this.$route.query.roomId
+      console.log(this.$route.query,this.msg)
+      let d=new Date();
       let year =d.getFullYear();
       let month=d.getMonth()+1;
       month=month<10?'0'+month:month;
@@ -89,8 +91,8 @@
             getSchoolAndRoomNav({}).then(res => {
                 if(res.Code===1){
                     this.navData=res.Data
-                    this.msg.SchoolId=res.Data[0].Key
-                    this.msg.RoomId=res.Data[0].RoomList[0].RoomId
+                    // this.msg.SchoolId=res.Data[0].Key
+                    // this.msg.RoomId=res.Data[0].RoomList[0].RoomId
                     that.getClassRoomTimeList()
                 }
                 }).catch(() => {
@@ -110,8 +112,9 @@
         },
         //选择校区教室导航
         successNav(val){
+          console.log(114,val)
             this.msg.RoomId=val.RoomId
-            this.msg.SchoolId=val.SchoolId
+            this.msg.SchoolId=val.schoolId
             this.getClassRoomTimeList();
             this.$forceUpdate()
         },

src/pages/school/classroom.vue

@@ -38,18 +38,18 @@
         </template>
         <template v-slot:body-cell-TeacherName="props">
           <q-td :props="props">
-            <div class="text-blue cursor-pointer">{{props.value}}</div>
+            <div class="text-blue cursor-pointer">{{props.row.value}}</div>
           </q-td>
         </template>
          <template v-slot:body-cell-time="props">
           <q-td :props="props">
-            <div class="text-blue cursor-pointer">{{props.StartTime}}/{{props.EndTime}}</div>
+            <div class="text-blue cursor-pointer" >{{props.row.StartTime}}<span v-if="props.row.EndTime">/</span>{{props.row.EndTime}}</div>
           </q-td>
         </template>
         <template v-slot:body-cell-AssistIcon="props">
           <q-td auto-width :props="props">
             <q-avatar size="md" v-if="props.value">
-              <img :src="props.value" />
+              <img :src="props.row.value" />
             </q-avatar>
             <q-avatar size="md" color="teal-10" text-color="white" v-if="!props.value">
               {{props.row.AssistName}}</q-avatar>
@@ -106,7 +106,7 @@
         currentUrl: "",
         columns: [{
             name: 'RoomName',
-            label: '教师名称',
+            label: '教室名称',
             align: 'left',
             field: 'RoomName',
           },
@@ -118,7 +118,7 @@
           },
           {
             name: 'time',
-            label: '排班开始/结束时间',
+            label: '排课时间范围',
             align: 'left',
             field: 'time'
           },