diff --git a/apps/hand-factory/components/klp-header/klp-header.vue b/apps/hand-factory/components/klp-header/klp-header.vue index 033f35e..f944b8b 100644 --- a/apps/hand-factory/components/klp-header/klp-header.vue +++ b/apps/hand-factory/components/klp-header/klp-header.vue @@ -37,10 +37,10 @@ export default { // 产线列表(原Tab列表改造,可外部传入,此处保留默认值) lineList: [ { name: "科伦普重工-酸轧机组", key: "acidity" }, - { name: "科伦普重工-彩涂机组", key: "paint" }, + // { name: "科伦普重工-彩涂机组", key: "paint" }, { name: "科伦普重工-镀锌线一组", key: "zinc1" }, - { name: "科伦普重工-镀锌线二组", key: "zinc2" }, - { name: "科伦普重工-镀锌线三组", key: "zinc3" }, + // { name: "科伦普重工-镀锌线二组", key: "zinc2" }, + // { name: "科伦普重工-镀锌线三组", key: "zinc3" }, ], // 当前选中的产线索引(关联picker) currentLineIndex: 0, diff --git a/apps/hand-factory/components/lines/zinc1.vue b/apps/hand-factory/components/lines/zinc1.vue index 3cb144a..9c3fc99 100644 --- a/apps/hand-factory/components/lines/zinc1.vue +++ b/apps/hand-factory/components/lines/zinc1.vue @@ -170,6 +170,7 @@ export default { this.socketClient = createMeasureSocket({ type: 'track_measure', onOpen: () => { + console.log('初始化socket成功') this.isConnected = true }, onClose: () => { diff --git a/apps/hand-factory/config.js b/apps/hand-factory/config.js index 1c955a7..f0dc466 100644 --- a/apps/hand-factory/config.js +++ b/apps/hand-factory/config.js @@ -2,6 +2,7 @@ module.exports = { // baseUrl: 'http://192.168.31.116:8080', baseUrl: 'http://140.143.206.120:8080', + wsUrl: 'ws://140.143.206.120:18081', // baseUrl: 'http://localhost:8080', // 应用信息 appInfo: { diff --git a/apps/hand-factory/pages/line/line.vue b/apps/hand-factory/pages/line/line.vue index 31cff59..f1638cd 100644 --- a/apps/hand-factory/pages/line/line.vue +++ b/apps/hand-factory/pages/line/line.vue @@ -5,10 +5,10 @@ - - - - + + + + diff --git a/apps/hand-factory/utils/socketMeasure.js b/apps/hand-factory/utils/socketMeasure.js index cf89815..1e69db4 100644 --- a/apps/hand-factory/utils/socketMeasure.js +++ b/apps/hand-factory/utils/socketMeasure.js @@ -16,24 +16,33 @@ export function createMeasureSocket({ const wsBase = (config.wsUrl || config.baseUrl || '').replace(/^http/, 'ws') const url = `${wsBase}/websocket?type=${type}` - + console.log(url) + function connect() { manualClose = false - socket = new WebSocket(url) - - socket.onopen = () => { + // socket = new WebSocket(url) + socket = uni.connectSocket({ + url, + success() { + console.log('连接成功') + } + }) + + console.log(socket) + socket.onOpen = () => { + console.log('连接成功') onOpen && onOpen() } - socket.onmessage = (evt) => { + socket.onMessage = (evt) => { onMessage && onMessage(evt.data) } - socket.onerror = (err) => { + socket.onError = (err) => { onError && onError(err) } - socket.onclose = (evt) => { + socket.onClose = (evt) => { onClose && onClose(evt) if (!manualClose) { setTimeout(connect, 3000)