From 3a73cd63039981d1f7cd324afea8f14f37738467 Mon Sep 17 00:00:00 2001 From: zhaowei <zhaowei> Date: 星期五, 07 三月 2025 11:24:49 +0800 Subject: [PATCH] 1、统计分析和统计图表、对比分析和利用率走势分析、利用率分段分析和报警分析页面新增筛选条件保持跟TEEP页面一致 2、全局中重要程度的筛选方式由多选改为单选 3、设备监控与车间看板页面的设备详情弹窗中的图表调整为一直展示但若无数据则不展示图表的指针与数值 --- 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