From 57d37b58c2d9e8edbafbad28a6a326fa3eb33721 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期三, 01 十一月 2023 19:40:04 +0800
Subject: [PATCH] Merge branch 'wn' of http://192.168.5.5:10010/r/web/bulletin-board-style1 into dev
---
src/views/dashboard/index.vue | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index fb32de0..fbbaf4b 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -40,9 +40,12 @@
<template #rightBlock2>
<DeviceStatusInfo :device="device" :type="1"></DeviceStatusInfo>
<DeviceStatusInfo :device="device" :type="2"></DeviceStatusInfo>
+ <DeviceNumberInfo></DeviceNumberInfo>
</template>
<template #rightBlock3>
<SubTitle>鐭ヨ瘑搴�</SubTitle>
+ <KnowledgeInfo></KnowledgeInfo>
+ <BigButton class="btn" bg-color="red">绾㈢伅鍛煎彨</BigButton>
</template>
</DashboardLayout>
</template>
@@ -55,6 +58,9 @@
import ProcessInfo from '@/views/dashboard/components/ProcessInfo.vue'
import ColorInfo from '@/views/dashboard/components/ColorInfo.vue'
import DeviceStatusInfo from '@/views/dashboard/components/DeviceStatusInfo.vue'
+import DeviceNumberInfo from '@/views/dashboard/components/DeviceNumberInfo.vue'
+import KnowledgeInfo from '@/views/dashboard/components/KnowledgeInfo.vue'
+import BigButton from '@/views/dashboard/components/BigButton.vue'
import type { LabelValue } from '@/views/dashboard/components/TaskTabs.vue'
import TaskTabs from '@/views/dashboard/components/TaskTabs.vue'
import CurrentDateTime from '@/views/dashboard/components/CurrentDateTime.vue'
@@ -157,4 +163,8 @@
:deep(.el-tabs__nav-wrap::after) {
height: 1px;
}
+.btn {
+ width: 100%;
+ font-size: 20px;
+}
</style>
--
Gitblit v1.8.0