From 6c73fda22ea26903e47aa107ed5f21be0ed72eeb Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 17 Jan 2024 15:04:37 +0800 Subject: [PATCH] =?UTF-8?q?#113&6=E8=BD=A6=E9=97=B4=E5=90=88=E6=A0=BC?= =?UTF-8?q?=E7=8E=87=E5=B0=8F=E6=95=B0=E4=BD=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bigScreen/index_photon.vue | 115 +++++++++++++++------------ src/views/pm/utask_dept6.vue | 3 +- src/views/qm/first_check.vue | 6 +- src/views/qm/product_form.vue | 6 +- 4 files changed, 70 insertions(+), 60 deletions(-) diff --git a/src/views/bigScreen/index_photon.vue b/src/views/bigScreen/index_photon.vue index 99693539..5061dd3f 100644 --- a/src/views/bigScreen/index_photon.vue +++ b/src/views/bigScreen/index_photon.vue @@ -83,7 +83,7 @@
本周不合格占比
- + 7车间 10车间 @@ -355,7 +355,18 @@ export default { } else { that.deptName = '10车间' } - that.deptNameChange(that.deptName); + let deptData = []; + if (that.deptName == '7车间') { + deptData = that.dept7Data; + } else { + deptData = that.dept10Data; + } + that.pieoption.series.data = deptData; + let pieoption = that.pieoption; + let pieDom = document.getElementById('pie'); + let pieChart = echarts.init(pieDom); + pieChart.clear(); + pieChart.setOption(pieoption, true); }, 5000); that.initChart(); @@ -363,24 +374,23 @@ export default { //一天的毫秒数 const ondDayTime = 86400000 let cDate = new Date(); - - let week = cDate.getDay();//当前时间的week数 + let yesterday = new Date(cDate.getTime()-ondDayTime); + let week = yesterday.getDay();//当前时间的week数 // let time = ' 星期' + '日一二三四五六'.charAt(week);//当前时间周几 let weekFirst = week - 1;//第一天对应的天数 let weekLast = 7 - week;//最后一天对应的天数 - let first = new Date(new Date(cDate.getTime() - (weekFirst * ondDayTime)));//本周周一 - let last = new Date(new Date(cDate.getTime() + (weekLast * ondDayTime)));//本周周日 + let first = new Date(new Date(yesterday.getTime() - (weekFirst * ondDayTime)));//本周周一 + let last = new Date(new Date(yesterday.getTime() + (weekLast * ondDayTime)));//本周周日 let dateArr = []; for(let i=0;i<7;i++){ let itemDate = new Date(first.getTime()+i*ondDayTime); let item = itemDate.getDate(); dateArr.push(item); } - console.log('weekDateList',dateArr) this.weekDateList = dateArr; this.start_date = first.getFullYear() + '-' + (first.getMonth() + 1) + '-' + first.getDate(); this.end_date = last.getFullYear() + '-' + (last.getMonth() + 1) + '-' + last.getDate(); - let yesterday = new Date(cDate.getTime()-ondDayTime); + // let yesterday = new Date(cDate.getTime()-ondDayTime); this.yesterday = yesterday.getFullYear()+"-" + (yesterday.getMonth()+1) + "-" + yesterday.getDate(); this.getsaleOut(); this.getPlanRate(); @@ -785,51 +795,50 @@ export default { line3Chart.setOption(line3option); }) }, - deptNameChange(deptName) { - let that = this; - let obj = { - query: { start_date: that.start_date, end_date: that.end_date, dept_name: deptName }, - }; - that.$API.bi.dataset.exec.req('lineDay', obj).then((res) => { - let list = res.data2.ds0; - let deptData = []; - if (list.length > 0) { - list.forEach(item => { - if (that.deptName == '7车间') { - that.dept7Data[0].value = that.dept7Data[0].value + item.炸纹; - that.dept7Data[1].value = that.dept7Data[1].value + item.条纹; - that.dept7Data[2].value = that.dept7Data[2].value + item.气泡; - that.dept7Data[3].value = that.dept7Data[3].value + item.弯曲; - that.dept7Data[4].value = that.dept7Data[4].value + item.其他; - that.dept7Data[5].value = that.dept7Data[5].value + item.合格数; - deptData = that.dept7Data; - } else { - that.dept10Data[0].value = that.dept10Data[0].value + item.弯曲; - that.dept10Data[1].value = that.dept10Data[1].value + item.大小头; - that.dept10Data[2].value = that.dept10Data[2].value + item.偏壁; - that.dept10Data[3].value = that.dept10Data[3].value + item.结石; - that.dept10Data[4].value = that.dept10Data[4].value + item.气线; - that.dept10Data[5].value = that.dept10Data[5].value + item.合格数; - deptData = that.dept10Data; - } - }); - } else { - if (that.deptName == '7车间') { - deptData = that.dept7Data; - } else { - deptData = that.dept10Data; - } - } - console.log(deptData) - that.deptData = deptData; - that.pieoption.series.data = deptData; - let pieoption = that.pieoption; - let pieDom = document.getElementById('pie'); - let pieChart = echarts.init(pieDom); - pieChart.clear(); - pieChart.setOption(pieoption, true); - }); - }, + // deptNameChange(deptName) { + // let that = this; + // let obj = { + // query: { start_date: that.start_date, end_date: that.end_date, dept_name: deptName }, + // }; + // that.$API.bi.dataset.exec.req('lineDay', obj).then((res) => { + // let list = res.data2.ds0; + // let deptData = []; + // if (list.length > 0) { + // list.forEach(item => { + // if (that.deptName == '7车间') { + // that.dept7Data[0].value = that.dept7Data[0].value + item.炸纹; + // that.dept7Data[1].value = that.dept7Data[1].value + item.条纹; + // that.dept7Data[2].value = that.dept7Data[2].value + item.气泡; + // that.dept7Data[3].value = that.dept7Data[3].value + item.弯曲; + // that.dept7Data[4].value = that.dept7Data[4].value + item.其他; + // that.dept7Data[5].value = that.dept7Data[5].value + item.合格数; + // deptData = that.dept7Data; + // } else { + // that.dept10Data[0].value = that.dept10Data[0].value + item.弯曲; + // that.dept10Data[1].value = that.dept10Data[1].value + item.大小头; + // that.dept10Data[2].value = that.dept10Data[2].value + item.偏壁; + // that.dept10Data[3].value = that.dept10Data[3].value + item.结石; + // that.dept10Data[4].value = that.dept10Data[4].value + item.气线; + // that.dept10Data[5].value = that.dept10Data[5].value + item.合格数; + // deptData = that.dept10Data; + // } + // }); + // } else { + // if (that.deptName == '7车间') { + // deptData = that.dept7Data; + // } else { + // deptData = that.dept10Data; + // } + // } + // that.deptData = deptData; + // that.pieoption.series.data = deptData; + // let pieoption = that.pieoption; + // let pieDom = document.getElementById('pie'); + // let pieChart = echarts.init(pieDom); + // pieChart.clear(); + // pieChart.setOption(pieoption, true); + // }); + // }, //库存情况 getMaterialList() { let that = this; diff --git a/src/views/pm/utask_dept6.vue b/src/views/pm/utask_dept6.vue index ef065b76..39321704 100644 --- a/src/views/pm/utask_dept6.vue +++ b/src/views/pm/utask_dept6.vue @@ -75,7 +75,8 @@ diff --git a/src/views/qm/first_check.vue b/src/views/qm/first_check.vue index d8c71d25..7330028f 100644 --- a/src/views/qm/first_check.vue +++ b/src/views/qm/first_check.vue @@ -122,8 +122,8 @@ clearable style="width:100%" > - - + + @@ -225,7 +225,7 @@ export default { this.$API.mtm.process.list.req({page:0}).then(res=>{ let arr = []; res.forEach(item => { - if(item.name.indexOf('磨')>-1){ + if(item.name=='粗中细磨'){ arr.push(item); } }) diff --git a/src/views/qm/product_form.vue b/src/views/qm/product_form.vue index a305a5f0..83bd8ddf 100644 --- a/src/views/qm/product_form.vue +++ b/src/views/qm/product_form.vue @@ -1,9 +1,9 @@