Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/course/classmate-form.vue

@@ -10,7 +10,7 @@
     height: 40px;
   }
 
-  .MainPlan td {
+  .planClass-table td {
     vertical-align: top;
     padding: 5px;
     width: 14%;
@@ -126,7 +126,7 @@
       </thead>
     </table>
     <div class="planTabDiv" ref="planTabDiv">
-      <table class="ClassPlanTable" ref="PlanTable" style="border-collapse:collapse;margin-top:0;">
+      <table class="ClassPlanTable planClass-table" ref="PlanTable" style="border-collapse:collapse;margin-top:0;">
         <tbody>
           <tr v-for="(item,index) in dataList.fridayList" :key="index">
             <td>

src/pages/classroom/components/scenicSummary.vue

@@ -18,7 +18,7 @@
         </thead>
       </table>
       <div class="planTabDiv" ref="planTabDiv">
-        <table class="ClassPlanTable" ref="PlanTable" style="border-collapse:collapse;margin-top:0;">
+        <table class="ClassPlanTable planClass-table" ref="PlanTable" style="border-collapse:collapse;margin-top:0;">
           <tbody>
             <tr v-for="(item,index) in tbodayData.fridayList" :key="index">
               <td>
@@ -116,7 +116,7 @@
     height: 40px;
   }
 
-  .MainPlan td {
+  .planClass-table td {
     vertical-align: top;
     padding: 5px;
     width: 14%;

src/pages/teacher/components/classmate-form.vue

@@ -10,7 +10,7 @@
     height: 40px;
   }
 
-  .MainPlan td {
+  .teacher-Table td {
     vertical-align: top;
     padding: 5px;
     width: 14%;
@@ -126,7 +126,7 @@
       </thead>
     </table>
     <div class="planTabDiv" ref="planTabDiv">
-      <table class="ClassPlanTable" ref="PlanTable" style="border-collapse:collapse;margin-top:0;">
+      <table class="ClassPlanTable teacher-Table" ref="PlanTable" style="border-collapse:collapse;margin-top:0;">
         <tbody>
           <tr v-for="(item,index) in dataList.fridayList" :key="index">
             <td>

src/pages/teacher/components/teachTable.vue

 <template>
-  <div class="page-body" style="padding:20px 0">
+  <div style="padding:20px 0">
     <div class="page-content">
-      <q-table :pagination="setMsg" no-data-label="暂无相关数据" flat
-        class="sticky-column-table sticky-right-column-table" separator="none" :data="tableData" :columns="columns"
-        row-key="name">
+      <q-table :pagination="setMsg" no-data-label="暂无相关数据" flat class="sticky-column-table sticky-right-column-table"
+        separator="none" :data="tableData" :columns="columns" row-key="name">
         <template v-slot:body-cell-GuestList="props">
           <q-td auto-width :props="props">
             <span v-for="(item,index) in props.row.GuestList" style="margin-right:5px;">
-               {{item.GuestName}}
+              {{item.GuestName}}
             </span>
           </q-td>
         </template>
+        <template v-slot:body-cell-StartTime="props">
+          <q-td auto-width :props="props">
+            {{props.row.StartTime}}-{{props.row.EndTime}}
+          </q-td>
+        </template>
         <template v-slot:body-cell-TotalPlanNum="props">
           <q-td>
             {{props.row.Ranks}}/{{props.row.TotalPlanNum}}
           </q-td>
         </template>
+        <template v-slot:body-cell-optioned="props">
+          <q-td>
+            <q-btn flat size="xs" icon="iconfont icon-view" v-if="props.row.ClassType==1" color="accent"
+              style="font-weight:400" label="课程回顾" @click="goCourseRecord(props.row)" />
+          </q-td>
+        </template>
         <template v-slot:bottom>
           <q-pagination class="full-width justify-end" v-model="PageIndex" color="primary" :max="PageCount"
             :input="true" @input="changePage" />
@@ -28,7 +38,7 @@
   export default {
     props: {
       setMsg: {
-        type:Object,
+        type: Object,
         default: null
       },
       tableData: {
@@ -49,6 +59,16 @@
     data() {
       return {
         columns: [{
+            name: 'ClassDate',
+            label: '日期',
+            field: 'ClassDate',
+            align: 'left'
+          }, {
+            name: 'StartTime',
+            label: '上课时间',
+            field: 'StartTime',
+            align: 'left'
+          }, {
             name: 'ClassName',
             label: '班级',
             field: 'ClassName',
@@ -66,12 +86,6 @@
             field: 'GuestList',
             align: 'left'
           },
-          {
-            name: 'StartTime',
-            label: '上课时间',
-            field: 'StartTime',
-            align: 'left'
-          },
           {
             name: 'TeacherName',
             label: '教师',
@@ -83,33 +97,45 @@
             label: '课程进度',
             field: 'TotalPlanNum',
             align: 'left'
+          },
+          {
+            name: 'optioned',
+            label: '操作',
+            field: 'Id'
           }
         ],
-        tabMsg:{
-          PageIndex:1,
-          PageSize:15,
+        tabMsg: {
+          PageIndex: 1,
+          PageSize: 15,
           rowsPerPage: 15,
-          StartTime:'',
-          EndTime:'',
-          TeacherId:0,
-          ClassRoomId:0,
-          ClassType:0
+          StartTime: '',
+          EndTime: '',
+          TeacherId: 0,
+          ClassRoomId: 0,
+          ClassType: 0
         },
-        PageIndex:1
+        PageIndex: 1
       }
     },
     created() {
 
     },
     mounted() {
-      console.log(this.setMsg,'setMsg');
     },
     methods: {
       //翻页
       changePage(val) {
         this.PageIndex = val;
-        console.log(val,'val');
-        this.$emit('getChange',this.PageIndex);
+        this.$emit('getChange', this.PageIndex);
+      },
+      //跳转到课程回顾
+      goCourseRecord(item) {
+        this.$router.push({
+          path: "../../classroom/courseInfo",
+          query: {
+            id: item.Id
+          }
+        })
       }
     }
   }

src/pages/teacher/teacherSchedule.vue

 <template>
   <div class="page-body MainPlan">
     <div class="col row wrap q-col-gutter-md">
-      <div class="col-2">
-        <el-select v-model="msg.TeacherId" style="width:100%;" placeholder="教师团队" size="small" @change="getTypeWay()">
-          <el-option v-for="item in TeacherList" :key="item.TeacherName" :label="item.TeacherName" :value="item.TId">
-          </el-option>
-        </el-select>
-      </div>
       <div class="col-2">
         <el-select v-model="msg.ClassRoomId" style="width:100%;" placeholder="教室" size="small" @change="getTypeWay()">
           <el-option v-for="item in ClassRoomList" :key="item.RoomName" :label="item.RoomName" :value="item.RoomId">
@@ -34,7 +28,7 @@
         </el-select>
       </div>
       <div class="col-2">
-        <q-btn color="accent" size="sm" class="q-mr-md" @click="exchangeType" :label="typeName" />
+        <q-btn color="accent" size="sm" class="q-mr-md" style="margin-top:2px;" @click="exchangeType" :label="typeName" />
       </div>
     </div>
     <classmateForm :dataList="dataList" v-if="commonType==1"></classmateForm>
@@ -63,7 +57,6 @@
     },
     data() {
       return {
-        TeacherList: [], //教师团队
         ClassRoomList: [], //
         StartTime: "",
         EndTime: '',
@@ -98,7 +91,10 @@
       if (this.$route.query && this.$route.query.ClassType) {
         this.msg.ClassType = this.$route.query.ClassType;
       }
-      this.GetTeacherList();
+      let userinfo = this.getLocalStorage();
+      this.msg.TeacherId = userinfo.AccountId;
+      this.tabMsg.TeacherId = userinfo.AccountId;
+
       this.getClassRoomList();
     },
     mounted() {
@@ -115,19 +111,6 @@
 
         })
       },
-      //获取教师下拉
-      GetTeacherList() {
-        getTeacherDropDownList({}).then(res => {
-          if (res.Code == 1) {
-            this.TeacherList = res.Data;
-            var obj = {
-              TeacherName: '请选择',
-              TId: 0
-            }
-            this.TeacherList.unshift(obj);
-          }
-        })
-      },
       //获取教室下拉
       getClassRoomList() {
         queryClassRoomList({}).then(res => {
@@ -155,7 +138,6 @@
       getTableList(){
         this.tabMsg.StartTime = this.msg.StartTime;
         this.tabMsg.EndTime = this.msg.EndTime;
-        this.tabMsg.TeacherId = this.msg.TeacherId;
         this.tabMsg.ClassRoomId = this.msg.ClassRoomId;
         this.tabMsg.ClassType = this.msg.ClassType;
         GetClassPlanStatisticalPage(this.tabMsg).then(res => {