diff --git a/src/utils/request.js b/src/utils/request.js index 1da72057..fc41e22d 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -4,6 +4,7 @@ export const wsuri = `ws://192.168.1.232:61101//WebMoudule//websocket` export const name = `OP8888` export const name1 = `OP1000` export const name3 = `OP2000` +export const name4 = `OP9999` // 创建axios实例 export const readFile = `http://192.168.1.231:8411/webpage/file/` // invoice diff --git a/src/views/ManufacturingCenter/MaterialArrival/index.vue b/src/views/ManufacturingCenter/MaterialArrival/index.vue index f0ea004a..2caf60c1 100644 --- a/src/views/ManufacturingCenter/MaterialArrival/index.vue +++ b/src/views/ManufacturingCenter/MaterialArrival/index.vue @@ -117,7 +117,7 @@ import { getMachines, getGroups, getTable, gettabledata1, submitEdit, searchPartNumber } from '@/api/ManufacturingCenter/MaterialArrival' import Cookie from 'js-cookie' import { mapGetters } from 'vuex' -import { wsuri, name } from '@/utils/request' +import { wsuri, name4 } from '@/utils/request' export default { data() { @@ -304,7 +304,7 @@ export default { // 打开 websocketopen() { console.log('WebSocket连接成功') - this.websock.send('{<' + name + '>}') + this.websock.send('{<' + name4 + '>}') }, // 数据接收 websocketonmessage(msg) { @@ -340,7 +340,7 @@ export default { }, getRow(row) { this.processSerialNumber = row.工序流水号 - row.完成时间 ? this.Name = 1 : this.Name = 0 + row.完成日期 ? this.Name = 1 : this.Name = 0 }, handleSizeChange(val) { this.pageSize = val