From 39864dcc835f1e75efd3f20a99d50a7edae4a94f Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期一, 06 十一月 2023 17:59:51 +0800
Subject: [PATCH] Merge branch 'wn' of http://192.168.5.5:10010/r/web/bulletin-board-style1 into dev
---
src/views/dashboard/components/DashboardTitle.vue | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/src/views/dashboard/components/DashboardTitle.vue b/src/views/dashboard/components/DashboardTitle.vue
index 637ef35..015694a 100644
--- a/src/views/dashboard/components/DashboardTitle.vue
+++ b/src/views/dashboard/components/DashboardTitle.vue
@@ -1,29 +1,39 @@
<template>
<div class="dashboard-title">
<div class="title-text">
- 鏅鸿兘宸ヤ綔鍙� 鈥� {{ deviceStore?.deviceInfo?.currentDeviceID ?? '' }}
+ 鏅鸿兘宸ヤ綔鍙� 鈥�
+ <el-popover
+ placement="bottom"
+ :width="200"
+ trigger="click"
+ :content="deviceStore?.deviceInfo?.currentDeviceID ?? ''"
+ >
+ <template #reference>
+ <el-text truncated class="device-name">{{ deviceStore?.deviceInfo?.currentDeviceID ?? '' }}</el-text>
+ </template>
+ </el-popover>
<el-icon size="32" color="#0db7f5" style="margin-left: 20px; cursor: pointer" @click="openDevicesModal">
<IconSlider></IconSlider>
</el-icon>
</div>
<div class="title-status">
<div class="connection-info" @click="openProblemsModal">
- <el-icon size="30" :color="problemsIconStatus ? '#00ff00' : '#ff0000'">
+ <el-icon size="26" :color="problemsIconStatus ? '#00ff00' : '#ff0000'">
<AlertLightIcon></AlertLightIcon>
</el-icon>
</div>
<div class="cloud-connection-status">
- <el-icon v-if="cloudConnectionIconStatus" size="45" color="#00ff00">
+ <el-icon v-if="cloudConnectionIconStatus" size="38" color="#00ff00">
<IconCloudDone></IconCloudDone>
</el-icon>
- <el-icon v-else size="45" color="#ff0000">
+ <el-icon v-else size="38" color="#ff0000">
<IconCloudOff></IconCloudOff>
</el-icon>
</div>
</div>
</div>
- <DeviceCheckList v-model="showDevicesModal" :devices="deviceList"></DeviceCheckList>
+ <DeviceCheckList v-model="showDevicesModal" @should-reload="emits('shouldReload')"></DeviceCheckList>
<TroubleTrackerModal v-model="showProblemsModal" :problems="problemList"></TroubleTrackerModal>
</template>
<script setup lang="ts">
@@ -38,6 +48,10 @@
import { useRequest } from 'vue-hooks-plus'
import { apiGetProblemList } from '@/api'
import { PROBLEMS_POLLING_DURATION } from '@/common/constants'
+
+const emits = defineEmits<{
+ shouldReload: []
+}>()
// 鏄惁鏄剧ず闂璇婃柇modal
const showProblemsModal = ref(false)
@@ -117,10 +131,15 @@
align-items: center;
position: absolute;
top: 16px;
- right: 40px;
+ right: 6px;
}
.connection-info {
margin-right: 10px;
cursor: pointer;
}
+.device-name {
+ max-width: 340px;
+ font-size: 40px;
+ color: #fff;
+}
</style>
--
Gitblit v1.8.0