Browse Source

fix: 接收推送的提示和警告

master
guoapeng 4 days ago
parent
commit
bd6fe7818b
  1. 23
      src/layouts/default.vue

23
src/layouts/default.vue

@ -26,8 +26,8 @@ const homeStore = useHomeStore()
const router = useRouter() const router = useRouter()
onMounted(async () => { onMounted(async () => {
socket.init(receiveMessage, 'alarm')
socket.init(receiveMessage1, 'warn')
socket.init(receiveMessage, 'popup')
socket.init(receiveMessage1, 'toast')
socket.init(receiveMessage2, 'cmd_debug') socket.init(receiveMessage2, 'cmd_debug')
socket.init(receiveMessage2, 'cmd_response') socket.init(receiveMessage2, 'cmd_response')
if (!systemStore.systemStatus.currentUser) { if (!systemStore.systemStatus.currentUser) {
@ -53,19 +53,17 @@ const receiveMessage2 = (data: Socket.cmdData) => {
} }
} }
let flag = false
const receiveMessage1 = (data: any) => { const receiveMessage1 = (data: any) => {
FtMessage.warning(data)
FtMessage[data.level](`${data.code}: ${data.msg}`)
} }
let messageBoxInstance: any = null
const receiveMessage = async (data: any) => { const receiveMessage = async (data: any) => {
if (flag) {
return
if (messageBoxInstance) {
ElMessageBox.close()
} }
flag = true
await ElMessageBox.confirm(
data,
messageBoxInstance = ElMessageBox.confirm(
`${data.code}: ${data.msg}`,
'提示', '提示',
{ {
confirmButtonText: '确认', confirmButtonText: '确认',
@ -73,10 +71,11 @@ const receiveMessage = async (data: any) => {
showCancelButton: false, showCancelButton: false,
closeOnClickModal: false, closeOnClickModal: false,
closeOnPressEscape: false, closeOnPressEscape: false,
type: 'warning',
type: data.level,
}, },
) )
flag = false
await messageBoxInstance
messageBoxInstance = null
} }
watch (() => isClose.value, async (newVal) => { watch (() => isClose.value, async (newVal) => {

Loading…
Cancel
Save