From a85dca660fd4a28f1da79716a2bf2bb0f2ab1e3d Mon Sep 17 00:00:00 2001 From: shijing Date: Fri, 19 Jan 2024 17:40:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=A3=80=E9=AA=8C=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/statistics/pass_num.vue | 14 +- src/views/statistics/product_check.vue | 263 ++++++++++++++----------- 2 files changed, 159 insertions(+), 118 deletions(-) diff --git a/src/views/statistics/pass_num.vue b/src/views/statistics/pass_num.vue index e41883b4..2efff321 100644 --- a/src/views/statistics/pass_num.vue +++ b/src/views/statistics/pass_num.vue @@ -100,7 +100,7 @@ - + @@ -108,7 +108,11 @@ - + + + + + @@ -125,7 +129,7 @@ - + @@ -133,10 +137,6 @@ - - - - diff --git a/src/views/statistics/product_check.vue b/src/views/statistics/product_check.vue index c7c64984..ad03cbb5 100644 --- a/src/views/statistics/product_check.vue +++ b/src/views/statistics/product_check.vue @@ -38,27 +38,34 @@ - - + + - + - + - + + + + + + - + - + - + - + - + - + @@ -71,31 +78,38 @@ - - + + - + - + - + + + + + + - + - + - + - + - + - + - + - + @@ -108,31 +122,38 @@ - - + + - + - + - + + + + + + - + - + - + - + - + - + - + - + @@ -167,23 +188,21 @@ tooltip: { trigger: 'item' }, - series: [ - { - name: '7车间预制棒', - type: 'pie', - radius: ['40%', '70%'], - center: ['50%', '60%'], - label: false, - data: [ - {value: 800, name: '合格数'}, - {value: 5, name: '炸纹'}, - {value: 2, name: '条纹'}, - {value: 6, name: '气泡'}, - {value: 3, name: '弯曲'}, - {value: 2, name: '其他'}, - ] - } - ] + series: { + name: '7车间预制棒', + type: 'pie', + radius: ['40%', '70%'], + center: ['50%', '60%'], + label: false, + data: [ + {value: 0, name: '合格数'}, + {value: 0, name: '炸纹'}, + {value: 0, name: '条纹'}, + {value: 0, name: '气泡'}, + {value: 0, name: '弯曲'}, + {value: 0, name: '其他'}, + ] + } }, option2: { title: { @@ -193,24 +212,22 @@ tooltip: { trigger: 'item' }, - series: [ - { - name: '10车间预制管', - type: 'pie', - radius: ['40%', '70%'], - center: ['50%', '60%'], - label: false, - data: [ - {value: 800, name: '合格数'}, - {value: 2, name: '条纹'}, - {value: 5, name: '断裂'}, - {value: 6, name: '偏壁'}, - {value: 3, name: '大小头'}, - {value: 2, name: '结石'}, - {value: 2, name: '气线'}, - ] - } - ] + series: { + name: '10车间预制管', + type: 'pie', + radius: ['40%', '70%'], + center: ['50%', '60%'], + label: false, + data: [ + {value: 0, name: '合格数'}, + {value: 0, name: '条纹'}, + {value: 0, name: '断裂'}, + {value: 0, name: '偏壁'}, + {value: 0, name: '大小头'}, + {value: 0, name: '结石'}, + {value: 0, name: '气线'}, + ] + } }, option3: { title: { @@ -220,36 +237,28 @@ tooltip: { trigger: 'item' }, - series: [ - { + series: { name: '退火预制管', type: 'pie', radius: ['40%', '70%'], center: ['50%', '60%'], label: false, data: [ - {value: 800, name: '合格数'}, - {value: 5, name: '椭圆/弯曲'}, - {value: 2, name: '条纹'}, - {value: 6, name: '断裂'}, - {value: 3, name: '偏壁'}, - {value: 2, name: '大小头'}, - {value: 3, name: '结石'}, - {value: 3, name: '气线'}, - {value: 4, name: '箱中破'}, + {value: 0, name: '合格数'}, + {value: 0, name: '椭圆/弯曲'}, + {value: 0, name: '条纹'}, + {value: 0, name: '断裂'}, + {value: 0, name: '偏壁'}, + {value: 0, name: '大小头'}, + {value: 0, name: '结石'}, + {value: 0, name: '气线'}, + {value: 0, name: '箱中破'}, ] } - ] }, - tableData:[ - {id:1,date:'2023-12-11',name:'ZJ2-1',count:300,count_ok:200,count_rate:66}, - {id:1,date:'2023-12-11',name:'ZJ2-2',count:300,count_ok:200,count_rate:66}, - {id:1,date:'2023-12-11',name:'ZJ2-3',countk:300,count_ok:200,count_rate:66}, - {id:1,date:'2023-12-11',name:'ZJ2-4',count:300,count_ok:200,count_rate:66}, - ], - tableData1:[], - tableData2:[], - tableData3:[], + tableData7:[], + tableData10:[], + tableData8:[], } }, mounted(){ @@ -273,52 +282,84 @@ }, getData(){ let that = this; + that.tableData8 = []; let exec = that.queryType=='月'?'lineWeek':'lineMonth'; let obj = { - query: { start_date: this.start_date, end_date: this.end_date, dept_name: "6车间" }, + query: { start_date: this.start_date, end_date: this.end_date, dept_name: "8车间" }, }; - that.$API.bi.dataset.exec.req(exec, obj).then((doInRes) => { - console.log('退火车间统计:',doInRes); - debugger; + that.$API.bi.dataset.exec.req(exec, obj).then((res) => { + console.log('退火车间统计:',res); + if(res.length>0){ + that.tableData8 = res; + that.option1.series.data[0].value = res[0].合格数; + that.option1.series.data[1].value = res[0].弯曲; + that.option1.series.data[2].value = res[0].条纹; + that.option1.series.data[3].value = res[0].断裂; + that.option1.series.data[4].value = res[0].偏壁; + that.option1.series.data[5].value = res[0].大小头; + that.option1.series.data[6].value = res[0].结石; + that.option1.series.data[7].value = res[0].气线; + that.option1.series.data[8].value = res[0].箱中破; + } + // debugger; }); }, getData7(){ let that = this; + that.tableData7 = []; let obj = { query: { start_date: this.start_date, end_date: this.end_date, dept_name: "7车间" }, }; let exec = that.queryType=='月'?'lineWeek':'lineMonth'; - that.$API.bi.dataset.exec.req(exec, obj).then((doInRes) => { - console.log('7生产车间统计:',doInRes); - debugger; + that.$API.bi.dataset.exec.req(exec, obj).then((res) => { + console.log('7生产车间统计:',res); + if(res.length>0){ + that.tableData7 = res; + that.option1.series.data[0].value = res[0].合格数; + that.option1.series.data[1].value = res[0].炸纹; + that.option1.series.data[2].value = res[0].条纹; + that.option1.series.data[3].value = res[0].气泡; + that.option1.series.data[4].value = res[0].弯曲; + that.option1.series.data[5].value = res[0].其他; + } }); }, getData10(){ let that = this; + that.tableData10 = []; let obj = { query: { start_date: this.start_date, end_date: this.end_date, dept_name: "10·车间" }, }; let exec = that.queryType=='月'?'lineWeek':'lineMonth'; - that.$API.bi.dataset.exec.req(exec, obj).then((doInRes) => { - console.log('10生产车间统计:',doInRes); - debugger; + that.$API.bi.dataset.exec.req(exec, obj).then((res) => { + console.log('10生产车间统计:',res); + if(res.length>0){ + that.tableData10 = res; + that.option2.series.data[0].value = res[0].合格数; + that.option2.series.data[1].value = res[0].断裂; + that.option2.series.data[2].value = res[0].条纹; + that.option2.series.data[3].value = res[0].偏壁; + that.option2.series.data[4].value = res[0].大小头; + that.option2.series.data[5].value = res[0].结石; + that.option2.series.data[6].value = res[0].气线; + } }); }, handleQuery(){ - if(this.queryDate!==''){ - if(this.queryType=='月'){ - + let that = this; + if(this.queryType=='月'){ + if(this.queryDate!==''&&this.queryDate!==null){ this.start_date =this.queryDate+'-01'; let arr = this.queryDate.split('-'); this.end_date = this.queryDate+'-'+new Date(arr[0], arr[1], 0).getDate(); }else{ - this.start_date = this.queryDate+'-01-01'; - this.end_date = this.queryDate+'-12-31'; - } - }else{ - if(this.queryType=='月'){ this.start_date =this.currentYear+'-'+this.currentMonth+'-01'; this.end_date = this.currentYear+'-'+this.currentMonth+'-'+new Date(this.currentYear, this.currentMonth, 0).getDate(); + } + }else{ + if(this.queryDate!==''&&this.queryDate!==null){ + this.start_date = this.queryDate+'-01-01'; + this.end_date = this.queryDate+'-12-31'; }else{ this.start_date = this.currentYear+'-01-01'; this.end_date = this.currentYear+'-12-31';