From b06f6a316b6a8293bb8aba6bfff33336b66c032a Mon Sep 17 00:00:00 2001 From: ahaos <8406649+lhailgl@user.noreply.gitee.com> Date: 星期三, 13 十二月 2023 09:01:52 +0800 Subject: [PATCH] !64 版本升级 * Merge branch 'dev' of gitee.com:JavaLionLi/plus-ui into ts * 升级依赖 * !61 fix: 删除重复环境变量ElUploadInstance * fix: 删除重复环境变量ElUploadInstance --- src/utils/websocket.ts | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/src/utils/websocket.ts b/src/utils/websocket.ts index 0d5e9ee..7add725 100644 --- a/src/utils/websocket.ts +++ b/src/utils/websocket.ts @@ -20,6 +20,7 @@ import { getToken } from '@/utils/auth'; import useNoticeStore from '@/store/modules/notice'; +import { ElNotification } from 'element-plus'; const { addNotice } = useNoticeStore(); @@ -32,6 +33,9 @@ // 鍒濆鍖杝ocket export const initWebSocket = (url: any) => { + if (import.meta.env.VITE_APP_WEBSOCKET === 'false') { + return; + } socketUrl = url; // 鍒濆鍖� websocket websocket = new WebSocket(url + '?Authorization=Bearer ' + getToken() + '&clientid=' + import.meta.env.VITE_APP_CLIENT_ID); @@ -126,7 +130,12 @@ read: false, time: new Date().toLocaleString() }); - ElMessage.success(e.data); + ElNotification({ + title: '娑堟伅', + message: e.data, + type: 'success', + duration: 3000 + }); return e.data; }; }; -- Gitblit v1.9.3