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 | 43 +++++++++++++++----------------------------
1 files changed, 15 insertions(+), 28 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/index.vue b/src/views/CNAS/resourceDemand/device/index.vue
index 0c79ff6..a12de51 100644
--- a/src/views/CNAS/resourceDemand/device/index.vue
+++ b/src/views/CNAS/resourceDemand/device/index.vue
@@ -4,15 +4,15 @@
<el-input v-model="deviceName" class="div_left_input" clearable placeholder="杈撳叆璁惧鍚嶇О" size="small"
suffix-icon="el-icon-search" @blur="searchFilter" @clear="searchFilter"
@keyup.enter.native="searchFilter"></el-input>
- <el-tree ref="tree" v-loading="loading" :data="list" :expand-on-click-node="false"
- :filter-node-method="filterNode" :props="{ children: 'children', label: 'label' }" highlight-current
- node-key="id" style="height:calc(100vh - 200px);
+ <el-tree :data="list" ref="tree" :props="{ children: 'children', label: 'label' }" node-key="id"
+ @node-click="handleNodeClick" :filter-node-method="filterNode" highlight-current @node-expand="nodeOpen"
+ @node-collapse="nodeClose" v-loading="loading" :expand-on-click-node="false" style="height:calc(100% - 46px);
overflow-y: scroll;
- scrollbar-width: none;" @node-click="handleNodeClick" @node-expand="nodeOpen" @node-collapse="nodeClose">
- <div slot-scope="{ node, data }" class="custom-tree-node">
+ scrollbar-width: none;">
+ <div class="custom-tree-node" slot-scope="{ node, data }">
<el-row style="width: 100%;">
- <el-col :span="24">
- <p class="single-line-ellipsis" style="width: 100%">
+ <el-col :span="21" :title="data.label">
+ <span class="single-line-ellipsis" style="width: 100%;display: inline-block;">
<i :class="`node_i ${data.children != undefined
? data.code === '[1]'
? 'el-icon-folder-opened'
@@ -21,10 +21,7 @@
}`
"></i>
{{ data.label }}
- </p>
- <p>
- {{ data.managementNumber === undefined ? '' : data.managementNumber }}
- </p>
+ </span>
</el-col>
</el-row>
</div>
@@ -34,58 +31,48 @@
<div v-if="isShowAll" style="height: 100%;">
<el-tabs v-model="menuListActiveName" class="main_right" type="border-card">
<el-tab-pane label="璁惧鎬昏" name="璁惧鎬昏">
- <!-- 瀹屾垚鎺ュ彛 -->
<overview v-if="menuListActiveName == '璁惧鎬昏'" :clickNodeVal="clickNodeVal" />
</el-tab-pane>
<el-tab-pane label="璁惧宸ュ叿鏄庣粏" name="璁惧宸ュ叿鏄庣粏">
- <!-- 瀹屾垚鎺ュ彛 -->
<management v-if="menuListActiveName == '璁惧宸ュ叿鏄庣粏'" :clickNodeVal="clickNodeVal" />
</el-tab-pane>
<el-tab-pane label="璧勬簮棰勫畾" name="璧勬簮棰勫畾">
<resourceReservation v-if="menuListActiveName == '璧勬簮棰勫畾'" :clickNodeVal="clickNodeVal"/>
</el-tab-pane>
<el-tab-pane label="浣滀笟鎸囧涔�" name="浣滀笟鎸囧涔�">
- <operationInstruction v-if="tabListActiveName == '浣滀笟鎸囧涔�'" :clickNodeVal="clickNodeVal" />
+ <operationInstruction v-if="menuListActiveName == '浣滀笟鎸囧涔�'" :clickNodeVal="clickNodeVal" />
</el-tab-pane>
</el-tabs>
</div>
<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" />
</el-tab-pane>
<el-tab-pane label="璁惧楠屾敹" name="璁惧楠屾敹">
- <!-- 瀹屾垚鎺ュ彛 -->
- <equipment-acceptance v-if="tabListActiveName == '璁惧楠屾敹'"
- :clickNodeVal="clickNodeVal"></equipment-acceptance>
+ <checkAndAccept v-if="tabListActiveName == '璁惧楠屾敹'" :clickNodeVal="clickNodeVal"/>
</el-tab-pane>
<el-tab-pane label="璁惧鏍″噯" name="璁惧鏍″噯">
- <!-- 瀹屾垚鎺ュ彛 -->
<calibration v-if="tabListActiveName == '璁惧鏍″噯'" :clickNodeVal="clickNodeVal" />
</el-tab-pane>
<el-tab-pane label="璁惧鏍告煡" name="璁惧鏍告煡">
<check v-if="tabListActiveName == '璁惧鏍告煡'" :clickNodeVal="clickNodeVal"/>
</el-tab-pane>
<el-tab-pane label="璁惧缁存姢" name="璁惧缁存姢">
- <!-- 瀹屾垚鎺ュ彛 -->
<maintenance v-if="tabListActiveName == '璁惧缁存姢'" :clickNodeVal="clickNodeVal" />
</el-tab-pane>
<el-tab-pane label="璁惧鍊熺敤" name="璁惧鍊熺敤">
- <!-- 瀹屾垚鎺ュ彛 -->
<borrow v-if="tabListActiveName == '璁惧鍊熺敤'" :clickNodeVal="clickNodeVal" />
</el-tab-pane>
<el-tab-pane label="璁惧鏁呴殰" name="璁惧鏁呴殰">
<fault v-if="tabListActiveName == '璁惧鏁呴殰'" :clickNodeVal="clickNodeVal" />
</el-tab-pane>
- <!-- 瀹屾垚鎺ュ彛 -->
<el-tab-pane label="浣跨敤璁板綍" name="浣跨敤璁板綍">
<record v-if="tabListActiveName == '浣跨敤璁板綍'" :clickNodeVal="clickNodeVal" />
</el-tab-pane>
- <!-- 瀹屾垚鎺ュ彛 -->
<el-tab-pane label="璁惧鍋滅敤/鍚敤" name="璁惧鍋滅敤/鍚敤">
<state v-if="tabListActiveName == '璁惧鍋滅敤/鍚敤'" :clickNodeVal="clickNodeVal" />
</el-tab-pane>
@@ -102,7 +89,7 @@
import operationInstruction from "./component/operationInstruction.vue";
import operationOverview from "./component/operationOverview.vue";
import files from "./component/files.vue";
-import EquipmentAcceptance from "./component/equipmentAcceptance.vue";
+import checkAndAccept from "./component/check-and-accept.vue";
import calibration from "./component/calibration.vue";
import check from "./component/check.vue";
import maintenance from "./component/maintenance.vue";
@@ -116,7 +103,7 @@
} from '@/api/cnas/resourceDemand/device.js'
export default {
components: {
- EquipmentAcceptance,
+ checkAndAccept,
operationOverview,
files,
calibration,
@@ -136,7 +123,7 @@
isShowAll: true,
deviceName: "", // 渚ц竟鏍忔悳绱�
loading: false,
- tabListActiveName: '璁惧妗ｆ',
+ tabListActiveName: '璁惧杩愯鎬昏',
menuListActiveName: '璁惧鎬昏',
list: [],
clickNodeVal: {}
@@ -213,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