From 7edce9d027ae6b4b17457baa9bbd900db9b32baf Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 03 三月 2025 15:01:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/CNAS/resourceDemand/device/index.vue | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/index.vue b/src/views/CNAS/resourceDemand/device/index.vue
index 6a23ed4..0720819 100644
--- a/src/views/CNAS/resourceDemand/device/index.vue
+++ b/src/views/CNAS/resourceDemand/device/index.vue
@@ -97,29 +97,37 @@
<!-- <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>
+ <!-- 瀹屾垚鎺ュ彛 -->
<el-tab-pane label="璁惧鎶ュ簾" name="璁惧鎶ュ簾">
<equipment-scrap v-if="tabListActiveName == '璁惧鎶ュ簾'" :clickNodeVal="clickNodeVal" />
</el-tab-pane>
+ <!-- 瀹屾垚鎺ュ彛 -->
<el-tab-pane label="璁惧鏁呴殰涓庣淮淇�" name="璁惧鏁呴殰涓庣淮淇�">
<equipment-failure v-if="tabListActiveName == '璁惧鏁呴殰涓庣淮淇�'" :clickNodeVal="clickNodeVal" />
</el-tab-pane>
+ <!-- 瀹屾垚鎺ュ彛 -->
<el-tab-pane label="璁惧鐐规" name="璁惧鐐规">
<inspection-of-equipment v-if="tabListActiveName == '璁惧鐐规'" :clickNodeVal="clickNodeVal" />
</el-tab-pane>
+ <!-- 瀹屾垚鎺ュ彛 -->
<el-tab-pane label="璁惧浜嬫晠" name="璁惧浜嬫晠">
<equipment-accident v-if="tabListActiveName == '璁惧浜嬫晠'" :clickNodeVal="clickNodeVal" />
</el-tab-pane>
@@ -233,13 +241,13 @@
}
},
nodeOpen(data, node, el) {
- $($(el.$el).find(".node_i")[0]).attr(
- "class",
- "node_i el-icon-folder-opened"
- );
+ // $($(el.$el).find(".node_i")[0]).attr(
+ // "class",
+ // "node_i el-icon-folder-opened"
+ // );
},
nodeClose(data, node, el) {
- $($(el.$el).find(".node_i")[0]).attr("class", "node_i el-icon-folder");
+ // $($(el.$el).find(".node_i")[0]).attr("class", "node_i el-icon-folder");
},
}
};
--
Gitblit v1.9.3