feat: 优化消息提醒

src/layouts/components/Header/components/Message.vue

@@ -62,7 +62,7 @@ const onNewsClick = (item: any) => {
   noticeStore.state.value.notices = newsList.value
   router.push({ path: `/index` }).then(() => {
     nextTick(() => {
-      window.location.reload()
+      // window.location.reload()
     })
   })
 }

src/layouts/index.vue

@@ -5,7 +5,7 @@
 </template>
 
 <script setup lang="ts" name="layout">
-import { computed, type Component } from 'vue'
+import { computed, type Component, onMounted } from 'vue'
 import { LayoutType } from '@/stores/interface'
 import { useGlobalStore } from '@/stores/modules/global'
 import ThemeDrawer from './components/ThemeDrawer/index.vue'
@@ -13,6 +13,14 @@ import LayoutVertical from './LayoutVertical/index.vue'
 import LayoutClassic from './LayoutClassic/index.vue'
 import LayoutTransverse from './LayoutTransverse/index.vue'
 import LayoutColumns from './LayoutColumns/index.vue'
+import { useUserStore } from '@/stores/modules/user'
+import { initWebSocket } from '@/utils/websocket'
+onMounted(() => {
+  const userStore = useUserStore()
+  let protocol = window.location.protocol === 'https:' ? 'wss://' : 'ws://'
+  // initWebSocket(protocol + 'localhost:8089' + '/resource/websocket')
+  initWebSocket(protocol + window.location.host + import.meta.env.VITE_API_URL + '/websocket/message/' + userStore.name)
+})
 const LayoutComponents: Record<LayoutType, Component> = {
   vertical: LayoutVertical,
   classic: LayoutClassic,

src/utils/websocket.ts

@@ -25,7 +25,7 @@ let socketUrl: any = '' // socket地址
 let websocket: any = null // websocket 实例
 let heartTime: any = null // 心跳定时器实例
 let socketHeart = 0 as number // 心跳次数
-const HeartTimeOut = 10000 // 心跳超时时间 10000 = 10s
+const HeartTimeOut = 5000 // 心跳超时时间 10000 = 10s
 let socketError = 0 as number // 错误次数
 // import { getTimeState } from '@/utils'
 // 初始化socket

src/views/login/components/LoginForm.vue

@@ -48,7 +48,7 @@ import type { ElForm } from 'element-plus'
 import { lodashFunc } from '@/utils/common'
 import Cookies from 'js-cookie'
 import { encrypt, decrypt } from '@/utils/jsEncrypt'
-import { initWebSocket } from '@/utils/websocket'
+// import { initWebSocket } from '@/utils/websocket'
 
 const router = useRouter()
 const userStore = useUserStore()
@@ -106,9 +106,9 @@ const handleLogin = (formEl: FormInstance | undefined) => {
           // 4.跳转到首页
           router.push(HOME_URL)
           loading.value = false
-          let protocol = window.location.protocol === 'https:' ? 'wss://' : 'ws://'
-          // initWebSocket(protocol + 'localhost:8089' + '/resource/websocket')
-          initWebSocket(protocol + window.location.host + import.meta.env.VITE_API_URL + '/websocket/message/' + loginForm.username)
+          // let protocol = window.location.protocol === 'https:' ? 'wss://' : 'ws://'
+          // // initWebSocket(protocol + 'localhost:8089' + '/resource/websocket')
+          // initWebSocket(protocol + window.location.host + import.meta.env.VITE_API_URL + '/websocket/message/' + loginForm.username)
         })
         .catch(error => {
           console.log('登录失败', error)

src/views/manage/dataPlayback/index.vue

@@ -61,7 +61,6 @@ const treeFilterData = ref<any>([])
 const getTreeFilter = async () => {
   const { data } = await listAircraftAllApi({})
   treeFilterData.value = data
-  console.log('treeFilterData', treeFilterData.value)
   initParam.aircraftNumber = treeFilterData.value[0].number
 }
 

src/views/manage/orderInfo/index.vue

@@ -30,18 +30,6 @@ import { getOrderConfigByCodeApi } from '@/api/modules/manage/orderConfig'
 import { getDictsApi } from '@/api/modules/system/dictData'
 import { useRouter } from 'vue-router'
 const router = useRouter()
-
-// 跳转执行
-// const toExeDetail = async (row: { id: any; orderType: any; orderCode: any }) => {
-//   if (!row.orderCode) return
-//   const { data } = await getOrderConfigByCodeApi(row.orderCode)
-//   if (!data) {
-//     ElMessage.error('未找到对应的指令配置项，请核对指令配置信息。')
-//     return
-//   }
-//   router.push({ path: `/manage/execution/index/${data.sortie}`, query: { type: row.orderType, orderId: row.id } })
-// }
-
 const toExe = async (row: any) => {
   if (!row.orderCode) return
   const { data } = await getOrderConfigByCodeApi(row.orderCode)
@@ -49,7 +37,6 @@ const toExe = async (row: any) => {
     ElMessage.error('未找到对应的指令配置项，请核对指令配置信息。')
     return
   }
-
   router.push({ path: `/order/task/${data.sortie}`, query: { type: row.orderType, orderId: row.id, taskId: row.orderBatchId } })
 }
 

src/views/manage/sortie/index.vue

@@ -96,7 +96,6 @@ const treeFilterData = ref<any>([])
 const getTreeFilter = async () => {
   const { data } = await listAircraftAllApi({})
   treeFilterData.value = data
-  console.log('treeFilterData', treeFilterData.value)
   initParam.aircraftNumber = treeFilterData.value[0].number
 }