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

src/pages/scheduling/mySchedule.vue

@@ -78,7 +78,7 @@
             <div v-if="props.row.Status==1">
               {{props.row.CheckTimeStr}}
               <template v-if="props.row.CheckLateTime&&props.row.CheckLateTime>0">
-                <span style="color:red">[迟到 {{props.row.CheckLateTime}} 分钟] </span>
+                <span style="color:red">{{props.row.CheckLateTimeStr}}</span>
               </template>
               <template v-else>
                 <span style="color:green">[正常]</span>
@@ -91,7 +91,7 @@
             <div v-if="props.row.Status==2">
               {{props.row.FinishTimeStr}}
               <template v-if="props.row.FinishLateTime&&props.row.FinishLateTime>0">
-                <span style="color:red">[早退 {{props.row.FinishLateTime}} 分钟]</span>
+                <span style="color:red">{{props.row.FinishLateTimeStr}}</span>
               </template>
               <template v-else>
                 <span style="color:green">[正常]</span>
@@ -117,7 +117,7 @@
                 </tr>
               </table>
             </div>
-            <div slot="reference" style="cursor:pointer;text-align:center;">
+            <div slot="reference" style="cursor:pointer;">
               {{getWorked(props.row.PlanList)}}/{{props.row.PlanList.length}}
             </div>
           </el-popover>