From 031b4d9a2a6a757571015b1903bb125d414ecb2a Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期四, 02 十一月 2023 13:59:30 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.5.5:10010/r/web/bulletin-board-style1 into wn
---
src/views/dashboard/components/DashboardTitle.vue | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/views/dashboard/components/DashboardTitle.vue b/src/views/dashboard/components/DashboardTitle.vue
index ed14226..d52b218 100644
--- a/src/views/dashboard/components/DashboardTitle.vue
+++ b/src/views/dashboard/components/DashboardTitle.vue
@@ -1,6 +1,6 @@
<template>
<div class="dashboard-title">
- <div class="title-text">鏅鸿兘宸ヤ綔鍙� 鈥� {{ props?.deviceInfo?.currentDeviceID ?? '' }}</div>
+ <div class="title-text">鏅鸿兘宸ヤ綔鍙� 鈥� {{ deviceStore?.devices?.currentDeviceID ?? '' }}</div>
<div class="title-status">
<div class="connection-info" @click="openSelectDeviceModal">
<el-icon size="30" color="red">
@@ -10,14 +10,17 @@
<div class="connection-status"></div>
</div>
</div>
+
+ <TroubleTrackerModal v-model="showModal"></TroubleTrackerModal>
</template>
<script setup lang="ts">
-import type { Devices } from '@/api/device'
import AlertLightIcon from '@/components/icons/AlertLightIcon.vue'
import { ref } from 'vue'
+import { useDevicesStore } from '@/stores/devices'
+import TroubleTrackerModal from '@/views/dashboard/components/TroubleTrackerModal.vue'
export interface DashBoardTitleProps {
- deviceInfo: Devices
+ // deviceInfo: Devices
}
const props = defineProps<DashBoardTitleProps>()
@@ -27,6 +30,10 @@
function openSelectDeviceModal() {
showModal.value = true
}
+
+const deviceStore = useDevicesStore()
+
+deviceStore.getDevicesInfo()
</script>
<style scoped lang="scss">
--
Gitblit v1.8.0