diff --git a/src/api/operationManagement/quality/qualityStatistics.js b/src/api/operationManagement/quality/qualityStatistics.js new file mode 100644 index 0000000..453528d --- /dev/null +++ b/src/api/operationManagement/quality/qualityStatistics.js @@ -0,0 +1,9 @@ +import request from '@/utils/request' + +export function QueryQualityStatisticsTable(query) { + return request({ + url: 'mes/op/operation/quality/gueryQualityStatisticsTable', + method: 'get', + params: query, + }) + } \ No newline at end of file diff --git a/src/utils/signalR.js b/src/utils/signalR.js index a63f214..bc5e3f5 100644 --- a/src/utils/signalR.js +++ b/src/utils/signalR.js @@ -84,10 +84,10 @@ export default { }) //接受缓存 - connection.on('GetCache', (checkid, sum) => { - store.dispatch('socket/GetCache', {checkid,sum}) + connection.on('GetCache', (Moudle,checkid, sum) => { + store.dispatch('socket/GetCache', {Moudle,checkid,sum}) }) - + }, } diff --git a/src/views/OperationManagement/quality/qualityStatistics.vue b/src/views/OperationManagement/quality/qualityStatistics.vue index e69de29..e2155b0 100644 --- a/src/views/OperationManagement/quality/qualityStatistics.vue +++ b/src/views/OperationManagement/quality/qualityStatistics.vue @@ -0,0 +1,106 @@ + + + + + diff --git a/src/views/productManagement/workplan.vue b/src/views/productManagement/workplan.vue index 973058b..aff4e64 100644 --- a/src/views/productManagement/workplan.vue +++ b/src/views/productManagement/workplan.vue @@ -570,7 +570,7 @@ export default { }) .then(() => { if (res.code == 200) { - if ((res.data = 1)) { + if ((res.data ==1)) { this.$notify.success('删除成功') this.getList() } else { diff --git a/src/views/qualityManagement/FQC/firstFQC.vue b/src/views/qualityManagement/FQC/firstFQC.vue index 7826a90..4d38110 100644 --- a/src/views/qualityManagement/FQC/firstFQC.vue +++ b/src/views/qualityManagement/FQC/firstFQC.vue @@ -79,26 +79,24 @@
-
产品名称：
-
+
工单id：{{ ProductSituationForm.workorderid }}
-
左右:
-
+
产品名称：{{ ProductSituationForm.productName }}
-
颜色:
-
+
左右:{{ ProductSituationForm.direction }}
+
+
+
颜色:{{ ProductSituationForm.color }}
-
班组:
-
+
班组: {{ ProductSituationForm.team }}
-
投入数:
-
+
投入数:{{ ProductSituationForm.inputNum }}
@@ -122,14 +120,41 @@ export default { team: [{ inspectionModule: '' }], //班组 ProductSituationForm: { - name: '', + workorderid:"VW123456", + productName: 'VW12309', + direction: '左', + color: 'blued', + team: 'A', + inputNum: 7852, }, signal: null, data: null, } }, watch: { - + '$store.getters.counterList': { + immediate: true, + deep: true, + handler(newValue, oldValue) { + switch (this.$store.getters.counterList.Moudle) { + case '油漆': + this.paint.filter((it) => it.id == this.$store.getters.counterList.checkid)[0].counter = this.$store.getters.counterList.sum + break + case '设备': + this.device.filter((it) => it.id == this.$store.getters.counterList.checkid)[0].counter = this.$store.getters.counterList.sum + break + case '毛坯': + this.blank.filter((it) => it.id == this.$store.getters.counterList.checkid)[0].counter = this.$store.getters.counterList.sum + break + case '程序': + this.program.filter((it) => it.id == this.$store.getters.counterList.checkid)[0].counter = this.$store.getters.counterList.sum + break + case '班组操作': + this.team.filter((it) => it.id == this.$store.getters.counterList.checkid)[0].counter = this.$store.getters.counterList.sum + break + } + }, + }, }, computed: { ...mapGetters(['counterList']), @@ -173,25 +198,31 @@ export default { switch (item.inspectionModule) { case '油漆': // 把数据传递到redis - this.signalr.SR.invoke('SaveCacheInformation', '工单号', 'id', this.paint.filter((it) => it.id == item.id)[0].counter + 1).catch( - (err) => { - console.log(err) - }, - ) + this.signalr.SR.invoke('SaveCacheInformation', this.ProductSituationForm.workorderid, '油漆', item.id + '').catch((err) => { + console.log(err) + }) // redis再将数据返回 - this.paint.filter((it) => it.id == item.id)[0].counter = this.counterList.sum + break case '设备': - this.device.filter((it) => it.id == item.id)[0].counter++ + this.signalr.SR.invoke('SaveCacheInformation', this.ProductSituationForm.workorderid, '设备', item.id + '').catch((err) => { + console.log(err) + }) break case '毛坯': - this.blank.filter((it) => it.id == item.id)[0].counter++ + this.signalr.SR.invoke('SaveCacheInformation', this.ProductSituationForm.workorderid, '毛坯', item.id + '').catch((err) => { + console.log(err) + }) break case '程序': - this.program.filter((it) => it.id == item.id)[0].counter++ + this.signalr.SR.invoke('SaveCacheInformation', this.ProductSituationForm.workorderid, '程序', item.id + '').catch((err) => { + console.log(err) + }) break case '班组操作': - this.team.filter((it) => it.id == item.id)[0].counter++ + this.signalr.SR.invoke('SaveCacheInformation', this.ProductSituationForm.workorderid, '班组操作', item.id + '').catch((err) => { + console.log(err) + }) break default: this.$notify.warning('异常操作，警告') @@ -201,7 +232,7 @@ export default { //todo 数据同步 /* 1.从后台获取数据 - + */ //todo 初始话 signalR