11/18 10:17

111

src/views/teamDetail/componentCourse/gpsLocation.vue

@@ -118,6 +118,7 @@ export default {
           this.getDistance(this.signInLongitudeLatitude, this.schoolLongitudeLatitude)
         }
       })
+      this.amapManager.setFitView();
       // this.getDistance()
     },
     onSearchResult () { },

src/views/teamDetail/componentCourse/studentWork.vue

@@ -22,14 +22,15 @@
       <el-table :data="tableList"
                 :header-cell-style="{background:'#EDEEF0',color:'#444'}">
         <el-table-column align="center"
-                         prop="username"
+                         prop="studentName"
                          label="学生姓名"></el-table-column>
         <el-table-column align="center"
-                         prop="username"
+                         prop="studentId"
                          label="学生编号"></el-table-column>
         <el-table-column align="center"
                          prop="phone"
-                         label="手机号"></el-table-column>
+                         label="手机号"
+                         width="120"></el-table-column>
         <el-table-column align="center"
                          prop="subjectName"
                          label="声部名称"></el-table-column>
@@ -41,13 +42,13 @@
             <div>{{ scope.row.createTime | dateForMinFormat}}</div>
           </template>
         </el-table-column>
-        <el-table-column align="center"
+        <!-- <el-table-column align="center"
                          prop="isView"
                          label="是否交付">
           <template slot-scope="scope">
             <div>{{ scope.row.isView ? '是' : '否' }}</div>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column align="center"
                          prop="isView"
                          label="是否查看">

src/views/teamDetail/componentCourse/teacherList.vue

@@ -0,0 +1,71 @@
+<template>
+  <div class="tableWrap">
+    <el-table :data='tableList'
+              :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+      <el-table-column align='center'
+                       prop="teacherName"
+                       label="老师姓名">
+      </el-table-column>
+      <el-table-column align='center'
+                       prop="teacherId"
+                       label="老师编号">
+      </el-table-column>
+      <el-table-column align='center'
+                       prop="jobNature"
+                       label="老师类型">
+        <template slot-scope="scope">
+          <div>
+            {{ scope.row.jobNature|jobNature}}
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column align='center'
+                       prop="teacherPhone"
+                       label="签到时间">
+      </el-table-column>
+      <el-table-column align='center'
+                       prop="teacherPhone"
+                       label="签退时间">
+      </el-table-column>
+      <el-table-column align='center'
+                       prop="teacherPhone"
+                       label="签到状态">
+      </el-table-column>
+      <el-table-column align='center'
+                       prop="teacherPhone"
+                       label="签退状态">
+      </el-table-column>
+      <el-table-column align='center'
+                       label="操作">
+        <template slot-scope="scope">
+          <div>
+            <el-button type="text"
+                       size="small">补考勤</el-button>
+            <el-button type="text"
+                       size="small">清除考勤</el-button>
+            <el-button type="text"
+                       size="small">GPS定位</el-button>
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import { getTeacherPersonalAttendanceDetail } from "@/api/teacherManager";
+export default {
+  data () {
+    return {
+      tableList: []
+    }
+  },
+  mounted () { },
+  activated () { },
+  methods: {
+    getList () {
+
+    },
+    init () { }
+  },
+}
+</script>

src/views/teamDetail/components/courseList.vue

@@ -900,9 +900,9 @@ export default {
       }
     }
   }
-  .searchForm {
-    // margin: 0 30px;
-  }
+  // .searchForm {
+  //   // margin: 0 30px;
+  // }
 }
 .btnWraps {
   display: flex;

src/views/teamDetail/teamCourseList.vue

@@ -286,60 +286,59 @@
           disabled></el-input>-->
           <div class="inputStyle">{{maskForm.status | coursesStatus}}</div>
         </el-form-item>
-        <el-form-item label="签到时间">
-          <!-- <el-input v-model.trim=" maskForm.signInTime"
-          disabled></el-input>-->
+        <!-- <el-form-item label="签到时间">
           <div class="inputStyle">{{maskForm.signInTime | dateForMinFormat}}</div>
         </el-form-item>
         <el-form-item label="签退时间">
-          <!-- <el-input v-model.trim="maskForm.signOutTime"
-          disabled></el-input>-->
           <div class="inputStyle">{{maskForm.signOutTime | dateForMinFormat}}</div>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="是否点名">
           <!-- <el-input :value="maskForm.isCallNames | isCall"
           disabled></el-input>-->
           <div class="inputStyle">{{maskForm.isCallNames | isCall}}</div>
         </el-form-item>
-        <el-form-item label="签到状态">
-          <!-- <el-input :value=" maskForm.isSignIn | attendanceType"
-          disabled></el-input>-->
+        <!-- <el-form-item label="签到状态">
           <div class="inputStyle"
                :class="maskForm.isSignIn==1?'':'red'">{{ maskForm.isSignIn | attendanceType}}</div>
         </el-form-item>
         <el-form-item label="签退状态">
-          <!-- <el-input :value=" maskForm.isSignOut | attendanceOutType"
-          disabled></el-input>-->
           <div class="inputStyle"
                :class="maskForm.isSignIn==1?'':'red'">{{ maskForm.isSignOut | attendanceOutType}}</div>
+        </el-form-item> -->
+
+        <el-form-item label="上课时间">
+          {{ maskForm.startClassTime ? maskForm.startClassTime.substr(0, 16) : '' }}-{{ maskForm.endClassTime ? maskForm.endClassTime.substr(11,5) : ''}}
         </el-form-item>
         <el-form-item label="上课时长">
+
           <div class="inputStyle"
                :class=" (maskForm.attendClassTime <= 120)?'':'red'">{{ maskForm.attendClassTime>=0?maskForm.attendClassTime:0+'分钟'}}</div>
         </el-form-item>
-        <el-form-item label="备注">
-          <!-- <el-input :value=" maskForm.isSignOut | attendanceOutType"
-          disabled></el-input>-->
-          <div class="inputStyle">{{ maskForm.remark}}</div>
-        </el-form-item>
+
       </el-form>
       <!--  v-if="maskForm.status != 'NOT_START'" -->
       <el-tabs v-model.trim="activeName"
                type="card"
                @tab-click="handleClick">
-        <el-tab-pane label="点名"
+        <el-tab-pane label="学员列表"
                      name="first">
           <div v-if="activeName == 'first'">
             <!-- studentRollCall  -->
             <studentRollCall :courseScheduleId="maskForm.id"></studentRollCall>
           </div>
         </el-tab-pane>
-        <el-tab-pane label="GPS定位"
+        <!-- <el-tab-pane label="GPS定位"
                      v-if="maskForm.teachMode == 'OFFLINE'"
                      name="second">
           <div v-if="activeName == 'second'">
             <gpsLoction :courseScheduleId="maskForm.id"></gpsLoction>
           </div>
+        </el-tab-pane> -->
+        <el-tab-pane label="老师列表"
+                     name="second">
+          <div v-if="activeName == 'second'">
+            <teacherList :courseScheduleId="maskForm.id"></teacherList>
+          </div>
         </el-tab-pane>
         <el-tab-pane label="作业"
                      v-if="maskForm.teachMode != 'OFFLINE'"
@@ -386,6 +385,7 @@ import axios from "axios";
 import { getToken } from "@/utils/auth";
 import load from "@/utils/loading";
 import resetClass from './componentCourse/resetClass'
+import teacherList from './componentCourse/teacherList'
 let nowTime = new Date();
 nowTime =
   nowTime.getFullYear() +
@@ -439,7 +439,8 @@ export default {
     gpsLoction,
     studentWork,
     courseEvaluate,
-    resetClass
+    resetClass,
+    teacherList
   },
   activated () {
     this.init();
@@ -614,14 +615,17 @@ export default {
     lookDetail (row) {
       // this.maskForm = row;
       // 发请求 获取详情 row.id
-      getTeacherPersonalAttendanceDetail({ courseScheduleId: row.id }).then(res => {
-        if (res.code == 200) {
-          this.maskForm = res.data;
-          this.maskForm.id = row.id;
-          this.activeName = "first";
-          this.classVisible = true;
-        }
-      })
+      this.maskForm = row;
+      this.activeName = "first";
+      this.classVisible = true;
+      // getTeacherPersonalAttendanceDetail({ courseScheduleId: row.id }).then(res => {
+      //   if (res.code == 200) {
+      //     this.maskForm = res.data;
+      //     this.maskForm.id = row.id;
+      //     this.activeName = "first";
+      //     this.classVisible = true;
+      //   }
+      // })
 
     },
     handleClick (tab, event) {