From fe0ba3d7bde1d5cfc6a4a87843e945deaff60a8d Mon Sep 17 00:00:00 2001 From: caoxinyu Date: Sat, 11 May 2019 17:10:41 +0800 Subject: [PATCH] =?UTF-8?q?Andon=E7=9B=91=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManufacturingCenter/AntonMonitoring.js | 25 +++ src/icons/svg/AntonMonitoring.svg | 1 + src/icons/svg/OutPartSelect.svg | 1 + src/icons/svg/machine.svg | 1 + src/icons/svg/machiningHoursStatistics.svg | 1 + src/utils/request.js | 1 + src/views/Inventory/Inboundscanning/index.vue | 14 +- .../AntonMonitoring/index.vue | 153 ++++++++++++++++++ 8 files changed, 190 insertions(+), 7 deletions(-) create mode 100644 src/api/ManufacturingCenter/AntonMonitoring.js create mode 100644 src/icons/svg/AntonMonitoring.svg create mode 100644 src/icons/svg/OutPartSelect.svg create mode 100644 src/icons/svg/machine.svg create mode 100644 src/icons/svg/machiningHoursStatistics.svg create mode 100644 src/views/ManufacturingCenter/AntonMonitoring/index.vue diff --git a/src/api/ManufacturingCenter/AntonMonitoring.js b/src/api/ManufacturingCenter/AntonMonitoring.js new file mode 100644 index 00000000..d5b48e32 --- /dev/null +++ b/src/api/ManufacturingCenter/AntonMonitoring.js @@ -0,0 +1,25 @@ +import request from '@/utils/request' +// 电子看板_线体上下线数量统计_查询 +export function ANDON_countselect() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'ANDON_大屏幕显示', + param: 'WorkShopType=A' + } + }) +} +export function ANDON_opselect(opname) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'ANDON_办公室监控_消息通知', + param: 'WorkShopType=A' + '&工位号=' + opname + '=string' + } + }) +} + diff --git a/src/icons/svg/AntonMonitoring.svg b/src/icons/svg/AntonMonitoring.svg new file mode 100644 index 00000000..9fc12cb7 --- /dev/null +++ b/src/icons/svg/AntonMonitoring.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/OutPartSelect.svg b/src/icons/svg/OutPartSelect.svg new file mode 100644 index 00000000..d599116b --- /dev/null +++ b/src/icons/svg/OutPartSelect.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/machine.svg b/src/icons/svg/machine.svg new file mode 100644 index 00000000..efcc00d2 --- /dev/null +++ b/src/icons/svg/machine.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/machiningHoursStatistics.svg b/src/icons/svg/machiningHoursStatistics.svg new file mode 100644 index 00000000..759825ae --- /dev/null +++ b/src/icons/svg/machiningHoursStatistics.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/utils/request.js b/src/utils/request.js index 0a45cef9..fc9ff291 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -5,6 +5,7 @@ import axios from 'axios' export const wsuri = `ws://192.168.1.232:61101//WebMoudule//websocket` export const name = `OP8888` +export const name1 = `OP1000` // 创建axios实例 export const readFile = `http://192.168.1.231:8411/webpage/file/` // invoice diff --git a/src/views/Inventory/Inboundscanning/index.vue b/src/views/Inventory/Inboundscanning/index.vue index 183499a8..c2502792 100644 --- a/src/views/Inventory/Inboundscanning/index.vue +++ b/src/views/Inventory/Inboundscanning/index.vue @@ -172,7 +172,7 @@ export default { this.Partpaint = response.data[0].零件图号 return this.Partpaint }).then(() => { - this. getCraftNumber() + this.getCraftNumber() }) // this.getscantable() }, @@ -188,27 +188,27 @@ export default { } else { this.listLoading = true searchTable(this.partNumber).then(response => { - if(response.data.length === 0) { + if (response.data.length === 0) { this.listLoading = false this.$notify({ title: '警告', message: '该零件未加工完成', type: 'warning' }) - }else { + } else { for (let i = 0; i < response.data.length; i++) { if (response.data[i].考核状态 === 8) { this.listLoading = false this.$notify({ title: '警告', - message: 'P' + response.data[i].工艺计划流水号 + '已入库', + message: 'P' + response.data[i].工艺计划流水号 + '已入库', type: 'warning' }) } else if (response.data[i].考核状态 === 9) { this.listLoading = false this.$notify({ title: '警告', - message: 'P' + response.data[i].工艺计划流水号 + '已出库', + message: 'P' + response.data[i].工艺计划流水号 + '已出库', type: 'warning' }) } else if (response.data[i].考核状态 === 7) { @@ -223,7 +223,7 @@ export default { 机床图号: response.data[i].机床图号, 零件图号: response.data[i].零件图号 }) - let hash = {}; // 一个新数组，data为你需要去重的数组，newData用于接收去重后的数组, curVal.去重条件 + const hash = {} // 一个新数组，data为你需要去重的数组，newData用于接收去重后的数组, curVal.去重条件 this.tableDataNum = this.tableData.reduce((preVal, curVal) => { hash[curVal.工艺计划流水号] ? '' : hash[curVal.工艺计划流水号] = true && preVal.push({ 工艺计划流水号: curVal.工艺计划流水号, @@ -234,7 +234,7 @@ export default { innumber: curVal.innumber, capture: '', note: '' - }); + }) return preVal }, []) } diff --git a/src/views/ManufacturingCenter/AntonMonitoring/index.vue b/src/views/ManufacturingCenter/AntonMonitoring/index.vue new file mode 100644 index 00000000..f3025d4f --- /dev/null +++ b/src/views/ManufacturingCenter/AntonMonitoring/index.vue @@ -0,0 +1,153 @@ + + + + +