diff --git a/src/views/bigScreen/index_6dept.vue b/src/views/bigScreen/index_6dept.vue index faf20590..4a8863d1 100644 --- a/src/views/bigScreen/index_6dept.vue +++ b/src/views/bigScreen/index_6dept.vue @@ -43,7 +43,7 @@
-
昨日工序进度
+
本周工序进度
@@ -294,7 +294,8 @@ export default { chartInterval2:null, currentTime:'', currentDay:'', - + weekFirst:'', + weekLast:'', } }, mounted() { @@ -318,8 +319,15 @@ export default { this.start_date = start_date; this.end_date = end_date; this.today = year+'-'+month+'-'+day; - let yesterday = new Date(date.getTime()-24*60*60*1000); - this.yesterday = yesterday.getFullYear()+"-" + (yesterday.getMonth()+1) + "-" + yesterday.getDate(); + // let yesterday = new Date(date.getTime()-24*60*60*1000); + // this.yesterday = yesterday.getFullYear()+"-" + (yesterday.getMonth()+1) + "-" + yesterday.getDate(); + let week = date.getDay();//当前时间的week数 + let weekFirst = week - 1;//第一天对应的天数 + let weekLast = 7 - week;//最后一天对应的天数 + let first = new Date(new Date(date.getTime() - (weekFirst * ondDayTime)));//本周周一 + let last = new Date(new Date(date.getTime() + (weekLast * ondDayTime)));//本周周日 + this.weekFirst = first.getFullYear() + '-' + (first.getMonth() + 1) + '-' + first.getDate(); + this.weekLast = last.getFullYear() + '-' + (last.getMonth() + 1) + '-' + last.getDate(); this.getsaleOut(); this.getMioItem();//发货情况 this.getTodayUtask();//今日任务 @@ -397,12 +405,12 @@ export default { this.saleOutData = saleOutData; }); }, - //昨日工序进展 + //本周工序进展 getMtask(){ let that = this; let obj ={}; - obj.start_date = this.today; - obj.end_date = this.today; + obj.start_date = this.weekFirst; + obj.end_date = this.weekLast; obj.mgroup__belong_dept__name='6车间'; obj.page=0; that.$API.pm.mtask.list.req(obj).then((res) => {