From 6140eb0f56b7adae1d4e41dbd4a1ac582dd17d9b Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 12 三月 2025 11:23:29 +0800
Subject: [PATCH] Merge branch 'dev' of http://114.132.189.42:9002/r/center-lims-before-ruoyi into dev
---
src/views/CNAS/resourceDemand/device/index.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/index.vue b/src/views/CNAS/resourceDemand/device/index.vue
index 8206ced..a12de51 100644
--- a/src/views/CNAS/resourceDemand/device/index.vue
+++ b/src/views/CNAS/resourceDemand/device/index.vue
@@ -47,7 +47,7 @@
<div v-if="!isShowAll" style="height: 100%;">
<el-tabs v-model="tabListActiveName" class="main_right" type="border-card" @tab-click="handleClick">
<el-tab-pane label="璁惧杩愯鎬昏" name="璁惧杩愯鎬昏">
- <operationOverview v-if="tabListActiveName == '璁惧杩愯鎬昏'" :clickNodeVal="clickNodeVal"/>
+ <operationOverview view v-if="tabListActiveName == '璁惧杩愯鎬昏'" :clickNodeVal="clickNodeVal"/>
</el-tab-pane>
<el-tab-pane label="璁惧妗ｆ" name="璁惧妗ｆ">
<files v-if="tabListActiveName == '璁惧妗ｆ'" :clickNodeVal="clickNodeVal" />
@@ -123,7 +123,7 @@
isShowAll: true,
deviceName: "", // 渚ц竟鏍忔悳绱�
loading: false,
- tabListActiveName: '璁惧妗ｆ',
+ tabListActiveName: '璁惧杩愯鎬昏',
menuListActiveName: '璁惧鎬昏',
list: [],
clickNodeVal: {}
@@ -200,7 +200,7 @@
.device-right {
background: #fff;
width: calc(100% - 250px);
- height: calc(100vh - 100px);
+ height: calc(100vh - 40px);
border-radius: 16px;
box-sizing: border-box;
padding: 10px;
--
Gitblit v1.9.3