From d3793edc9e3479f162c0cab6930d17c919ecacae Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 10 三月 2025 17:12:37 +0800
Subject: [PATCH] 设备搬迁

---
 src/views/CNAS/resourceDemand/device/index.vue |   18 ++++--------------
 1 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/views/CNAS/resourceDemand/device/index.vue b/src/views/CNAS/resourceDemand/device/index.vue
index 0c79ff6..929ed5e 100644
--- a/src/views/CNAS/resourceDemand/device/index.vue
+++ b/src/views/CNAS/resourceDemand/device/index.vue
@@ -34,18 +34,16 @@
       <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>
@@ -55,37 +53,29 @@
             <operationOverview v-if="tabListActiveName == '璁惧杩愯鎬昏'" :clickNodeVal="clickNodeVal"/>
           </el-tab-pane>
           <el-tab-pane label="璁惧妗f" name="璁惧妗f">
-            <!-- 瀹屾垚鎺ュ彛 -->
             <files v-if="tabListActiveName == '璁惧妗f'" :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 +92,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 +106,7 @@
 } from '@/api/cnas/resourceDemand/device.js'
 export default {
   components: {
-    EquipmentAcceptance,
+    checkAndAccept,
     operationOverview,
     files,
     calibration,

--
Gitblit v1.9.3