diff --git a/src/api/quality/qcTable.js b/src/api/quality/qcTable.js index 179a127..5e99d05 100644 --- a/src/api/quality/qcTable.js +++ b/src/api/quality/qcTable.js @@ -257,3 +257,43 @@ export function getMonthOfDataDefect(query) { params: query }); } + +export function getDefectItemTitle(query) { + return request({ + url: '/quality/staticTable/getDefectItemTitle', + method: 'get', + params: query + }); +} + +export function getDefectItemData(query) { + return request({ + url: '/quality/staticTable/getDefectItemData', + method: 'get', + params: query + }); +} + +export function getDefectItemLine(query) { + return request({ + url: '/quality/staticTable/getDefectItemLine', + method: 'get', + params: query + }); +} + +export function getDefectItemDataPC(query) { + return request({ + url: '/quality/staticTable/getDefectItemDataPC', + method: 'get', + params: query + }); +} + +export function getDefectItemLinePC(query) { + return request({ + url: '/quality/staticTable/getDefectItemLinePC', + method: 'get', + params: query + }); +} diff --git a/src/views/quality/report/bpDefect/index.vue b/src/views/quality/report/bpDefect/index.vue index 60cf68c..48d6ef4 100644 --- a/src/views/quality/report/bpDefect/index.vue +++ b/src/views/quality/report/bpDefect/index.vue @@ -197,9 +197,9 @@ export default { /** 导出按钮操作 */ handleExport() { - this.download('mes/reportWork/getHourProductionNewExport', { + this.download('quality/staticTable/getMonthOfDataDefectExport', { ...this.queryParams - }, `hourProduction_${new Date().getTime()}.xlsx`) + }, `bpDefect_${new Date().getTime()}.xlsx`) }, // 生成表头序号 diff --git a/src/views/quality/report/bpDefectItem/index.vue b/src/views/quality/report/bpDefectItem/index.vue new file mode 100644 index 0000000..abf5451 --- /dev/null +++ b/src/views/quality/report/bpDefectItem/index.vue @@ -0,0 +1,342 @@ + + + + \ No newline at end of file diff --git a/src/views/quality/report/bpDefectItemPC/index.vue b/src/views/quality/report/bpDefectItemPC/index.vue new file mode 100644 index 0000000..a256178 --- /dev/null +++ b/src/views/quality/report/bpDefectItemPC/index.vue @@ -0,0 +1,342 @@ + + + + \ No newline at end of file diff --git a/src/views/quality/report/bpNookRate/index.vue b/src/views/quality/report/bpNookRate/index.vue index 0896485..2c1f9b6 100644 --- a/src/views/quality/report/bpNookRate/index.vue +++ b/src/views/quality/report/bpNookRate/index.vue @@ -35,11 +35,11 @@ - - - + + +
@@ -152,7 +152,7 @@ export default { getMonthOfData(this.queryParams).then(response => { this.hourProList = response; this.rowspan(); - + this.loading = false; }); //获取图表数据 @@ -211,9 +211,9 @@ export default { /** 导出按钮操作 */ handleExport() { - this.download('mes/reportWork/getHourProductionNewExport', { + this.download('quality/staticTable/getMonthOfDataExport', { ...this.queryParams - }, `hourProduction_${new Date().getTime()}.xlsx`) + }, `bpNoOkRate_${new Date().getTime()}.xlsx`) }, @@ -233,11 +233,11 @@ export default { getMonthOfLine(this.queryParams).then(response => { response.map((item,index)=>{ xData.push(item.ymdms), - yData.push(item.noOkBatchRate) + yData.push(item.noOkBatchRate) }) _this.getEcharts(xData,yData) }); - + }, getEcharts(xData,yData){ var _this=this @@ -267,7 +267,7 @@ export default { rotate: 50, fontSize:11 }, - + data: xData }, yAxis: { @@ -282,7 +282,7 @@ export default { } }, series: [ - { + { name:'不良率%', data: yData, type: 'line', @@ -310,7 +310,7 @@ export default { ] }; - option && myChart.setOption(option); + option && myChart.setOption(option); }, // 生成表头序号 diff --git a/src/views/quality/report/bpReworkRate/index.vue b/src/views/quality/report/bpReworkRate/index.vue index 733cfca..e6df143 100644 --- a/src/views/quality/report/bpReworkRate/index.vue +++ b/src/views/quality/report/bpReworkRate/index.vue @@ -39,7 +39,7 @@ - +
@@ -152,7 +152,7 @@ export default { getMonthOfDataRework(this.queryParams).then(response => { this.hourProList = response; this.rowspan(); - + this.loading = false; }); //获取图表数据 @@ -211,9 +211,9 @@ export default { /** 导出按钮操作 */ handleExport() { - this.download('mes/reportWork/getHourProductionNewExport', { + this.download('quality/staticTable/getMonthOfDataReworkExport', { ...this.queryParams - }, `hourProduction_${new Date().getTime()}.xlsx`) + }, `bpReworkRate_${new Date().getTime()}.xlsx`) }, @@ -233,11 +233,11 @@ export default { getMonthOfLineRework(this.queryParams).then(response => { response.map((item,index)=>{ xData.push(item.ymdms), - yData.push(item.noOkBatchRate) + yData.push(item.noOkBatchRate) }) _this.getEcharts(xData,yData) }); - + }, getEcharts(xData,yData){ var _this=this @@ -267,7 +267,7 @@ export default { rotate: 50, fontSize:11 }, - + data: xData }, yAxis: { @@ -282,7 +282,7 @@ export default { } }, series: [ - { + { name:'不良率%', data: yData, type: 'line', @@ -310,7 +310,7 @@ export default { ] }; - option && myChart.setOption(option); + option && myChart.setOption(option); }, // 生成表头序号