From 4fba1be16ab3c6c005b499f3820a3aa2a1e7ec1e Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 01 三月 2024 10:09:04 +0800
Subject: [PATCH] 1、车间看板页面缩放和拖拽时增加辅助线 2、驱动参数管理页面调整英文名称字段验证输入字数长度由2-18位调整为为仅验证非空 3、设备日志页面采样周期字段默认值由1000调整为100 4、设备日志页面设备日志列表中若时段状态为关机则不弹出工作曲线 5、设备综合效率分析页面增加表格数据加载动画 6、jQuery.table2excel组件导出表格数据功能增加日期格式的转换 7、设备日志页面工作曲线Y轴增加颜色区分，与对应数据颜色保持一致 8、设备管理页面表单填写界面设备功率增加计量单位kw
---
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