diff --git a/src/views/bigScreen/index_gx.vue b/src/views/bigScreen/index_gx.vue index b8d5040e..b5ef4570 100644 --- a/src/views/bigScreen/index_gx.vue +++ b/src/views/bigScreen/index_gx.vue @@ -170,7 +170,7 @@
-
精雕
+
倒角
9?that.currentMonth:'0'+that.currentMonth; let day = that.currentDay>9?that.currentDay:'0'+that.currentDay; let current_date = that.currentYear+'-'+month+'-'+day; - let objDay = {query:{start_date:current_date,end_date:current_date,mgroup_name:'三次超洗'}}; + let objDay = {query:{start_date:current_date,end_date:current_date,mgroup_name:'二次超洗'}}; that.$API.bi.dataset.exec.req('lineDay_m2', objDay).then((res0) => { if(res0.data2.ds0&&res0.data2.ds0.length>0){ that.count_day = res0.data2.ds0[0].生产数; @@ -708,7 +709,7 @@ export default { let first = new Date(new Date(nowDate.getTime() - (weekFirst * ondDayTime)));//本周周一 let last = new Date(new Date(nowDate.getTime() + (weekLast * ondDayTime)));//本周周日 let objWeek = {query:{ - start_date:first,end_date:last,mgroup_name:'三次超洗', + start_date:first,end_date:last,mgroup_name:'二次超洗', group_bys_date:',月,周',order_bys_date:',月,周', select_cols_date:', EXTRACT ( MONTH FROM mlog.work_end_time) AS 月,EXTRACT(WEEK FROM mlog.work_end_time) AS 周' }}; @@ -720,7 +721,7 @@ export default { let start_month = that.currentYear+'-'+month+'-01'; let end_month = that.currentYear+'-'+month+'-'+new Date(that.currentYear, month, 0).getDate(); let objMonth = {query:{ - start_date:start_month,end_date:end_month,mgroup_name:'三次超洗', + start_date:start_month,end_date:end_month,mgroup_name:'二次超洗', group_bys_date:',月',order_bys_date:',月', select_cols_date:', EXTRACT ( MONTH FROM mlog.work_end_time) AS 月' }}; @@ -884,7 +885,7 @@ export default { }else if(data[i].name=='减薄A'){ that.getProcessDatas(data[i].name,1); that.getProcessCount(data[i].name,1); - }else if(data[i].name=='精雕'){ + }else if(data[i].name=='倒角'){ that.getProcessDatas(data[i].name,2); that.getProcessCount(data[i].name,2); }else if(data[i].name=='成品抛'){ @@ -913,12 +914,12 @@ export default { // let current_date = that.currentYear+'-'+month+'-'+day; // let obj = {query:{current_date:current_date,mgroup_name:name}}; // that.$API.bi.dataset.exec.req('batch_search', obj).then((res) => { + let keys = 'configData'+index; + that[keys] = that.deepCopy(configData); + that[keys].data = []; that.$API.wpm.ana.batchwork.req({mgroup_name:name}).then((res) => { if(res.length>0){ //根据工段名称分组 - let keys = 'configData'+index; - that[keys] = that.deepCopy(configData); - that[keys].data = []; res.forEach((item) => { let arr = []; arr[0] = item.batch;