ZaiZai 6 miesięcy temu
rodzic
commit
3860477e30
3 zmienionych plików z 36 dodań i 15 usunięć
  1. 2 2
      package.json
  2. 26 5
      src/layout/index.vue
  3. 8 8
      yarn.lock

+ 2 - 2
package.json

@@ -25,7 +25,7 @@
         "dayjs": "^1.11.13",
         "echarts": "^5.5.1",
         "element-plus": "^2.8.1",
-        "hc-vue3-ui": "^4.2.5",
+        "hc-vue3-ui": "^4.2.7",
         "js-base64": "^3.7.7",
         "js-cookie": "^3.0.5",
         "js-fast-way": "^0.5.6",
@@ -44,7 +44,7 @@
     },
     "devDependencies": {
         "@unocss/eslint-config": "0.58.9",
-        "@vitejs/plugin-vue": "^5.1.2",
+        "@vitejs/plugin-vue": "^5.1.3",
         "@vue/compiler-sfc": "^3.4.38",
         "animate.css": "^4.1.1",
         "archiver": "^7.0.1",

+ 26 - 5
src/layout/index.vue

@@ -53,11 +53,12 @@
 
 <script setup>
 import { nextTick, onMounted, onUnmounted, ref, watch } from 'vue'
-import { useAppStore } from '~src/store'
+import { getObjValue, isNullES, useClick } from 'js-fast-way'
+import { HcSocket } from '~src/plugins/HcSocket'
 import { useRoute, useRouter } from 'vue-router'
+import { useAppStore } from '~src/store'
 import { initButtons } from '~sto/app'
-import { HcSocket } from '~src/plugins/HcSocket'
-import { isNullES, useClick } from 'js-fast-way'
+import { HcAnnouncement } from 'hc-vue3-ui'
 import { useProject } from '~sto/useProject'
 import website from '~src/config'
 
@@ -181,8 +182,8 @@ const cascaderSend = async ({ projectId, contractId }) => {
     //链接webSocket
     if (!isNullES(socket)) socket.close()
     if (!website.localModel) {
-        socket = new HcSocket({ projectId, contractId, userId: userId.value }, ({ data }) => {
-            console.log('socket:', data)
+        socket = new HcSocket({ projectId, contractId, userId: userId.value }, (res) => {
+            socketData(res?.data)
         })
     }
     //本地模式
@@ -193,6 +194,26 @@ const cascaderSend = async ({ projectId, contractId }) => {
     }
 }
 
+//长链接消息
+const socketData = async (res) => {
+    console.log('socket:', res)
+    const { type, data } = getObjValue(res)
+    if (type === 'msgUpdateMsg') {
+        //更新公告
+        await HcAnnouncement({
+            type: 'update',
+            data: data,
+            //time: 'xxx年xx月xx日 xx:xx:xx',
+        })
+    } else if (type === 'msgSystemMsg') {
+        //普通公告
+        await HcAnnouncement({
+            type: 'system',
+            data: data,
+        })
+    }
+}
+
 // 项目切换
 const cascaderChange = () => {
     reloadRouter.value = false

+ 8 - 8
yarn.lock

@@ -1017,10 +1017,10 @@
     fast-glob "^3.3.2"
     magic-string "^0.30.8"
 
-"@vitejs/plugin-vue@^5.1.2":
-  version "5.1.2"
-  resolved "http://39.108.216.210:9000/@vitejs/plugin-vue/-/plugin-vue-5.1.2.tgz#f11091e0130eca6c1ca8cfb85ee71ea53b255d31"
-  integrity sha512-nY9IwH12qeiJqumTCLJLE7IiNx7HZ39cbHaysEUd+Myvbz9KAqd2yq+U01Kab1R/H1BmiyM2ShTYlNH32Fzo3A==
+"@vitejs/plugin-vue@^5.1.3":
+  version "5.1.3"
+  resolved "http://39.108.216.210:9000/@vitejs/plugin-vue/-/plugin-vue-5.1.3.tgz#42b55c1a4d6f329aea25c5a24db51a31db31c693"
+  integrity sha512-3xbWsKEKXYlmX82aOHufFQVnkbMC/v8fLpWwh6hWOUrK5fbbtBh9Q/WWse27BFgSy2/e2c0fz5Scgya9h2GLhw==
 
 "@vue/compiler-core@3.4.38":
   version "3.4.38"
@@ -2053,10 +2053,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.5:
-  version "4.2.5"
-  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-4.2.5.tgz#54ccf63fb1bc35a803baa6183c65524907b81df0"
-  integrity sha512-DgsPg1NvLkb374zgdASKV/2JXG7xq1URgn/+ks8ArVzC86Vw/hT1FbYmf3XwFKbDtV1yIXsICWf2hBbjjSVPXg==
+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==
   dependencies:
     axios "^1.7.5"
     dayjs "^1.11.13"