From de3e9e6532cf3cb980f20c4b154d6e244391f6b6 Mon Sep 17 00:00:00 2001 From: shijing Date: Tue, 26 Dec 2023 17:46:44 +0800 Subject: [PATCH] =?UTF-8?q?#10410=E8=BD=A6=E9=97=B4=E8=BD=A6=E9=97=B4?= =?UTF-8?q?=E7=9C=8B=E6=9D=BF=E7=B4=AF=E8=AE=A1=E5=90=88=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/bigScreen/index_10dept.vue | 145 +++----------------- src/views/bigScreen/index_6dept.vue | 192 +++++++++------------------ 2 files changed, 76 insertions(+), 261 deletions(-) diff --git a/src/views/bigScreen/index_10dept.vue b/src/views/bigScreen/index_10dept.vue index bedc054a..2d945a7e 100644 --- a/src/views/bigScreen/index_10dept.vue +++ b/src/views/bigScreen/index_10dept.vue @@ -16,7 +16,7 @@
- {{item.material_out_name}} + {{item.material_out_.name}}|{{ item.material_out_.specification }}|{{ item.material_out_.model }} {{item.count}} @@ -42,9 +42,13 @@
累计合格
-
- ZT2 - 130 +
+
+ {{item.物料名}} + + {{item.合格数}} + +
@@ -298,7 +302,7 @@ export default { today:'', todayObjet:{}, yesterdayObjet:{}, - + monthobjList:[], } }, mounted() { @@ -308,114 +312,6 @@ export default { //表格table2的显示 this.containerHeight2 = document.getElementById('scrollContainer2').clientHeight; this.table2Visible = true; - - // let chart1Option = deepCopy(this.basicOption) - // chart1Option.xAxis.data = xAxisData1; - // let chart1 = this.setChart("chart1", chart1Option); - - // let index1 = 0 - // this.chartInterval1 = setInterval(function () { - // if (index1 < chart1Option.series[0].data.length) { - // chart1.dispatchAction({ type: 'downplay', seriesIndex: 0 }); - // chart1.dispatchAction({ type: 'highlight', seriesIndex: 0, dataIndex: index1 }); - // chart1.dispatchAction({ type: 'showTip', seriesIndex: 0, dataIndex: index1 }); - // index1++; - // } else { - // index1 = 0; - // } - // }, 3000); - // let chart2Option = deepCopy(this.basicOption); - // chart2Option.xAxis = { - // type: 'category', - // boundaryGap: true, - // data: ['1日','2日', '3日', '4日', '5日', '6日', '7日', '8日','9日','10日', '11日', '12日', '13日', '14日', '15日', '16日', '17日', '18日','19日','20日', '21日', '22日', '23日', '24日', '25日', '26日', '27日', '28日', '29日', '30日'], - // nameTextStyle: { - // color: '#ffffff' - // }, - // axisLabel: { - // color: '#ffffff' - // }, - // }; - // chart2Option.legend = { - // icon: "stack", - // right: 0, - // data: [{ - // backgroundColor: 'rgb(250,205,0)', - // name: '合格率', - // itemStyle: { - // color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ - // { - // offset: 0, - // color: 'rgb(1,235,239)' - // }, - // { - // offset: 1, - // color: 'rgb(5, 158, 163)' - // } - // ]) - // }, - // textStyle: { - // color: '#fff' - // } - // }], - // }; - // chart2Option.series=[{ - // name: '合格率', - // type: 'line', - // smooth: true, - // lineStyle: { - // width: 1, color: 'rgb(1,235,239)' - // }, - // showSymbol: false, - // areaStyle: { - // opacity: 0.8, - // color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ - // { - // offset: 0, - // color: 'rgb(1,235,239)' - // }, - // { - // offset: 1, - // color: 'rgb(5, 158, 163)' - // } - // ]) - // }, - // emphasis: { - // focus: 'series' - // }, - // label: { - // show: true, - // position: 'top', - // color:'#fff' - // }, - // itemStyle: { - // borderRadius: [2, 2, 0, 0], - // color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ - // { - // offset: 0, - // color: 'rgb(250,205,0)' - // }, - // { - // offset: 1, - // color: 'rgb(254,129,0)' - // } - // ]) - // }, - // data: [40, 60, 52, 64, 70, 53, 50,40, 32, 62, 64, 90, 50, 50,56, 49, 66, 64, 70, 58, 50,40, 59, 60, 64, 90, 40, 50, 70, 50] - // }]; - // let chart2 = this.setChart("chart2", chart2Option); - // let index2 = 0 - // this.chartInterval2 = setInterval(function () { - // if (index2 < chart2Option.series[0].data.length) { - // chart2.dispatchAction({ type: 'downplay', seriesIndex: 0 }); - // chart2.dispatchAction({ type: 'highlight', seriesIndex: 0, dataIndex: index2 }); - // chart2.dispatchAction({ type: 'showTip', seriesIndex: 0, dataIndex: index2 }); - // index2++; - // } else { - // index2 = 0; - // } - // }, 3000); - this.showTime() this.dayInterval = setInterval(()=>{ @@ -575,14 +471,19 @@ export default { } }, 3000); }); - + let obj ={ + query: {start_date:that.start_date,end_date:that.end_date,dept_name: "10车间"}, + }; + that.$API.bi.dataset.exec.req('lineMonth', obj).then((res) => { + console.log('本月生产统计:',res1); + that.monthobjList = res1.data2.ds0; + }); //本月合格率统计///11月1号-----11月30号 let obj2 ={ query: {start_date:that.start_date,end_date:that.end_date,dept_name: "10车间"}, }; that.$API.bi.dataset.exec.req('lineDay', obj2).then((res2) => { console.log('本月合格率统计:',res2); - console.log('days',that.days) let list2 = res2.data2.ds0; let seriesData2 = [],xAxisData2=[]; for (let i = 0; i < that.days; i++) { @@ -725,20 +626,6 @@ export default { }, //今日任务 - getUtask(){ - let that = this; - let obj = {}; - let date = that.currentYear+'-'+that.currentMonth+'-'+that.currentDay; - obj.start_date =date; - obj.end_date =date; - obj.page = 0; - obj.belong_dept__name = '10车间'; - that.$API.pm.utask.list.req(obj).then(res=>{ - let list = res; - - }) - }, - //今日任务 getTodayMtask(){ let that = this; let obj ={}; diff --git a/src/views/bigScreen/index_6dept.vue b/src/views/bigScreen/index_6dept.vue index 0b174e7c..8f1b6838 100644 --- a/src/views/bigScreen/index_6dept.vue +++ b/src/views/bigScreen/index_6dept.vue @@ -280,8 +280,8 @@ export default { table2Visible:false, refValue1:'moocBox1', refValue2:'moocBox2', - liData1: ['序号','日期', '型号', '规格', '发货数量'], - liData2: ['序号','工序','产品名称', '型号', '计划数量', '合格数量', '完成进度', '合格率','操作人'], + liData1: ['序号','日期','名称', '型号', '规格', '发货数量'], + liData2: ['序号','工序','产品名称', '型号', '计划数量', '合格数量', '完成进度', '合格率'], todayUtask:[], saleOutData:[], processData:[], @@ -370,23 +370,26 @@ export default { let obj ={}; obj.mio__type = 'sale_out'; obj.page=0; - that.$API.inm.mio.list.req(obj).then((res) => { + that.$API.inm.mioitem.list.req(obj).then((res) => { console.log(res); let saleOutData = []; res.forEach(item => { - let arr = [],obj1 = {},obj2 = {},obj3 = {},obj4 = {}; + let arr = [],obj1 = {},obj2 = {},obj3 = {},obj4 = {},obj5 = {}; obj1.elType = 'primary'; obj1.value = item.inout_date; obj2.elType = 'primary'; - obj2.value = item.inout_date; + obj2.value = item.material_.name; obj3.elType = 'primary'; - obj3.value = item.inout_date; + obj3.value = item.material_.specification; obj4.elType = 'primary'; - obj4.value = item.inout_date; + obj4.value = item.material_.model; + obj5.elType = 'primary'; + obj5.value = item.count; arr.push(obj1); arr.push(obj2); arr.push(obj3); arr.push(obj4); + arr.push(obj5); saleOutData.push(arr); }); this.saleOutData = saleOutData; @@ -427,8 +430,6 @@ export default { rate = 0; } obj7.value = rate; - obj8.elType = 'primary'; - obj8.value = item.submit_user; arr.push(obj1); arr.push(obj2); arr.push(obj3); @@ -436,7 +437,6 @@ export default { arr.push(obj5); arr.push(obj6); arr.push(obj7); - arr.push(obj8); processData.push(arr); }); @@ -456,25 +456,43 @@ export default { query: {start_date:this.start_date,end_date:this.end_date,dept_name: "6车间"}, }; //生产车间按日统计 - that.$API.bi.dataset.exec.req('lineDay', obj).then((res1) => { + that.$API.bi.dataset.exec.req('productStatistic', obj).then((res1) => { console.log('生产车间按日统计:',res1); let list1 = res1.data2.ds0; - let seriesData1 = [],xAxisData1=[]; + let seriesData11 = [],seriesData12 = [],xAxisData1=[],bangArr=[],guanArr=[]; for (let i = 0; i < that.days; i++) { let day = i+1; let text = day+'日'; xAxisData1[i]=text; - seriesData1.push(0); + seriesData11.push(0); + seriesData12.push(0); } if(list1.length>0){ list1.forEach(item1=>{ - let index1 = item1.日-1; - seriesData1[index1] = item1.生产数; + if(item1.name=='光纤预制管'){ + guanArr.push(item1) + }else{ + bangArr.push(item1) + } }) } + if(bangArr.length>0){ + bangArr.forEach(item11=>{ + let index11 = item11.日-1; + seriesData11[index11] = item11.生产数; + }) + } + if(guanArr.length>0){ + guanArr.forEach(item12=>{ + let index12 = item12.日-1; + seriesData12[index12] = item12.生产数; + }) + } + let chart1Option = deepCopy(this.basicOption) chart1Option.xAxis.data = xAxisData1; - chart1Option.series[0].data=seriesData1; + chart1Option.series[0].data=seriesData11; + chart1Option.series[1].data=seriesData12; let chart1 = this.setChart("chart1", chart1Option); let index1 = 0 this.chartInterval1 = setInterval(function () { @@ -492,136 +510,46 @@ export default { //本月交付统计 that.$API.bi.dataset.exec.req('saleOutDay', obj2).then((saleOutRes) => { console.log('本月交付统计:',saleOutRes); - let seriesData2 = [],xAxisData2=[]; + let seriesData21 = [],seriesData22 = [],xAxisData2=[],bangArr2=[],guanArr2=[]; let list2 = saleOutRes.data2.ds0; for (let i = 0; i < that.days; i++) { let day = i+1; let text = day+'日'; xAxisData2[i]=text; - seriesData2.push(0) + seriesData21.push(0); + seriesData22.push(0); } if(list2.length>0){ list2.forEach(item2=>{ - let index2 = item2.日-1; - seriesData2[index2] = item2.交付数; + if(item2.name=='光纤预制管'){ + guanArr2.push(item2) + }else{ + bangArr2.push(item2) + } }) } + if(bangArr2.length>0){ + bangArr2.forEach(item21=>{ + let index21 = item21.日-1; + seriesData21[index21] = item21.生产数; + }) + } + if(guanArr2.length>0){ + guanArr2.forEach(item22=>{ + let index22 = item22.日-1; + seriesData22[index22] = item22.生产数; + }) + } let chart2Option = deepCopy(this.basicOption); chart2Option.series[0].type = 'line'; chart2Option.series[1].type = 'line'; chart2Option.xAxis.data = xAxisData2; - chart2Option.yAxis.name='生产交付'; - // chart2Option.legend = { - // icon: "stack", - // right: 0, - // data: [{ - // backgroundColor: 'rgb(250,205,0)', - // name: '生产交付', - // itemStyle: { - // color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ - // { - // offset: 0, - // color: 'rgb(1,235,239)' - // }, - // { - // offset: 1, - // color: 'rgb(5, 158, 163)' - // } - // ]) - // }, - // textStyle: { - // color: '#fff' - // } - // }], - // }; - let series2=[{ - name: '光纤预制管', - type: 'line', - smooth: true, - lineStyle: { - width: 1, color: 'rgb(1,235,239)' - }, - showSymbol: false, - areaStyle: { - opacity: 0.8, - color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ - { - offset: 0, - color: 'rgb(1,235,239)' - }, - { - offset: 1, - color: 'rgb(5, 158, 163)' - } - ]) - }, - emphasis: { - focus: 'series' - }, - label: { - show: true, - position: 'top', - color:'#fff' - }, - itemStyle: { - borderRadius: [2, 2, 0, 0], - color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ - { - offset: 0, - color: 'rgb(250,205,0)' - }, - { - offset: 1, - color: 'rgb(254,129,0)' - } - ]) - }, - data: seriesData2 - },{ - name: '光纤预制棒', - type: 'line', - smooth: true, - lineStyle: { - width: 1, color: 'rgb(1,235,239)' - }, - showSymbol: false, - areaStyle: { - opacity: 0.8, - color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ - { - offset: 0, - color: 'rgb(1,235,239)' - }, - { - offset: 1, - color: 'rgb(5, 158, 163)' - } - ]) - }, - emphasis: { - focus: 'series' - }, - label: { - show: true, - position: 'top', - color:'#fff' - }, - itemStyle: { - borderRadius: [2, 2, 0, 0], - color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ - { - offset: 0, - color: 'rgb(250,205,0)' - }, - { - offset: 1, - color: 'rgb(254,129,0)' - } - ]) - }, - data: seriesData2 - }]; - chart2Option.series=series2; + + chart2Option.series[0].data=seriesData21; + chart2Option.series[0].label.position='top'; + chart2Option.series[1].data=seriesData22; + chart2Option.series[1].label.position='top'; + let chart2 = this.setChart("chart2", chart2Option); let index2 = 0 this.chartInterval2 = setInterval(function () {