-
-
成品玻璃基本缺陷统计
+
+ {{ reportTitle }}
-
- - 单位：um
- - 玻璃ID：26522322323
- - 生产日期：2022.12.24 15:56:24
- - 等级：G1
-
-
@@ -40,64 +42,74 @@
+
diff --git a/src/views/qualityManagement/finalInspectionDataReport/glassQualityReport.vue b/src/views/qualityManagement/finalInspectionDataReport/glassQualityReport.vue
new file mode 100644
index 0000000..0e1a22a
--- /dev/null
+++ b/src/views/qualityManagement/finalInspectionDataReport/glassQualityReport.vue
@@ -0,0 +1,146 @@
+
+
+
+
+
+
diff --git a/src/views/qualityManagement/finalInspectionDataReport/glassThickReport.vue b/src/views/qualityManagement/finalInspectionDataReport/glassThickReport.vue
new file mode 100644
index 0000000..11c5155
--- /dev/null
+++ b/src/views/qualityManagement/finalInspectionDataReport/glassThickReport.vue
@@ -0,0 +1,78 @@
+
+
+
+
+
+
diff --git a/src/views/qualityManagement/processFullInspection/defectScatterPlot.vue b/src/views/qualityManagement/processFullInspection/defectScatterPlot.vue
index d359868..6de042c 100644
--- a/src/views/qualityManagement/processFullInspection/defectScatterPlot.vue
+++ b/src/views/qualityManagement/processFullInspection/defectScatterPlot.vue
@@ -56,7 +56,7 @@
@@ -168,27 +168,7 @@ export default {
{ label: '无法识别', value: 'iisrest' }
],
selectedGlassId: [],
- leftList: [
- { name: 'S', value: null, key: 's' },
- { name: 'M', value: null, key: 'm' },
- { name: 'L', value: null, key: 'l' },
- { name: 'XL', value: null, key: 'xl' }
- ],
- rightList: [
- { name: '气泡', value: null, key: 'bl' },
- { name: '变形', value: null, key: 'distortion' },
- { name: '纤维', value: null, key: 'fiber' },
- { name: '划伤', value: null, key: 'scratch' },
- { name: '点状缺陷', value: null, key: 'tin' },
- { name: '结石', value: null, key: 'stone' },
- { name: '铂金', value: null, key: 'pt' },
- { name: '结节', value: null, key: 'knot' },
- { name: '拖尾', value: null, key: 'tail' },
- { name: 'ADG', value: null, key: 'adg' },
- { name: '锡缺陷(顶部)', value: null, key: 'top' },
- { name: '锡缺陷(底部)', value: null, key: 'bottom' },
- { name: '无法识别', value: null, key: 'iisrest' }
- ]
+ detailMsg: {}
}
},
mounted() {
@@ -212,26 +192,44 @@ export default {
},
drawPic() {
// 绘图
+ if (this.selectedGlassId.length === 0) {
+ this.$message({
+ message: '请先勾选左侧的玻璃',
+ type: 'error',
+ duration: 1500,
+ onClose: () => {}
+ })
+ return false
+ }
this.getDetail()
- drawPoint().then((res) => {
+ drawPoint({
+ startTime: this.listQuery.startTime,
+ endTime: this.listQuery.endTime,
+ glassId: this.selectedGlassId
+ }).then((res) => {
console.log(res)
})
},
getDetail() {
// 明细
queryPointClear({
+ startTime: this.listQuery.startTime,
+ endTime: this.listQuery.endTime,
glassId: this.selectedGlassId
}).then((res) => {
- console.log(res)
+ if (res.code === 0) {
+ this.detailMsg = res.data[0] || {}
+ this.$refs.plotTotal.init(this.detailMsg)
+ }
})
},
buttonClick(val) {
//查询
- console.log(val)
this.listQuery.startTime = val.timeVal ? val.timeVal[0] : ''
this.listQuery.endTime = val.timeVal ? val.timeVal[1] : ''
this.getList()
},
+ // 左侧列表选择
selectChange(val) {
console.log(val)
let arr = []
@@ -244,8 +242,8 @@ export default {
this.selectedGlassId = []
}
},
+ // 缺陷选择
selectType(val) {
- console.log(val)
if (val === 'pellet') {
this.checkList = ['s', 'm', 'l', 'xl']
} else {
diff --git a/src/views/qualityManagement/processFullInspection/particleLineChart.vue b/src/views/qualityManagement/processFullInspection/particleLineChart.vue
index 5051bf0..2d6c4d2 100644
--- a/src/views/qualityManagement/processFullInspection/particleLineChart.vue
+++ b/src/views/qualityManagement/processFullInspection/particleLineChart.vue
@@ -71,7 +71,6 @@ export default {
]
this.listQuery.startTime = moment().format('yyyy-MM-DD') + 'T00:00:00'
this.listQuery.endTime = moment().format('yyyy-MM-DD') + 'T23:59:59'
- this.getList()
this.getMsg()
},
methods: {
diff --git a/src/views/qualityManagement/processFullInspection/thicknessDistributionMap.vue b/src/views/qualityManagement/processFullInspection/thicknessDistributionMap.vue
index 8ae9bc9..14458bc 100644
--- a/src/views/qualityManagement/processFullInspection/thicknessDistributionMap.vue
+++ b/src/views/qualityManagement/processFullInspection/thicknessDistributionMap.vue
@@ -130,7 +130,6 @@ export default {
this.listQuery.startTime = val.timeVal ? val.timeVal[0] : ''
this.listQuery.endTime = val.timeVal ? val.timeVal[1] : ''
this.listQuery.glassId = val.glassId
- this.listQuery.current = 1
this.getList()
break
default:
diff --git a/src/views/siteMonitoring/components/ProductionLineDiagram.vue b/src/views/siteMonitoring/components/ProductionLineDiagram.vue
index b5d443d..341f312 100644
--- a/src/views/siteMonitoring/components/ProductionLineDiagram.vue
+++ b/src/views/siteMonitoring/components/ProductionLineDiagram.vue
@@ -65,7 +65,7 @@ export default {
this.resetSize()
this.resetSize2()
this.getGlass()
- this.getAlarm()
+ // this.getAlarm() //报警红框
// this.timer = setInterval(this.getGlassAndAlarm, 1000)
},
methods: {
@@ -100,8 +100,8 @@ export default {
this.getArea3()
this.getText()
},
+ // 部分1
getArea1() {
- // 部分1
this.drawRect(22, 43, 28, 22, '#B2FFC8', true)
this.drawRect(66, 43, 28, 22, '#B2FFC8', true)
this.drawRect(22, 161, 28, 22, '#B2FFC8', true)