From 07e3e588a730569b8f1cd3227c8649208337e4b0 Mon Sep 17 00:00:00 2001 From: zhuzhuanzhuan Date: 星期二, 19 十二月 2023 13:35:36 +0800 Subject: [PATCH] 1、调整网站标题为MDC智慧车间 2、设备管理页面新增弹窗中统一编码选择弹窗中的查询区域样式调整 3、设备参数阈值管理页面添加参数阈值弹窗中原默认驱动类型为空,现调整为首位数据,且无参数时显示请选择参数 4、加工数量管理页面新增弹窗中选择标准加工时间弹窗中的查询区域样式调整 5、加班管理页面新增弹窗中班次选择弹窗中的查询区域样式调整 --- src/components/jeecg/JVxeTable/mixins/vxe.web.socket.mixins.js | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/components/jeecg/JVxeTable/mixins/vxe.web.socket.mixins.js b/src/components/jeecg/JVxeTable/mixins/vxe.web.socket.mixins.js index 0385e62..3d0ea79 100644 --- a/src/components/jeecg/JVxeTable/mixins/vxe.web.socket.mixins.js +++ b/src/components/jeecg/JVxeTable/mixins/vxe.web.socket.mixins.js @@ -1,5 +1,8 @@ import store from '@/store/' import { randomUUID } from '@/utils/util' +import Vue from 'vue' +import { ACCESS_TOKEN } from '@/store/mutation-types' + // vxe socket const vs = { // 椤甸潰鍞竴 id锛岀敤浜庢爣璇嗗悓涓�鐢ㄦ埛锛屼笉鍚岄〉闈㈢殑websocket @@ -52,7 +55,10 @@ const domain = window._CONFIG['domianURL'].replace('https://', 'wss://').replace('http://', 'ws://') const url = `${domain}/vxeSocket/${userId}/${this.pageId}` - this.ws = new WebSocket(url) + //update-begin-author:taoyan date:2022-4-22 for: v2.4.6 鐨� websocket 鏈嶅姟绔紝瀛樺湪鎬ц兘鍜屽畨鍏ㄩ棶棰樸�� #3278 + let token = Vue.ls.get(ACCESS_TOKEN) + this.ws = new WebSocket(url, [token]) + //update-end-author:taoyan date:2022-4-22 for: v2.4.6 鐨� websocket 鏈嶅姟绔紝瀛樺湪鎬ц兘鍜屽畨鍏ㄩ棶棰樸�� #3278 this.ws.onopen = this.on.open.bind(this) this.ws.onerror = this.on.error.bind(this) this.ws.onmessage = this.on.message.bind(this) -- Gitblit v1.9.3