|
@@ -22,7 +22,15 @@
|
|
|
</div>
|
|
|
<div class="layout-navBars-breadcrumb-user-icon mr10" title="消息通知">
|
|
|
<div class="layout-navBars-breadcrumb-user-icon">
|
|
|
- <el-popover placement="bottom" trigger="click" popper-class="user-news-box" transition="el-zoom-in-top" :width="300" :persistent="false" v-model:visible="newsVisible">
|
|
|
+ <el-popover
|
|
|
+ placement="bottom"
|
|
|
+ trigger="click"
|
|
|
+ popper-class="user-news-box"
|
|
|
+ transition="el-zoom-in-top"
|
|
|
+ :width="300"
|
|
|
+ :persistent="false"
|
|
|
+ v-model:visible="newsVisible"
|
|
|
+ >
|
|
|
<template #reference>
|
|
|
<el-badge :value="messageCount" :max="99" :hidden="messageHidden">
|
|
|
<SvgIcon name="ele-Bell" size="18px" />
|
|
@@ -159,7 +167,7 @@ import { changePwd } from '@/api/login/user';
|
|
|
import { megcount } from '@/api/auxiliary/notice';
|
|
|
import signalR from '@/utils/signalR';
|
|
|
import { ola } from '@/utils/ola_api';
|
|
|
-import {dutyOff} from "@/api/public/wex";
|
|
|
+import { dutyOff } from '@/api/public/wex';
|
|
|
|
|
|
// 引入组件
|
|
|
const UserNews = defineAsyncComponent(() => import('@/layout/navBars/breadcrumb/userNews.vue'));
|
|
@@ -316,6 +324,7 @@ const onLogOut = () => {
|
|
|
type: 'warning',
|
|
|
autofocus: false,
|
|
|
cancelButtonClass: 'default-button',
|
|
|
+ showClose: false,
|
|
|
beforeClose: (action, instance, done) => {
|
|
|
if (action === 'confirm') {
|
|
|
instance.confirmButtonLoading = true;
|
|
@@ -332,21 +341,21 @@ const onLogOut = () => {
|
|
|
},
|
|
|
})
|
|
|
.then(() => {
|
|
|
- dutyOff(); // 呼叫中心签出
|
|
|
- setTimeout(()=>{
|
|
|
- ola.logout(); // 呼叫中心退出登录
|
|
|
- ola.close(); // 呼叫中心关闭
|
|
|
- signalR.leaveGroup('CallCenter'); // 离开呼叫中心组
|
|
|
- signalR.stop(); // 断开链接
|
|
|
- // 重置所有状态
|
|
|
- usetelStatusStore.resetState();
|
|
|
- // 清除缓存/token等
|
|
|
- Local.clear();
|
|
|
- Session.clear();
|
|
|
- Cookie.clear();
|
|
|
- // 使用 reload 时,不需要调用 resetRoute() 重置路由
|
|
|
- window.location.reload();
|
|
|
- },100)
|
|
|
+ dutyOff(); // 呼叫中心签出
|
|
|
+ setTimeout(() => {
|
|
|
+ ola.logout(); // 呼叫中心退出登录
|
|
|
+ ola.close(); // 呼叫中心关闭
|
|
|
+ signalR.leaveGroup('CallCenter'); // 离开呼叫中心组
|
|
|
+ signalR.stop(); // 断开链接
|
|
|
+ // 重置所有状态
|
|
|
+ usetelStatusStore.resetState();
|
|
|
+ // 清除缓存/token等
|
|
|
+ Local.clear();
|
|
|
+ Session.clear();
|
|
|
+ Cookie.clear();
|
|
|
+ // 使用 reload 时,不需要调用 resetRoute() 重置路由
|
|
|
+ window.location.reload();
|
|
|
+ }, 300);
|
|
|
})
|
|
|
.catch(() => {});
|
|
|
return;
|
|
@@ -364,6 +373,7 @@ const onLogOut = () => {
|
|
|
type: 'warning',
|
|
|
autofocus: false,
|
|
|
cancelButtonClass: 'default-button',
|
|
|
+ showClose: false,
|
|
|
beforeClose: (action, instance, done) => {
|
|
|
if (action === 'confirm') {
|
|
|
instance.confirmButtonLoading = true;
|
|
@@ -570,8 +580,8 @@ onMounted(() => {
|
|
|
}
|
|
|
</style>
|
|
|
<style lang="scss">
|
|
|
-.user-news-box{
|
|
|
- height: 400px;
|
|
|
+.user-news-box {
|
|
|
+ height: 400px;
|
|
|
}
|
|
|
.user-info-box {
|
|
|
&-content {
|