11

src/layout/index.vue

@@ -208,8 +208,9 @@ const cascaderSend = async ({ projectId, contractId }) => {
 }
 
 //长链接消息
+let annUpdateRef
 const annRefs = ref([])
-const annUpdateRef = ref()
+
 const socketData = async (res) => {
     console.log('socket:', res)
     const { type, data } = getObjValue(res)
@@ -219,7 +220,7 @@ const socketData = async (res) => {
         if (isNullES(data)) return
         await nextTick()
         //系统更新公告，直接替换
-        annUpdateRef.value = await HcAnnouncement({ type: 'update', data: data, time: 'xxx年xx月xx日 xx:xx:xx' })
+        annUpdateRef = await HcAnnouncement({ type: 'update', data: data })
     } else if (type === 'msgSystemMsg') {
         //内容为空时，代表公告已经取消，由于前面已经关闭，所以不再创建
         if (isNullES(data)) {
@@ -260,9 +261,9 @@ const closeAnnFun = () => {
 
 //关闭系统更新公告
 const closeAnnUpdate = () => {
-    if (!annUpdateRef.value) {
-        annUpdateRef.value?.close()
-        annUpdateRef.value = null
+    if (!isNullES(annUpdateRef)) {
+        annUpdateRef.close()
+        annUpdateRef = null
     }
 }