更新依赖

package.json

@@ -25,7 +25,7 @@
         "dayjs": "^1.11.13",
         "echarts": "^5.5.1",
         "element-plus": "^2.8.1",
-        "hc-vue3-ui": "^4.2.7",
+        "hc-vue3-ui": "^4.2.8",
         "js-base64": "^3.7.7",
         "js-fast-way": "^0.5.6",
         "js-md5": "^0.8.3",

src/layout/index.vue

@@ -86,6 +86,7 @@ const isLayout = ref('')
 onMounted(() => {
     const layout = useRoutes?.query?.layout, layout2 = store.isLayout
     isLayout.value = layout ?? layout2
+    annRefs.value = []
     initButtons()
 })
 
@@ -181,22 +182,25 @@ const cascaderSend = async ({ projectId, contractId }) => {
 }
 
 //长链接消息
+const annRefs = ref([])
 const socketData = async (res) => {
     console.log('socket:', res)
     const { type, data } = getObjValue(res)
     if (type === 'msgUpdateMsg') {
         //更新公告
-        await HcAnnouncement({
+        const ref = await HcAnnouncement({
             type: 'update',
             data: data,
             //time: 'xxx年xx月xx日 xx:xx:xx',
         })
+        annRefs.value.push(ref)
     } else if (type === 'msgSystemMsg') {
         //普通公告
-        await HcAnnouncement({
+        const ref = await HcAnnouncement({
             type: 'system',
             data: data,
         })
+        annRefs.value.push(ref)
     }
 }
 
@@ -216,6 +220,13 @@ const logoClick = () => {
 //页面卸载
 onUnmounted(() => {
     if (!isNullES(socket)) socket.close()
+    const refs = annRefs.value
+    for (let i = 0; i < refs.length; i++) {
+        if (!isNullES(refs[i])) {
+            refs[i]?.close()
+        }
+    }
+    annRefs.value = []
 })
 </script>
 

src/store/modules/user.js

@@ -23,7 +23,7 @@ export const useAppLogin = async (form) => {
     const { error, code, res, msg } = await userLogin(form)
     if (!error && code === 200) {
         const info = await setUserAppInfo(res)
-        return { error: info.error, msg: info.msg }
+        return { error: info.error, msg: info.msg, data: info.res }
     } else {
         return { error: true, msg: msg }
     }
@@ -37,10 +37,10 @@ export const setUserAppInfo = async (res) => {
     store.setUserInfo(res)
     const routerRes = await setRouterData()
     if (routerRes.length <= 0) {
-        return { error: true, msg: '路由异常' }
+        return { error: true, msg: '路由异常', res }
     }
     await initUserConfigInfo()
-    return { error: false, msg: '成功' }
+    return { error: false, msg: '成功', res }
 }
 
 //设置租户信息

src/views/login/index.vue

@@ -150,7 +150,7 @@ const formValidateClick = async () => {
     if (!formRes) return false
     //登录请求
     loading.value = true
-    const { error, msg } = await useAppLogin(formValue.value)
+    const { error, msg, data } = await useAppLogin(formValue.value)
     if (error) {
         loading.value = false
         window?.$message?.error(msg)

yarn.lock

@@ -1987,10 +1987,10 @@ has-flag@^4.0.0:
   resolved "http://39.108.216.210:9000/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-hc-vue3-ui@^4.2.7:
-  version "4.2.7"
-  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-4.2.7.tgz#27225ef46d638fdf6aba3d5205c489c7ee322647"
-  integrity sha512-AD+w6j37FbLcVmbTHuaPmFFD/HvE67HvBg2v10ogsfdEeusmCcfUWgsuNyx9FBW0diOJOIV7MJBbRkdRgEeAkg==
+hc-vue3-ui@^4.2.8:
+  version "4.2.8"
+  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-4.2.8.tgz#c103553e8d7a2f0444a0b048bb686ce1e015540e"
+  integrity sha512-S4VM5PFQQxEw/NCzLjZ2ki8FnrCepebs0mJc2/2PcrUP9cne356Zv/BjRLmkW39bmv7r1QhKcxmgiZe9m0n1PQ==
   dependencies:
     axios "^1.7.5"
     dayjs "^1.11.13"
@@ -2753,9 +2753,9 @@ sortablejs@1.14.0:
   integrity sha512-pBXvQCs5/33fdN1/39pPL0NZF20LeRbLQ5jtnheIPN9JQAaufGjKdWduZn4U7wCtVuzKhmRkI0DFYHYRbB2H1w==
 
 sortablejs@^1.15.1:
-  version "1.15.2"
-  resolved "http://39.108.216.210:9000/sortablejs/-/sortablejs-1.15.2.tgz#4e9f7bda4718bd1838add9f1866ec77169149809"
-  integrity sha512-FJF5jgdfvoKn1MAKSdGs33bIqLi3LmsgVTliuX6iITj834F+JRQZN90Z93yql8h0K2t0RwDPBmxwlbZfDcxNZA==
+  version "1.15.3"
+  resolved "http://39.108.216.210:9000/sortablejs/-/sortablejs-1.15.3.tgz#033668db5ebfb11167d1249ab88e748f27959e29"
+  integrity sha512-zdK3/kwwAK1cJgy1rwl1YtNTbRmc8qW/+vgXf75A7NHag5of4pyI6uK86ktmQETyWRH7IGaE73uZOOBcGxgqZg==
 
 "source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.1, source-map-js@^1.2.0:
   version "1.2.0"