From ec68cffd70d2a2788f7c74af55a11563aaf611d1 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 06 十二月 2023 15:47:38 +0800
Subject: [PATCH] 1、登录页面优化首次登录会出现404字样，需要明确用户登录后显示页面是否为首页/消息页或者角色中可设置 2、驱动参数管理页面新增或修改控制系统中英文名称规则限制字符数最少6位调整为2位 3、效率段管理页面效率段颜色可自定义 4、设备利用率、设备开动率、班次利用率页面增加可按照设备类型筛选查询 5、对比分析页面增加通过选择设备来对比 6、设备日利用率和设备日利用率对比页面优化选择树节点后查询区域的设备名称字段不会更新问题
---
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