From e5454b769d44a34af423bf87ac8a740bf8c20341 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 29 四月 2025 13:25:29 +0800
Subject: [PATCH] Merge branch 'dev' into dev_tides
---
src/views/CNAS/resourceDemand/device/index.vue | 58 +++++++++++++++++++++-------------------------------------
1 files changed, 21 insertions(+), 37 deletions(-)
diff --git a/src/views/CNAS/resourceDemand/device/index.vue b/src/views/CNAS/resourceDemand/device/index.vue
index 6a23ed4..063a9b2 100644
--- a/src/views/CNAS/resourceDemand/device/index.vue
+++ b/src/views/CNAS/resourceDemand/device/index.vue
@@ -34,77 +34,56 @@
<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="璁惧鏍″噯璁″垝">
- <!-- 瀹屾垚鎺ュ彛 -->
<equipment-calibration-plan v-if="menuListActiveName == '璁惧鏍″噯璁″垝'"
:clickNodeVal="clickNodeVal"></equipment-calibration-plan>
</el-tab-pane>
<el-tab-pane label="璁惧鏍告煡璁″垝" name="璁惧鏍告煡璁″垝">
- <!-- 瀹屾垚鎺ュ彛 -->
<equipment-verification-plan v-if="menuListActiveName == '璁惧鏍告煡璁″垝'"
:clickNodeVal="clickNodeVal"></equipment-verification-plan>
</el-tab-pane>
<el-tab-pane label="璁惧淇濆吇璁″垝" name="璁惧淇濆吇璁″垝">
- <!-- 瀹屾垚鎺ュ彛 -->
<equipment-maintenance-plan v-if="menuListActiveName == '璁惧淇濆吇璁″垝'"
:clickNodeVal="clickNodeVal"></equipment-maintenance-plan>
</el-tab-pane>
<el-tab-pane label="閲忓�兼函婧愯鍒�" name="閲忓�兼函婧愯鍒�">
- <!-- 瀹屾垚鎺ュ彛 -->
<quantity-value-traceability-plan v-if="menuListActiveName == '閲忓�兼函婧愯鍒�'"
:clickNodeVal="clickNodeVal"></quantity-value-traceability-plan>
</el-tab-pane>
+ <el-tab-pane label="璁惧浣跨敤鎺堟潈" name="璁惧浣跨敤鎺堟潈">
+ <usage-authorization v-if="menuListActiveName == '璁惧浣跨敤鎺堟潈'"
+ :clickNodeVal="clickNodeVal"></usage-authorization>
+ </el-tab-pane>
<el-tab-pane label="鍒╃敤澶栭儴浠櫒璁惧" name="鍒╃敤澶栭儴浠櫒璁惧">
- <!-- 瀹屾垚鎺ュ彛 -->
- <using-external-instruments v-if="menuListActiveName == '鍒╃敤澶栭儴浠櫒璁惧'"
- :clickNodeVal="clickNodeVal"></using-external-instruments>
+ <using-external-instruments v-if="menuListActiveName == '鍒╃敤澶栭儴浠櫒璁惧'" :clickNodeVal="clickNodeVal"></using-external-instruments>
</el-tab-pane>
<el-tab-pane label="浣跨敤璁板綍" name="浣跨敤璁板綍">
- <!-- 瀹屾垚鎺ュ彛 -->
<record v-if="menuListActiveName == '浣跨敤璁板綍'" :isMenuList="1" />
</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"/>-->
- <!-- </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>
+ <equipment-acceptance v-if="tabListActiveName == '璁惧楠屾敹'" :clickNodeVal="clickNodeVal"></equipment-acceptance>
</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 label="璁惧缁存姢淇濆吇" name="璁惧缁存姢淇濆吇">
+ <equipmentMaintenance 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>
@@ -137,7 +116,6 @@
import files from "./component/files.vue";
import calibration from "./component/calibration.vue";
import check from "./component/check.vue";
-import maintenance from "./component/maintenance.vue";
import borrow from "./component/borrow.vue";
import fault from "./component/fault.vue";
import record from "./component/record.vue";
@@ -156,10 +134,13 @@
import EquipmentMaintenancePlan from "./component/equipmentMaintenancePlan.vue";
import EquipmentAcceptance from "./component/equipmentAcceptance.vue";
import QuantityValueTraceabilityPlan from "./component/quantityValueTraceabilityPlan.vue";
+import equipmentMaintenance from "./component/equipmentMaintenance.vue";
+import usageAuthorization from "./component/usageAuthorization.vue";
import {
treeDevice,
} from '@/api/cnas/resourceDemand/device.js'
export default {
+ name: 'Device',
components: {
QuantityValueTraceabilityPlan,
EquipmentAcceptance,
@@ -175,7 +156,6 @@
files,
calibration,
check,
- maintenance,
borrow,
fault,
record,
@@ -183,7 +163,9 @@
management,
overview,
resourceReservation,
- operationInstruction
+ operationInstruction,
+ equipmentMaintenance,
+ usageAuthorization,
},
data() {
return {
@@ -233,13 +215,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");
},
}
};
@@ -302,6 +284,8 @@
>>>.el-tabs__content {
padding-top: 0;
+ max-height: 95%; /* 鏍规嵁闇�姹傝皟鏁撮珮搴� */
+ overflow-y: auto; /* 鍨傜洿鏂瑰悜瓒呭嚭鏃舵樉绀烘粴鍔ㄦ潯 */
}
>>>.single-line-ellipsis {
--
Gitblit v1.9.3