From 60dffa58131cb501480cc95b078ba8ce1ec46a9e Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 14 十二月 2023 09:30:21 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into main-dev
---
web_src/src/layout/UiHeader.vue | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/web_src/src/layout/UiHeader.vue b/web_src/src/layout/UiHeader.vue
index 2cdca02..fdfcb9f 100755
--- a/web_src/src/layout/UiHeader.vue
+++ b/web_src/src/layout/UiHeader.vue
@@ -37,7 +37,6 @@
</template>
<script>
-
import changePasswordDialog from '../components/dialog/changePassword.vue'
import userService from '../components/service/UserService'
import {Notification} from 'element-ui';
@@ -55,18 +54,19 @@
};
},
created() {
- console.log(4444)
console.log(JSON.stringify(userService.getUser()))
if (this.$route.path.startsWith("/channelList")) {
this.activeIndex = "/deviceList"
-
}
},
mounted() {
window.addEventListener('beforeunload', e => this.beforeunloadHandler(e))
- // window.addEventListener('unload', e => this.unloadHandler(e))
this.alarmNotify = this.getAlarmSwitchStatus() === "true";
- this.sseControl();
+
+ // TODO: 姝ゅ寤惰繜杩炴帴 sse, 閬垮厤 sse 杩炴帴鏃� browserId 杩樻湭鐢熸垚, 鍚庣画寰呬紭鍖�
+ setTimeout(() => {
+ this.sseControl()
+ }, 3000);
},
methods: {
loginout() {
@@ -107,10 +107,12 @@
this.sseSource = new EventSource('/api/emit?browserId=' + this.$browserId);
this.sseSource.addEventListener('message', function (evt) {
that.$notify({
- title: '鏀跺埌鎶ヨ淇℃伅',
+ title: '鎶ヨ淇℃伅',
dangerouslyUseHTMLString: true,
message: evt.data,
- type: 'warning'
+ type: 'warning',
+ position: 'bottom-right',
+ duration: 3000
});
console.log("鏀跺埌淇℃伅锛�" + evt.data);
});
--
Gitblit v1.8.0