|
@@ -1927,7 +1927,7 @@
|
|
|
let that = this;
|
|
|
// this.$refs.maTable.bodyWarpper
|
|
|
let dom = that.$refs.hasworkTbl.bodyWrapper;
|
|
|
- console.log(dom)
|
|
|
+ // console.log(dom)
|
|
|
// 添加scroll监听事件
|
|
|
dom.addEventListener("scroll", function () {
|
|
|
// scrollHeight-scrollTop-clientHeight=0 用来判断滚动条到底部
|
|
@@ -1935,13 +1935,13 @@
|
|
|
if (scrollDistance < 2) {
|
|
|
if (that.monthworkDateS.length < that.monthworkDateS1.length) {
|
|
|
that.monthTotalPage++; //当前页数自增
|
|
|
- console.log(that.monthworkDateS1.length, that.monthworkDateS.length, that.monthTotalPage, that.monthTotalLages, that.monthTotalPage * that.monthTotalLages)
|
|
|
+ // console.log(that.monthworkDateS1.length, that.monthworkDateS.length, that.monthTotalPage, that.monthTotalLages, that.monthTotalPage * that.monthTotalLages)
|
|
|
var arrList = JSON.parse(JSON.stringify(that.monthworkDateS1))
|
|
|
var infoList = arrList.splice(
|
|
|
that.monthTotalPage * that.monthTotalLages,
|
|
|
that.monthTotalLages
|
|
|
);
|
|
|
- console.log(infoList, '将要合并的数据')
|
|
|
+ // console.log(infoList, '将要合并的数据')
|
|
|
// 数据添加
|
|
|
that.monthworkDateS = that.monthworkDateS.concat(infoList);
|
|
|
}
|
|
@@ -1950,7 +1950,7 @@
|
|
|
},
|
|
|
showMonthNotWorkTime() {
|
|
|
this.monthTotalPage = 0,
|
|
|
- console.log("exportMembNotWorkHours",this.WorktimeDatepickValue);
|
|
|
+ // console.log("exportMembNotWorkHours",this.WorktimeDatepickValue);
|
|
|
this.tbload = true
|
|
|
this.http.post(
|
|
|
// "/report/getUserDailyWorkTime",
|
|
@@ -2005,7 +2005,7 @@
|
|
|
let that = this;
|
|
|
// this.$refs.maTable.bodyWarpper
|
|
|
let dom2 = that.$refs.hasworkTbl2.bodyWrapper;
|
|
|
- console.log(dom2)
|
|
|
+ // console.log(dom2)
|
|
|
// 添加scroll监听事件
|
|
|
dom2.addEventListener("scroll", function () {
|
|
|
// scrollHeight-scrollTop-clientHeight=0 用来判断滚动条到底部
|
|
@@ -2013,13 +2013,13 @@
|
|
|
if (scrollDistance2 < 2) {
|
|
|
if (that.monthNotWorkDateS.length < that.monthnotworkDateS1.length) {
|
|
|
that.monthnotTotalPage++; //当前页数自增
|
|
|
- console.log(that.monthnotworkDateS1.length, that.monthNotWorkDateS.length, that.monthnotTotalPage, that.monthnotTotalLages, that.monthnotTotalPage * that.monthnotTotalLages)
|
|
|
+ // console.log(that.monthnotworkDateS1.length, that.monthNotWorkDateS.length, that.monthnotTotalPage, that.monthnotTotalLages, that.monthnotTotalPage * that.monthnotTotalLages)
|
|
|
var arrList = JSON.parse(JSON.stringify(that.monthnotworkDateS1))
|
|
|
var infoList = arrList.splice(
|
|
|
that.monthnotTotalPage * that.monthnotTotalLages,
|
|
|
that.monthnotTotalLages
|
|
|
);
|
|
|
- console.log(infoList, '将要合并的数据')
|
|
|
+ // console.log(infoList, '将要合并的数据')
|
|
|
// 数据添加
|
|
|
that.monthNotWorkDateS = that.monthNotWorkDateS.concat(infoList);
|
|
|
}
|