diff --git a/src/pages/repleinsh/job/repleinshTimeJob.vue b/src/pages/repleinsh/job/repleinshTimeJob.vue index e62dcac9..4b09f10e 100644 --- a/src/pages/repleinsh/job/repleinshTimeJob.vue +++ b/src/pages/repleinsh/job/repleinshTimeJob.vue @@ -174,13 +174,13 @@ methods: { timerRefresh() { - // this.getList('refresh') - // this.stopRefresh(); - // var that = this; - // this.timer = setInterval(function() { - // that.getList('refresh') - // console.log('补料刷新'); - // }, planRefreshTime) + this.getList('refresh') + this.stopRefresh(); + var that = this; + this.timer = setInterval(function() { + that.getList('refresh') + console.log('补料刷新'); + }, planRefreshTime) }, stopRefresh() { if (this.timer) { @@ -263,28 +263,30 @@ value: queryParams.productionLineCode }) } - // 日期 - if(queryParams.day){ - filterParams.push({ - column: "day", - action: "==", - value: queryParams.day - }) - } - // 时间 - if(queryParams.time){ - filterParams.push({ - column: "time", - action: "==", - value: queryParams.time - }) - } + if(queryParams.day&&queryParams.time){ filterParams.push({ column: "dayAndTime", action: "==", value: queryParams.day+' '+queryParams.time }) + }else{ + // 日期 + if(queryParams.day){ + filterParams.push({ + column: "day", + action: "==", + value: queryParams.day + }) + } + // 时间 + if(queryParams.time){ + filterParams.push({ + column: "time", + action: "==", + value: queryParams.time + }) + } } // 便次 if(queryParams.deliNo){