|
|
@@ -59,9 +59,23 @@
|
|
|
align="center"
|
|
|
prop="classDate">
|
|
|
<template slot-scope="scope">
|
|
|
- <div>{{ scope.row.classDate | formatTimer}}</div>
|
|
|
+ <div>{{ scope.row.classDate | formatTimer}} {{ scope.row.startClassTimeStr | timerForMinFormat}}~{{ scope.row.endClassTimeStr | timerForMinFormat}}</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <!-- <el-table-column label="开始时间"
|
|
|
+ align="center"
|
|
|
+ prop="startClassTimeStr">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <div>{{ scope.row.startClassTimeStr | timerForMinFormat}}</div>
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="结束时间"
|
|
|
+ align="center"
|
|
|
+ prop="endClassTimeStr">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <div>{{ scope.row.endClassTimeStr | timerForMinFormat}}</div>
|
|
|
+ </template>
|
|
|
+ </el-table-column> -->
|
|
|
<el-table-column label="是否点名"
|
|
|
align="center"
|
|
|
prop="status">
|
|
|
@@ -80,20 +94,6 @@
|
|
|
<div>{{scope.row.isSettlement?'已结算':'未结算'}}</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
- <el-table-column label="开始时间"
|
|
|
- align="center"
|
|
|
- prop="startClassTimeStr">
|
|
|
- <template slot-scope="scope">
|
|
|
- <div>{{ scope.row.startClassTimeStr | timerForMinFormat}}</div>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
- <el-table-column label="结束时间"
|
|
|
- align="center"
|
|
|
- prop="endClassTimeStr">
|
|
|
- <template slot-scope="scope">
|
|
|
- <div>{{ scope.row.endClassTimeStr | timerForMinFormat}}</div>
|
|
|
- </template>
|
|
|
- </el-table-column>
|
|
|
<!-- <el-table-column label="教学点" align="center" prop="schoolName">
|
|
|
<template slot-scope="scope">
|
|
|
<div>{{scope.row.schoolName?scope.row.schoolName:'网络教室'}}</div>
|
