diff --git a/src/utils/request.js b/src/utils/request.js index 857e6f30..b6dbd859 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -23,7 +23,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` const service = axios.create({ - baseURL: `http://192.168.0.103:8411/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.0.101:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue index d0139c12..6dbf76b1 100644 --- a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue +++ b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue @@ -273,11 +273,17 @@ export default { OPNAME141: 'OP1410', OPNAME142: 'OP1420', OPNAME143: 'OP1430', - OPNAME144: 'OP1440' + OPNAME144: 'OP1440', + timer: null } }, mounted() { this.connect() + this.timer = setInterval(this.searchState, 15 * 1000) // 工位状态 15秒 一刷新 + }, + beforeDestroy() { + // 页面结束之前关闭所有timer,防止资源占用 + clearInterval(this.timer) }, methods: { /* socket连接*/ @@ -303,6 +309,7 @@ export default { // 数据接收 websocketonmessage(msg) { this.msg = msg + console.log(msg) const aa = this.msg.data.split('|') console.log(aa[1]) // if (aa[1] === '') { @@ -319,7 +326,8 @@ export default { websocketerror() { console.log('WebSocket连接失败') this.socketConnect = false - } + }, + searchState() {} } }