Merge branch 'master' of http://git.dayaedu.com/molingzhide/dy-admin-manager

src/views/teamDetail/components/teamTeacherRecord.vue

@@ -1,8 +1,9 @@
 <template>
   <div class="m-container">
     <h2>
-      <div class='squrt'></div>
-      {{name}}
+      <!-- <div class='squrt'></div>
+      {{name}} -->
+      <el-page-header @back="onCancel" :content="name"></el-page-header>
     </h2>
     <p style="margin-bottom:20px;">老师上课记录</p>
     <!-- 搜索类型 -->
@@ -42,6 +43,9 @@
         <el-table-column align='center'
                          prop="classDate"
                          label="时间">
+          <template slot-scope="scope">
+            {{ scope.row.classDate }} {{ scope.row.startClassTime ? scope.row.startClassTime.substr(0, 5) : '' }}
+          </template>
         </el-table-column>
         <el-table-column align='center'
                          prop="courseScheduleName"
@@ -117,6 +121,9 @@ export default {
     this.getList()
   },
   methods: {
+    onCancel() {
+      window.history.back()
+    },
     search () {
       this.rules.page = 1;
       this.getList();