From d5f1100dd9784a43b8e6677637203f3c24643caf Mon Sep 17 00:00:00 2001 From: juzi <819872918@qq.com> Date: Tue, 13 Jun 2023 14:04:38 +0800 Subject: [PATCH 1/3] 6.13 --- .../components/productPowerEdit.vue | 256 +++++++++--------- .../performanceAnalysis/devicePage.vue | 49 ++-- src/views/home/components/Product.vue | 2 +- .../components/OffShelfPackagingDetail.vue | 121 +++++---- .../components/WorkOrderProgressDetails.vue | 2 +- .../workOrderProgress.vue | 2 +- .../siteMonitoring/productionLineStatus.vue | 25 +- 7 files changed, 252 insertions(+), 205 deletions(-) diff --git a/src/views/deviceManagement/components/productPowerEdit.vue b/src/views/deviceManagement/components/productPowerEdit.vue index 4ff5227..15c48b1 100644 --- a/src/views/deviceManagement/components/productPowerEdit.vue +++ b/src/views/deviceManagement/components/productPowerEdit.vue @@ -1,126 +1,131 @@ diff --git a/src/views/productionScheduling/components/WorkOrderProgressDetails.vue b/src/views/productionScheduling/components/WorkOrderProgressDetails.vue index c1d1f1f..7c0e096 100644 --- a/src/views/productionScheduling/components/WorkOrderProgressDetails.vue +++ b/src/views/productionScheduling/components/WorkOrderProgressDetails.vue @@ -84,7 +84,7 @@ fontSize: 27 * beilv + 'px', marginBottom: 6 * beilv + 'px' }" - >{{ detailMsg.finishNum }}{{ detailMsg.realProductNum }} 完成数量 - {{ productMsg.finishNum }} + {{ productMsg.realProductNum }}

生产数量 diff --git a/src/views/siteMonitoring/productionLineStatus.vue b/src/views/siteMonitoring/productionLineStatus.vue index 636e258..4899e9d 100644 --- a/src/views/siteMonitoring/productionLineStatus.vue +++ b/src/views/siteMonitoring/productionLineStatus.vue @@ -1,6 +1,9 @@ diff --git a/src/views/qualityManagement/components/defectScatterPlotChart.vue b/src/views/qualityManagement/components/defectScatterPlotChart.vue index f055e7f..d809e09 100644 --- a/src/views/qualityManagement/components/defectScatterPlotChart.vue +++ b/src/views/qualityManagement/components/defectScatterPlotChart.vue @@ -34,7 +34,6 @@ export default { }, data() { return { - chartDom: '', chart: '', chartHeight: tableHeight(446), list: [ @@ -120,8 +119,8 @@ export default { ) { this.chart.dispose() // 页面多次刷新会出现警告，Dom已经初始化了一个实例，这是销毁实例 } - this.chartDom = document.getElementById('defectScatterPlotChart') - this.chart = echarts.init(this.chartDom) + var chartDom = document.getElementById('defectScatterPlotChart') + this.chart = echarts.init(chartDom) let legendList = [] let seriesList = [] for (let i in this.defectMsg) { @@ -130,8 +129,8 @@ export default { let obj = {} for (let j of this.defectMsg[i]) { let arr2 = [] - arr2.push(parseInt(j.xpos)) arr2.push(parseInt(j.ypos)) + arr2.push(parseInt(j.xpos)) arr1.push(arr2) } obj.name = this.transLabel(i) @@ -169,6 +168,10 @@ export default { }, itemWidth: 10 // 图例宽度 }, + brush: { + toolbox: ['rect', 'clear'], + xAxisIndex: 0 + }, grid: { x: 60, y: 60, @@ -187,7 +190,10 @@ export default { lineStyle: { color: 'rgba(0, 0, 0, 0.15)' } - } + }, + max: 2600, + min: 0, + interval: 100 }, yAxis: { type: 'value', @@ -201,30 +207,76 @@ export default { lineStyle: { color: 'rgba(0, 0, 0, 0.15)' } - } + }, + max: 2250, + min: 0, + interval: 100 }, series: seriesList - // series: [ - // { - // name: 'S', - // type: 'scatter', - // data: dataS, - // symbolSize: 5 - // }, - // { - // name: 'M', - // type: 'scatter', - // data: dataM, - // symbolSize: 5 - // }, - // { - // name: 'L', - // type: 'scatter', - // data: dataL, - // symbolSize: 5 - // } - // ] } + let that = this + this.chart.on('brushSelected', function (params) { + var brushed = [] + var brushComponent = params.batch[0] + var total = 0 + var xLong = 0 + var yLong = 0 + if (params.batch[0].areas[0]) { + xLong = parseInt( + params.batch[0].areas[0].coordRange[0][1] - + params.batch[0].areas[0].coordRange[0][0] + ) + yLong = parseInt( + params.batch[0].areas[0].coordRange[1][1] - + params.batch[0].areas[0].coordRange[1][0] + ) + } + for (var sIdx = 0; sIdx < brushComponent.selected.length; sIdx++) { + var rawIndices = brushComponent.selected[sIdx].dataIndex.length + total += rawIndices + brushed.push( + brushComponent.selected[sIdx].seriesName + ' : ' + rawIndices + ) + } + brushed.push('总计 : ' + total) + that.chart.setOption({ + title: { + backgroundColor: 'rgba(0, 0, 0, 0.5)', + text: 'SELECTED DATA: \n' + brushed.join('\n'), + right: params.batch[0].areas[0] ? '10%' : -100, + bottom: params.batch[0].areas[0] ? 0 : -500, + textStyle: { + fontSize: 12, + fontWeight: 'normal', + color: '#fff' + } + }, + graphic: [ + { + type: 'group', + left: params.batch[0].areas[0] + ? params.batch[0].areas[0].range[0][0] + : -100, + top: params.batch[0].areas[0] + ? params.batch[0].areas[0].range[1][1] + 5 + : -100, + children: [ + { + type: 'text', + z: 100, + style: { + fill: '#333', + width: 220, + overflow: 'break', + text: xLong + '*' + yLong, + font: '12px Microsoft YaHei' + } + } + ] + } + ] + }) + }) option && this.chart.setOption(option) } } diff --git a/src/views/qualityManagement/finalInspectionDailyReport.vue b/src/views/qualityManagement/finalInspectionDailyReport.vue deleted file mode 100644 index e4e41bd..0000000 --- a/src/views/qualityManagement/finalInspectionDailyReport.vue +++ /dev/null @@ -1,545 +0,0 @@ - - diff --git a/src/views/qualityManagement/processFullInspection/defectScatterPlot.vue b/src/views/qualityManagement/processFullInspection/defectScatterPlot.vue index 0be74d3..0fc32c8 100644 --- a/src/views/qualityManagement/processFullInspection/defectScatterPlot.vue +++ b/src/views/qualityManagement/processFullInspection/defectScatterPlot.vue @@ -92,10 +92,13 @@ const tableProps = [ fixed: 'left', minWidth: 120 }, + { + prop: 'package', + label: '包装工位' + }, { prop: 'testTime', label: '检验时间', - fixed: 'left', filter: timeFormatter, minWidth: 160 }, diff --git a/src/views/reportManagement/finalInspectionData.vue b/src/views/reportManagement/finalInspectionData.vue index 0767d9f..7cd6f20 100644 --- a/src/views/reportManagement/finalInspectionData.vue +++ b/src/views/reportManagement/finalInspectionData.vue @@ -29,7 +29,7 @@

{{ reportTitle }}
-
+
@@ -41,6 +41,18 @@ :tableData2="packReportArr" />
+
+ +
+
+ +
+
+ +
+
+ +
@@ -60,6 +72,10 @@ import { import glassQualityReport from './finalInspectionDataReport/glassQualityReport.vue' import glassThickReport from './finalInspectionDataReport/glassThickReport.vue' import glassPackReport from './finalInspectionDataReport/glassPackReport.vue' +import glassWasteReport from './finalInspectionDataReport/glassWasteReport.vue' +import wasteMachineReport from './finalInspectionDataReport/wasteMachineReport.vue' +import wasteLocationReport from './finalInspectionDataReport/wasteLocationReport.vue' +import glassDefectReport from './finalInspectionDataReport/glassDefectReport.vue' import moment from 'moment' import { timeFormatter } from '@/utils' const tablePropsL = [ @@ -82,7 +98,15 @@ const tablePropsL = [ ] export default { name: 'FinalInspectionData', - components: { glassQualityReport, glassThickReport, glassPackReport }, + components: { + glassQualityReport, + glassThickReport, + glassPackReport, + glassWasteReport, + wasteMachineReport, + wasteLocationReport, + glassDefectReport + }, data() { return { formConfig: [ @@ -112,9 +136,13 @@ export default { type: 'select', label: '报表类型', selectOptions: [ - { id: '玻璃基板缺陷统计', name: '玻璃基板缺陷统计' }, + { id: '玻璃基板品质报表', name: '玻璃基板品质报表' }, { id: '终检下片包装', name: '终检下片包装' }, - { id: '厚度汇总报表', name: '厚度汇总报表' } + { id: '厚度汇总报表', name: '厚度汇总报表' }, + { id: '玻璃判废统计表', name: '玻璃判废统计表' }, + { id: '判废机组统计表', name: '判废机组统计表' }, + { id: '判废位置统计表', name: '判废位置统计表' }, + { id: '玻璃基板缺陷报表', name: '玻璃基板缺陷报表' } ], param: 'fullInspectionType1', defaultSelect: '', @@ -153,7 +181,23 @@ export default { glassQualityArr: [], //基板玻璃品质 thickReportArr: [], // 厚度汇总 packReportArr: [], //下片包装 - packClaReportArr: [] + packClaReportArr: [], + wasteReportArr: [{ name1: 11 }, { name1: 22 }], // 玻璃判废 + wasteMachineArr: [ + { name: '颗粒/面检数超标', name1: '11' }, + { name: '颗粒/缺陷聚集', name1: '22' }, + { name: '划伤', name1: '33' }, + { name: '面磨印记', name1: '44' }, + { name: '磨痕', name1: '55' } + ], + wasteLocationArr: [ + { name: '颗粒/面检数超标', name1: '11' }, + { name: '颗粒/缺陷聚集', name1: '22' }, + { name: '划伤', name1: '33' }, + { name: '面磨印记', name1: '44' }, + { name: '磨痕', name1: '55' } + ], + glassDefectArr: [] } }, mounted() { @@ -220,7 +264,7 @@ export default { for (let i of this.selectArr) { arr.push(i.glassId) } - if (this.reportTitle === '玻璃基板缺陷统计') { + if (this.reportTitle === '玻璃基板品质报表') { this.exportGlassReport(arr) } else if (this.reportTitle === '厚度汇总报表') { this.exportThickReport(arr) @@ -258,7 +302,7 @@ export default { arr.push(i.glassId) } switch (this.reportTitle) { - case '玻璃基板缺陷统计': + case '玻璃基板品质报表': this.getGlassReport(arr) break case '厚度汇总报表': diff --git a/src/views/qualityManagement/components/finalDataTable.vue b/src/views/reportManagement/finalInspectionDataReport/glassDefectReport.vue similarity index 93% rename from src/views/qualityManagement/components/finalDataTable.vue rename to src/views/reportManagement/finalInspectionDataReport/glassDefectReport.vue index b294903..5225f24 100644 --- a/src/views/qualityManagement/components/finalDataTable.vue +++ b/src/views/reportManagement/finalInspectionDataReport/glassDefectReport.vue @@ -1,5 +1,11 @@