Commit e448511b authored by 姬鋆屾's avatar 姬鋆屾

feated:优化实到数据展示

parent fc5817d1
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
{{ item.label }} {{ item.label }}
</el-checkbox> </el-checkbox>
</el-checkbox-group> </el-checkbox-group>
<div class="mt20" style="text-align:right"> <div class="mt20" style="text-align: right">
<el-button @click="handleCancel(1)">取消</el-button> <el-button @click="handleCancel(1)">取消</el-button>
<el-button type="primary" @click="handleSubmit(1)">确定</el-button> <el-button type="primary" @click="handleSubmit(1)">确定</el-button>
</div> </div>
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
{{ item.label }} {{ item.label }}
</el-checkbox> </el-checkbox>
</el-checkbox-group> </el-checkbox-group>
<div class="mt20" style="text-align:right"> <div class="mt20" style="text-align: right">
<el-button @click="handleCancel(2)">取消</el-button> <el-button @click="handleCancel(2)">取消</el-button>
<el-button type="primary" @click="handleSubmit(2)">确定</el-button> <el-button type="primary" @click="handleSubmit(2)">确定</el-button>
</div> </div>
...@@ -120,9 +120,7 @@ ...@@ -120,9 +120,7 @@
<div>打卡记录汇总</div> <div>打卡记录汇总</div>
<el-button type="text">导出成功</el-button> <el-button type="text">导出成功</el-button>
</div> </div>
<div class="times"> <div class="times">导出时间:2020-08-13</div>
导出时间:2020-08-13
</div>
</div> </div>
</div> </div>
</el-drawer> </el-drawer>
...@@ -137,7 +135,7 @@ ...@@ -137,7 +135,7 @@
:show-close="false" :show-close="false"
> >
<div class="fresh_box" v-if="showContent"> <div class="fresh_box" v-if="showContent">
<div class="title_box" style="margin-bottom: 20px;"> <div class="title_box" style="margin-bottom: 20px">
仅支持手动更新前一天及当日的打卡数据,请选择需要更新的时间段: 仅支持手动更新前一天及当日的打卡数据,请选择需要更新的时间段:
</div> </div>
<el-date-picker <el-date-picker
...@@ -154,23 +152,23 @@ ...@@ -154,23 +152,23 @@
<div class="fresh_box" v-else> <div class="fresh_box" v-else>
<div <div
class="title_box" class="title_box"
style="margin-bottom: 20px;line-height: 30px;" style="margin-bottom: 20px; line-height: 30px"
v-if="showTip" v-if="showTip"
> >
请确认是否开始进行{{ 请确认是否开始进行{{
freshDate[0] + "" + freshDate[1] freshDate[0] + "" + freshDate[1]
}}的考勤数据重新汇总;此过程预计需要 }}的考勤数据重新汇总;此过程预计需要
<span style="color:#ff0000 ;">10</span> 分钟左右,请勿关闭或刷新页面 <span style="color: #ff0000">10</span> 分钟左右,请勿关闭或刷新页面
</div> </div>
<div <div
class="title_box" class="title_box"
style="margin-bottom: 20px;line-height: 30px;" style="margin-bottom: 20px; line-height: 30px"
v-else v-else
> >
正在进行{{ 正在进行{{
freshDate[0] + "" + freshDate[1] freshDate[0] + "" + freshDate[1]
}}的考勤数据重新汇总;此过程预计还需要 }}的考勤数据重新汇总;此过程预计还需要
<span style="color:#ff0000 ;">{{ restTime }}</span> <span style="color: #ff0000">{{ restTime }}</span>
分钟左右,请勿关闭或刷新页面 分钟左右,请勿关闭或刷新页面
</div> </div>
</div> </div>
...@@ -243,7 +241,7 @@ export default { ...@@ -243,7 +241,7 @@ export default {
this.getData(); this.getData();
return; return;
} }
setTimeout(function() { setTimeout(function () {
that.countdown(); that.countdown();
}, 1000); }, 1000);
} }
...@@ -675,9 +673,9 @@ export default { ...@@ -675,9 +673,9 @@ export default {
}, },
{ {
label: "实到", label: "实到",
prop: "goTimes", prop: "goWorks",
formatter: (row) => { formatter: (row) => {
return row.goTimes == 0 ? 0 : row.goTimes ? row.goTimes : "--"; return row.goWorks == 0 ? 0 : row.goWorks ? row.goWorks : "--";
}, },
show: true, show: true,
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment