From 8be1cd495fdcbc3a3599e57b7d21c4c186a018ed Mon Sep 17 00:00:00 2001
From: songshankun <songshankun@foxmail.com>
Date: 星期四, 02 十一月 2023 16:56:11 +0800
Subject: [PATCH] Merge branch 'dev' into songshankun/refactor-new-style
---
src/views/dashboard/index.vue | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index c733a51..51c7ff8 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -17,7 +17,10 @@
<el-tab-pane label="宸ヨ壓淇℃伅" name="宸ヨ壓淇℃伅">
<ProcessInfo :process="process"></ProcessInfo>
</el-tab-pane>
- <el-tab-pane label="鐗╂枡娓呭崟" name="鐗╂枡娓呭崟">Role</el-tab-pane>
+ <el-tab-pane label="鐗╂枡娓呭崟" name="鐗╂枡娓呭崟">
+ <InputMaterialsList></InputMaterialsList>
+ <OutputMaterialsList></OutputMaterialsList>
+ </el-tab-pane>
</el-tabs>
</template>
<template #middleBlock3>
@@ -60,6 +63,8 @@
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 InputMaterialsList from '@/views/dashboard/components/InputMaterialsList.vue'
+import OutputMaterialsList from '@/views/dashboard/components/OutputMaterialsList.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'
@@ -146,7 +151,15 @@
justify-content: center;
padding-top: 12px;
}
-
+:deep(.el-tabs) {
+ height: 100%;
+}
+:deep(.el-tab-pane) {
+ height: 100%;
+}
+:deep(.el-tabs__content) {
+ height: calc(100% - 56px);
+}
:deep(.el-tabs__item) {
color: #fff;
font-size: 20px;
--
Gitblit v1.8.0