From ddd818f74d59c1fdeeed29714d660d7e49200c04 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 06 三月 2025 15:54:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/eam/EquipmentListOfTester.vue                                                       | 1154 -----
 src/views/eam/EquipmentMaintenancePlanList.vue                                                |    2 
 src/views/eam/EquipmentListOfProduct.vue                                                      | 1150 -----
 src/views/eam/DailyMaintenanceStandard3List.vue                                               |    2 
 src/views/eam/EquipmentListOfTruck.vue                                                        | 1149 -----
 src/views/spare/SparePartOutboundList.vue                                                     |    2 
 src/views/eam/EquipmentListOfAll.vue                                                          |   36 
 src/views/eam/FaultCauseChart.vue                                                             |    2 
 src/views/eam/UnitList.vue                                                                    |    2 
 src/views/eam/DeductionItemList.vue                                                           |    2 
 src/views/eam/modules/equipmentNew/RepairOrderListComponent.vue                               |  840 +++
 src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderModal.vue            |    6 
 src/views/eam/ProcessParametersTemplateList.vue                                               |    2 
 src/views/eam/modules/projectMaintenanceOrder/ProjectMaintenanceOrderForm.vue                 |   21 
 src/views/eam/modules/equipmentNew/EquipmentModal.vue                                         |   10 
 src/views/eam/DocumentTypeList.vue                                                            |    2 
 src/views/eam/InspectionCycleList.vue                                                         |    4 
 src/views/eam/EquipmentChangeList.vue                                                         |    2 
 src/views/eam/MalfunctionRepair.vue                                                           |    2 
 src/views/eam/QuanlityConfirmList.vue                                                         |    2 
 src/views/eam/EquipmentListOfPressureVessel.vue                                               | 1150 -----
 src/views/eam/OperationCertificateList.vue                                                    |    2 
 src/views/eam/DailyInspectionStandardList.vue                                                 |    2 
 src/views/spare/SparePartCancellingStocksList.vue                                             |    2 
 src/views/eam/PrecisionParametersTemplateList.vue                                             |    4 
 src/views/eam/RepairOrderList.vue                                                             |    2 
 src/views/spare/SpartPartRequirement.vue                                                      |    2 
 src/views/eam/OperationCertificateApplyList.vue                                               |    2 
 src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportModal.vue      |    2 
 src/views/eam/EquipmentListAllStandard.vue                                                    |    2 
 src/views/eam/EquipmentUnsealList.vue                                                         |    2 
 src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportList.vue       |    4 
 src/views/eam/PredictiveWorkOrderList.vue                                                     |    2 
 src/components/tools/EquipmentSelection.vue                                                   |    7 
 src/views/eam/ProjectMaintenanceOrderList.vue                                                 |    4 
 src/views/eam/EquipmentListOfRide.vue                                                         | 1155 -----
 src/views/eam/EquipmentListOfWeldingMachine.vue                                               | 1150 -----
 src/views/eam/EquipmentTransferInList.vue                                                     |    2 
 src/views/eam/UploadList.vue                                                                  |    2 
 src/views/eam/SpecialtyMaintenanceStandardList.vue                                            |    2 
 src/views/spare/SparePartScrapList.vue                                                        |    2 
 src/views/spare/SparePartPurchaseStorageList.vue                                              |    2 
 src/views/eam/MaintenanceTypeList.vue                                                         |    2 
 src/views/eam/InspectionReportForms.vue                                                       |    2 
 src/views/eam/EquipmentListOfEnvProEquipment.vue                                              | 1161 -----
 src/views/eam/EquipmentListOfCrane.vue                                                        | 1140 -----
 src/views/eam/ABC/StreamList.vue                                                              |    2 
 src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportDrawerList.vue |    2 
 src/views/eam/SpecialtyMaintenanceOrderList.vue                                               |    2 
 src/views/eam/MTBF.vue                                                                        |    2 
 src/views/eam/PredictiveWorkPlanList.vue                                                      |    2 
 src/views/eam/modules/equipmentNew/EquipmentCalibrationOrderComponent.vue                     |  505 ++
 src/views/eam/MaintenanceSpecialtyList.vue                                                    |    2 
 src/views/eam/EquipmentTransferList.vue                                                       |    2 
 src/views/eam/EquipmentSealList.vue                                                           |    2 
 src/views/eam/EquipmentListOfFilesCarousel.vue                                                | 1154 -----
 src/views/eam/modules/equipment/EquipmentResume/EquipmentResumeDrawer.vue                     |    2 
 src/views/spare/SparePartScrapRequirementList.vue                                             |    2 
 src/views/eam/EquipmentOfLine.vue                                                             |    2 
 src/views/eam/SpecialtyMaintenancePlanList.vue                                                |    2 
 src/views/eam/modules/repairorder/moudles/select/ProjectMaintenanceOrder.vue                  |    1 
 src/views/eam/DailyMaintenanceStandardList.vue                                                |    2 
 src/views/eam/EquipmentCalibrationOrder.vue                                                   |   10 
 src/views/spare/SparePartReceiveList.vue                                                      |    2 
 src/views/eam/EquipmentListOfMetrological.vue                                                 | 1154 -----
 src/views/eam/modules/equipment/EquipmentResume/EquipmentCalibrationRecord.vue                |    6 
 src/views/eam/modules/maintenanceCycle/MaintenanceCycleForm.vue                               |   11 
 src/views/eam/modules/inspectionCycle/InspectionCycleForm.vue                                 |    2 
 src/views/eam/RiskPreventionList.vue                                                          |    2 
 src/views/eam/MaintenanceCycleList.vue                                                        |    4 
 70 files changed, 1,502 insertions(+), 11,576 deletions(-)

diff --git a/src/components/tools/EquipmentSelection.vue b/src/components/tools/EquipmentSelection.vue
index 51208b3..45db249 100644
--- a/src/components/tools/EquipmentSelection.vue
+++ b/src/components/tools/EquipmentSelection.vue
@@ -100,13 +100,6 @@
           ellipsis: true
         },
         {
-          title: '璧勪骇缂栫爜',
-          align: 'center',
-          dataIndex: 'assetNumber',
-          width: 120
-        },
-
-        {
           title: '鐗圭璁惧',
           align: 'center',
           dataIndex: 'specificEquipment_dictText',
diff --git a/src/views/eam/ABC/StreamList.vue b/src/views/eam/ABC/StreamList.vue
index cbe2fbf..7285762 100644
--- a/src/views/eam/ABC/StreamList.vue
+++ b/src/views/eam/ABC/StreamList.vue
@@ -1,6 +1,6 @@
 <template>
   <a-card
-    title='ABC璇勫垎'
+    title=''
     :bordered="false"
   >
     <!-- 鏌ヨ鍖哄煙 -->
diff --git a/src/views/eam/DailyInspectionStandardList.vue b/src/views/eam/DailyInspectionStandardList.vue
index 7eb48de..8473bf0 100644
--- a/src/views/eam/DailyInspectionStandardList.vue
+++ b/src/views/eam/DailyInspectionStandardList.vue
@@ -1,6 +1,6 @@
 <template>
   <a-card
-    title="鑷富缁存姢鐐规鏍囧噯"
+    title=""
     :bordered='false'
   >
     <div class='table-page-search-wrapper'>
diff --git a/src/views/eam/DailyMaintenanceStandard3List.vue b/src/views/eam/DailyMaintenanceStandard3List.vue
index 6b99f7a..33bdd9d 100644
--- a/src/views/eam/DailyMaintenanceStandard3List.vue
+++ b/src/views/eam/DailyMaintenanceStandard3List.vue
@@ -1,6 +1,6 @@
 <template>
   <a-card
-    title="涓夌骇淇濆吇鏍囧噯"
+    title=""
     :bordered='false'
   >
     <div class='table-page-search-wrapper'>
diff --git a/src/views/eam/DailyMaintenanceStandardList.vue b/src/views/eam/DailyMaintenanceStandardList.vue
index 18253ef..4edd32c 100644
--- a/src/views/eam/DailyMaintenanceStandardList.vue
+++ b/src/views/eam/DailyMaintenanceStandardList.vue
@@ -1,6 +1,6 @@
 <template>
   <a-card
-    title="浜岀骇淇濆吇鏍囧噯"
+    title=""
     :bordered='false'
   >
     <div class='table-page-search-wrapper'>
diff --git a/src/views/eam/DeductionItemList.vue b/src/views/eam/DeductionItemList.vue
index 2ab0591..7a39701 100644
--- a/src/views/eam/DeductionItemList.vue
+++ b/src/views/eam/DeductionItemList.vue
@@ -1,6 +1,6 @@
 <template>
   <a-card
-    title="鎿嶄綔璇佺Н鍒嗚鍒�"
+    title=""
     :bordered="false"
   >
     <!-- 鏌ヨ鍖哄煙 -->
diff --git a/src/views/eam/DocumentTypeList.vue b/src/views/eam/DocumentTypeList.vue
index fd2d0bd..bb3022c 100644
--- a/src/views/eam/DocumentTypeList.vue
+++ b/src/views/eam/DocumentTypeList.vue
@@ -1,7 +1,7 @@
 <template>
   <a-card
     :bordered="false"
-    title="鏂囨。绫诲瀷"
+    title=""
   >
     <!-- 鏌ヨ鍖哄煙 -->
     <div class="table-page-search-wrapper">
diff --git a/src/views/eam/EquipmentCalibrationOrder.vue b/src/views/eam/EquipmentCalibrationOrder.vue
index 5b7d464..613fc4a 100644
--- a/src/views/eam/EquipmentCalibrationOrder.vue
+++ b/src/views/eam/EquipmentCalibrationOrder.vue
@@ -1,7 +1,7 @@
 <template>
   <a-card
     :bordered='false'
-    title='鎶�鏈姸鎬侀壌瀹氱鐞�'
+    title=''
   >
     <!-- 鏌ヨ鍖哄煙 -->
     <div class='table-page-search-wrapper'>
@@ -46,7 +46,7 @@
                 icon='search'
               >鏌ヨ</a-button>
               <a-button
-                type='primary'
+                type='info'
                 @click='searchReset'
                 icon='reload'
                 style='margin-left: 8px'
@@ -239,7 +239,7 @@
 
         <a-tab-pane
           key='2'
-          tab='妫�瀹氭姤鍛�'
+          tab='閴村畾鎶ュ憡'
         >
           <equipment-calibration-order-report-list
             ref='EquipmentCalibrationOrderReportList'
@@ -480,7 +480,7 @@
 
     handleOrderExe(record) {
       this.$refs.EquipmentCalibrationOrderExeDrawer.visible = true
-      this.$refs.EquipmentCalibrationOrderExeDrawer.title = '妫�瀹氬伐鍗曟墽琛�'
+      this.$refs.EquipmentCalibrationOrderExeDrawer.title = '閴村畾宸ュ崟鎵ц'
       this.$refs.EquipmentCalibrationOrderExeDrawer.handleShow(record)
       if (record.status === '4') {
         this.$refs.EquipmentCalibrationOrderExeDrawer.buttonDistable = true//淇濆瓨銆佹殏瀛樸�佹姤宸�
@@ -534,7 +534,7 @@
     // 鐩存帴涓婁紶閴村畾鎶ュ憡
     handleAddOrderReport: function (record) {
       this.$refs.equipmentCalibrationOrderReportModal.add(record.id)
-      this.$refs.equipmentCalibrationOrderReportModal.title = '涓婁紶妫�瀹氭姤鍛�'
+      this.$refs.equipmentCalibrationOrderReportModal.title = '涓婁紶閴村畾鎶ュ憡'
       this.$refs.equipmentCalibrationOrderReportModal.disableSubmit = false
     },
     handleFinal(record) {
diff --git a/src/views/eam/EquipmentChangeList.vue b/src/views/eam/EquipmentChangeList.vue
index 5b05dac..7664c5d 100644
--- a/src/views/eam/EquipmentChangeList.vue
+++ b/src/views/eam/EquipmentChangeList.vue
@@ -1,6 +1,6 @@
 <template>
   <a-card
-    title='璁惧鍙樺姩'
+    title=''
     :bordered='false'
   >
     <div class='table-page-search-wrapper'>
diff --git a/src/views/eam/EquipmentListAllStandard.vue b/src/views/eam/EquipmentListAllStandard.vue
index da5ad14..14b4680 100644
--- a/src/views/eam/EquipmentListAllStandard.vue
+++ b/src/views/eam/EquipmentListAllStandard.vue
@@ -1,7 +1,7 @@
 <template>
   <a-card
     :bordered="false"
-    title="璁惧鍙拌处-淇濆吇鏍囧噯"
+    title=""
   >
     <!-- 鏌ヨ鍖哄煙 -->
     <div class="table-page-search-wrapper">
diff --git a/src/views/eam/EquipmentListOfAll.vue b/src/views/eam/EquipmentListOfAll.vue
index 490cde8..de4d6d5 100644
--- a/src/views/eam/EquipmentListOfAll.vue
+++ b/src/views/eam/EquipmentListOfAll.vue
@@ -39,7 +39,7 @@
               :wrapperCol="wrapperCol"
             >
               <j-dict-select-tag
-                dictCode="mom_eam_equipment_category,name,id,del_flag!='1'"
+                :dictCode="caytegoryParam==='all'?'mom_eam_equipment_category,name,id,del_flag!=\'1\'':'mom_eam_equipment_category,name,id,equipment_category_uda1 = '+'\''+caytegoryParam+'\''"
                 placeholder="璇疯緭鍏ユ悳绱㈡潯浠跺苟閫夋嫨"
                 v-model="queryParam.equipmentCategoryId"
               />
@@ -764,6 +764,18 @@
       >
         <daily3-maintenance-order-list-component :mainId="selectedMainId"></daily3-maintenance-order-list-component>
       </a-tab-pane>
+      <a-tab-pane
+        tab="缁翠慨宸ュ崟"
+        key="13"
+      >
+        <repair-order-list-component :mainId="selectedMainId"></repair-order-list-component>
+      </a-tab-pane>
+      <a-tab-pane
+        tab="鎶�鏈姸鎬侀壌瀹�"
+        key="14"
+      >
+        <equipment-calibration-order-component :mainId="selectedMainId"></equipment-calibration-order-component>
+      </a-tab-pane>
     </a-tabs>
     <equipment-modal
       ref="modalForm"
@@ -823,6 +835,8 @@
 import DailyInspectionOrderListComponent from './modules/equipmentNew/DailyInspectionOrderListComponent.vue'
 import DailyMaintenanceOrderListComponent from './modules/equipmentNew/DailyMaintenanceOrderListComponent.vue'
 import Daily3MaintenanceOrderListComponent from './modules/equipmentNew/Daily3MaintenanceOrderListComponent.vue'
+import RepairOrderListComponent from './modules/equipmentNew/RepairOrderListComponent.vue'
+import EquipmentCalibrationOrderComponent from './modules/equipmentNew/EquipmentCalibrationOrderComponent.vue'
 
 export default {
   name: "EquipmentList",
@@ -852,11 +866,19 @@
     DailyInspectionOrderListComponent,
     DailyMaintenanceOrderListComponent,
     Daily3MaintenanceOrderListComponent,
+    RepairOrderListComponent,
+    EquipmentCalibrationOrderComponent,
+  },
+  props: {
+    caytegoryParam: {
+      type: String,
+      default: 'all',
+      required: true,
+    },
   },
   data() {
     return {
       description: '璁惧鍙拌处绠$悊椤甸潰',
-      caytegoryParam: 'all',
       // 琛ㄥご
       columns: [
         {
@@ -1275,7 +1297,10 @@
         this.ipagination.current = 1;
       }
       this.onClearSelected()
-      var params = this.getQueryParams();//鏌ヨ鏉′欢
+      if(this.caytegoryParam !== 'all') {
+        this.queryParam.equipmentCategoryUda1 = this.caytegoryParam;
+      }
+      let params = this.getQueryParams();//鏌ヨ鏉′欢
       this.loading = true;
       getAction(this.url.list, params).then((res) => {
         if (res.success) {
@@ -1418,6 +1443,11 @@
               }
             })
           }
+          else {
+            this.$message.warning('鏈煡璇㈠埌鏈夋晥妯℃澘')
+          }
+        } else {
+          this.$message.warning('鏈煡璇㈠埌鏈夋晥妯℃澘')
         }
       })
     },
diff --git a/src/views/eam/EquipmentListOfCrane.vue b/src/views/eam/EquipmentListOfCrane.vue
index 1c4d03b..b7226a0 100644
--- a/src/views/eam/EquipmentListOfCrane.vue
+++ b/src/views/eam/EquipmentListOfCrane.vue
@@ -1,1154 +1,22 @@
 <template>
-  <a-card
-    :bordered="false"
-    title="璧烽噸璁惧"
-  >
-    <!-- 鏌ヨ鍖哄煙 -->
-    <div class="table-page-search-wrapper">
-      <a-form
-        layout="inline"
-        @keyup.enter.native="searchQuery"
-      >
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-item
-              label="璁惧鎵�灞炲垎绫�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                :dictCode="'mom_eam_equipment_category,name,id,equipment_category_uda1='+'\''+caytegoryParam+'\''"
-                placeholder="璇疯緭鍏ユ悳绱㈡潯浠跺苟閫夋嫨"
-                v-model="queryParam.equipmentCategoryId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="缁熶竴缂栫爜"
-            >
-              <a-input
-                placeholder="璇疯緭鍏ヨ澶囩粺涓�缂栫爜鏌ヨ"
-                v-model="queryParam.num"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="璁惧鍚嶇О"
-            >
-              <a-input
-                placeholder="璇疯緭鍏ヨ澶囧悕绉版煡璇�"
-                v-model="queryParam.name"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鍨嬪彿"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <a-input
-                v-model="queryParam.model"
-                placeholder="璇疯緭鍏ュ瀷鍙�"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-item
-              label="宸ュ尯"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨宸ュ尯"
-                :triggerChange="true"
-                dictCode="mom_base_area,name,id,del_flag!='1'"
-                v-model="queryParam.factoryModelId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="缁存姢閮ㄩ棬"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <!-- <a-tree-select
-                style="width: 100%"
-                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-                :tree-data="treeData"
-                placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
-                tree-default-expand-all
-                v-model="queryParam.manageId"
-              /> -->
-              <j-dict-select-tag
-                dictCode="sys_depart,depart_name,id"
-                placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
-                v-model="queryParam.manageId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="浣跨敤閮ㄩ棬"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <!-- <a-tree-select
-                style="width: 100%"
-                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-                :tree-data="treeData"
-                placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
-                tree-default-expand-all
-                v-model="queryParam.useId"
-              /> -->
-              <j-dict-select-tag
-                dictCode="sys_depart,depart_name,id"
-                placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
-                v-model="queryParam.useId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鏄惁鐢熶骇绾胯澶�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨"
-                :triggerChange="true"
-                dictCode="is_product"
-                v-model="queryParam.isLineEquip"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-item
-              label="ABC鏍囪瘑"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨ABC鏍囪瘑"
-                :triggerChange="true"
-                dictCode="ABC-standard-result"
-                v-model="queryParam.equipmentImportanceId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鎶�鏈姸鎬�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨鎶�鏈姸鎬�"
-                :triggerChange="true"
-                dictCode="technology_status"
-                v-model="queryParam.technologyStatus"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="璁惧鐘舵��"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨璁惧鐘舵��"
-                :triggerChange="true"
-                dictCode="equipment_status"
-                v-model="queryParam.equipmentStatus"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鍏抽敭璁惧鏍囪瘑"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                :triggerChange="true"
-                placeholder="璇烽�夋嫨鍏抽敭璁惧鏍囪瘑"
-                dictCode="specific_equipment"
-                v-model="queryParam.specificEquipment"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-model-item
-              label="璐ㄤ繚寮�濮嬫棩鏈�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-date
-                style="width: 100%;"
-                placeholder="璇烽�夋嫨寮�濮嬫棩鏈�"
-                class="query-group-cust"
-                v-model="queryParam.warrantyStart"
-              ></j-date>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-model-item
-              label="璐ㄤ繚缁撴潫鏃ユ湡"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-date
-                style="width: 100%;"
-                placeholder="璇烽�夋嫨缁撴潫鏃ユ湡"
-                class="query-group-cust"
-                v-model="queryParam.warrantyEnd"
-              ></j-date>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="缁翠慨鐝粍"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨缁翠慨鐝粍"
-                :triggerChange="true"
-                dictCode="mom_base_team,name,id,del_flag!='1'"
-                v-model="queryParam.teamId"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 鏌ヨ鍖哄煙-END -->
-
-    <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
-    <div class="table-operator">
-      <a-button
-        type="primary"
-        @click="searchQuery"
-        icon="search"
-      >鏌ヨ</a-button>
-      <a-button
-        @click="searchReset"
-        icon="reload"
-      >閲嶇疆</a-button>
-      <a-button
-        @click="handleAdd"
-        type="primary"
-        icon="plus"
-        v-has="'equipmentAccount:add&delete&import&Edit'"
-      >鏂板</a-button>
-      <a-button
-        type="primary"
-        icon="download"
-        @click="handleExportXls('璁惧鍙拌处')"
-        v-has="'equipmentAccount:outport'"
-      >瀵煎嚭</a-button>
-      <a-upload
-        name="file"
-        :showUploadList="false"
-        :multiple="false"
-        :headers="tokenHeader"
-        :action="importExcelUrl"
-        @change="handleImportExcel"
-      >
-        <a-button
-          type="primary"
-          icon="import"
-          v-has="'equipmentAccount:add&delete&import&Edit'"
-        >瀵煎叆</a-button>
-      </a-upload>
-      <a-button
-        :disabled="selectedRowKeys.length==0"
-        @click="handleUpdateABC"
-        type="primary"
-        icon="font-colors"
-        v-has="'equipmentAccount:add&delete&import&Edit'"
-      >ABC鏍囪瘑鍙樻洿</a-button>
-      <a-button
-        :disabled="selectedRowKeys.length==0"
-        @click="handleUpdateWarranty"
-        type="primary"
-        icon="calendar"
-        v-has="'equipmentAccount:add&delete&import&Edit'"
-      >璐ㄤ繚鏈熷彉鏇�</a-button>
-    </div>
-    <!-- table鍖哄煙-begin -->
-    <div>
-      <div
-        class="ant-alert ant-alert-info"
-        style="margin-bottom: 16px;"
-      >
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
-        <a
-          style="margin-left: 24px"
-          @click="onClearSelected"
-        >娓呯┖</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :scroll="{x:true}"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'checkbox'}"
-        :customRow="clickThenSelect"
-        @change="handleTableChange"
-      >
-        <!-- 鐐瑰嚮鎶�鏈姸鎬佸垪锛岃烦杞埌鎶�鏈姸鎬侀壌瀹氶〉闈� -->
-        <template
-          slot="technologyStatus"
-          slot-scope="text,record"
-        >
-          <a
-            href="javascript:eam/EquipmentCalibrationOrder;"
-            @click="handleTechnologyStatus(record)"
-          >{{record.technologyStatus_dictText}}</a>
-        </template>
-        <template
-          slot="htmlSlot"
-          slot-scope="text"
-        >
-          <div v-html="text"></div>
-        </template>
-        <template
-          slot="imgSlot"
-          slot-scope="text,record"
-        >
-          <span
-            v-if="!text"
-            style="font-size: 12px;font-style: italic;"
-          >鏃犲浘鐗�</span>
-          <img
-            v-else
-            :src="getImgView(text)"
-            :preview="record.id"
-            height="25px"
-            alt=""
-            style="max-width:80px;font-size: 12px;font-style: italic;"
-          />
-        </template>
-        <template
-          slot="fileSlot"
-          slot-scope="text"
-        >
-          <span
-            v-if="!text"
-            style="font-size: 12px;font-style: italic;"
-          >鏃犳枃浠�</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)"
-          >
-            涓嬭浇
-          </a-button>
-        </template>
-
-        <!--宸ヨ壓鍙傛暟涓�у睍绀�-->
-        <span
-          slot="processParameters"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.processParameters==1"
-            status="success"
-          />
-          <span
-            v-if="record.processParameters==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.processParameters==0"
-            status="error"
-          />
-          <span
-            v-if="record.processParameters==0"
-            class="error"
-          >鍚�</span>
-        </span>
-        <span
-          slot="processParameters"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.processParameters==1"
-            status="success"
-          />
-          <span
-            v-if="record.processParameters==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.processParameters==0"
-            status="error"
-          />
-          <span
-            v-if="record.processParameters==0"
-            class="error"
-          >鍚�</span>
-        </span>
-        <span
-          slot="precisionParameters"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.precisionParameters==1"
-            status="success"
-          />
-          <span
-            v-if="record.precisionParameters==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.precisionParameters==0"
-            status="error"
-          />
-          <span
-            v-if="record.precisionParameters==0"
-            class="error"
-          >鍚�</span>
-        </span>
-        <span
-          slot="verification"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.verification==1"
-            status="success"
-          />
-          <span
-            v-if="record.verification==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.verification==0"
-            status="error"
-          />
-          <span
-            v-if="record.verification==0"
-            class="error"
-          >鍚�</span>
-        </span>
-
-        <span
-          slot="name"
-          slot-scope="text"
-        >
-          <j-ellipsis
-            :value="text"
-            :length="8"
-          />
-        </span>
-
-        <template
-          slot="num"
-          slot-scope="text,record"
-        >
-          <a
-            href="javascript:;"
-            @click="handleDetail(record)"
-          >{{record.num}}</a>
-        </template>
-
-        <span
-          slot="action"
-          slot-scope="text, record"
-        >
-          <!-- class="table-operation" -->
-          <!-- <a
-          href="javascript:;"
-          @click="equipmentStructuresShow(record)"
-        >璁惧缁撴瀯</a>
-        <a-divider type="vertical" /> -->
-          <a
-            href="javascript:;"
-            @click='handleDetail(record)'
-          >璇︽儏</a>
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">
-              鏇村
-              <a-icon type="down" />
-            </a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="equipmentResumeShow(record)">璁惧灞ュ巻</a>
-              </a-menu-item>
-              <a-menu-item
-                v-has="'accountSons:add&edit&delete&submit'"
-                v-if="record.processParameters==1"
-              >
-                <a @click="editProcess(record)">宸ヨ壓鍙傛暟缁存姢</a>
-              </a-menu-item>
-              <a-menu-item
-                v-has="'accountSons:add&edit&delete&submit'"
-                v-if="record.precisionParameters==1"
-              >
-                <a @click="editPrecision(record)">绮惧害鍙傛暟缁存姢</a>
-              </a-menu-item>
-              <a-menu-item v-has="'equipmentAccount:add&delete&import&Edit'">
-                <a @click="handleEdit(record)">缂栬緫</a>
-              </a-menu-item>
-              <a-menu-item v-has="'equipmentAccount:add&delete&import&Edit'">
-                <a @click="handleEditSpareParts(record)">缂栬緫澶囦欢</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm
-                  title="纭畾鍒犻櫎鍚�?"
-                  @confirm="() => handleDelete(record.id)"
-                  v-has="'equipmentAccount:add&delete&import&Edit'"
-                >
-                  <a>鍒犻櫎</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-      </a-table>
-    </div>
-    <equipment-resume-drawer
-      ref="EquipmentResumeDrawer"
-      @ok="modalFormOk"
-    ></equipment-resume-drawer>
-
-    <a-tabs defaultActiveKey="1">
-      <a-tab-pane
-        tab="宸ヨ壓鍙傛暟"
-        key="1"
-      >
-        <EquipmentProcessParametersList
-          :mainId="selectedMainId"
-          :isOpen="isOpenProcess"
-        />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="璁惧绮惧害"
-        key="2"
-        forceRender
-      >
-        <EquipmentPrecisionParametersList
-          :isOpen="isOpenPrecision"
-          :mainId="precisionParametersTemplateId"
-        />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="璁惧鏂囨。"
-        key="3"
-        forceRender
-      >
-        <EquipmentDocumentList :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="澶囦欢"
-        key="4"
-        forceRender
-      >
-        <EquipmentSpareParts :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="ABC鏍囪瘑鍙樻洿璁板綍"
-        key="5"
-        forceRender
-      >
-        <equipment-update-ABC-list :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="璐ㄤ繚鏈熷彉鏇�"
-        key="6"
-        forceRender
-      >
-        <equipment-update-warranty-list :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="鏃ヤ繚鏍囧噯"
-        key="7"
-        forceRender
-      >
-        <daily-maintenance-list :mainId="selectedMainId"></daily-maintenance-list>
-      </a-tab-pane>
-      <a-tab-pane
-        tab="浜屼繚鏍囧噯"
-        key="8"
-        forceRender
-      >
-        <second-maintenance-list :mainId="selectedMainId"></second-maintenance-list>
-      </a-tab-pane>
-      <a-tab-pane
-        tab="涓変繚鏍囧噯"
-        key="9"
-        forceRender
-      >
-        <third-maintenance-list :mainId="selectedMainId"></third-maintenance-list>
-      </a-tab-pane>
-    </a-tabs>
-    <equipment-modal
-      ref="modalForm"
-      @ok="modalFormOk"
-      :caytegoryParam="caytegoryParam"
-    ></equipment-modal>
-    <process-edit-model ref="processEditModel"></process-edit-model>
-    <precision-edit-model ref="precisionEditModel"></precision-edit-model>
-    <aBC-update-edit-model
-      @ok="modalFormOk"
-      :updateList="selectionRows"
-      ref="updateABC"
-    ></aBC-update-edit-model>
-    <warranty-update-model
-      :updateList="selectionRows"
-      ref="updateWarranty"
-    ></warranty-update-model>
-    <EquipmentSparePartsModal
-      ref="modalFormSpareParts"
-      @ok="modalFormOk"
-    />
-  </a-card>
+  <equipment-list-of-all :caytegoryParam="caytegoryParam"></equipment-list-of-all>
 </template>
 
 <script>
 
-import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-import { mixinDevice } from '@/utils/mixin'
-import EquipmentModal from './modules/equipmentNew/EquipmentModal'
-import { getAction } from '@/api/manage'
-import EquipmentProcessParametersList from './modules/equipmentNew/EquipmentProcessParametersList'
-import EquipmentDocumentList from './modules/equipmentNew/EquipmentDocumentList'
-import EquipmentPrecisionParametersList from './modules/equipmentNew/EquipmentPrecisionParametersList'
-import '@/assets/less/TableExpand.less'
-import EquipmentResumeDrawer from './modules/equipmentNew/EquipmentResume/EquipmentResumeDrawer'
-import JSearchSelectTag from '../../components/dict/JSearchSelectTag.vue'
-import ProcessEditModel from './modules/equipmentNew/edit/ProcessEditModel.vue'
-import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
-import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
-import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
-import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
-import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
-import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts'
-import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
-import StandardOfInspection from './modules/equipmentNew/StandardOfInspection.vue'
-import StandardOfMaintenance from './modules/equipmentNew/StandardOfMaintenance.vue'
-import DailyMaintenanceList from './modules/equipmentNew/DailyMaintenanceList.vue'
-import SecondMaintenanceList from './modules/equipmentNew/SecondMaintenanceList.vue'
-import ThirdMaintenanceList from './modules/equipmentNew/ThirdMaintenanceList.vue'
-import JEllipsis from '@/components/jeecg/JEllipsis'
+import EquipmentListOfAll from './EquipmentListOfAll.vue'
+
 export default {
   name: "EquipmentList",
-  mixins: [JeecgListMixin, mixinDevice],
   components: {
-    EquipmentProcessParametersList,
-    EquipmentDocumentList,
-    EquipmentPrecisionParametersList,
-    EquipmentModal,
-    EquipmentResumeDrawer,
-    JSearchSelectTag,
-    ProcessEditModel,
-    PrecisionEditModel,
-    EquipmentUpdateABCList,
-    EquipmentUpdateWarrantyList,
-    ABCUpdateEditModel,
-    WarrantyUpdateModel,
-    EquipmentSpareParts,
-    EquipmentSparePartsModal,
-    StandardOfInspection,
-    StandardOfMaintenance,
-    DailyMaintenanceList,
-    SecondMaintenanceList,
-    ThirdMaintenanceList,
-    JEllipsis
+    EquipmentListOfAll,
   },
   data() {
     return {
       description: '璁惧鍙拌处绠$悊椤甸潰',
       caytegoryParam: 'crane',
-      // 琛ㄥご
-      columns: [
-        {
-          title: '#',
-          dataIndex: '',
-          key: 'rowIndex',
-          align: 'center',
-          customRender: function (t, r, index) {
-            return parseInt(index) + 1
-          },
-          width: 50,
-        },
-        {
-          title: '璁惧绫诲瀷',
-          align: "center",
-          dataIndex: 'equipmentCategoryId_dictText',
-        },
-        {
-          title: '鏄惁鐢熶骇绾胯澶�',
-          align: "center",
-          dataIndex: 'isLineEquip_dictText',
-        },
-        {
-          title: '鍏抽敭璁惧鏍囪瘑',
-          align: "center",
-          dataIndex: 'specificEquipment_dictText',
-        },
-        {
-          title: '缁熶竴缂栫爜',
-          align: "center",
-          dataIndex: 'num',
-          scopedSlots: { customRender: 'num' },
-        },
-        {
-          title: '璁惧鍚嶇О',
-          align: "center",
-          dataIndex: 'name',
-          scopedSlots: { customRender: 'name' },
-        },
-        {
-          title: '鍨嬪彿',
-          align: "center",
-          dataIndex: 'model',
-        },
-        {
-          title: '瑙勬牸',
-          align: "center",
-          dataIndex: 'specification',
-        },
-        {
-          title: '鎬诲姛鐜�',
-          align: "center",
-          dataIndex: 'gpo',
-        },
-        // {
-        //   title: '浣跨敤閮ㄩ棬',
-        //   align: "center",
-        //   dataIndex: 'useId_dictText',
-        // },
-        // {
-        //   title: '缁存姢閮ㄩ棬',
-        //   align: "center",
-        //   dataIndex: 'manageId_dictText',
-        // },
-        {
-          title: '缁翠慨鐝粍',
-          align: "center",
-          dataIndex: 'teamId_dictText',
-        },
-        {
-          title: 'ABC鏍囪瘑',
-          align: "center",
-          dataIndex: 'equipmentImportanceId',
-        },
-        // {
-        //   title: '鍏抽敭璁惧鏍囪瘑',
-        //   align: "center",
-        //   dataIndex: 'specificEquipment_dictText',
-        // },
-        {
-          title: '鎶�鏈姸鎬�',
-          align: "center",
-          dataIndex: 'technologyStatus_dictText',
-          scopedSlots: { customRender: 'technologyStatus' },
-        },
-        {
-          title: '鎶�鏈姸鎬侀壌瀹氱被鍨�',
-          align: "center",
-          dataIndex: 'technologyStatusVerificationType_dictText',
-        },
-        {
-          title: '涓嬫鎶�鏈姸鎬侀壌瀹氭椂闂�',
-          align: "center",
-          dataIndex: 'nextTechnologyStatusQualificationTime',
-        },
-        {
-          title: '鐢熶骇绾跨紪鍙�',
-          align: "center",
-          dataIndex: 'lineId_dictText',
-        },
-        {
-          title: '涓昏澶�?',
-          align: "center",
-          dataIndex: 'isMeta_dictText',
-        },
-        // {
-        //   title: '宸ュ尯',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda1',
-        // },
-        // {
-        //   title: '瀹夊叏閰嶇疆',
-        //   align: "center",
-        //   dataIndex: 'securityConfiguration',
-        // },
-        // {
-        //   title: '鍐峰嵈绯荤粺',
-        //   align: "center",
-        //   dataIndex: 'coolingSystem',
-        // },
-        // {
-        //   title: '鐏伀鍣�',
-        //   align: "center",
-        //   dataIndex: 'fireExtinguisher',
-        // },
-
-        // {
-        //   title: '鐏伀鍣ㄦ湁鏁堟湡',
-        //   align: "center",
-        //   dataIndex: 'fireExtinguisherValidityPeriod',
-        // },
-        // {
-        //   title: '鎿嶄綔绯荤粺',
-        //   align: "center",
-        //   dataIndex: 'operatingSystem',
-        // },
-        // {
-        //   title: '绯荤粺',
-        //   align: "center",
-        //   dataIndex: 'system',
-        // },
-        // {
-        //   title: '璁惧绔彛',
-        //   align: "center",
-        //   dataIndex: 'port',
-        // },
-        // {
-        //   title: '鍧愭爣鏁伴噺',
-        //   align: "center",
-        //   dataIndex: 'coordinateNum',
-        // },
-        // {
-        //   title: '璁惧鐘舵��',
-        //   align: "center",
-        //   dataIndex: 'equipmentStatus_dictText',
-        // },
-        // {
-        //   title: '閲嶉噺',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda3',
-        // },
-        // {
-        //   title: '閲嶉噺璁¢噺鍗曚綅',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda4_dictText',
-        // },
-        // {
-        //   title: '鍔熻兘浣嶇疆',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda5',
-        // },
-        // {
-        //   title: '瀹夎浣嶇疆',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda2',
-        // },
-        // {
-        //   title: '鍑哄巶鏃ユ湡',
-        //   align: "center",
-        //   dataIndex: 'leaveFactoryDate',
-        // },
-        // {
-        //   title: '绔嬮」鍗″彿',
-        //   align: "center",
-        //   dataIndex: 'projectApprovalNo',
-        // },
-        // {
-        //   title: '璧勯噾鏉ユ簮',
-        //   align: "center",
-        //   dataIndex: 'fundSource',
-        // },
-        // {
-        //   title: '楠屾敹鏃ユ湡',
-        //   align: "center",
-        //   dataIndex: 'acceptanceCheckDate',
-        // },
-        // {
-        //   title: '鍑哄巶缂栧彿',
-        //   align: "center",
-        //   dataIndex: 'factoryNo',
-        // },
-        // {
-        //   title: '璧勪骇鍒堕�犲晢',
-        //   align: "center",
-        //   dataIndex: 'constructorId_dictText',
-        // },
-        // {
-        //   title: '璧勪骇鐨勬潵婧愬浗瀹�',
-        //   align: "center",
-        //   dataIndex: 'sourceCountry',
-        // }, 
-        {
-          title: '宸ヨ壓鍙傛暟绠$悊',
-          align: "center",
-          dataIndex: 'processParameters',
-          scopedSlots: { customRender: 'processParameters' },
-        },
-        {
-          title: '宸ヨ壓鍙傛暟妯℃澘',
-          align: "center",
-          dataIndex: 'processParametersTemplateId_dictText',
-        },
-        {
-          title: '璁惧绮惧害绠$悊',
-          align: "center",
-          dataIndex: 'precisionParameters',
-          scopedSlots: { customRender: 'precisionParameters' },
-        },
-        {
-          title: '绮惧害鍙傛暟妯℃澘',
-          align: "center",
-          dataIndex: 'precisionParametersTemplateId_dictText',
-        },
-        // {
-        //   title: '澶囨敞',
-        //   align: "center",
-        //   dataIndex: 'remark',
-        // },
-        {
-          title: '鎿嶄綔',
-          align: "center",
-          dataIndex: 'action',
-          scopedSlots: {
-            customRender: 'action',
-          },
-          width: 147,
-          fixed: 'right',
-        },
-      ],
-      url: {
-        list: "/eam/equipment/getEquipmentTZList",
-        delete: "/eam/equipment/delete",
-        deleteBatch: "/eam/equipment/deleteBatch",
-        active: "/eam/equipment/active",
-        exportXlsUrl: '/eam/equipment/exportXls',
-        importExcelUrl: "/eam/equipment/importExcel",
-        loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
-      },
-      dictOptions: {
-      },
-      /* 鍒嗛〉鍙傛暟 */
-      ipagination: {
-        current: 1,
-        pageSize: 20,
-        pageSizeOptions: ['5', '10', '20', '50'],
-        showTotal: (total, range) => {
-          return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
-        },
-        showQuickJumper: true,
-        showSizeChanger: true,
-        total: 0
-      },
-      selectedMainId: '',
-      superFieldList: [],
-      equipmentProcessParametersMainId: '',
-      equipmentDocumentMainId: '',
-      equipmentPrecisionParametersMainId: '',
-      precisionParametersTemplateId: '',
-      isOpenPrecision: true,
-      isOpenProcess: true,
-      treeData: [],
-      labelCol: {
-        xs: { span: 24 },
-        sm: { span: 5 },
-      },
-      wrapperCol: {
-        xs: { span: 24 },
-        sm: { span: 16 },
-      },
-      mainId: '',
     }
   },
-  created() {
-    this.getSuperFieldList();
-    this.initOptions();
-  },
-  computed: {
-    importExcelUrl: function () {
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    }
-  },
-  methods: {
-    initDictConfig() {
-    },
-    equipmentResumeShow(record) {
-      this.$refs.EquipmentResumeDrawer.visible = true
-      this.$refs.EquipmentResumeDrawer.title = '璁惧灞ュ巻'
-      this.$refs.EquipmentResumeDrawer.handleShow(record)
-    },
-    clickThenSelect(record) {
-      return {
-        on: {
-          click: () => {
-            this.onSelectChange(record.id.split(","), [record]);
-          }
-        }
-      }
-    },
-    onClearSelected() {
-      this.selectedRowKeys = [];
-      this.selectionRows = [];
-      this.selectedMainId = ''
-    },
-    onSelectChange(selectedRowKeys, selectionRows) {
-      if (selectedRowKeys.length == 1) {
-        this.selectedMainId = selectedRowKeys[0]
-        this.precisionParametersTemplateId = selectionRows[0].precisionParametersTemplateId;
-        this.isOpenProcess = selectionRows[0].processParameters == 1;
-        this.isOpenPrecision = selectionRows[0].precisionParameters == 1;
-      } else {
-        this.selectedMainId = ''
-        this.precisionParametersTemplateId = ''
-      }
-      this.selectedRowKeys = selectedRowKeys;
-      this.selectionRows = selectionRows;
-    },
-    loadData(arg) {
-      if (!this.url.list) {
-        this.$message.error("璇疯缃畊rl.list灞炴��!")
-        return
-      }
-      //鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
-      if (arg === 1) {
-        this.ipagination.current = 1;
-      }
-      this.onClearSelected()
-      this.queryParam.equipmentCategoryUda1 = this.caytegoryParam;
-      var params = this.getQueryParams();//鏌ヨ鏉′欢
-      this.loading = true;
-      getAction(this.url.list, params).then((res) => {
-        if (res.success) {
-          this.dataSource = res.result.records;
-          this.ipagination.total = res.result.total;
-        }
-        if (res.code === 510) {
-          this.$message.warning(res.message)
-        }
-        this.loading = false;
-      })
-    },
-    getSuperFieldList() {
-      let fieldList = [];
-      fieldList.push({ type: 'string', value: 'num', text: '缁熶竴缂栫爜', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'name', text: '璁惧鍚嶇О', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'model', text: '鍨嬪彿', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'specification', text: '瑙勬牸', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentStatus', text: '璁惧鐘舵��', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'technologyStatus', text: 'technologyStatus', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'assetNumber', text: 'assetNumber', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentCategoryId', text: 'equipmentCategoryId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'specificEquipment', text: 'specificEquipment', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentPhoto', text: 'equipmentPhoto', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'constructorId', text: '璧勪骇鍒堕�犲晢', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'supplierId', text: 'supplierId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'factoryNumber', text: 'factoryNumber', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'leaveFactoryDate', text: '鍑哄巶鏃ユ湡', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'acceptanceCheckDate', text: '楠屾敹鏃ユ湡', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'affiliationId', text: 'affiliationId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'manageId', text: '缁存姢閮ㄩ棬ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'manager', text: 'manager', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'useId', text: '浣跨敤閮ㄩ棬ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'functionary', text: 'functionary', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'location', text: 'location', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentImportanceId', text: 'ABC鏍囪瘑ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'processParameters', text: 'processParameters', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'processParametersTemplateId', text: 'processParametersTemplateId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'precisionParameters', text: 'precisionParameters', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'precisionParametersTemplateId', text: 'precisionParametersTemplateId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'verification', text: 'verification', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'verificationPeriod', text: 'verificationPeriod', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'lastVerificationDate', text: 'lastVerificationDate', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'nextVerificationDate', text: 'nextVerificationDate', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'status', text: 'status', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'remark', text: 'remark', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda1', text: '宸ュ尯', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda2', text: '瀹夎浣嶇疆', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda3', text: '閲嶉噺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda4', text: '閲嶉噺璁¢噺鍗曚綅ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda5', text: '鍔熻兘浣嶇疆', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'tenantId', text: 'tenantId', dictCode: '' })
-      fieldList.push({ type: 'int', value: 'delFlag', text: 'delFlag', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'teamId', text: '缁翠慨鐝粍ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'sourceId', text: 'sourceId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'fundSource', text: '璧勯噾鏉ユ簮', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'factoryNo', text: '鍑哄巶缂栧彿', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'mfr', text: '鍒堕�犲晢', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'sourceCountry', text: '璧勪骇鏉ユ簮鍥藉', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'gpo', text: '鎬诲姛鐜�', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'keyEquipmentIdentification', text: '鍏抽敭璁惧鏍囪瘑', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'securityConfiguration', text: '瀹夊叏閰嶇疆', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'coolingSystem', text: '鍐峰嵈绯荤粺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'fireExtinguisher', text: '鐏伀鍣�', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'fireExtinguisherValidityPeriod', text: '鐏伀鍣ㄦ湁鏁堟湡', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'operatingSystem', text: '鎿嶄綔绯荤粺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'system', text: '绯荤粺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'port', text: '绔彛', dictCode: '' })
-      fieldList.push({ type: 'BigDecimal', value: 'coordinateNum', text: '鍧愭爣鏁伴噺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'projectApprovalNo', text: '绔嬮」鍗″彿', dictCode: '' })
-      this.superFieldList = fieldList
-    },
-    editProcess(record) {
-      this.$refs.processEditModel.edit(record);
-    },
-    editPrecision(record) {
-      this.$refs.precisionEditModel.edit(record);
-    },
-    initOptions() {
-      getAction(this.url.loadOptions).then(res => {
-        if (res.success) {
-          this.treeData = res.result
-        } else {
-          this.$message.warning(res.message)
-        }
-      })
-    },
-    handleUpdateABC() {
-      this.$refs.updateABC.add();
-    },
-    handleUpdateWarranty() {
-      this.$refs.updateWarranty.add();
-    },
-    handleEditSpareParts(record) {
-      this.$refs.modalFormSpareParts.edit(record);
-    },
-    handleTechnologyStatus(record) {
-      //璺敱鏄痚am/EquipmentCalibrationOrder
-      this.$router.push({
-        path: '/eam/EquipmentCalibrationOrder',
-        query: {
-          equipmentId: record.id,
-          technologyStatus: record.technologyStatus,
-          technologyStatusVerificationType: record.technologyStatusVerificationType,
-        }
-      })
-    },
-
-  }
 }
 </script>
 <style scoped>
diff --git a/src/views/eam/EquipmentListOfEnvProEquipment.vue b/src/views/eam/EquipmentListOfEnvProEquipment.vue
index 5208501..1fe9da1 100644
--- a/src/views/eam/EquipmentListOfEnvProEquipment.vue
+++ b/src/views/eam/EquipmentListOfEnvProEquipment.vue
@@ -1,1175 +1,22 @@
 <template>
-  <a-card
-    :bordered="false"
-    title="鐜繚璁惧"
-  >
-    <!-- 鏌ヨ鍖哄煙 -->
-    <div class="table-page-search-wrapper">
-      <a-form
-        layout="inline"
-        @keyup.enter.native="searchQuery"
-      >
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-item
-              label="璁惧鎵�灞炲垎绫�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                :dictCode="'mom_eam_equipment_category,name,id,equipment_category_uda1='+'\''+caytegoryParam+'\''"
-                placeholder="璇疯緭鍏ユ悳绱㈡潯浠跺苟閫夋嫨"
-                v-model="queryParam.equipmentCategoryId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="缁熶竴缂栫爜"
-            >
-              <a-input
-                placeholder="璇疯緭鍏ヨ澶囩粺涓�缂栫爜鏌ヨ"
-                v-model="queryParam.num"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="璁惧鍚嶇О"
-            >
-              <a-input
-                placeholder="璇疯緭鍏ヨ澶囧悕绉版煡璇�"
-                v-model="queryParam.name"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鍨嬪彿"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <a-input
-                v-model="queryParam.model"
-                placeholder="璇疯緭鍏ュ瀷鍙�"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-item
-              label="宸ュ尯"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨宸ュ尯"
-                :triggerChange="true"
-                dictCode="mom_base_area,name,id,del_flag!='1'"
-                v-model="queryParam.factoryModelId"
-              />
-            </a-form-item>
-          </a-col>
-          <!-- <a-col :span="6">
-            <a-form-item
-              label="杞﹂棿"
-              :labelCol="labelCol"
-            :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨璧勮溅闂�"
-                :triggerChange="true"
-                dictCode="mom_base_factory_model,name,id,del_flag!='1'"
-                v-model="queryParam.factoryModelId"
-              />
-            </a-form-item>
-          </a-col> -->
-          <a-col :span="6">
-            <a-form-item
-              label="缁存姢閮ㄩ棬"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <!-- <a-tree-select
-                style="width: 100%"
-                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-                :tree-data="treeData"
-                placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
-                tree-default-expand-all
-                v-model="queryParam.manageId"
-              /> -->
-              <j-dict-select-tag
-                dictCode="sys_depart,depart_name,id"
-                placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
-                v-model="queryParam.manageId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="浣跨敤閮ㄩ棬"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <!-- <a-tree-select
-                style="width: 100%"
-                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-                :tree-data="treeData"
-                placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
-                tree-default-expand-all
-                v-model="queryParam.useId"
-              /> -->
-              <j-dict-select-tag
-                dictCode="sys_depart,depart_name,id"
-                placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
-                v-model="queryParam.useId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鏄惁鐢熶骇绾胯澶�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨"
-                :triggerChange="true"
-                dictCode="is_product"
-                v-model="queryParam.isLineEquip"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-item
-              label="ABC鏍囪瘑"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨ABC鏍囪瘑"
-                :triggerChange="true"
-                dictCode="ABC-standard-result"
-                v-model="queryParam.equipmentImportanceId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鎶�鏈姸鎬�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨鎶�鏈姸鎬�"
-                :triggerChange="true"
-                dictCode="technology_status"
-                v-model="queryParam.technologyStatus"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="璁惧鐘舵��"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨璁惧鐘舵��"
-                :triggerChange="true"
-                dictCode="equipment_status"
-                v-model="queryParam.equipmentStatus"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鍏抽敭璁惧鏍囪瘑"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                :triggerChange="true"
-                placeholder="璇烽�夋嫨鍏抽敭璁惧鏍囪瘑"
-                dictCode="specific_equipment"
-                v-model="queryParam.specificEquipment"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-model-item
-              label="璐ㄤ繚寮�濮嬫棩鏈�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-date
-                style="width: 100%;"
-                placeholder="璇烽�夋嫨寮�濮嬫棩鏈�"
-                class="query-group-cust"
-                v-model="queryParam.warrantyStart"
-              ></j-date>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-model-item
-              label="璐ㄤ繚缁撴潫鏃ユ湡"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-date
-                style="width: 100%;"
-                placeholder="璇烽�夋嫨缁撴潫鏃ユ湡"
-                class="query-group-cust"
-                v-model="queryParam.warrantyEnd"
-              ></j-date>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="缁翠慨鐝粍"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨缁翠慨鐝粍"
-                :triggerChange="true"
-                dictCode="mom_base_team,name,id,del_flag!='1'"
-                v-model="queryParam.teamId"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 鏌ヨ鍖哄煙-END -->
-
-    <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
-    <div class="table-operator">
-      <a-button
-        type="primary"
-        @click="searchQuery"
-        icon="search"
-      >鏌ヨ</a-button>
-      <a-button
-        @click="searchReset"
-        icon="reload"
-      >閲嶇疆</a-button>
-      <a-button
-        @click="handleAdd"
-        type="primary"
-        icon="plus"
-        v-has="'equipmentAccount:add&delete&import&Edit'"
-      >鏂板</a-button>
-      <a-button
-        type="primary"
-        icon="download"
-        @click="handleExportXls('璁惧鍙拌处')"
-        v-has="'equipmentAccount:outport'"
-      >瀵煎嚭</a-button>
-      <a-upload
-        name="file"
-        :showUploadList="false"
-        :multiple="false"
-        :headers="tokenHeader"
-        :action="importExcelUrl"
-        @change="handleImportExcel"
-      >
-        <a-button
-          type="primary"
-          icon="import"
-          v-has="'equipmentAccount:add&delete&import&Edit'"
-        >瀵煎叆</a-button>
-      </a-upload>
-      <a-button
-        :disabled="selectedRowKeys.length==0"
-        @click="handleUpdateABC"
-        type="primary"
-        icon="font-colors"
-        v-has="'equipmentAccount:add&delete&import&Edit'"
-      >ABC鏍囪瘑鍙樻洿</a-button>
-      <a-button
-        :disabled="selectedRowKeys.length==0"
-        @click="handleUpdateWarranty"
-        type="primary"
-        icon="calendar"
-        v-has="'equipmentAccount:add&delete&import&Edit'"
-      >璐ㄤ繚鏈熷彉鏇�</a-button>
-    </div>
-    <!-- table鍖哄煙-begin -->
-    <div>
-      <div
-        class="ant-alert ant-alert-info"
-        style="margin-bottom: 16px;"
-      >
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
-        <a
-          style="margin-left: 24px"
-          @click="onClearSelected"
-        >娓呯┖</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :scroll="{x:true}"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'checkbox'}"
-        :customRow="clickThenSelect"
-        @change="handleTableChange"
-      >
-        <template
-          slot="technologyStatus"
-          slot-scope="text,record"
-        >
-          <a
-            href="javascript:eam/EquipmentCalibrationOrder;"
-            @click="handleTechnologyStatus(record)"
-          >{{record.technologyStatus_dictText}}</a>
-        </template>
-        <template
-          slot="htmlSlot"
-          slot-scope="text"
-        >
-          <div v-html="text"></div>
-        </template>
-        <template
-          slot="imgSlot"
-          slot-scope="text,record"
-        >
-          <span
-            v-if="!text"
-            style="font-size: 12px;font-style: italic;"
-          >鏃犲浘鐗�</span>
-          <img
-            v-else
-            :src="getImgView(text)"
-            :preview="record.id"
-            height="25px"
-            alt=""
-            style="max-width:80px;font-size: 12px;font-style: italic;"
-          />
-        </template>
-        <template
-          slot="fileSlot"
-          slot-scope="text"
-        >
-          <span
-            v-if="!text"
-            style="font-size: 12px;font-style: italic;"
-          >鏃犳枃浠�</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)"
-          >
-            涓嬭浇
-          </a-button>
-        </template>
-
-        <!--宸ヨ壓鍙傛暟涓�у睍绀�-->
-        <span
-          slot="processParameters"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.processParameters==1"
-            status="success"
-          />
-          <span
-            v-if="record.processParameters==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.processParameters==0"
-            status="error"
-          />
-          <span
-            v-if="record.processParameters==0"
-            class="error"
-          >鍚�</span>
-        </span>
-        <span
-          slot="processParameters"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.processParameters==1"
-            status="success"
-          />
-          <span
-            v-if="record.processParameters==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.processParameters==0"
-            status="error"
-          />
-          <span
-            v-if="record.processParameters==0"
-            class="error"
-          >鍚�</span>
-        </span>
-        <span
-          slot="precisionParameters"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.precisionParameters==1"
-            status="success"
-          />
-          <span
-            v-if="record.precisionParameters==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.precisionParameters==0"
-            status="error"
-          />
-          <span
-            v-if="record.precisionParameters==0"
-            class="error"
-          >鍚�</span>
-        </span>
-        <span
-          slot="verification"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.verification==1"
-            status="success"
-          />
-          <span
-            v-if="record.verification==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.verification==0"
-            status="error"
-          />
-          <span
-            v-if="record.verification==0"
-            class="error"
-          >鍚�</span>
-        </span>
-
-        <span
-          slot="name"
-          slot-scope="text"
-        >
-          <j-ellipsis
-            :value="text"
-            :length="8"
-          />
-        </span>
-
-        <template
-          slot="num"
-          slot-scope="text,record"
-        >
-          <a
-            href="javascript:;"
-            @click="handleDetail(record)"
-          >{{record.num}}</a>
-        </template>
-
-        <span
-          slot="action"
-          slot-scope="text, record"
-        >
-          <!-- class="table-operation" -->
-          <!-- <a
-          href="javascript:;"
-          @click="equipmentStructuresShow(record)"
-        >璁惧缁撴瀯</a>
-        <a-divider type="vertical" /> -->
-          <a
-            href="javascript:;"
-            @click='handleDetail(record)'
-          >璇︽儏</a>
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">
-              鏇村
-              <a-icon type="down" />
-            </a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="equipmentResumeShow(record)">璁惧灞ュ巻</a>
-              </a-menu-item>
-              <a-menu-item
-                v-has="'accountSons:add&edit&delete&submit'"
-                v-if="record.processParameters==1"
-              >
-                <a @click="editProcess(record)">宸ヨ壓鍙傛暟缁存姢</a>
-              </a-menu-item>
-              <a-menu-item
-                v-has="'accountSons:add&edit&delete&submit'"
-                v-if="record.precisionParameters==1"
-              >
-                <a @click="editPrecision(record)">绮惧害鍙傛暟缁存姢</a>
-              </a-menu-item>
-              <a-menu-item v-has="'equipmentAccount:add&delete&import&Edit'">
-                <a @click="handleEdit(record)">缂栬緫</a>
-              </a-menu-item>
-              <a-menu-item v-has="'equipmentAccount:add&delete&import&Edit'">
-                <a @click="handleEditSpareParts(record)">缂栬緫澶囦欢</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm
-                  title="纭畾鍒犻櫎鍚�?"
-                  @confirm="() => handleDelete(record.id)"
-                  v-has="'equipmentAccount:add&delete&import&Edit'"
-                >
-                  <a>鍒犻櫎</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-      </a-table>
-    </div>
-    <equipment-resume-drawer
-      ref="EquipmentResumeDrawer"
-      @ok="modalFormOk"
-    ></equipment-resume-drawer>
-
-    <a-tabs defaultActiveKey="1">
-      <a-tab-pane
-        tab="宸ヨ壓鍙傛暟"
-        key="1"
-      >
-        <EquipmentProcessParametersList
-          :mainId="selectedMainId"
-          :isOpen="isOpenProcess"
-        />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="璁惧绮惧害"
-        key="2"
-        forceRender
-      >
-        <EquipmentPrecisionParametersList
-          :isOpen="isOpenPrecision"
-          :mainId="precisionParametersTemplateId"
-        />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="璁惧鏂囨。"
-        key="3"
-        forceRender
-      >
-        <EquipmentDocumentList :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="澶囦欢"
-        key="4"
-        forceRender
-      >
-        <EquipmentSpareParts :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="ABC鏍囪瘑鍙樻洿璁板綍"
-        key="5"
-        forceRender
-      >
-        <equipment-update-ABC-list :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="璐ㄤ繚鏈熷彉鏇�"
-        key="6"
-        forceRender
-      >
-        <equipment-update-warranty-list :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="缁翠繚鏍囧噯"
-        key="7"
-        forceRender
-      >
-        <standard-of-maintenance :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="鏃ヤ繚鏍囧噯"
-        key="7"
-        forceRender
-      >
-        <daily-maintenance-list :mainId="selectedMainId"></daily-maintenance-list>
-      </a-tab-pane>
-      <a-tab-pane
-        tab="浜屼繚鏍囧噯"
-        key="8"
-        forceRender
-      >
-        <second-maintenance-list :mainId="selectedMainId"></second-maintenance-list>
-      </a-tab-pane>
-      <a-tab-pane
-        tab="涓変繚鏍囧噯"
-        key="9"
-        forceRender
-      >
-        <third-maintenance-list :mainId="selectedMainId"></third-maintenance-list>
-      </a-tab-pane>
-    </a-tabs>
-    <equipment-modal
-      ref="modalForm"
-      @ok="modalFormOk"
-      :caytegoryParam="caytegoryParam"
-    ></equipment-modal>
-    <process-edit-model ref="processEditModel"></process-edit-model>
-    <precision-edit-model ref="precisionEditModel"></precision-edit-model>
-    <aBC-update-edit-model
-      @ok="modalFormOk"
-      :updateList="selectionRows"
-      ref="updateABC"
-    ></aBC-update-edit-model>
-    <warranty-update-model
-      :updateList="selectionRows"
-      ref="updateWarranty"
-    ></warranty-update-model>
-    <EquipmentSparePartsModal
-      ref="modalFormSpareParts"
-      @ok="modalFormOk"
-    />
-  </a-card>
+  <equipment-list-of-all :caytegoryParam="caytegoryParam"></equipment-list-of-all>
 </template>
 
 <script>
 
-import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-import { mixinDevice } from '@/utils/mixin'
-import EquipmentModal from './modules/equipmentNew/EquipmentModal'
-import { getAction } from '@/api/manage'
-import EquipmentProcessParametersList from './modules/equipmentNew/EquipmentProcessParametersList'
-import EquipmentDocumentList from './modules/equipmentNew/EquipmentDocumentList'
-import EquipmentPrecisionParametersList from './modules/equipmentNew/EquipmentPrecisionParametersList'
-import '@/assets/less/TableExpand.less'
-import EquipmentResumeDrawer from './modules/equipmentNew/EquipmentResume/EquipmentResumeDrawer'
-import JSearchSelectTag from '../../components/dict/JSearchSelectTag.vue'
-import ProcessEditModel from './modules/equipmentNew/edit/ProcessEditModel.vue'
-import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
-import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
-import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
-import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
-import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
-import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts'
-import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
-import StandardOfInspection from './modules/equipmentNew/StandardOfInspection.vue'
-import StandardOfMaintenance from './modules/equipmentNew/StandardOfMaintenance.vue'
-import DailyMaintenanceList from './modules/equipmentNew/DailyMaintenanceList.vue'
-import SecondMaintenanceList from './modules/equipmentNew/SecondMaintenanceList.vue'
-import ThirdMaintenanceList from './modules/equipmentNew/ThirdMaintenanceList.vue'
-import JEllipsis from '@/components/jeecg/JEllipsis'
+import EquipmentListOfAll from './EquipmentListOfAll.vue'
+
 export default {
   name: "EquipmentList",
-  mixins: [JeecgListMixin, mixinDevice],
   components: {
-    EquipmentProcessParametersList,
-    EquipmentDocumentList,
-    EquipmentPrecisionParametersList,
-    EquipmentModal,
-    EquipmentResumeDrawer,
-    JSearchSelectTag,
-    ProcessEditModel,
-    PrecisionEditModel,
-    EquipmentUpdateABCList,
-    EquipmentUpdateWarrantyList,
-    ABCUpdateEditModel,
-    WarrantyUpdateModel,
-    EquipmentSpareParts,
-    EquipmentSparePartsModal,
-    StandardOfInspection,
-    StandardOfMaintenance,
-    DailyMaintenanceList,
-    SecondMaintenanceList,
-    ThirdMaintenanceList,
-    JEllipsis
+    EquipmentListOfAll,
   },
   data() {
     return {
       description: '璁惧鍙拌处绠$悊椤甸潰',
       caytegoryParam: 'envProEquipment',
-      // 琛ㄥご
-      columns: [
-        {
-          title: '#',
-          dataIndex: '',
-          key: 'rowIndex',
-          align: 'center',
-          customRender: function (t, r, index) {
-            return parseInt(index) + 1
-          },
-          width: 50,
-        },
-        {
-          title: '璁惧绫诲瀷',
-          align: "center",
-          dataIndex: 'equipmentCategoryId_dictText',
-        },
-        {
-          title: '鏄惁鐢熶骇绾胯澶�',
-          align: "center",
-          dataIndex: 'isLineEquip_dictText',
-        },
-        {
-          title: '鍏抽敭璁惧鏍囪瘑',
-          align: "center",
-          dataIndex: 'specificEquipment_dictText',
-        },
-        {
-          title: '缁熶竴缂栫爜',
-          align: "center",
-          dataIndex: 'num',
-          scopedSlots: { customRender: 'num' },
-        },
-        {
-          title: '璁惧鍚嶇О',
-          align: "center",
-          dataIndex: 'name',
-          scopedSlots: { customRender: 'name' },
-        },
-        {
-          title: '鍨嬪彿',
-          align: "center",
-          dataIndex: 'model',
-        },
-        {
-          title: '瑙勬牸',
-          align: "center",
-          dataIndex: 'specification',
-        },
-        {
-          title: '鎬诲姛鐜�',
-          align: "center",
-          dataIndex: 'gpo',
-        },
-        // {
-        //   title: '浣跨敤閮ㄩ棬',
-        //   align: "center",
-        //   dataIndex: 'useId_dictText',
-        // },
-        // {
-        //   title: '缁存姢閮ㄩ棬',
-        //   align: "center",
-        //   dataIndex: 'manageId_dictText',
-        // },
-        {
-          title: '缁翠慨鐝粍',
-          align: "center",
-          dataIndex: 'teamId_dictText',
-        },
-        {
-          title: 'ABC鏍囪瘑',
-          align: "center",
-          dataIndex: 'equipmentImportanceId',
-        },
-        {
-          title: '鍏抽敭璁惧鏍囪瘑',
-          align: "center",
-          dataIndex: 'specificEquipment_dictText',
-        },
-        {
-          title: '鎶�鏈姸鎬�',
-          align: "center",
-          dataIndex: 'technologyStatus_dictText',
-          scopedSlots: { customRender: 'technologyStatus' },
-        },
-        {
-          title: '鎶�鏈姸鎬侀壌瀹氱被鍨�',
-          align: "center",
-          dataIndex: 'technologyStatusVerificationType_dictText',
-        },
-        {
-          title: '涓嬫鎶�鏈姸鎬侀壌瀹氭椂闂�',
-          align: "center",
-          dataIndex: 'nextTechnologyStatusQualificationTime',
-        },
-        {
-          title: '鐢熶骇绾跨紪鍙�',
-          align: "center",
-          dataIndex: 'lineId_dictText',
-        },
-        {
-          title: '涓昏澶�?',
-          align: "center",
-          dataIndex: 'isMeta_dictText',
-        },
-        // {
-        //   title: '宸ュ尯',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda1',
-        // },
-        // {
-        //   title: '瀹夊叏閰嶇疆',
-        //   align: "center",
-        //   dataIndex: 'securityConfiguration',
-        // },
-        // {
-        //   title: '鍐峰嵈绯荤粺',
-        //   align: "center",
-        //   dataIndex: 'coolingSystem',
-        // },
-        // {
-        //   title: '鐏伀鍣�',
-        //   align: "center",
-        //   dataIndex: 'fireExtinguisher',
-        // },
-
-        // {
-        //   title: '鐏伀鍣ㄦ湁鏁堟湡',
-        //   align: "center",
-        //   dataIndex: 'fireExtinguisherValidityPeriod',
-        // },
-        // {
-        //   title: '鎿嶄綔绯荤粺',
-        //   align: "center",
-        //   dataIndex: 'operatingSystem',
-        // },
-        // {
-        //   title: '绯荤粺',
-        //   align: "center",
-        //   dataIndex: 'system',
-        // },
-        // {
-        //   title: '璁惧绔彛',
-        //   align: "center",
-        //   dataIndex: 'port',
-        // },
-        // {
-        //   title: '鍧愭爣鏁伴噺',
-        //   align: "center",
-        //   dataIndex: 'coordinateNum',
-        // },
-        // {
-        //   title: '璁惧鐘舵��',
-        //   align: "center",
-        //   dataIndex: 'equipmentStatus_dictText',
-        // },
-        // {
-        //   title: '閲嶉噺',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda3',
-        // },
-        // {
-        //   title: '閲嶉噺璁¢噺鍗曚綅',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda4_dictText',
-        // },
-        // {
-        //   title: '鍔熻兘浣嶇疆',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda5',
-        // },
-        // {
-        //   title: '瀹夎浣嶇疆',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda2',
-        // },
-        // {
-        //   title: '鍑哄巶鏃ユ湡',
-        //   align: "center",
-        //   dataIndex: 'leaveFactoryDate',
-        // },
-        // {
-        //   title: '绔嬮」鍗″彿',
-        //   align: "center",
-        //   dataIndex: 'projectApprovalNo',
-        // },
-        // {
-        //   title: '璧勯噾鏉ユ簮',
-        //   align: "center",
-        //   dataIndex: 'fundSource',
-        // },
-        // {
-        //   title: '楠屾敹鏃ユ湡',
-        //   align: "center",
-        //   dataIndex: 'acceptanceCheckDate',
-        // },
-        // {
-        //   title: '鍑哄巶缂栧彿',
-        //   align: "center",
-        //   dataIndex: 'factoryNo',
-        // },
-        // {
-        //   title: '璧勪骇鍒堕�犲晢',
-        //   align: "center",
-        //   dataIndex: 'constructorId_dictText',
-        // },
-        // {
-        //   title: '璧勪骇鐨勬潵婧愬浗瀹�',
-        //   align: "center",
-        //   dataIndex: 'sourceCountry',
-        // }, 
-        {
-          title: '宸ヨ壓鍙傛暟绠$悊',
-          align: "center",
-          dataIndex: 'processParameters',
-          scopedSlots: { customRender: 'processParameters' },
-        },
-        {
-          title: '宸ヨ壓鍙傛暟妯℃澘',
-          align: "center",
-          dataIndex: 'processParametersTemplateId_dictText',
-        },
-        {
-          title: '璁惧绮惧害绠$悊',
-          align: "center",
-          dataIndex: 'precisionParameters',
-          scopedSlots: { customRender: 'precisionParameters' },
-        },
-        {
-          title: '绮惧害鍙傛暟妯℃澘',
-          align: "center",
-          dataIndex: 'precisionParametersTemplateId_dictText',
-        },
-        // {
-        //   title: '澶囨敞',
-        //   align: "center",
-        //   dataIndex: 'remark',
-        // },
-        {
-          title: '鎿嶄綔',
-          align: "center",
-          dataIndex: 'action',
-          scopedSlots: {
-            customRender: 'action',
-          },
-          width: 147,
-          fixed: 'right',
-        },
-      ],
-      url: {
-        list: "/eam/equipment/getEquipmentTZList",
-        delete: "/eam/equipment/delete",
-        deleteBatch: "/eam/equipment/deleteBatch",
-        active: "/eam/equipment/active",
-        exportXlsUrl: '/eam/equipment/exportXls',
-        importExcelUrl: "/eam/equipment/importExcel",
-        loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
-      },
-      dictOptions: {
-      },
-      /* 鍒嗛〉鍙傛暟 */
-      ipagination: {
-        current: 1,
-        pageSize: 20,
-        pageSizeOptions: ['5', '10', '20', '50'],
-        showTotal: (total, range) => {
-          return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
-        },
-        showQuickJumper: true,
-        showSizeChanger: true,
-        total: 0
-      },
-      selectedMainId: '',
-      superFieldList: [],
-      equipmentProcessParametersMainId: '',
-      equipmentDocumentMainId: '',
-      equipmentPrecisionParametersMainId: '',
-      precisionParametersTemplateId: '',
-      isOpenPrecision: true,
-      isOpenProcess: true,
-      treeData: [],
-      labelCol: {
-        xs: { span: 24 },
-        sm: { span: 5 },
-      },
-      wrapperCol: {
-        xs: { span: 24 },
-        sm: { span: 16 },
-      },
-      mainId: '',
     }
   },
-  created() {
-    this.getSuperFieldList();
-    this.initOptions();
-  },
-  computed: {
-    importExcelUrl: function () {
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    }
-  },
-  methods: {
-    initDictConfig() {
-    },
-    equipmentResumeShow(record) {
-      this.$refs.EquipmentResumeDrawer.visible = true
-      this.$refs.EquipmentResumeDrawer.title = '璁惧灞ュ巻'
-      this.$refs.EquipmentResumeDrawer.handleShow(record)
-    },
-    clickThenSelect(record) {
-      return {
-        on: {
-          click: () => {
-            this.onSelectChange(record.id.split(","), [record]);
-          }
-        }
-      }
-    },
-    onClearSelected() {
-      this.selectedRowKeys = [];
-      this.selectionRows = [];
-      this.selectedMainId = ''
-    },
-    onSelectChange(selectedRowKeys, selectionRows) {
-      if (selectedRowKeys.length == 1) {
-        this.selectedMainId = selectedRowKeys[0]
-        this.precisionParametersTemplateId = selectionRows[0].precisionParametersTemplateId;
-        this.isOpenProcess = selectionRows[0].processParameters == 1;
-        this.isOpenPrecision = selectionRows[0].precisionParameters == 1;
-      } else {
-        this.selectedMainId = ''
-        this.precisionParametersTemplateId = ''
-      }
-      this.selectedRowKeys = selectedRowKeys;
-      this.selectionRows = selectionRows;
-    },
-    loadData(arg) {
-      if (!this.url.list) {
-        this.$message.error("璇疯缃畊rl.list灞炴��!")
-        return
-      }
-      //鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
-      if (arg === 1) {
-        this.ipagination.current = 1;
-      }
-      this.onClearSelected()
-      this.queryParam.equipmentCategoryUda1 = this.caytegoryParam;
-      var params = this.getQueryParams();//鏌ヨ鏉′欢
-      this.loading = true;
-      getAction(this.url.list, params).then((res) => {
-        if (res.success) {
-          this.dataSource = res.result.records;
-          this.ipagination.total = res.result.total;
-        }
-        if (res.code === 510) {
-          this.$message.warning(res.message)
-        }
-        this.loading = false;
-      })
-    },
-    getSuperFieldList() {
-      let fieldList = [];
-      fieldList.push({ type: 'string', value: 'num', text: '缁熶竴缂栫爜', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'name', text: '璁惧鍚嶇О', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'model', text: '鍨嬪彿', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'specification', text: '瑙勬牸', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentStatus', text: '璁惧鐘舵��', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'technologyStatus', text: 'technologyStatus', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'assetNumber', text: 'assetNumber', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentCategoryId', text: 'equipmentCategoryId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'specificEquipment', text: 'specificEquipment', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentPhoto', text: 'equipmentPhoto', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'constructorId', text: '璧勪骇鍒堕�犲晢', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'supplierId', text: 'supplierId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'factoryNumber', text: 'factoryNumber', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'leaveFactoryDate', text: '鍑哄巶鏃ユ湡', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'acceptanceCheckDate', text: '楠屾敹鏃ユ湡', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'affiliationId', text: 'affiliationId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'manageId', text: '缁存姢閮ㄩ棬ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'manager', text: 'manager', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'useId', text: '浣跨敤閮ㄩ棬ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'functionary', text: 'functionary', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'location', text: 'location', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentImportanceId', text: 'ABC鏍囪瘑ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'processParameters', text: 'processParameters', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'processParametersTemplateId', text: 'processParametersTemplateId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'precisionParameters', text: 'precisionParameters', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'precisionParametersTemplateId', text: 'precisionParametersTemplateId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'verification', text: 'verification', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'verificationPeriod', text: 'verificationPeriod', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'lastVerificationDate', text: 'lastVerificationDate', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'nextVerificationDate', text: 'nextVerificationDate', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'status', text: 'status', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'remark', text: 'remark', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda1', text: '宸ュ尯', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda2', text: '瀹夎浣嶇疆', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda3', text: '閲嶉噺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda4', text: '閲嶉噺璁¢噺鍗曚綅ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda5', text: '鍔熻兘浣嶇疆', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'tenantId', text: 'tenantId', dictCode: '' })
-      fieldList.push({ type: 'int', value: 'delFlag', text: 'delFlag', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'teamId', text: '缁翠慨鐝粍ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'sourceId', text: 'sourceId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'fundSource', text: '璧勯噾鏉ユ簮', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'factoryNo', text: '鍑哄巶缂栧彿', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'mfr', text: '鍒堕�犲晢', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'sourceCountry', text: '璧勪骇鏉ユ簮鍥藉', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'gpo', text: '鎬诲姛鐜�', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'keyEquipmentIdentification', text: '鍏抽敭璁惧鏍囪瘑', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'securityConfiguration', text: '瀹夊叏閰嶇疆', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'coolingSystem', text: '鍐峰嵈绯荤粺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'fireExtinguisher', text: '鐏伀鍣�', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'fireExtinguisherValidityPeriod', text: '鐏伀鍣ㄦ湁鏁堟湡', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'operatingSystem', text: '鎿嶄綔绯荤粺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'system', text: '绯荤粺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'port', text: '绔彛', dictCode: '' })
-      fieldList.push({ type: 'BigDecimal', value: 'coordinateNum', text: '鍧愭爣鏁伴噺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'projectApprovalNo', text: '绔嬮」鍗″彿', dictCode: '' })
-      this.superFieldList = fieldList
-    },
-    editProcess(record) {
-      this.$refs.processEditModel.edit(record);
-    },
-    editPrecision(record) {
-      this.$refs.precisionEditModel.edit(record);
-    },
-    initOptions() {
-      getAction(this.url.loadOptions).then(res => {
-        if (res.success) {
-          this.treeData = res.result
-        } else {
-          this.$message.warning(res.message)
-        }
-      })
-    },
-    handleUpdateABC() {
-      this.$refs.updateABC.add();
-    },
-    handleUpdateWarranty() {
-      this.$refs.updateWarranty.add();
-    },
-    handleEditSpareParts(record) {
-      this.$refs.modalFormSpareParts.edit(record);
-    },
-    handleTechnologyStatus(record) {
-      //璺敱鏄痚am/EquipmentCalibrationOrder
-      this.$router.push({
-        path: '/eam/EquipmentCalibrationOrder',
-        query: {
-          equipmentId: record.id,
-          technologyStatus: record.technologyStatus,
-          technologyStatusVerificationType: record.technologyStatusVerificationType,
-        }
-      })
-    },
-
-  }
 }
 </script>
 <style scoped>
diff --git a/src/views/eam/EquipmentListOfFilesCarousel.vue b/src/views/eam/EquipmentListOfFilesCarousel.vue
index a288647..141b02f 100644
--- a/src/views/eam/EquipmentListOfFilesCarousel.vue
+++ b/src/views/eam/EquipmentListOfFilesCarousel.vue
@@ -1,1168 +1,22 @@
 <template>
-  <a-card
-    :bordered="false"
-    title="鏁版帶鍥炶浆搴�"
-  >
-    <!-- 鏌ヨ鍖哄煙 -->
-    <div class="table-page-search-wrapper">
-      <a-form
-        layout="inline"
-        @keyup.enter.native="searchQuery"
-      >
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-item
-              label="璁惧鎵�灞炲垎绫�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                dictCode="mom_eam_equipment_category,name,id,equipment_category_uda1='filesCarousel'"
-                placeholder="璇疯緭鍏ユ悳绱㈡潯浠跺苟閫夋嫨"
-                v-model="queryParam.equipmentCategoryId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="缁熶竴缂栫爜"
-            >
-              <a-input
-                placeholder="璇疯緭鍏ヨ澶囩粺涓�缂栫爜鏌ヨ"
-                v-model="queryParam.num"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="璁惧鍚嶇О"
-            >
-              <a-input
-                placeholder="璇疯緭鍏ヨ澶囧悕绉版煡璇�"
-                v-model="queryParam.name"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鍨嬪彿"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <a-input
-                v-model="queryParam.model"
-                placeholder="璇疯緭鍏ュ瀷鍙�"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-item
-              label="宸ュ尯"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨宸ュ尯"
-                :triggerChange="true"
-                dictCode="mom_base_area,name,id,del_flag!='1'"
-                v-model="queryParam.factoryModelId"
-              />
-            </a-form-item>
-          </a-col>
-          <!-- <a-col :span="6">
-            <a-form-item
-              label="杞﹂棿"
-              :labelCol="labelCol"
-            :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨璧勮溅闂�"
-                :triggerChange="true"
-                dictCode="mom_base_factory_model,name,id,del_flag!='1'"
-                v-model="queryParam.factoryModelId"
-              />
-            </a-form-item>
-          </a-col> -->
-          <a-col :span="6">
-            <a-form-item
-              label="缁存姢閮ㄩ棬"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <!-- <a-tree-select
-                style="width: 100%"
-                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-                :tree-data="treeData"
-                placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
-                tree-default-expand-all
-                v-model="queryParam.manageId"
-              /> -->
-              <j-dict-select-tag
-                dictCode="sys_depart,depart_name,id"
-                placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
-                v-model="queryParam.manageId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="浣跨敤閮ㄩ棬"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <!-- <a-tree-select
-                style="width: 100%"
-                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-                :tree-data="treeData"
-                placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
-                tree-default-expand-all
-                v-model="queryParam.useId"
-              /> -->
-              <j-dict-select-tag
-                dictCode="sys_depart,depart_name,id"
-                placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
-                v-model="queryParam.useId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鏄惁鐢熶骇绾胯澶�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨"
-                :triggerChange="true"
-                dictCode="is_product"
-                v-model="queryParam.isLineEquip"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-item
-              label="ABC鏍囪瘑"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨ABC鏍囪瘑"
-                :triggerChange="true"
-                dictCode="ABC-standard-result"
-                v-model="queryParam.equipmentImportanceId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鎶�鏈姸鎬�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨鎶�鏈姸鎬�"
-                :triggerChange="true"
-                dictCode="technology_status"
-                v-model="queryParam.technologyStatus"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="璁惧鐘舵��"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨璁惧鐘舵��"
-                :triggerChange="true"
-                dictCode="equipment_status"
-                v-model="queryParam.equipmentStatus"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鍏抽敭璁惧鏍囪瘑"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                :triggerChange="true"
-                placeholder="璇烽�夋嫨鍏抽敭璁惧鏍囪瘑"
-                dictCode="specific_equipment"
-                v-model="queryParam.specificEquipment"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-model-item
-              label="璐ㄤ繚寮�濮嬫棩鏈�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-date
-                style="width: 100%;"
-                placeholder="璇烽�夋嫨寮�濮嬫棩鏈�"
-                class="query-group-cust"
-                v-model="queryParam.warrantyStart"
-              ></j-date>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-model-item
-              label="璐ㄤ繚缁撴潫鏃ユ湡"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-date
-                style="width: 100%;"
-                placeholder="璇烽�夋嫨缁撴潫鏃ユ湡"
-                class="query-group-cust"
-                v-model="queryParam.warrantyEnd"
-              ></j-date>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="缁翠慨鐝粍"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨缁翠慨鐝粍"
-                :triggerChange="true"
-                dictCode="mom_base_team,name,id,del_flag!='1'"
-                v-model="queryParam.teamId"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 鏌ヨ鍖哄煙-END -->
-
-    <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
-    <div class="table-operator">
-      <a-button
-        type="primary"
-        @click="searchQuery"
-        icon="search"
-      >鏌ヨ</a-button>
-      <a-button
-        @click="searchReset"
-        icon="reload"
-      >閲嶇疆</a-button>
-      <a-button
-        @click="handleAdd"
-        type="primary"
-        icon="plus"
-        v-has="'equipmentAccount:add&delete&import&Edit'"
-      >鏂板</a-button>
-      <a-button
-        type="primary"
-        icon="download"
-        @click="handleExportXls('璁惧鍙拌处')"
-        v-has="'equipmentAccount:outport'"
-      >瀵煎嚭</a-button>
-      <a-upload
-        name="file"
-        :showUploadList="false"
-        :multiple="false"
-        :headers="tokenHeader"
-        :action="importExcelUrl"
-        @change="handleImportExcel"
-      >
-        <a-button
-          type="primary"
-          icon="import"
-          v-has="'equipmentAccount:add&delete&import&Edit'"
-        >瀵煎叆</a-button>
-      </a-upload>
-      <a-button
-        :disabled="selectedRowKeys.length==0"
-        @click="handleUpdateABC"
-        type="primary"
-        icon="font-colors"
-        v-has="'equipmentAccount:add&delete&import&Edit'"
-      >ABC鏍囪瘑鍙樻洿</a-button>
-      <a-button
-        :disabled="selectedRowKeys.length==0"
-        @click="handleUpdateWarranty"
-        type="primary"
-        icon="calendar"
-        v-has="'equipmentAccount:add&delete&import&Edit'"
-      >璐ㄤ繚鏈熷彉鏇�</a-button>
-    </div>
-    <!-- table鍖哄煙-begin -->
-    <div>
-      <div
-        class="ant-alert ant-alert-info"
-        style="margin-bottom: 16px;"
-      >
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
-        <a
-          style="margin-left: 24px"
-          @click="onClearSelected"
-        >娓呯┖</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :scroll="{x:true}"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'checkbox'}"
-        :customRow="clickThenSelect"
-        @change="handleTableChange"
-      >
-        <template
-          slot="technologyStatus"
-          slot-scope="text,record"
-        >
-          <a
-            href="javascript:eam/EquipmentCalibrationOrder;"
-            @click="handleTechnologyStatus(record)"
-          >{{record.technologyStatus_dictText}}</a>
-        </template>
-        <template
-          slot="htmlSlot"
-          slot-scope="text"
-        >
-          <div v-html="text"></div>
-        </template>
-        <template
-          slot="imgSlot"
-          slot-scope="text,record"
-        >
-          <span
-            v-if="!text"
-            style="font-size: 12px;font-style: italic;"
-          >鏃犲浘鐗�</span>
-          <img
-            v-else
-            :src="getImgView(text)"
-            :preview="record.id"
-            height="25px"
-            alt=""
-            style="max-width:80px;font-size: 12px;font-style: italic;"
-          />
-        </template>
-        <template
-          slot="fileSlot"
-          slot-scope="text"
-        >
-          <span
-            v-if="!text"
-            style="font-size: 12px;font-style: italic;"
-          >鏃犳枃浠�</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)"
-          >
-            涓嬭浇
-          </a-button>
-        </template>
-
-        <!--宸ヨ壓鍙傛暟涓�у睍绀�-->
-        <span
-          slot="processParameters"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.processParameters==1"
-            status="success"
-          />
-          <span
-            v-if="record.processParameters==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.processParameters==0"
-            status="error"
-          />
-          <span
-            v-if="record.processParameters==0"
-            class="error"
-          >鍚�</span>
-        </span>
-        <span
-          slot="processParameters"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.processParameters==1"
-            status="success"
-          />
-          <span
-            v-if="record.processParameters==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.processParameters==0"
-            status="error"
-          />
-          <span
-            v-if="record.processParameters==0"
-            class="error"
-          >鍚�</span>
-        </span>
-        <span
-          slot="precisionParameters"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.precisionParameters==1"
-            status="success"
-          />
-          <span
-            v-if="record.precisionParameters==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.precisionParameters==0"
-            status="error"
-          />
-          <span
-            v-if="record.precisionParameters==0"
-            class="error"
-          >鍚�</span>
-        </span>
-        <span
-          slot="verification"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.verification==1"
-            status="success"
-          />
-          <span
-            v-if="record.verification==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.verification==0"
-            status="error"
-          />
-          <span
-            v-if="record.verification==0"
-            class="error"
-          >鍚�</span>
-        </span>
-
-        <span
-          slot="name"
-          slot-scope="text"
-        >
-          <j-ellipsis
-            :value="text"
-            :length="8"
-          />
-        </span>
-
-        <template
-          slot="num"
-          slot-scope="text,record"
-        >
-          <a
-            href="javascript:;"
-            @click="handleDetail(record)"
-          >{{record.num}}</a>
-        </template>
-
-        <span
-          slot="action"
-          slot-scope="text, record"
-        >
-          <!-- class="table-operation" -->
-          <!-- <a
-          href="javascript:;"
-          @click="equipmentStructuresShow(record)"
-        >璁惧缁撴瀯</a>
-        <a-divider type="vertical" /> -->
-          <a
-            href="javascript:;"
-            @click='handleDetail(record)'
-          >璇︽儏</a>
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">
-              鏇村
-              <a-icon type="down" />
-            </a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="equipmentResumeShow(record)">璁惧灞ュ巻</a>
-              </a-menu-item>
-              <a-menu-item
-                v-has="'accountSons:add&edit&delete&submit'"
-                v-if="record.processParameters==1"
-              >
-                <a @click="editProcess(record)">宸ヨ壓鍙傛暟缁存姢</a>
-              </a-menu-item>
-              <a-menu-item
-                v-has="'accountSons:add&edit&delete&submit'"
-                v-if="record.precisionParameters==1"
-              >
-                <a @click="editPrecision(record)">绮惧害鍙傛暟缁存姢</a>
-              </a-menu-item>
-              <a-menu-item v-has="'equipmentAccount:add&delete&import&Edit'">
-                <a @click="handleEdit(record)">缂栬緫</a>
-              </a-menu-item>
-              <a-menu-item v-has="'equipmentAccount:add&delete&import&Edit'">
-                <a @click="handleEditSpareParts(record)">缂栬緫澶囦欢</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm
-                  title="纭畾鍒犻櫎鍚�?"
-                  @confirm="() => handleDelete(record.id)"
-                  v-has="'equipmentAccount:add&delete&import&Edit'"
-                >
-                  <a>鍒犻櫎</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-      </a-table>
-    </div>
-    <equipment-resume-drawer
-      ref="EquipmentResumeDrawer"
-      @ok="modalFormOk"
-    ></equipment-resume-drawer>
-
-    <a-tabs defaultActiveKey="1">
-      <a-tab-pane
-        tab="宸ヨ壓鍙傛暟"
-        key="1"
-      >
-        <EquipmentProcessParametersList
-          :mainId="selectedMainId"
-          :isOpen="isOpenProcess"
-        />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="璁惧绮惧害"
-        key="2"
-        forceRender
-      >
-        <EquipmentPrecisionParametersList
-          :isOpen="isOpenPrecision"
-          :mainId="precisionParametersTemplateId"
-        />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="璁惧鏂囨。"
-        key="3"
-        forceRender
-      >
-        <EquipmentDocumentList :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="澶囦欢"
-        key="4"
-        forceRender
-      >
-        <EquipmentSpareParts :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="ABC鏍囪瘑鍙樻洿璁板綍"
-        key="5"
-        forceRender
-      >
-        <equipment-update-ABC-list :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="璐ㄤ繚鏈熷彉鏇�"
-        key="6"
-        forceRender
-      >
-        <equipment-update-warranty-list :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="鏃ヤ繚鏍囧噯"
-        key="7"
-        forceRender
-      >
-        <daily-maintenance-list :mainId="selectedMainId"></daily-maintenance-list>
-      </a-tab-pane>
-      <a-tab-pane
-        tab="浜屼繚鏍囧噯"
-        key="8"
-        forceRender
-      >
-        <second-maintenance-list :mainId="selectedMainId"></second-maintenance-list>
-      </a-tab-pane>
-      <a-tab-pane
-        tab="涓変繚鏍囧噯"
-        key="9"
-        forceRender
-      >
-        <third-maintenance-list :mainId="selectedMainId"></third-maintenance-list>
-      </a-tab-pane>
-    </a-tabs>
-    <equipment-modal
-      ref="modalForm"
-      @ok="modalFormOk"
-      :caytegoryParam="caytegoryParam"
-    ></equipment-modal>
-    <process-edit-model ref="processEditModel"></process-edit-model>
-    <precision-edit-model ref="precisionEditModel"></precision-edit-model>
-    <aBC-update-edit-model
-      @ok="modalFormOk"
-      :updateList="selectionRows"
-      ref="updateABC"
-    ></aBC-update-edit-model>
-    <warranty-update-model
-      :updateList="selectionRows"
-      ref="updateWarranty"
-    ></warranty-update-model>
-    <EquipmentSparePartsModal
-      ref="modalFormSpareParts"
-      @ok="modalFormOk"
-    />
-  </a-card>
+  <equipment-list-of-all :caytegoryParam="caytegoryParam"></equipment-list-of-all>
 </template>
 
 <script>
 
-import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-import { mixinDevice } from '@/utils/mixin'
-import EquipmentModal from './modules/equipmentNew/EquipmentModal'
-import { getAction } from '@/api/manage'
-import EquipmentProcessParametersList from './modules/equipmentNew/EquipmentProcessParametersList'
-import EquipmentDocumentList from './modules/equipmentNew/EquipmentDocumentList'
-import EquipmentPrecisionParametersList from './modules/equipmentNew/EquipmentPrecisionParametersList'
-import '@/assets/less/TableExpand.less'
-import EquipmentResumeDrawer from './modules/equipmentNew/EquipmentResume/EquipmentResumeDrawer'
-import JSearchSelectTag from '../../components/dict/JSearchSelectTag.vue'
-import ProcessEditModel from './modules/equipmentNew/edit/ProcessEditModel.vue'
-import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
-import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
-import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
-import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
-import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
-import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts'
-import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
-import StandardOfInspection from './modules/equipmentNew/StandardOfInspection.vue'
-import StandardOfMaintenance from './modules/equipmentNew/StandardOfMaintenance.vue'
-import DailyMaintenanceList from './modules/equipmentNew/DailyMaintenanceList.vue'
-import SecondMaintenanceList from './modules/equipmentNew/SecondMaintenanceList.vue'
-import ThirdMaintenanceList from './modules/equipmentNew/ThirdMaintenanceList.vue'
-import JEllipsis from '@/components/jeecg/JEllipsis'
+import EquipmentListOfAll from './EquipmentListOfAll.vue'
+
 export default {
   name: "EquipmentList",
-  mixins: [JeecgListMixin, mixinDevice],
   components: {
-    EquipmentProcessParametersList,
-    EquipmentDocumentList,
-    EquipmentPrecisionParametersList,
-    EquipmentModal,
-    EquipmentResumeDrawer,
-    JSearchSelectTag,
-    ProcessEditModel,
-    PrecisionEditModel,
-    EquipmentUpdateABCList,
-    EquipmentUpdateWarrantyList,
-    ABCUpdateEditModel,
-    WarrantyUpdateModel,
-    EquipmentSpareParts,
-    EquipmentSparePartsModal,
-    StandardOfInspection,
-    StandardOfMaintenance,
-    DailyMaintenanceList,
-    SecondMaintenanceList,
-    ThirdMaintenanceList,
-    JEllipsis
+    EquipmentListOfAll,
   },
   data() {
     return {
       description: '璁惧鍙拌处绠$悊椤甸潰',
       caytegoryParam: 'filesCarousel',
-      // 琛ㄥご
-      columns: [
-        {
-          title: '#',
-          dataIndex: '',
-          key: 'rowIndex',
-          align: 'center',
-          customRender: function (t, r, index) {
-            return parseInt(index) + 1
-          },
-          width: 50,
-        },
-        {
-          title: '璁惧绫诲瀷',
-          align: "center",
-          dataIndex: 'equipmentCategoryId_dictText',
-        },
-        {
-          title: '鏄惁鐢熶骇绾胯澶�',
-          align: "center",
-          dataIndex: 'isLineEquip_dictText',
-        },
-        {
-          title: '鍏抽敭璁惧鏍囪瘑',
-          align: "center",
-          dataIndex: 'specificEquipment_dictText',
-        },
-        {
-          title: '缁熶竴缂栫爜',
-          align: "center",
-          dataIndex: 'num',
-          scopedSlots: { customRender: 'num' },
-        },
-        {
-          title: '璁惧鍚嶇О',
-          align: "center",
-          dataIndex: 'name',
-          scopedSlots: { customRender: 'name' },
-        },
-        {
-          title: '鍨嬪彿',
-          align: "center",
-          dataIndex: 'model',
-        },
-        {
-          title: '瑙勬牸',
-          align: "center",
-          dataIndex: 'specification',
-        },
-        {
-          title: '鎬诲姛鐜�',
-          align: "center",
-          dataIndex: 'gpo',
-        },
-        // {
-        //   title: '浣跨敤閮ㄩ棬',
-        //   align: "center",
-        //   dataIndex: 'useId_dictText',
-        // },
-        // {
-        //   title: '缁存姢閮ㄩ棬',
-        //   align: "center",
-        //   dataIndex: 'manageId_dictText',
-        // },
-        {
-          title: '缁翠慨鐝粍',
-          align: "center",
-          dataIndex: 'teamId_dictText',
-        },
-        {
-          title: 'ABC鏍囪瘑',
-          align: "center",
-          dataIndex: 'equipmentImportanceId',
-        },
-        {
-          title: '鍏抽敭璁惧鏍囪瘑',
-          align: "center",
-          dataIndex: 'specificEquipment_dictText',
-        },
-        {
-          title: '鎶�鏈姸鎬�',
-          align: "center",
-          dataIndex: 'technologyStatus_dictText',
-          scopedSlots: { customRender: 'technologyStatus' },
-        },
-        {
-          title: '鎶�鏈姸鎬侀壌瀹氱被鍨�',
-          align: "center",
-          dataIndex: 'technologyStatusVerificationType_dictText',
-        },
-        {
-          title: '涓嬫鎶�鏈姸鎬侀壌瀹氭椂闂�',
-          align: "center",
-          dataIndex: 'nextTechnologyStatusQualificationTime',
-        },
-        {
-          title: '鐢熶骇绾跨紪鍙�',
-          align: "center",
-          dataIndex: 'lineId_dictText',
-        },
-        {
-          title: '涓昏澶�?',
-          align: "center",
-          dataIndex: 'isMeta_dictText',
-        },
-        // {
-        //   title: '宸ュ尯',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda1',
-        // },
-        // {
-        //   title: '瀹夊叏閰嶇疆',
-        //   align: "center",
-        //   dataIndex: 'securityConfiguration',
-        // },
-        // {
-        //   title: '鍐峰嵈绯荤粺',
-        //   align: "center",
-        //   dataIndex: 'coolingSystem',
-        // },
-        // {
-        //   title: '鐏伀鍣�',
-        //   align: "center",
-        //   dataIndex: 'fireExtinguisher',
-        // },
-
-        // {
-        //   title: '鐏伀鍣ㄦ湁鏁堟湡',
-        //   align: "center",
-        //   dataIndex: 'fireExtinguisherValidityPeriod',
-        // },
-        // {
-        //   title: '鎿嶄綔绯荤粺',
-        //   align: "center",
-        //   dataIndex: 'operatingSystem',
-        // },
-        // {
-        //   title: '绯荤粺',
-        //   align: "center",
-        //   dataIndex: 'system',
-        // },
-        // {
-        //   title: '璁惧绔彛',
-        //   align: "center",
-        //   dataIndex: 'port',
-        // },
-        // {
-        //   title: '鍧愭爣鏁伴噺',
-        //   align: "center",
-        //   dataIndex: 'coordinateNum',
-        // },
-        // {
-        //   title: '璁惧鐘舵��',
-        //   align: "center",
-        //   dataIndex: 'equipmentStatus_dictText',
-        // },
-        // {
-        //   title: '閲嶉噺',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda3',
-        // },
-        // {
-        //   title: '閲嶉噺璁¢噺鍗曚綅',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda4_dictText',
-        // },
-        // {
-        //   title: '鍔熻兘浣嶇疆',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda5',
-        // },
-        // {
-        //   title: '瀹夎浣嶇疆',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda2',
-        // },
-        // {
-        //   title: '鍑哄巶鏃ユ湡',
-        //   align: "center",
-        //   dataIndex: 'leaveFactoryDate',
-        // },
-        // {
-        //   title: '绔嬮」鍗″彿',
-        //   align: "center",
-        //   dataIndex: 'projectApprovalNo',
-        // },
-        // {
-        //   title: '璧勯噾鏉ユ簮',
-        //   align: "center",
-        //   dataIndex: 'fundSource',
-        // },
-        // {
-        //   title: '楠屾敹鏃ユ湡',
-        //   align: "center",
-        //   dataIndex: 'acceptanceCheckDate',
-        // },
-        // {
-        //   title: '鍑哄巶缂栧彿',
-        //   align: "center",
-        //   dataIndex: 'factoryNo',
-        // },
-        // {
-        //   title: '璧勪骇鍒堕�犲晢',
-        //   align: "center",
-        //   dataIndex: 'constructorId_dictText',
-        // },
-        // {
-        //   title: '璧勪骇鐨勬潵婧愬浗瀹�',
-        //   align: "center",
-        //   dataIndex: 'sourceCountry',
-        // }, 
-        {
-          title: '宸ヨ壓鍙傛暟绠$悊',
-          align: "center",
-          dataIndex: 'processParameters',
-          scopedSlots: { customRender: 'processParameters' },
-        },
-        {
-          title: '宸ヨ壓鍙傛暟妯℃澘',
-          align: "center",
-          dataIndex: 'processParametersTemplateId_dictText',
-        },
-        {
-          title: '璁惧绮惧害绠$悊',
-          align: "center",
-          dataIndex: 'precisionParameters',
-          scopedSlots: { customRender: 'precisionParameters' },
-        },
-        {
-          title: '绮惧害鍙傛暟妯℃澘',
-          align: "center",
-          dataIndex: 'precisionParametersTemplateId_dictText',
-        },
-        // {
-        //   title: '澶囨敞',
-        //   align: "center",
-        //   dataIndex: 'remark',
-        // },
-        {
-          title: '鎿嶄綔',
-          align: "center",
-          dataIndex: 'action',
-          scopedSlots: {
-            customRender: 'action',
-          },
-          width: 147,
-          fixed: 'right',
-        },
-      ],
-      url: {
-        list: "/eam/equipment/getEquipmentTZList",
-        delete: "/eam/equipment/delete",
-        deleteBatch: "/eam/equipment/deleteBatch",
-        active: "/eam/equipment/active",
-        exportXlsUrl: '/eam/equipment/exportXls',
-        importExcelUrl: "/eam/equipment/importExcel",
-        loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
-      },
-      dictOptions: {
-      },
-      /* 鍒嗛〉鍙傛暟 */
-      ipagination: {
-        current: 1,
-        pageSize: 20,
-        pageSizeOptions: ['5', '10', '20', '50'],
-        showTotal: (total, range) => {
-          return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
-        },
-        showQuickJumper: true,
-        showSizeChanger: true,
-        total: 0
-      },
-      selectedMainId: '',
-      superFieldList: [],
-      equipmentProcessParametersMainId: '',
-      equipmentDocumentMainId: '',
-      equipmentPrecisionParametersMainId: '',
-      precisionParametersTemplateId: '',
-      isOpenPrecision: true,
-      isOpenProcess: true,
-      treeData: [],
-      labelCol: {
-        xs: { span: 24 },
-        sm: { span: 5 },
-      },
-      wrapperCol: {
-        xs: { span: 24 },
-        sm: { span: 16 },
-      },
-      mainId: '',
     }
   },
-  created() {
-    this.getSuperFieldList();
-    this.initOptions();
-  },
-  computed: {
-    importExcelUrl: function () {
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    }
-  },
-  methods: {
-    initDictConfig() {
-    },
-    equipmentResumeShow(record) {
-      this.$refs.EquipmentResumeDrawer.visible = true
-      this.$refs.EquipmentResumeDrawer.title = '璁惧灞ュ巻'
-      this.$refs.EquipmentResumeDrawer.handleShow(record)
-    },
-    clickThenSelect(record) {
-      return {
-        on: {
-          click: () => {
-            this.onSelectChange(record.id.split(","), [record]);
-          }
-        }
-      }
-    },
-    onClearSelected() {
-      this.selectedRowKeys = [];
-      this.selectionRows = [];
-      this.selectedMainId = ''
-    },
-    onSelectChange(selectedRowKeys, selectionRows) {
-      if (selectedRowKeys.length == 1) {
-        this.selectedMainId = selectedRowKeys[0]
-        this.precisionParametersTemplateId = selectionRows[0].precisionParametersTemplateId;
-        this.isOpenProcess = selectionRows[0].processParameters == 1;
-        this.isOpenPrecision = selectionRows[0].precisionParameters == 1;
-      } else {
-        this.selectedMainId = ''
-        this.precisionParametersTemplateId = ''
-      }
-      this.selectedRowKeys = selectedRowKeys;
-      this.selectionRows = selectionRows;
-    },
-    loadData(arg) {
-      if (!this.url.list) {
-        this.$message.error("璇疯缃畊rl.list灞炴��!")
-        return
-      }
-      //鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
-      if (arg === 1) {
-        this.ipagination.current = 1;
-      }
-      this.onClearSelected()
-      this.queryParam.equipmentCategoryUda1 = this.caytegoryParam;
-      var params = this.getQueryParams();//鏌ヨ鏉′欢
-      this.loading = true;
-      getAction(this.url.list, params).then((res) => {
-        if (res.success) {
-          this.dataSource = res.result.records;
-          this.ipagination.total = res.result.total;
-        }
-        if (res.code === 510) {
-          this.$message.warning(res.message)
-        }
-        this.loading = false;
-      })
-    },
-    getSuperFieldList() {
-      let fieldList = [];
-      fieldList.push({ type: 'string', value: 'num', text: '缁熶竴缂栫爜', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'name', text: '璁惧鍚嶇О', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'model', text: '鍨嬪彿', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'specification', text: '瑙勬牸', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentStatus', text: '璁惧鐘舵��', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'technologyStatus', text: 'technologyStatus', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'assetNumber', text: 'assetNumber', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentCategoryId', text: 'equipmentCategoryId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'specificEquipment', text: 'specificEquipment', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentPhoto', text: 'equipmentPhoto', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'constructorId', text: '璧勪骇鍒堕�犲晢', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'supplierId', text: 'supplierId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'factoryNumber', text: 'factoryNumber', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'leaveFactoryDate', text: '鍑哄巶鏃ユ湡', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'acceptanceCheckDate', text: '楠屾敹鏃ユ湡', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'affiliationId', text: 'affiliationId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'manageId', text: '缁存姢閮ㄩ棬ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'manager', text: 'manager', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'useId', text: '浣跨敤閮ㄩ棬ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'functionary', text: 'functionary', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'location', text: 'location', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentImportanceId', text: 'ABC鏍囪瘑ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'processParameters', text: 'processParameters', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'processParametersTemplateId', text: 'processParametersTemplateId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'precisionParameters', text: 'precisionParameters', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'precisionParametersTemplateId', text: 'precisionParametersTemplateId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'verification', text: 'verification', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'verificationPeriod', text: 'verificationPeriod', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'lastVerificationDate', text: 'lastVerificationDate', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'nextVerificationDate', text: 'nextVerificationDate', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'status', text: 'status', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'remark', text: 'remark', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda1', text: '宸ュ尯', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda2', text: '瀹夎浣嶇疆', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda3', text: '閲嶉噺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda4', text: '閲嶉噺璁¢噺鍗曚綅ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda5', text: '鍔熻兘浣嶇疆', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'tenantId', text: 'tenantId', dictCode: '' })
-      fieldList.push({ type: 'int', value: 'delFlag', text: 'delFlag', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'teamId', text: '缁翠慨鐝粍ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'sourceId', text: 'sourceId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'fundSource', text: '璧勯噾鏉ユ簮', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'factoryNo', text: '鍑哄巶缂栧彿', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'mfr', text: '鍒堕�犲晢', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'sourceCountry', text: '璧勪骇鏉ユ簮鍥藉', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'gpo', text: '鎬诲姛鐜�', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'keyEquipmentIdentification', text: '鍏抽敭璁惧鏍囪瘑', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'securityConfiguration', text: '瀹夊叏閰嶇疆', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'coolingSystem', text: '鍐峰嵈绯荤粺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'fireExtinguisher', text: '鐏伀鍣�', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'fireExtinguisherValidityPeriod', text: '鐏伀鍣ㄦ湁鏁堟湡', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'operatingSystem', text: '鎿嶄綔绯荤粺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'system', text: '绯荤粺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'port', text: '绔彛', dictCode: '' })
-      fieldList.push({ type: 'BigDecimal', value: 'coordinateNum', text: '鍧愭爣鏁伴噺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'projectApprovalNo', text: '绔嬮」鍗″彿', dictCode: '' })
-      this.superFieldList = fieldList
-    },
-    editProcess(record) {
-      this.$refs.processEditModel.edit(record);
-    },
-    editPrecision(record) {
-      this.$refs.precisionEditModel.edit(record);
-    },
-    initOptions() {
-      getAction(this.url.loadOptions).then(res => {
-        if (res.success) {
-          this.treeData = res.result
-        } else {
-          this.$message.warning(res.message)
-        }
-      })
-    },
-    handleUpdateABC() {
-      this.$refs.updateABC.add();
-    },
-    handleUpdateWarranty() {
-      this.$refs.updateWarranty.add();
-    },
-    handleEditSpareParts(record) {
-      this.$refs.modalFormSpareParts.edit(record);
-    },
-    handleTechnologyStatus(record) {
-      //璺敱鏄痚am/EquipmentCalibrationOrder
-      this.$router.push({
-        path: '/eam/EquipmentCalibrationOrder',
-        query: {
-          equipmentId: record.id,
-          technologyStatus: record.technologyStatus,
-          technologyStatusVerificationType: record.technologyStatusVerificationType,
-        }
-      })
-    },
-
-  }
 }
 </script>
 <style scoped>
diff --git a/src/views/eam/EquipmentListOfMetrological.vue b/src/views/eam/EquipmentListOfMetrological.vue
index ed317ee..a68b6c7 100644
--- a/src/views/eam/EquipmentListOfMetrological.vue
+++ b/src/views/eam/EquipmentListOfMetrological.vue
@@ -1,1168 +1,22 @@
 <template>
-  <a-card
-    :bordered="false"
-    title="璁¢噺妫�娴嬭澶�"
-  >
-    <!-- 鏌ヨ鍖哄煙 -->
-    <div class="table-page-search-wrapper">
-      <a-form
-        layout="inline"
-        @keyup.enter.native="searchQuery"
-      >
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-item
-              label="璁惧鎵�灞炲垎绫�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                :dictCode="'mom_eam_equipment_category,name,id,equipment_category_uda1='+'\''+caytegoryParam+'\''"
-                placeholder="璇疯緭鍏ユ悳绱㈡潯浠跺苟閫夋嫨"
-                v-model="queryParam.equipmentCategoryId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="缁熶竴缂栫爜"
-            >
-              <a-input
-                placeholder="璇疯緭鍏ヨ澶囩粺涓�缂栫爜鏌ヨ"
-                v-model="queryParam.num"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="璁惧鍚嶇О"
-            >
-              <a-input
-                placeholder="璇疯緭鍏ヨ澶囧悕绉版煡璇�"
-                v-model="queryParam.name"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鍨嬪彿"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <a-input
-                v-model="queryParam.model"
-                placeholder="璇疯緭鍏ュ瀷鍙�"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-item
-              label="宸ュ尯"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨宸ュ尯"
-                :triggerChange="true"
-                dictCode="mom_base_area,name,id,del_flag!='1'"
-                v-model="queryParam.factoryModelId"
-              />
-            </a-form-item>
-          </a-col>
-          <!-- <a-col :span="6">
-            <a-form-item
-              label="杞﹂棿"
-              :labelCol="labelCol"
-            :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨璧勮溅闂�"
-                :triggerChange="true"
-                dictCode="mom_base_factory_model,name,id,del_flag!='1'"
-                v-model="queryParam.factoryModelId"
-              />
-            </a-form-item>
-          </a-col> -->
-          <a-col :span="6">
-            <a-form-item
-              label="缁存姢閮ㄩ棬"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <!-- <a-tree-select
-                style="width: 100%"
-                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-                :tree-data="treeData"
-                placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
-                tree-default-expand-all
-                v-model="queryParam.manageId"
-              /> -->
-              <j-dict-select-tag
-                dictCode="sys_depart,depart_name,id"
-                placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
-                v-model="queryParam.manageId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="浣跨敤閮ㄩ棬"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <!-- <a-tree-select
-                style="width: 100%"
-                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-                :tree-data="treeData"
-                placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
-                tree-default-expand-all
-                v-model="queryParam.useId"
-              /> -->
-              <j-dict-select-tag
-                dictCode="sys_depart,depart_name,id"
-                placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
-                v-model="queryParam.useId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鏄惁鐢熶骇绾胯澶�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨"
-                :triggerChange="true"
-                dictCode="is_product"
-                v-model="queryParam.isLineEquip"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-item
-              label="ABC鏍囪瘑"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨ABC鏍囪瘑"
-                :triggerChange="true"
-                dictCode="ABC-standard-result"
-                v-model="queryParam.equipmentImportanceId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鎶�鏈姸鎬�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨鎶�鏈姸鎬�"
-                :triggerChange="true"
-                dictCode="technology_status"
-                v-model="queryParam.technologyStatus"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="璁惧鐘舵��"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨璁惧鐘舵��"
-                :triggerChange="true"
-                dictCode="equipment_status"
-                v-model="queryParam.equipmentStatus"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鍏抽敭璁惧鏍囪瘑"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                :triggerChange="true"
-                placeholder="璇烽�夋嫨鍏抽敭璁惧鏍囪瘑"
-                dictCode="specific_equipment"
-                v-model="queryParam.specificEquipment"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-model-item
-              label="璐ㄤ繚寮�濮嬫棩鏈�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-date
-                style="width: 100%;"
-                placeholder="璇烽�夋嫨寮�濮嬫棩鏈�"
-                class="query-group-cust"
-                v-model="queryParam.warrantyStart"
-              ></j-date>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-model-item
-              label="璐ㄤ繚缁撴潫鏃ユ湡"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-date
-                style="width: 100%;"
-                placeholder="璇烽�夋嫨缁撴潫鏃ユ湡"
-                class="query-group-cust"
-                v-model="queryParam.warrantyEnd"
-              ></j-date>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="缁翠慨鐝粍"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨缁翠慨鐝粍"
-                :triggerChange="true"
-                dictCode="mom_base_team,name,id,del_flag!='1'"
-                v-model="queryParam.teamId"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 鏌ヨ鍖哄煙-END -->
-
-    <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
-    <div class="table-operator">
-      <a-button
-        type="primary"
-        @click="searchQuery"
-        icon="search"
-      >鏌ヨ</a-button>
-      <a-button
-        @click="searchReset"
-        icon="reload"
-      >閲嶇疆</a-button>
-      <a-button
-        @click="handleAdd"
-        type="primary"
-        icon="plus"
-        v-has="'equipmentAccount:add&delete&import&Edit'"
-      >鏂板</a-button>
-      <a-button
-        type="primary"
-        icon="download"
-        @click="handleExportXls('璁惧鍙拌处')"
-        v-has="'equipmentAccount:outport'"
-      >瀵煎嚭</a-button>
-      <a-upload
-        name="file"
-        :showUploadList="false"
-        :multiple="false"
-        :headers="tokenHeader"
-        :action="importExcelUrl"
-        @change="handleImportExcel"
-      >
-        <a-button
-          type="primary"
-          icon="import"
-          v-has="'equipmentAccount:add&delete&import&Edit'"
-        >瀵煎叆</a-button>
-      </a-upload>
-      <a-button
-        :disabled="selectedRowKeys.length==0"
-        @click="handleUpdateABC"
-        type="primary"
-        icon="font-colors"
-        v-has="'equipmentAccount:add&delete&import&Edit'"
-      >ABC鏍囪瘑鍙樻洿</a-button>
-      <a-button
-        :disabled="selectedRowKeys.length==0"
-        @click="handleUpdateWarranty"
-        type="primary"
-        icon="calendar"
-        v-has="'equipmentAccount:add&delete&import&Edit'"
-      >璐ㄤ繚鏈熷彉鏇�</a-button>
-    </div>
-    <!-- table鍖哄煙-begin -->
-    <div>
-      <div
-        class="ant-alert ant-alert-info"
-        style="margin-bottom: 16px;"
-      >
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
-        <a
-          style="margin-left: 24px"
-          @click="onClearSelected"
-        >娓呯┖</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :scroll="{x:true}"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'checkbox'}"
-        :customRow="clickThenSelect"
-        @change="handleTableChange"
-      >
-        <template
-          slot="technologyStatus"
-          slot-scope="text,record"
-        >
-          <a
-            href="javascript:eam/EquipmentCalibrationOrder;"
-            @click="handleTechnologyStatus(record)"
-          >{{record.technologyStatus_dictText}}</a>
-        </template>
-        <template
-          slot="htmlSlot"
-          slot-scope="text"
-        >
-          <div v-html="text"></div>
-        </template>
-        <template
-          slot="imgSlot"
-          slot-scope="text,record"
-        >
-          <span
-            v-if="!text"
-            style="font-size: 12px;font-style: italic;"
-          >鏃犲浘鐗�</span>
-          <img
-            v-else
-            :src="getImgView(text)"
-            :preview="record.id"
-            height="25px"
-            alt=""
-            style="max-width:80px;font-size: 12px;font-style: italic;"
-          />
-        </template>
-        <template
-          slot="fileSlot"
-          slot-scope="text"
-        >
-          <span
-            v-if="!text"
-            style="font-size: 12px;font-style: italic;"
-          >鏃犳枃浠�</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)"
-          >
-            涓嬭浇
-          </a-button>
-        </template>
-
-        <!--宸ヨ壓鍙傛暟涓�у睍绀�-->
-        <span
-          slot="processParameters"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.processParameters==1"
-            status="success"
-          />
-          <span
-            v-if="record.processParameters==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.processParameters==0"
-            status="error"
-          />
-          <span
-            v-if="record.processParameters==0"
-            class="error"
-          >鍚�</span>
-        </span>
-        <span
-          slot="processParameters"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.processParameters==1"
-            status="success"
-          />
-          <span
-            v-if="record.processParameters==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.processParameters==0"
-            status="error"
-          />
-          <span
-            v-if="record.processParameters==0"
-            class="error"
-          >鍚�</span>
-        </span>
-        <span
-          slot="precisionParameters"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.precisionParameters==1"
-            status="success"
-          />
-          <span
-            v-if="record.precisionParameters==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.precisionParameters==0"
-            status="error"
-          />
-          <span
-            v-if="record.precisionParameters==0"
-            class="error"
-          >鍚�</span>
-        </span>
-        <span
-          slot="verification"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.verification==1"
-            status="success"
-          />
-          <span
-            v-if="record.verification==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.verification==0"
-            status="error"
-          />
-          <span
-            v-if="record.verification==0"
-            class="error"
-          >鍚�</span>
-        </span>
-
-        <span
-          slot="name"
-          slot-scope="text"
-        >
-          <j-ellipsis
-            :value="text"
-            :length="8"
-          />
-        </span>
-
-        <template
-          slot="num"
-          slot-scope="text,record"
-        >
-          <a
-            href="javascript:;"
-            @click="handleDetail(record)"
-          >{{record.num}}</a>
-        </template>
-
-        <span
-          slot="action"
-          slot-scope="text, record"
-        >
-          <!-- class="table-operation" -->
-          <!-- <a
-          href="javascript:;"
-          @click="equipmentStructuresShow(record)"
-        >璁惧缁撴瀯</a>
-        <a-divider type="vertical" /> -->
-          <a
-            href="javascript:;"
-            @click='handleDetail(record)'
-          >璇︽儏</a>
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">
-              鏇村
-              <a-icon type="down" />
-            </a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="equipmentResumeShow(record)">璁惧灞ュ巻</a>
-              </a-menu-item>
-              <a-menu-item
-                v-has="'accountSons:add&edit&delete&submit'"
-                v-if="record.processParameters==1"
-              >
-                <a @click="editProcess(record)">宸ヨ壓鍙傛暟缁存姢</a>
-              </a-menu-item>
-              <a-menu-item
-                v-has="'accountSons:add&edit&delete&submit'"
-                v-if="record.precisionParameters==1"
-              >
-                <a @click="editPrecision(record)">绮惧害鍙傛暟缁存姢</a>
-              </a-menu-item>
-              <a-menu-item v-has="'equipmentAccount:add&delete&import&Edit'">
-                <a @click="handleEdit(record)">缂栬緫</a>
-              </a-menu-item>
-              <a-menu-item v-has="'equipmentAccount:add&delete&import&Edit'">
-                <a @click="handleEditSpareParts(record)">缂栬緫澶囦欢</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm
-                  title="纭畾鍒犻櫎鍚�?"
-                  @confirm="() => handleDelete(record.id)"
-                  v-has="'equipmentAccount:add&delete&import&Edit'"
-                >
-                  <a>鍒犻櫎</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-      </a-table>
-    </div>
-    <equipment-resume-drawer
-      ref="EquipmentResumeDrawer"
-      @ok="modalFormOk"
-    ></equipment-resume-drawer>
-
-    <a-tabs defaultActiveKey="1">
-      <a-tab-pane
-        tab="宸ヨ壓鍙傛暟"
-        key="1"
-      >
-        <EquipmentProcessParametersList
-          :mainId="selectedMainId"
-          :isOpen="isOpenProcess"
-        />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="璁惧绮惧害"
-        key="2"
-        forceRender
-      >
-        <EquipmentPrecisionParametersList
-          :isOpen="isOpenPrecision"
-          :mainId="precisionParametersTemplateId"
-        />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="璁惧鏂囨。"
-        key="3"
-        forceRender
-      >
-        <EquipmentDocumentList :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="澶囦欢"
-        key="4"
-        forceRender
-      >
-        <EquipmentSpareParts :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="ABC鏍囪瘑鍙樻洿璁板綍"
-        key="5"
-        forceRender
-      >
-        <equipment-update-ABC-list :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="璐ㄤ繚鏈熷彉鏇�"
-        key="6"
-        forceRender
-      >
-        <equipment-update-warranty-list :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="鏃ヤ繚鏍囧噯"
-        key="7"
-        forceRender
-      >
-        <daily-maintenance-list :mainId="selectedMainId"></daily-maintenance-list>
-      </a-tab-pane>
-      <a-tab-pane
-        tab="浜屼繚鏍囧噯"
-        key="8"
-        forceRender
-      >
-        <second-maintenance-list :mainId="selectedMainId"></second-maintenance-list>
-      </a-tab-pane>
-      <a-tab-pane
-        tab="涓変繚鏍囧噯"
-        key="9"
-        forceRender
-      >
-        <third-maintenance-list :mainId="selectedMainId"></third-maintenance-list>
-      </a-tab-pane>
-    </a-tabs>
-    <equipment-modal
-      ref="modalForm"
-      @ok="modalFormOk"
-      :caytegoryParam="caytegoryParam"
-    ></equipment-modal>
-    <process-edit-model ref="processEditModel"></process-edit-model>
-    <precision-edit-model ref="precisionEditModel"></precision-edit-model>
-    <aBC-update-edit-model
-      @ok="modalFormOk"
-      :updateList="selectionRows"
-      ref="updateABC"
-    ></aBC-update-edit-model>
-    <warranty-update-model
-      :updateList="selectionRows"
-      ref="updateWarranty"
-    ></warranty-update-model>
-    <EquipmentSparePartsModal
-      ref="modalFormSpareParts"
-      @ok="modalFormOk"
-    />
-  </a-card>
+  <equipment-list-of-all :caytegoryParam="caytegoryParam"></equipment-list-of-all>
 </template>
 
 <script>
 
-import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-import { mixinDevice } from '@/utils/mixin'
-import EquipmentModal from './modules/equipmentNew/EquipmentModal'
-import { getAction } from '@/api/manage'
-import EquipmentProcessParametersList from './modules/equipmentNew/EquipmentProcessParametersList'
-import EquipmentDocumentList from './modules/equipmentNew/EquipmentDocumentList'
-import EquipmentPrecisionParametersList from './modules/equipmentNew/EquipmentPrecisionParametersList'
-import '@/assets/less/TableExpand.less'
-import EquipmentResumeDrawer from './modules/equipmentNew/EquipmentResume/EquipmentResumeDrawer'
-import JSearchSelectTag from '../../components/dict/JSearchSelectTag.vue'
-import ProcessEditModel from './modules/equipmentNew/edit/ProcessEditModel.vue'
-import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
-import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
-import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
-import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
-import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
-import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts'
-import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
-import StandardOfInspection from './modules/equipmentNew/StandardOfInspection.vue'
-import StandardOfMaintenance from './modules/equipmentNew/StandardOfMaintenance.vue'
-import DailyMaintenanceList from './modules/equipmentNew/DailyMaintenanceList.vue'
-import SecondMaintenanceList from './modules/equipmentNew/SecondMaintenanceList.vue'
-import ThirdMaintenanceList from './modules/equipmentNew/ThirdMaintenanceList.vue'
-import JEllipsis from '@/components/jeecg/JEllipsis'
+import EquipmentListOfAll from './EquipmentListOfAll.vue'
+
 export default {
   name: "EquipmentList",
-  mixins: [JeecgListMixin, mixinDevice],
   components: {
-    EquipmentProcessParametersList,
-    EquipmentDocumentList,
-    EquipmentPrecisionParametersList,
-    EquipmentModal,
-    EquipmentResumeDrawer,
-    JSearchSelectTag,
-    ProcessEditModel,
-    PrecisionEditModel,
-    EquipmentUpdateABCList,
-    EquipmentUpdateWarrantyList,
-    ABCUpdateEditModel,
-    WarrantyUpdateModel,
-    EquipmentSpareParts,
-    EquipmentSparePartsModal,
-    StandardOfInspection,
-    StandardOfMaintenance,
-    DailyMaintenanceList,
-    SecondMaintenanceList,
-    ThirdMaintenanceList,
-    JEllipsis
+    EquipmentListOfAll,
   },
   data() {
     return {
       description: '璁惧鍙拌处绠$悊椤甸潰',
       caytegoryParam: 'metrological',
-      // 琛ㄥご
-      columns: [
-        {
-          title: '#',
-          dataIndex: '',
-          key: 'rowIndex',
-          align: 'center',
-          customRender: function (t, r, index) {
-            return parseInt(index) + 1
-          },
-          width: 50,
-        },
-        {
-          title: '璁惧绫诲瀷',
-          align: "center",
-          dataIndex: 'equipmentCategoryId_dictText',
-        },
-        {
-          title: '鏄惁鐢熶骇绾胯澶�',
-          align: "center",
-          dataIndex: 'isLineEquip_dictText',
-        },
-        {
-          title: '鍏抽敭璁惧鏍囪瘑',
-          align: "center",
-          dataIndex: 'specificEquipment_dictText',
-        },
-        {
-          title: '缁熶竴缂栫爜',
-          align: "center",
-          dataIndex: 'num',
-          scopedSlots: { customRender: 'num' },
-        },
-        {
-          title: '璁惧鍚嶇О',
-          align: "center",
-          dataIndex: 'name',
-          scopedSlots: { customRender: 'name' },
-        },
-        {
-          title: '鍨嬪彿',
-          align: "center",
-          dataIndex: 'model',
-        },
-        {
-          title: '瑙勬牸',
-          align: "center",
-          dataIndex: 'specification',
-        },
-        {
-          title: '鎬诲姛鐜�',
-          align: "center",
-          dataIndex: 'gpo',
-        },
-        {
-          title: '浣跨敤閮ㄩ棬',
-          align: "center",
-          dataIndex: 'useId_dictText',
-        },
-        {
-          title: '缁存姢閮ㄩ棬',
-          align: "center",
-          dataIndex: 'manageId_dictText',
-        },
-        {
-          title: '缁翠慨鐝粍',
-          align: "center",
-          dataIndex: 'teamId_dictText',
-        },
-        {
-          title: 'ABC鏍囪瘑',
-          align: "center",
-          dataIndex: 'equipmentImportanceId',
-        },
-        // {
-        //   title: '鍏抽敭璁惧鏍囪瘑',
-        //   align: "center",
-        //   dataIndex: 'specificEquipment_dictText',
-        // },
-        {
-          title: '鎶�鏈姸鎬�',
-          align: "center",
-          dataIndex: 'technologyStatus_dictText',
-          scopedSlots: { customRender: 'technologyStatus' },
-        },
-        {
-          title: '鎶�鏈姸鎬侀壌瀹氱被鍨�',
-          align: "center",
-          dataIndex: 'technologyStatusVerificationType_dictText',
-        },
-        {
-          title: '涓嬫鎶�鏈姸鎬侀壌瀹氭椂闂�',
-          align: "center",
-          dataIndex: 'nextTechnologyStatusQualificationTime',
-        },
-        {
-          title: '鐢熶骇绾跨紪鍙�',
-          align: "center",
-          dataIndex: 'lineId_dictText',
-        },
-        {
-          title: '涓昏澶�?',
-          align: "center",
-          dataIndex: 'isMeta_dictText',
-        },
-        // {
-        //   title: '宸ュ尯',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda1',
-        // },
-        // {
-        //   title: '瀹夊叏閰嶇疆',
-        //   align: "center",
-        //   dataIndex: 'securityConfiguration',
-        // },
-        // {
-        //   title: '鍐峰嵈绯荤粺',
-        //   align: "center",
-        //   dataIndex: 'coolingSystem',
-        // },
-        // {
-        //   title: '鐏伀鍣�',
-        //   align: "center",
-        //   dataIndex: 'fireExtinguisher',
-        // },
-
-        // {
-        //   title: '鐏伀鍣ㄦ湁鏁堟湡',
-        //   align: "center",
-        //   dataIndex: 'fireExtinguisherValidityPeriod',
-        // },
-        // {
-        //   title: '鎿嶄綔绯荤粺',
-        //   align: "center",
-        //   dataIndex: 'operatingSystem',
-        // },
-        // {
-        //   title: '绯荤粺',
-        //   align: "center",
-        //   dataIndex: 'system',
-        // },
-        // {
-        //   title: '璁惧绔彛',
-        //   align: "center",
-        //   dataIndex: 'port',
-        // },
-        // {
-        //   title: '鍧愭爣鏁伴噺',
-        //   align: "center",
-        //   dataIndex: 'coordinateNum',
-        // },
-        // {
-        //   title: '璁惧鐘舵��',
-        //   align: "center",
-        //   dataIndex: 'equipmentStatus_dictText',
-        // },
-        // {
-        //   title: '閲嶉噺',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda3',
-        // },
-        // {
-        //   title: '閲嶉噺璁¢噺鍗曚綅',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda4_dictText',
-        // },
-        // {
-        //   title: '鍔熻兘浣嶇疆',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda5',
-        // },
-        // {
-        //   title: '瀹夎浣嶇疆',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda2',
-        // },
-        // {
-        //   title: '鍑哄巶鏃ユ湡',
-        //   align: "center",
-        //   dataIndex: 'leaveFactoryDate',
-        // },
-        // {
-        //   title: '绔嬮」鍗″彿',
-        //   align: "center",
-        //   dataIndex: 'projectApprovalNo',
-        // },
-        // {
-        //   title: '璧勯噾鏉ユ簮',
-        //   align: "center",
-        //   dataIndex: 'fundSource',
-        // },
-        // {
-        //   title: '楠屾敹鏃ユ湡',
-        //   align: "center",
-        //   dataIndex: 'acceptanceCheckDate',
-        // },
-        // {
-        //   title: '鍑哄巶缂栧彿',
-        //   align: "center",
-        //   dataIndex: 'factoryNo',
-        // },
-        // {
-        //   title: '璧勪骇鍒堕�犲晢',
-        //   align: "center",
-        //   dataIndex: 'constructorId_dictText',
-        // },
-        // {
-        //   title: '璧勪骇鐨勬潵婧愬浗瀹�',
-        //   align: "center",
-        //   dataIndex: 'sourceCountry',
-        // }, 
-        {
-          title: '宸ヨ壓鍙傛暟绠$悊',
-          align: "center",
-          dataIndex: 'processParameters',
-          scopedSlots: { customRender: 'processParameters' },
-        },
-        {
-          title: '宸ヨ壓鍙傛暟妯℃澘',
-          align: "center",
-          dataIndex: 'processParametersTemplateId_dictText',
-        },
-        {
-          title: '璁惧绮惧害绠$悊',
-          align: "center",
-          dataIndex: 'precisionParameters',
-          scopedSlots: { customRender: 'precisionParameters' },
-        },
-        {
-          title: '绮惧害鍙傛暟妯℃澘',
-          align: "center",
-          dataIndex: 'precisionParametersTemplateId_dictText',
-        },
-        // {
-        //   title: '澶囨敞',
-        //   align: "center",
-        //   dataIndex: 'remark',
-        // },
-        {
-          title: '鎿嶄綔',
-          align: "center",
-          dataIndex: 'action',
-          scopedSlots: {
-            customRender: 'action',
-          },
-          width: 147,
-          fixed: 'right',
-        },
-      ],
-      url: {
-        list: "/eam/equipment/getEquipmentTZList",
-        delete: "/eam/equipment/delete",
-        deleteBatch: "/eam/equipment/deleteBatch",
-        active: "/eam/equipment/active",
-        exportXlsUrl: '/eam/equipment/exportXls',
-        importExcelUrl: "/eam/equipment/importExcel",
-        loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
-      },
-      dictOptions: {
-      },
-      /* 鍒嗛〉鍙傛暟 */
-      ipagination: {
-        current: 1,
-        pageSize: 20,
-        pageSizeOptions: ['5', '10', '20', '50'],
-        showTotal: (total, range) => {
-          return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
-        },
-        showQuickJumper: true,
-        showSizeChanger: true,
-        total: 0
-      },
-      selectedMainId: '',
-      superFieldList: [],
-      equipmentProcessParametersMainId: '',
-      equipmentDocumentMainId: '',
-      equipmentPrecisionParametersMainId: '',
-      precisionParametersTemplateId: '',
-      isOpenPrecision: true,
-      isOpenProcess: true,
-      treeData: [],
-      labelCol: {
-        xs: { span: 24 },
-        sm: { span: 5 },
-      },
-      wrapperCol: {
-        xs: { span: 24 },
-        sm: { span: 16 },
-      },
-      mainId: '',
     }
   },
-  created() {
-    this.getSuperFieldList();
-    this.initOptions();
-  },
-  computed: {
-    importExcelUrl: function () {
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    }
-  },
-  methods: {
-    initDictConfig() {
-    },
-    equipmentResumeShow(record) {
-      this.$refs.EquipmentResumeDrawer.visible = true
-      this.$refs.EquipmentResumeDrawer.title = '璁惧灞ュ巻'
-      this.$refs.EquipmentResumeDrawer.handleShow(record)
-    },
-    clickThenSelect(record) {
-      return {
-        on: {
-          click: () => {
-            this.onSelectChange(record.id.split(","), [record]);
-          }
-        }
-      }
-    },
-    onClearSelected() {
-      this.selectedRowKeys = [];
-      this.selectionRows = [];
-      this.selectedMainId = ''
-    },
-    onSelectChange(selectedRowKeys, selectionRows) {
-      if (selectedRowKeys.length == 1) {
-        this.selectedMainId = selectedRowKeys[0]
-        this.precisionParametersTemplateId = selectionRows[0].precisionParametersTemplateId;
-        this.isOpenProcess = selectionRows[0].processParameters == 1;
-        this.isOpenPrecision = selectionRows[0].precisionParameters == 1;
-      } else {
-        this.selectedMainId = ''
-        this.precisionParametersTemplateId = ''
-      }
-      this.selectedRowKeys = selectedRowKeys;
-      this.selectionRows = selectionRows;
-    },
-    loadData(arg) {
-      if (!this.url.list) {
-        this.$message.error("璇疯缃畊rl.list灞炴��!")
-        return
-      }
-      //鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
-      if (arg === 1) {
-        this.ipagination.current = 1;
-      }
-      this.onClearSelected()
-      this.queryParam.equipmentCategoryUda1 = this.caytegoryParam;
-      var params = this.getQueryParams();//鏌ヨ鏉′欢
-      this.loading = true;
-      getAction(this.url.list, params).then((res) => {
-        if (res.success) {
-          this.dataSource = res.result.records;
-          this.ipagination.total = res.result.total;
-        }
-        if (res.code === 510) {
-          this.$message.warning(res.message)
-        }
-        this.loading = false;
-      })
-    },
-    getSuperFieldList() {
-      let fieldList = [];
-      fieldList.push({ type: 'string', value: 'num', text: '缁熶竴缂栫爜', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'name', text: '璁惧鍚嶇О', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'model', text: '鍨嬪彿', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'specification', text: '瑙勬牸', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentStatus', text: '璁惧鐘舵��', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'technologyStatus', text: 'technologyStatus', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'assetNumber', text: 'assetNumber', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentCategoryId', text: 'equipmentCategoryId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'specificEquipment', text: 'specificEquipment', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentPhoto', text: 'equipmentPhoto', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'constructorId', text: '璧勪骇鍒堕�犲晢', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'supplierId', text: 'supplierId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'factoryNumber', text: 'factoryNumber', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'leaveFactoryDate', text: '鍑哄巶鏃ユ湡', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'acceptanceCheckDate', text: '楠屾敹鏃ユ湡', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'affiliationId', text: 'affiliationId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'manageId', text: '缁存姢閮ㄩ棬ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'manager', text: 'manager', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'useId', text: '浣跨敤閮ㄩ棬ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'functionary', text: 'functionary', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'location', text: 'location', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentImportanceId', text: 'ABC鏍囪瘑ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'processParameters', text: 'processParameters', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'processParametersTemplateId', text: 'processParametersTemplateId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'precisionParameters', text: 'precisionParameters', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'precisionParametersTemplateId', text: 'precisionParametersTemplateId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'verification', text: 'verification', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'verificationPeriod', text: 'verificationPeriod', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'lastVerificationDate', text: 'lastVerificationDate', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'nextVerificationDate', text: 'nextVerificationDate', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'status', text: 'status', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'remark', text: 'remark', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda1', text: '宸ュ尯', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda2', text: '瀹夎浣嶇疆', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda3', text: '閲嶉噺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda4', text: '閲嶉噺璁¢噺鍗曚綅ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda5', text: '鍔熻兘浣嶇疆', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'tenantId', text: 'tenantId', dictCode: '' })
-      fieldList.push({ type: 'int', value: 'delFlag', text: 'delFlag', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'teamId', text: '缁翠慨鐝粍ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'sourceId', text: 'sourceId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'fundSource', text: '璧勯噾鏉ユ簮', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'factoryNo', text: '鍑哄巶缂栧彿', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'mfr', text: '鍒堕�犲晢', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'sourceCountry', text: '璧勪骇鏉ユ簮鍥藉', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'gpo', text: '鎬诲姛鐜�', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'keyEquipmentIdentification', text: '鍏抽敭璁惧鏍囪瘑', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'securityConfiguration', text: '瀹夊叏閰嶇疆', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'coolingSystem', text: '鍐峰嵈绯荤粺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'fireExtinguisher', text: '鐏伀鍣�', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'fireExtinguisherValidityPeriod', text: '鐏伀鍣ㄦ湁鏁堟湡', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'operatingSystem', text: '鎿嶄綔绯荤粺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'system', text: '绯荤粺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'port', text: '绔彛', dictCode: '' })
-      fieldList.push({ type: 'BigDecimal', value: 'coordinateNum', text: '鍧愭爣鏁伴噺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'projectApprovalNo', text: '绔嬮」鍗″彿', dictCode: '' })
-      this.superFieldList = fieldList
-    },
-    editProcess(record) {
-      this.$refs.processEditModel.edit(record);
-    },
-    editPrecision(record) {
-      this.$refs.precisionEditModel.edit(record);
-    },
-    initOptions() {
-      getAction(this.url.loadOptions).then(res => {
-        if (res.success) {
-          this.treeData = res.result
-        } else {
-          this.$message.warning(res.message)
-        }
-      })
-    },
-    handleUpdateABC() {
-      this.$refs.updateABC.add();
-    },
-    handleUpdateWarranty() {
-      this.$refs.updateWarranty.add();
-    },
-    handleEditSpareParts(record) {
-      this.$refs.modalFormSpareParts.edit(record);
-    },
-    handleTechnologyStatus(record) {
-      //璺敱鏄痚am/EquipmentCalibrationOrder
-      this.$router.push({
-        path: '/eam/EquipmentCalibrationOrder',
-        query: {
-          equipmentId: record.id,
-          technologyStatus: record.technologyStatus,
-          technologyStatusVerificationType: record.technologyStatusVerificationType,
-        }
-      })
-    },
-
-  }
 }
 </script>
 <style scoped>
diff --git a/src/views/eam/EquipmentListOfPressureVessel.vue b/src/views/eam/EquipmentListOfPressureVessel.vue
index 0d61ef5..93a2940 100644
--- a/src/views/eam/EquipmentListOfPressureVessel.vue
+++ b/src/views/eam/EquipmentListOfPressureVessel.vue
@@ -1,1164 +1,22 @@
 <template>
-  <a-card
-    :bordered="false"
-    title="鍘嬪姏瀹瑰櫒"
-  >
-    <!-- 鏌ヨ鍖哄煙 -->
-    <div class="table-page-search-wrapper">
-      <a-form
-        layout="inline"
-        @keyup.enter.native="searchQuery"
-      >
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-item
-              label="璁惧鎵�灞炲垎绫�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                :dictCode="'mom_eam_equipment_category,name,id,equipment_category_uda1='+'\''+caytegoryParam+'\''"
-                placeholder="璇疯緭鍏ユ悳绱㈡潯浠跺苟閫夋嫨"
-                v-model="queryParam.equipmentCategoryId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="缁熶竴缂栫爜"
-            >
-              <a-input
-                placeholder="璇疯緭鍏ヨ澶囩粺涓�缂栫爜鏌ヨ"
-                v-model="queryParam.num"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="璁惧鍚嶇О"
-            >
-              <a-input
-                placeholder="璇疯緭鍏ヨ澶囧悕绉版煡璇�"
-                v-model="queryParam.name"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鍨嬪彿"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <a-input
-                v-model="queryParam.model"
-                placeholder="璇疯緭鍏ュ瀷鍙�"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-item
-              label="宸ュ尯"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨宸ュ尯"
-                :triggerChange="true"
-                dictCode="mom_base_area,name,id,del_flag!='1'"
-                v-model="queryParam.factoryModelId"
-              />
-            </a-form-item>
-          </a-col>
-          <!-- <a-col :span="6">
-            <a-form-item
-              label="杞﹂棿"
-              :labelCol="labelCol"
-            :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨璧勮溅闂�"
-                :triggerChange="true"
-                dictCode="mom_base_factory_model,name,id,del_flag!='1'"
-                v-model="queryParam.factoryModelId"
-              />
-            </a-form-item>
-          </a-col> -->
-          <a-col :span="6">
-            <a-form-item
-              label="缁存姢閮ㄩ棬"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <!-- <a-tree-select
-                style="width: 100%"
-                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-                :tree-data="treeData"
-                placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
-                tree-default-expand-all
-                v-model="queryParam.manageId"
-              /> -->
-              <j-dict-select-tag
-                dictCode="sys_depart,depart_name,id"
-                placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
-                v-model="queryParam.manageId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="浣跨敤閮ㄩ棬"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <!-- <a-tree-select
-                style="width: 100%"
-                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-                :tree-data="treeData"
-                placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
-                tree-default-expand-all
-                v-model="queryParam.useId"
-              /> -->
-              <j-dict-select-tag
-                dictCode="sys_depart,depart_name,id"
-                placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
-                v-model="queryParam.useId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鏄惁鐢熶骇绾胯澶�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨"
-                :triggerChange="true"
-                dictCode="is_product"
-                v-model="queryParam.isLineEquip"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-item
-              label="ABC鏍囪瘑"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨ABC鏍囪瘑"
-                :triggerChange="true"
-                dictCode="ABC-standard-result"
-                v-model="queryParam.equipmentImportanceId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鎶�鏈姸鎬�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨鎶�鏈姸鎬�"
-                :triggerChange="true"
-                dictCode="technology_status"
-                v-model="queryParam.technologyStatus"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="璁惧鐘舵��"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨璁惧鐘舵��"
-                :triggerChange="true"
-                dictCode="equipment_status"
-                v-model="queryParam.equipmentStatus"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鍏抽敭璁惧鏍囪瘑"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                :triggerChange="true"
-                placeholder="璇烽�夋嫨鍏抽敭璁惧鏍囪瘑"
-                dictCode="specific_equipment"
-                v-model="queryParam.specificEquipment"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-model-item
-              label="璐ㄤ繚寮�濮嬫棩鏈�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-date
-                style="width: 100%;"
-                placeholder="璇烽�夋嫨寮�濮嬫棩鏈�"
-                class="query-group-cust"
-                v-model="queryParam.warrantyStart"
-              ></j-date>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-model-item
-              label="璐ㄤ繚缁撴潫鏃ユ湡"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-date
-                style="width: 100%;"
-                placeholder="璇烽�夋嫨缁撴潫鏃ユ湡"
-                class="query-group-cust"
-                v-model="queryParam.warrantyEnd"
-              ></j-date>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="缁翠慨鐝粍"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨缁翠慨鐝粍"
-                :triggerChange="true"
-                dictCode="mom_base_team,name,id,del_flag!='1'"
-                v-model="queryParam.teamId"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 鏌ヨ鍖哄煙-END -->
-
-    <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
-    <div class="table-operator">
-      <a-button
-        type="primary"
-        @click="searchQuery"
-        icon="search"
-      >鏌ヨ</a-button>
-      <a-button
-        @click="searchReset"
-        icon="reload"
-      >閲嶇疆</a-button>
-      <a-button
-        @click="handleAdd"
-        type="primary"
-        icon="plus"
-        v-has="'equipmentAccount:add&delete&import&Edit'"
-      >鏂板</a-button>
-      <a-button
-        type="primary"
-        icon="download"
-        @click="handleExportXls('璁惧鍙拌处')"
-        v-has="'equipmentAccount:outport'"
-      >瀵煎嚭</a-button>
-      <a-upload
-        name="file"
-        :showUploadList="false"
-        :multiple="false"
-        :headers="tokenHeader"
-        :action="importExcelUrl"
-        @change="handleImportExcel"
-      >
-        <a-button
-          type="primary"
-          icon="import"
-          v-has="'equipmentAccount:add&delete&import&Edit'"
-        >瀵煎叆</a-button>
-      </a-upload>
-      <a-button
-        :disabled="selectedRowKeys.length==0"
-        @click="handleUpdateABC"
-        type="primary"
-        icon="font-colors"
-        v-has="'equipmentAccount:add&delete&import&Edit'"
-      >ABC鏍囪瘑鍙樻洿</a-button>
-      <a-button
-        :disabled="selectedRowKeys.length==0"
-        @click="handleUpdateWarranty"
-        type="primary"
-        icon="calendar"
-        v-has="'equipmentAccount:add&delete&import&Edit'"
-      >璐ㄤ繚鏈熷彉鏇�</a-button>
-    </div>
-    <!-- table鍖哄煙-begin -->
-    <div>
-      <div
-        class="ant-alert ant-alert-info"
-        style="margin-bottom: 16px;"
-      >
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
-        <a
-          style="margin-left: 24px"
-          @click="onClearSelected"
-        >娓呯┖</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :scroll="{x:true}"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'checkbox'}"
-        :customRow="clickThenSelect"
-        @change="handleTableChange"
-      >
-        <template
-          slot="technologyStatus"
-          slot-scope="text,record"
-        >
-          <a
-            href="javascript:eam/EquipmentCalibrationOrder;"
-            @click="handleTechnologyStatus(record)"
-          >{{record.technologyStatus_dictText}}</a>
-        </template>
-        <template
-          slot="htmlSlot"
-          slot-scope="text"
-        >
-          <div v-html="text"></div>
-        </template>
-        <template
-          slot="imgSlot"
-          slot-scope="text,record"
-        >
-          <span
-            v-if="!text"
-            style="font-size: 12px;font-style: italic;"
-          >鏃犲浘鐗�</span>
-          <img
-            v-else
-            :src="getImgView(text)"
-            :preview="record.id"
-            height="25px"
-            alt=""
-            style="max-width:80px;font-size: 12px;font-style: italic;"
-          />
-        </template>
-        <template
-          slot="fileSlot"
-          slot-scope="text"
-        >
-          <span
-            v-if="!text"
-            style="font-size: 12px;font-style: italic;"
-          >鏃犳枃浠�</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)"
-          >
-            涓嬭浇
-          </a-button>
-        </template>
-
-        <!--宸ヨ壓鍙傛暟涓�у睍绀�-->
-        <span
-          slot="processParameters"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.processParameters==1"
-            status="success"
-          />
-          <span
-            v-if="record.processParameters==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.processParameters==0"
-            status="error"
-          />
-          <span
-            v-if="record.processParameters==0"
-            class="error"
-          >鍚�</span>
-        </span>
-        <span
-          slot="processParameters"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.processParameters==1"
-            status="success"
-          />
-          <span
-            v-if="record.processParameters==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.processParameters==0"
-            status="error"
-          />
-          <span
-            v-if="record.processParameters==0"
-            class="error"
-          >鍚�</span>
-        </span>
-        <span
-          slot="precisionParameters"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.precisionParameters==1"
-            status="success"
-          />
-          <span
-            v-if="record.precisionParameters==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.precisionParameters==0"
-            status="error"
-          />
-          <span
-            v-if="record.precisionParameters==0"
-            class="error"
-          >鍚�</span>
-        </span>
-        <span
-          slot="verification"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.verification==1"
-            status="success"
-          />
-          <span
-            v-if="record.verification==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.verification==0"
-            status="error"
-          />
-          <span
-            v-if="record.verification==0"
-            class="error"
-          >鍚�</span>
-        </span>
-
-        <span
-          slot="name"
-          slot-scope="text"
-        >
-          <j-ellipsis
-            :value="text"
-            :length="8"
-          />
-        </span>
-
-        <template
-          slot="num"
-          slot-scope="text,record"
-        >
-          <a
-            href="javascript:;"
-            @click="handleDetail(record)"
-          >{{record.num}}</a>
-        </template>
-
-        <span
-          slot="action"
-          slot-scope="text, record"
-        >
-          <!-- class="table-operation" -->
-          <!-- <a
-          href="javascript:;"
-          @click="equipmentStructuresShow(record)"
-        >璁惧缁撴瀯</a>
-        <a-divider type="vertical" /> -->
-          <a
-            href="javascript:;"
-            @click='handleDetail(record)'
-          >璇︽儏</a>
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">
-              鏇村
-              <a-icon type="down" />
-            </a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="equipmentResumeShow(record)">璁惧灞ュ巻</a>
-              </a-menu-item>
-              <a-menu-item
-                v-has="'accountSons:add&edit&delete&submit'"
-                v-if="record.processParameters==1"
-              >
-                <a @click="editProcess(record)">宸ヨ壓鍙傛暟缁存姢</a>
-              </a-menu-item>
-              <a-menu-item
-                v-has="'accountSons:add&edit&delete&submit'"
-                v-if="record.precisionParameters==1"
-              >
-                <a @click="editPrecision(record)">绮惧害鍙傛暟缁存姢</a>
-              </a-menu-item>
-              <a-menu-item v-has="'equipmentAccount:add&delete&import&Edit'">
-                <a @click="handleEdit(record)">缂栬緫</a>
-              </a-menu-item>
-              <a-menu-item v-has="'equipmentAccount:add&delete&import&Edit'">
-                <a @click="handleEditSpareParts(record)">缂栬緫澶囦欢</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm
-                  title="纭畾鍒犻櫎鍚�?"
-                  @confirm="() => handleDelete(record.id)"
-                  v-has="'equipmentAccount:add&delete&import&Edit'"
-                >
-                  <a>鍒犻櫎</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-      </a-table>
-    </div>
-    <equipment-resume-drawer
-      ref="EquipmentResumeDrawer"
-      @ok="modalFormOk"
-    ></equipment-resume-drawer>
-
-    <a-tabs defaultActiveKey="1">
-      <a-tab-pane
-        tab="宸ヨ壓鍙傛暟"
-        key="1"
-      >
-        <EquipmentProcessParametersList
-          :mainId="selectedMainId"
-          :isOpen="isOpenProcess"
-        />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="璁惧绮惧害"
-        key="2"
-        forceRender
-      >
-        <EquipmentPrecisionParametersList
-          :isOpen="isOpenPrecision"
-          :mainId="precisionParametersTemplateId"
-        />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="璁惧鏂囨。"
-        key="3"
-        forceRender
-      >
-        <EquipmentDocumentList :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="澶囦欢"
-        key="4"
-        forceRender
-      >
-        <EquipmentSpareParts :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="ABC鏍囪瘑鍙樻洿璁板綍"
-        key="5"
-        forceRender
-      >
-        <equipment-update-ABC-list :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="璐ㄤ繚鏈熷彉鏇�"
-        key="6"
-        forceRender
-      >
-        <equipment-update-warranty-list :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="鏃ヤ繚鏍囧噯"
-        key="7"
-        forceRender
-      >
-        <daily-maintenance-list :mainId="selectedMainId"></daily-maintenance-list>
-      </a-tab-pane>
-      <a-tab-pane
-        tab="浜屼繚鏍囧噯"
-        key="8"
-        forceRender
-      >
-        <second-maintenance-list :mainId="selectedMainId"></second-maintenance-list>
-      </a-tab-pane>
-      <a-tab-pane
-        tab="涓変繚鏍囧噯"
-        key="9"
-        forceRender
-      >
-        <third-maintenance-list :mainId="selectedMainId"></third-maintenance-list>
-      </a-tab-pane>
-    </a-tabs>
-    <equipment-modal
-      ref="modalForm"
-      @ok="modalFormOk"
-      :caytegoryParam="caytegoryParam"
-    ></equipment-modal>
-    <process-edit-model ref="processEditModel"></process-edit-model>
-    <precision-edit-model ref="precisionEditModel"></precision-edit-model>
-    <aBC-update-edit-model
-      @ok="modalFormOk"
-      :updateList="selectionRows"
-      ref="updateABC"
-    ></aBC-update-edit-model>
-    <warranty-update-model
-      :updateList="selectionRows"
-      ref="updateWarranty"
-    ></warranty-update-model>
-    <EquipmentSparePartsModal
-      ref="modalFormSpareParts"
-      @ok="modalFormOk"
-    />
-  </a-card>
+  <equipment-list-of-all :caytegoryParam="caytegoryParam"></equipment-list-of-all>
 </template>
 
 <script>
 
-import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-import { mixinDevice } from '@/utils/mixin'
-import EquipmentModal from './modules/equipmentNew/EquipmentModal'
-import { getAction } from '@/api/manage'
-import EquipmentProcessParametersList from './modules/equipmentNew/EquipmentProcessParametersList'
-import EquipmentDocumentList from './modules/equipmentNew/EquipmentDocumentList'
-import EquipmentPrecisionParametersList from './modules/equipmentNew/EquipmentPrecisionParametersList'
-import '@/assets/less/TableExpand.less'
-import EquipmentResumeDrawer from './modules/equipmentNew/EquipmentResume/EquipmentResumeDrawer'
-import JSearchSelectTag from '../../components/dict/JSearchSelectTag.vue'
-import ProcessEditModel from './modules/equipmentNew/edit/ProcessEditModel.vue'
-import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
-import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
-import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
-import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
-import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
-import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts'
-import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
-import StandardOfInspection from './modules/equipmentNew/StandardOfInspection.vue'
-import StandardOfMaintenance from './modules/equipmentNew/StandardOfMaintenance.vue'
-import DailyMaintenanceList from './modules/equipmentNew/DailyMaintenanceList.vue'
-import SecondMaintenanceList from './modules/equipmentNew/SecondMaintenanceList.vue'
-import ThirdMaintenanceList from './modules/equipmentNew/ThirdMaintenanceList.vue'
-import JEllipsis from '@/components/jeecg/JEllipsis'
+import EquipmentListOfAll from './EquipmentListOfAll.vue'
+
 export default {
   name: "EquipmentList",
-  mixins: [JeecgListMixin, mixinDevice],
   components: {
-    EquipmentProcessParametersList,
-    EquipmentDocumentList,
-    EquipmentPrecisionParametersList,
-    EquipmentModal,
-    EquipmentResumeDrawer,
-    JSearchSelectTag,
-    ProcessEditModel,
-    PrecisionEditModel,
-    EquipmentUpdateABCList,
-    EquipmentUpdateWarrantyList,
-    ABCUpdateEditModel,
-    WarrantyUpdateModel,
-    EquipmentSpareParts,
-    EquipmentSparePartsModal,
-    StandardOfInspection,
-    StandardOfMaintenance,
-    DailyMaintenanceList,
-    SecondMaintenanceList,
-    ThirdMaintenanceList,
-    JEllipsis
+    EquipmentListOfAll,
   },
   data() {
     return {
       description: '璁惧鍙拌处绠$悊椤甸潰',
       caytegoryParam: 'pressureVessel',
-      // 琛ㄥご
-      columns: [
-        {
-          title: '#',
-          dataIndex: '',
-          key: 'rowIndex',
-          align: 'center',
-          customRender: function (t, r, index) {
-            return parseInt(index) + 1
-          },
-          width: 50,
-        },
-        {
-          title: '璁惧绫诲瀷',
-          align: "center",
-          dataIndex: 'equipmentCategoryId_dictText',
-        },
-        {
-          title: '鏄惁鐢熶骇绾胯澶�',
-          align: "center",
-          dataIndex: 'isLineEquip_dictText',
-        },
-        {
-          title: '鍏抽敭璁惧鏍囪瘑',
-          align: "center",
-          dataIndex: 'specificEquipment_dictText',
-        },
-        {
-          title: '缁熶竴缂栫爜',
-          align: "center",
-          dataIndex: 'num',
-          scopedSlots: { customRender: 'num' },
-        },
-        {
-          title: '璁惧鍚嶇О',
-          align: "center",
-          dataIndex: 'name',
-          scopedSlots: { customRender: 'name' },
-        },
-        {
-          title: '鍨嬪彿',
-          align: "center",
-          dataIndex: 'model',
-        },
-        {
-          title: '瑙勬牸',
-          align: "center",
-          dataIndex: 'specification',
-        },
-        {
-          title: '鎬诲姛鐜�',
-          align: "center",
-          dataIndex: 'gpo',
-        },
-        // {
-        //   title: '浣跨敤閮ㄩ棬',
-        //   align: "center",
-        //   dataIndex: 'useId_dictText',
-        // },
-        // {
-        //   title: '缁存姢閮ㄩ棬',
-        //   align: "center",
-        //   dataIndex: 'manageId_dictText',
-        // },
-        {
-          title: '缁翠慨鐝粍',
-          align: "center",
-          dataIndex: 'teamId_dictText',
-        },
-        {
-          title: 'ABC鏍囪瘑',
-          align: "center",
-          dataIndex: 'equipmentImportanceId',
-        },
-
-        {
-          title: '鎶�鏈姸鎬�',
-          align: "center",
-          dataIndex: 'technologyStatus_dictText',
-          scopedSlots: { customRender: 'technologyStatus' },
-        },
-        {
-          title: '鎶�鏈姸鎬侀壌瀹氱被鍨�',
-          align: "center",
-          dataIndex: 'technologyStatusVerificationType_dictText',
-        },
-        {
-          title: '涓嬫鎶�鏈姸鎬侀壌瀹氭椂闂�',
-          align: "center",
-          dataIndex: 'nextTechnologyStatusQualificationTime',
-        },
-        {
-          title: '鐢熶骇绾跨紪鍙�',
-          align: "center",
-          dataIndex: 'lineId_dictText',
-        },
-        {
-          title: '涓昏澶�?',
-          align: "center",
-          dataIndex: 'isMeta_dictText',
-        },
-        // {
-        //   title: '宸ュ尯',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda1',
-        // },
-        // {
-        //   title: '瀹夊叏閰嶇疆',
-        //   align: "center",
-        //   dataIndex: 'securityConfiguration',
-        // },
-        // {
-        //   title: '鍐峰嵈绯荤粺',
-        //   align: "center",
-        //   dataIndex: 'coolingSystem',
-        // },
-        // {
-        //   title: '鐏伀鍣�',
-        //   align: "center",
-        //   dataIndex: 'fireExtinguisher',
-        // },
-
-        // {
-        //   title: '鐏伀鍣ㄦ湁鏁堟湡',
-        //   align: "center",
-        //   dataIndex: 'fireExtinguisherValidityPeriod',
-        // },
-        // {
-        //   title: '鎿嶄綔绯荤粺',
-        //   align: "center",
-        //   dataIndex: 'operatingSystem',
-        // },
-        // {
-        //   title: '绯荤粺',
-        //   align: "center",
-        //   dataIndex: 'system',
-        // },
-        // {
-        //   title: '璁惧绔彛',
-        //   align: "center",
-        //   dataIndex: 'port',
-        // },
-        // {
-        //   title: '鍧愭爣鏁伴噺',
-        //   align: "center",
-        //   dataIndex: 'coordinateNum',
-        // },
-        // {
-        //   title: '璁惧鐘舵��',
-        //   align: "center",
-        //   dataIndex: 'equipmentStatus_dictText',
-        // },
-        // {
-        //   title: '閲嶉噺',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda3',
-        // },
-        // {
-        //   title: '閲嶉噺璁¢噺鍗曚綅',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda4_dictText',
-        // },
-        // {
-        //   title: '鍔熻兘浣嶇疆',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda5',
-        // },
-        // {
-        //   title: '瀹夎浣嶇疆',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda2',
-        // },
-        // {
-        //   title: '鍑哄巶鏃ユ湡',
-        //   align: "center",
-        //   dataIndex: 'leaveFactoryDate',
-        // },
-        // {
-        //   title: '绔嬮」鍗″彿',
-        //   align: "center",
-        //   dataIndex: 'projectApprovalNo',
-        // },
-        // {
-        //   title: '璧勯噾鏉ユ簮',
-        //   align: "center",
-        //   dataIndex: 'fundSource',
-        // },
-        // {
-        //   title: '楠屾敹鏃ユ湡',
-        //   align: "center",
-        //   dataIndex: 'acceptanceCheckDate',
-        // },
-        // {
-        //   title: '鍑哄巶缂栧彿',
-        //   align: "center",
-        //   dataIndex: 'factoryNo',
-        // },
-        // {
-        //   title: '璧勪骇鍒堕�犲晢',
-        //   align: "center",
-        //   dataIndex: 'constructorId_dictText',
-        // },
-        // {
-        //   title: '璧勪骇鐨勬潵婧愬浗瀹�',
-        //   align: "center",
-        //   dataIndex: 'sourceCountry',
-        // }, 
-        {
-          title: '宸ヨ壓鍙傛暟绠$悊',
-          align: "center",
-          dataIndex: 'processParameters',
-          scopedSlots: { customRender: 'processParameters' },
-        },
-        {
-          title: '宸ヨ壓鍙傛暟妯℃澘',
-          align: "center",
-          dataIndex: 'processParametersTemplateId_dictText',
-        },
-        {
-          title: '璁惧绮惧害绠$悊',
-          align: "center",
-          dataIndex: 'precisionParameters',
-          scopedSlots: { customRender: 'precisionParameters' },
-        },
-        {
-          title: '绮惧害鍙傛暟妯℃澘',
-          align: "center",
-          dataIndex: 'precisionParametersTemplateId_dictText',
-        },
-        // {
-        //   title: '澶囨敞',
-        //   align: "center",
-        //   dataIndex: 'remark',
-        // },
-        {
-          title: '鎿嶄綔',
-          align: "center",
-          dataIndex: 'action',
-          scopedSlots: {
-            customRender: 'action',
-          },
-          width: 147,
-          fixed: 'right',
-        },
-      ],
-      url: {
-        list: "/eam/equipment/getEquipmentTZList",
-        delete: "/eam/equipment/delete",
-        deleteBatch: "/eam/equipment/deleteBatch",
-        active: "/eam/equipment/active",
-        exportXlsUrl: '/eam/equipment/exportXls',
-        importExcelUrl: "/eam/equipment/importExcel",
-        loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
-      },
-      dictOptions: {
-      },
-      /* 鍒嗛〉鍙傛暟 */
-      ipagination: {
-        current: 1,
-        pageSize: 20,
-        pageSizeOptions: ['5', '10', '20', '50'],
-        showTotal: (total, range) => {
-          return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
-        },
-        showQuickJumper: true,
-        showSizeChanger: true,
-        total: 0
-      },
-      selectedMainId: '',
-      superFieldList: [],
-      equipmentProcessParametersMainId: '',
-      equipmentDocumentMainId: '',
-      equipmentPrecisionParametersMainId: '',
-      precisionParametersTemplateId: '',
-      isOpenPrecision: true,
-      isOpenProcess: true,
-      treeData: [],
-      labelCol: {
-        xs: { span: 24 },
-        sm: { span: 5 },
-      },
-      wrapperCol: {
-        xs: { span: 24 },
-        sm: { span: 16 },
-      },
-      mainId: '',
     }
   },
-  created() {
-    this.getSuperFieldList();
-    this.initOptions();
-  },
-  computed: {
-    importExcelUrl: function () {
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    }
-  },
-  methods: {
-    initDictConfig() {
-    },
-    equipmentResumeShow(record) {
-      this.$refs.EquipmentResumeDrawer.visible = true
-      this.$refs.EquipmentResumeDrawer.title = '璁惧灞ュ巻'
-      this.$refs.EquipmentResumeDrawer.handleShow(record)
-    },
-    clickThenSelect(record) {
-      return {
-        on: {
-          click: () => {
-            this.onSelectChange(record.id.split(","), [record]);
-          }
-        }
-      }
-    },
-    onClearSelected() {
-      this.selectedRowKeys = [];
-      this.selectionRows = [];
-      this.selectedMainId = ''
-    },
-    onSelectChange(selectedRowKeys, selectionRows) {
-      if (selectedRowKeys.length == 1) {
-        this.selectedMainId = selectedRowKeys[0]
-        this.precisionParametersTemplateId = selectionRows[0].precisionParametersTemplateId;
-        this.isOpenProcess = selectionRows[0].processParameters == 1;
-        this.isOpenPrecision = selectionRows[0].precisionParameters == 1;
-      } else {
-        this.selectedMainId = ''
-        this.precisionParametersTemplateId = ''
-      }
-      this.selectedRowKeys = selectedRowKeys;
-      this.selectionRows = selectionRows;
-    },
-    loadData(arg) {
-      if (!this.url.list) {
-        this.$message.error("璇疯缃畊rl.list灞炴��!")
-        return
-      }
-      //鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
-      if (arg === 1) {
-        this.ipagination.current = 1;
-      }
-      this.onClearSelected()
-      this.queryParam.equipmentCategoryUda1 = this.caytegoryParam;
-      var params = this.getQueryParams();//鏌ヨ鏉′欢
-      this.loading = true;
-      getAction(this.url.list, params).then((res) => {
-        if (res.success) {
-          this.dataSource = res.result.records;
-          this.ipagination.total = res.result.total;
-        }
-        if (res.code === 510) {
-          this.$message.warning(res.message)
-        }
-        this.loading = false;
-      })
-    },
-    getSuperFieldList() {
-      let fieldList = [];
-      fieldList.push({ type: 'string', value: 'num', text: '缁熶竴缂栫爜', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'name', text: '璁惧鍚嶇О', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'model', text: '鍨嬪彿', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'specification', text: '瑙勬牸', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentStatus', text: '璁惧鐘舵��', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'technologyStatus', text: 'technologyStatus', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'assetNumber', text: 'assetNumber', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentCategoryId', text: 'equipmentCategoryId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'specificEquipment', text: 'specificEquipment', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentPhoto', text: 'equipmentPhoto', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'constructorId', text: '璧勪骇鍒堕�犲晢', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'supplierId', text: 'supplierId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'factoryNumber', text: 'factoryNumber', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'leaveFactoryDate', text: '鍑哄巶鏃ユ湡', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'acceptanceCheckDate', text: '楠屾敹鏃ユ湡', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'affiliationId', text: 'affiliationId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'manageId', text: '缁存姢閮ㄩ棬ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'manager', text: 'manager', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'useId', text: '浣跨敤閮ㄩ棬ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'functionary', text: 'functionary', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'location', text: 'location', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentImportanceId', text: 'ABC鏍囪瘑ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'processParameters', text: 'processParameters', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'processParametersTemplateId', text: 'processParametersTemplateId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'precisionParameters', text: 'precisionParameters', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'precisionParametersTemplateId', text: 'precisionParametersTemplateId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'verification', text: 'verification', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'verificationPeriod', text: 'verificationPeriod', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'lastVerificationDate', text: 'lastVerificationDate', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'nextVerificationDate', text: 'nextVerificationDate', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'status', text: 'status', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'remark', text: 'remark', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda1', text: '宸ュ尯', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda2', text: '瀹夎浣嶇疆', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda3', text: '閲嶉噺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda4', text: '閲嶉噺璁¢噺鍗曚綅ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda5', text: '鍔熻兘浣嶇疆', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'tenantId', text: 'tenantId', dictCode: '' })
-      fieldList.push({ type: 'int', value: 'delFlag', text: 'delFlag', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'teamId', text: '缁翠慨鐝粍ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'sourceId', text: 'sourceId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'fundSource', text: '璧勯噾鏉ユ簮', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'factoryNo', text: '鍑哄巶缂栧彿', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'mfr', text: '鍒堕�犲晢', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'sourceCountry', text: '璧勪骇鏉ユ簮鍥藉', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'gpo', text: '鎬诲姛鐜�', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'keyEquipmentIdentification', text: '鍏抽敭璁惧鏍囪瘑', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'securityConfiguration', text: '瀹夊叏閰嶇疆', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'coolingSystem', text: '鍐峰嵈绯荤粺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'fireExtinguisher', text: '鐏伀鍣�', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'fireExtinguisherValidityPeriod', text: '鐏伀鍣ㄦ湁鏁堟湡', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'operatingSystem', text: '鎿嶄綔绯荤粺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'system', text: '绯荤粺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'port', text: '绔彛', dictCode: '' })
-      fieldList.push({ type: 'BigDecimal', value: 'coordinateNum', text: '鍧愭爣鏁伴噺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'projectApprovalNo', text: '绔嬮」鍗″彿', dictCode: '' })
-      this.superFieldList = fieldList
-    },
-    editProcess(record) {
-      this.$refs.processEditModel.edit(record);
-    },
-    editPrecision(record) {
-      this.$refs.precisionEditModel.edit(record);
-    },
-    initOptions() {
-      getAction(this.url.loadOptions).then(res => {
-        if (res.success) {
-          this.treeData = res.result
-        } else {
-          this.$message.warning(res.message)
-        }
-      })
-    },
-    handleUpdateABC() {
-      this.$refs.updateABC.add();
-    },
-    handleUpdateWarranty() {
-      this.$refs.updateWarranty.add();
-    },
-    handleEditSpareParts(record) {
-      this.$refs.modalFormSpareParts.edit(record);
-    },
-    handleTechnologyStatus(record) {
-      //璺敱鏄痚am/EquipmentCalibrationOrder
-      this.$router.push({
-        path: '/eam/EquipmentCalibrationOrder',
-        query: {
-          equipmentId: record.id,
-          technologyStatus: record.technologyStatus,
-          technologyStatusVerificationType: record.technologyStatusVerificationType,
-        }
-      })
-    },
-
-  }
 }
 </script>
 <style scoped>
diff --git a/src/views/eam/EquipmentListOfProduct.vue b/src/views/eam/EquipmentListOfProduct.vue
index a5446f1..b69f454 100644
--- a/src/views/eam/EquipmentListOfProduct.vue
+++ b/src/views/eam/EquipmentListOfProduct.vue
@@ -1,1164 +1,22 @@
 <template>
-  <a-card
-    :bordered="false"
-    title="鐢熶骇璁惧"
-  >
-    <!-- 鏌ヨ鍖哄煙 -->
-    <div class="table-page-search-wrapper">
-      <a-form
-        layout="inline"
-        @keyup.enter.native="searchQuery"
-      >
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-item
-              label="璁惧鎵�灞炲垎绫�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                dictCode="mom_eam_equipment_category,name,id,equipment_category_uda1 = 'producter'"
-                placeholder="璇疯緭鍏ユ悳绱㈡潯浠跺苟閫夋嫨"
-                v-model="queryParam.equipmentCategoryId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="缁熶竴缂栫爜"
-            >
-              <a-input
-                placeholder="璇疯緭鍏ヨ澶囩粺涓�缂栫爜鏌ヨ"
-                v-model="queryParam.num"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="璁惧鍚嶇О"
-            >
-              <a-input
-                placeholder="璇疯緭鍏ヨ澶囧悕绉版煡璇�"
-                v-model="queryParam.name"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鍨嬪彿"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <a-input
-                v-model="queryParam.model"
-                placeholder="璇疯緭鍏ュ瀷鍙�"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-item
-              label="宸ュ尯"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨宸ュ尯"
-                :triggerChange="true"
-                dictCode="mom_base_area,name,id,del_flag!='1'"
-                v-model="queryParam.factoryModelId"
-              />
-            </a-form-item>
-          </a-col>
-          <!-- <a-col :span="6">
-            <a-form-item
-              label="杞﹂棿"
-              :labelCol="labelCol"
-            :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨璧勮溅闂�"
-                :triggerChange="true"
-                dictCode="mom_base_factory_model,name,id,del_flag!='1'"
-                v-model="queryParam.factoryModelId"
-              />
-            </a-form-item>
-          </a-col> -->
-          <a-col :span="6">
-            <a-form-item
-              label="缁存姢閮ㄩ棬"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <!-- <a-tree-select
-                style="width: 100%"
-                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-                :tree-data="treeData"
-                placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
-                tree-default-expand-all
-                v-model="queryParam.manageId"
-              /> -->
-              <j-dict-select-tag
-                dictCode="sys_depart,depart_name,id"
-                placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
-                v-model="queryParam.manageId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="浣跨敤閮ㄩ棬"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <!-- <a-tree-select
-                style="width: 100%"
-                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-                :tree-data="treeData"
-                placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
-                tree-default-expand-all
-                v-model="queryParam.useId"
-              /> -->
-              <j-dict-select-tag
-                dictCode="sys_depart,depart_name,id"
-                placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
-                v-model="queryParam.useId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鏄惁鐢熶骇绾胯澶�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨"
-                :triggerChange="true"
-                dictCode="is_product"
-                v-model="queryParam.isLineEquip"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-item
-              label="ABC鏍囪瘑"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨ABC鏍囪瘑"
-                :triggerChange="true"
-                dictCode="ABC-standard-result"
-                v-model="queryParam.equipmentImportanceId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鎶�鏈姸鎬�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨鎶�鏈姸鎬�"
-                :triggerChange="true"
-                dictCode="technology_status"
-                v-model="queryParam.technologyStatus"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="璁惧鐘舵��"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨璁惧鐘舵��"
-                :triggerChange="true"
-                dictCode="equipment_status"
-                v-model="queryParam.equipmentStatus"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鍏抽敭璁惧鏍囪瘑"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                :triggerChange="true"
-                placeholder="璇烽�夋嫨鍏抽敭璁惧鏍囪瘑"
-                dictCode="specific_equipment"
-                v-model="queryParam.specificEquipment"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-model-item
-              label="璐ㄤ繚寮�濮嬫棩鏈�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-date
-                style="width: 100%;"
-                placeholder="璇烽�夋嫨寮�濮嬫棩鏈�"
-                class="query-group-cust"
-                v-model="queryParam.warrantyStart"
-              ></j-date>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-model-item
-              label="璐ㄤ繚缁撴潫鏃ユ湡"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-date
-                style="width: 100%;"
-                placeholder="璇烽�夋嫨缁撴潫鏃ユ湡"
-                class="query-group-cust"
-                v-model="queryParam.warrantyEnd"
-              ></j-date>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="缁翠慨鐝粍"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨缁翠慨鐝粍"
-                :triggerChange="true"
-                dictCode="mom_base_team,name,id,del_flag!='1'"
-                v-model="queryParam.teamId"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 鏌ヨ鍖哄煙-END -->
-
-    <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
-    <div class="table-operator">
-      <a-button
-        type="primary"
-        @click="searchQuery"
-        icon="search"
-      >鏌ヨ</a-button>
-      <a-button
-        @click="searchReset"
-        icon="reload"
-      >閲嶇疆</a-button>
-      <a-button
-        @click="handleAdd"
-        type="primary"
-        icon="plus"
-        v-has="'equipmentAccount:add&delete&import&Edit'"
-      >鏂板</a-button>
-      <a-button
-        type="primary"
-        icon="download"
-        @click="handleExportXls('璁惧鍙拌处')"
-        v-has="'equipmentAccount:outport'"
-      >瀵煎嚭</a-button>
-      <a-upload
-        name="file"
-        :showUploadList="false"
-        :multiple="false"
-        :headers="tokenHeader"
-        :action="importExcelUrl"
-        @change="handleImportExcel"
-      >
-        <a-button
-          type="primary"
-          icon="import"
-          v-has="'equipmentAccount:add&delete&import&Edit'"
-        >瀵煎叆</a-button>
-      </a-upload>
-      <a-button
-        :disabled="selectedRowKeys.length==0"
-        @click="handleUpdateABC"
-        type="primary"
-        icon="font-colors"
-        v-has="'equipmentAccount:add&delete&import&Edit'"
-      >ABC鏍囪瘑鍙樻洿</a-button>
-      <a-button
-        :disabled="selectedRowKeys.length==0"
-        @click="handleUpdateWarranty"
-        type="primary"
-        icon="calendar"
-        v-has="'equipmentAccount:add&delete&import&Edit'"
-      >璐ㄤ繚鏈熷彉鏇�</a-button>
-    </div>
-    <!-- table鍖哄煙-begin -->
-    <div>
-      <div
-        class="ant-alert ant-alert-info"
-        style="margin-bottom: 16px;"
-      >
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
-        <a
-          style="margin-left: 24px"
-          @click="onClearSelected"
-        >娓呯┖</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :scroll="{x:true}"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'checkbox'}"
-        :customRow="clickThenSelect"
-        @change="handleTableChange"
-      >
-        <template
-          slot="technologyStatus"
-          slot-scope="text,record"
-        >
-          <a
-            href="javascript:eam/EquipmentCalibrationOrder;"
-            @click="handleTechnologyStatus(record)"
-          >{{record.technologyStatus_dictText}}</a>
-        </template>
-        <template
-          slot="htmlSlot"
-          slot-scope="text"
-        >
-          <div v-html="text"></div>
-        </template>
-        <template
-          slot="imgSlot"
-          slot-scope="text,record"
-        >
-          <span
-            v-if="!text"
-            style="font-size: 12px;font-style: italic;"
-          >鏃犲浘鐗�</span>
-          <img
-            v-else
-            :src="getImgView(text)"
-            :preview="record.id"
-            height="25px"
-            alt=""
-            style="max-width:80px;font-size: 12px;font-style: italic;"
-          />
-        </template>
-        <template
-          slot="fileSlot"
-          slot-scope="text"
-        >
-          <span
-            v-if="!text"
-            style="font-size: 12px;font-style: italic;"
-          >鏃犳枃浠�</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)"
-          >
-            涓嬭浇
-          </a-button>
-        </template>
-
-        <!--宸ヨ壓鍙傛暟涓�у睍绀�-->
-        <span
-          slot="processParameters"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.processParameters==1"
-            status="success"
-          />
-          <span
-            v-if="record.processParameters==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.processParameters==0"
-            status="error"
-          />
-          <span
-            v-if="record.processParameters==0"
-            class="error"
-          >鍚�</span>
-        </span>
-        <span
-          slot="processParameters"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.processParameters==1"
-            status="success"
-          />
-          <span
-            v-if="record.processParameters==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.processParameters==0"
-            status="error"
-          />
-          <span
-            v-if="record.processParameters==0"
-            class="error"
-          >鍚�</span>
-        </span>
-        <span
-          slot="precisionParameters"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.precisionParameters==1"
-            status="success"
-          />
-          <span
-            v-if="record.precisionParameters==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.precisionParameters==0"
-            status="error"
-          />
-          <span
-            v-if="record.precisionParameters==0"
-            class="error"
-          >鍚�</span>
-        </span>
-        <span
-          slot="verification"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.verification==1"
-            status="success"
-          />
-          <span
-            v-if="record.verification==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.verification==0"
-            status="error"
-          />
-          <span
-            v-if="record.verification==0"
-            class="error"
-          >鍚�</span>
-        </span>
-
-        <span
-          slot="name"
-          slot-scope="text"
-        >
-          <j-ellipsis
-            :value="text"
-            :length="8"
-          />
-        </span>
-
-        <template
-          slot="num"
-          slot-scope="text,record"
-        >
-          <a
-            href="javascript:;"
-            @click="handleDetail(record)"
-          >{{record.num}}</a>
-        </template>
-
-        <span
-          slot="action"
-          slot-scope="text, record"
-        >
-          <!-- class="table-operation" -->
-          <!-- <a
-          href="javascript:;"
-          @click="equipmentStructuresShow(record)"
-        >璁惧缁撴瀯</a>
-        <a-divider type="vertical" /> -->
-          <a
-            href="javascript:;"
-            @click='handleDetail(record)'
-          >璇︽儏</a>
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">
-              鏇村
-              <a-icon type="down" />
-            </a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="equipmentResumeShow(record)">璁惧灞ュ巻</a>
-              </a-menu-item>
-              <a-menu-item
-                v-has="'accountSons:add&edit&delete&submit'"
-                v-if="record.processParameters==1"
-              >
-                <a @click="editProcess(record)">宸ヨ壓鍙傛暟缁存姢</a>
-              </a-menu-item>
-              <a-menu-item
-                v-has="'accountSons:add&edit&delete&submit'"
-                v-if="record.precisionParameters==1"
-              >
-                <a @click="editPrecision(record)">绮惧害鍙傛暟缁存姢</a>
-              </a-menu-item>
-              <a-menu-item v-has="'equipmentAccount:add&delete&import&Edit'">
-                <a @click="handleEdit(record)">缂栬緫</a>
-              </a-menu-item>
-              <a-menu-item v-has="'equipmentAccount:add&delete&import&Edit'">
-                <a @click="handleEditSpareParts(record)">缂栬緫澶囦欢</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm
-                  title="纭畾鍒犻櫎鍚�?"
-                  @confirm="() => handleDelete(record.id)"
-                  v-has="'equipmentAccount:add&delete&import&Edit'"
-                >
-                  <a>鍒犻櫎</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-      </a-table>
-    </div>
-    <equipment-resume-drawer
-      ref="EquipmentResumeDrawer"
-      @ok="modalFormOk"
-    ></equipment-resume-drawer>
-
-    <a-tabs defaultActiveKey="1">
-      <a-tab-pane
-        tab="宸ヨ壓鍙傛暟"
-        key="1"
-      >
-        <EquipmentProcessParametersList
-          :mainId="selectedMainId"
-          :isOpen="isOpenProcess"
-        />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="璁惧绮惧害"
-        key="2"
-        forceRender
-      >
-        <EquipmentPrecisionParametersList
-          :isOpen="isOpenPrecision"
-          :mainId="precisionParametersTemplateId"
-        />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="璁惧鏂囨。"
-        key="3"
-        forceRender
-      >
-        <EquipmentDocumentList :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="澶囦欢"
-        key="4"
-        forceRender
-      >
-        <EquipmentSpareParts :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="ABC鏍囪瘑鍙樻洿璁板綍"
-        key="5"
-        forceRender
-      >
-        <equipment-update-ABC-list :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="璐ㄤ繚鏈熷彉鏇�"
-        key="6"
-        forceRender
-      >
-        <equipment-update-warranty-list :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="鏃ヤ繚鏍囧噯"
-        key="7"
-        forceRender
-      >
-        <daily-maintenance-list :mainId="selectedMainId"></daily-maintenance-list>
-      </a-tab-pane>
-      <a-tab-pane
-        tab="浜屼繚鏍囧噯"
-        key="8"
-        forceRender
-      >
-        <second-maintenance-list :mainId="selectedMainId"></second-maintenance-list>
-      </a-tab-pane>
-      <a-tab-pane
-        tab="涓変繚鏍囧噯"
-        key="9"
-        forceRender
-      >
-        <third-maintenance-list :mainId="selectedMainId"></third-maintenance-list>
-      </a-tab-pane>
-    </a-tabs>
-    <equipment-modal
-      ref="modalForm"
-      @ok="modalFormOk"
-      :caytegoryParam="caytegoryParam"
-    ></equipment-modal>
-    <process-edit-model ref="processEditModel"></process-edit-model>
-    <precision-edit-model ref="precisionEditModel"></precision-edit-model>
-    <aBC-update-edit-model
-      @ok="modalFormOk"
-      :updateList="selectionRows"
-      ref="updateABC"
-    ></aBC-update-edit-model>
-    <warranty-update-model
-      :updateList="selectionRows"
-      ref="updateWarranty"
-    ></warranty-update-model>
-    <EquipmentSparePartsModal
-      ref="modalFormSpareParts"
-      @ok="modalFormOk"
-    />
-  </a-card>
+   <equipment-list-of-all :caytegoryParam="caytegoryParam"></equipment-list-of-all>
 </template>
 
 <script>
 
-import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-import { mixinDevice } from '@/utils/mixin'
-import EquipmentModal from './modules/equipmentNew/EquipmentModal'
-import { getAction } from '@/api/manage'
-import EquipmentProcessParametersList from './modules/equipmentNew/EquipmentProcessParametersList'
-import EquipmentDocumentList from './modules/equipmentNew/EquipmentDocumentList'
-import EquipmentPrecisionParametersList from './modules/equipmentNew/EquipmentPrecisionParametersList'
-import '@/assets/less/TableExpand.less'
-import EquipmentResumeDrawer from './modules/equipmentNew/EquipmentResume/EquipmentResumeDrawer'
-import JSearchSelectTag from '../../components/dict/JSearchSelectTag.vue'
-import ProcessEditModel from './modules/equipmentNew/edit/ProcessEditModel.vue'
-import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
-import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
-import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
-import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
-import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
-import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts'
-import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
-import StandardOfInspection from './modules/equipmentNew/StandardOfInspection.vue'
-import StandardOfMaintenance from './modules/equipmentNew/StandardOfMaintenance.vue'
-import DailyMaintenanceList from './modules/equipmentNew/DailyMaintenanceList.vue'
-import SecondMaintenanceList from './modules/equipmentNew/SecondMaintenanceList.vue'
-import ThirdMaintenanceList from './modules/equipmentNew/ThirdMaintenanceList.vue'
-import JEllipsis from '@/components/jeecg/JEllipsis'
+import EquipmentListOfAll from './EquipmentListOfAll.vue'
+
 export default {
   name: "EquipmentList",
-  mixins: [JeecgListMixin, mixinDevice],
   components: {
-    EquipmentProcessParametersList,
-    EquipmentDocumentList,
-    EquipmentPrecisionParametersList,
-    EquipmentModal,
-    EquipmentResumeDrawer,
-    JSearchSelectTag,
-    ProcessEditModel,
-    PrecisionEditModel,
-    EquipmentUpdateABCList,
-    EquipmentUpdateWarrantyList,
-    ABCUpdateEditModel,
-    WarrantyUpdateModel,
-    EquipmentSpareParts,
-    EquipmentSparePartsModal,
-    StandardOfInspection,
-    StandardOfMaintenance,
-    DailyMaintenanceList,
-    SecondMaintenanceList,
-    ThirdMaintenanceList,
-    JEllipsis,
+    EquipmentListOfAll,
   },
   data() {
     return {
       description: '璁惧鍙拌处绠$悊椤甸潰',
       caytegoryParam: 'producter',
-      // 琛ㄥご
-      columns: [
-        {
-          title: '#',
-          dataIndex: '',
-          key: 'rowIndex',
-          align: 'center',
-          customRender: function (t, r, index) {
-            return parseInt(index) + 1
-          },
-          width: 50,
-        },
-        {
-          title: '璁惧绫诲瀷',
-          align: "center",
-          dataIndex: 'equipmentCategoryId_dictText',
-        },
-        {
-          title: '鏄惁鐢熶骇绾胯澶�',
-          align: "center",
-          dataIndex: 'isLineEquip_dictText',
-        },
-        {
-          title: '鍏抽敭璁惧鏍囪瘑',
-          align: "center",
-          dataIndex: 'specificEquipment_dictText',
-        },
-        {
-          title: '缁熶竴缂栫爜',
-          align: "center",
-          dataIndex: 'num',
-          scopedSlots: { customRender: 'num' },
-        },
-        {
-          title: '璁惧鍚嶇О',
-          align: "center",
-          dataIndex: 'name',
-          scopedSlots: { customRender: 'name' },
-        },
-        {
-          title: '鍨嬪彿',
-          align: "center",
-          dataIndex: 'model',
-        },
-        {
-          title: '瑙勬牸',
-          align: "center",
-          dataIndex: 'specification',
-        },
-        {
-          title: '鎬诲姛鐜�',
-          align: "center",
-          dataIndex: 'gpo',
-        },
-        {
-          title: '浣跨敤閮ㄩ棬',
-          align: "center",
-          dataIndex: 'useId_dictText',
-        },
-        // {
-        //   title: '缁存姢閮ㄩ棬',
-        //   align: "center",
-        //   dataIndex: 'manageId_dictText',
-        // },
-        // {
-        //   title: '缁翠慨鐝粍',
-        //   align: "center",
-        //   dataIndex: 'teamId_dictText',
-        // },
-        {
-          title: 'ABC鏍囪瘑',
-          align: "center",
-          dataIndex: 'equipmentImportanceId',
-        },
-
-        {
-          title: '鎶�鏈姸鎬�',
-          align: "center",
-          dataIndex: 'technologyStatus_dictText',
-          scopedSlots: { customRender: 'technologyStatus' },
-        },
-        {
-          title: '鎶�鏈姸鎬侀壌瀹氱被鍨�',
-          align: "center",
-          dataIndex: 'technologyStatusVerificationType_dictText',
-        },
-        {
-          title: '涓嬫鎶�鏈姸鎬侀壌瀹氭椂闂�',
-          align: "center",
-          dataIndex: 'nextTechnologyStatusQualificationTime',
-        },
-        {
-          title: '鐢熶骇绾跨紪鍙�',
-          align: "center",
-          dataIndex: 'lineId_dictText',
-        },
-        {
-          title: '涓昏澶�?',
-          align: "center",
-          dataIndex: 'isMeta_dictText',
-        },
-        // {
-        //   title: '宸ュ尯',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda1',
-        // },
-        // {
-        //   title: '瀹夊叏閰嶇疆',
-        //   align: "center",
-        //   dataIndex: 'securityConfiguration',
-        // },
-        // {
-        //   title: '鍐峰嵈绯荤粺',
-        //   align: "center",
-        //   dataIndex: 'coolingSystem',
-        // },
-        // {
-        //   title: '鐏伀鍣�',
-        //   align: "center",
-        //   dataIndex: 'fireExtinguisher',
-        // },
-
-        // {
-        //   title: '鐏伀鍣ㄦ湁鏁堟湡',
-        //   align: "center",
-        //   dataIndex: 'fireExtinguisherValidityPeriod',
-        // },
-        // {
-        //   title: '鎿嶄綔绯荤粺',
-        //   align: "center",
-        //   dataIndex: 'operatingSystem',
-        // },
-        // {
-        //   title: '绯荤粺',
-        //   align: "center",
-        //   dataIndex: 'system',
-        // },
-        // {
-        //   title: '璁惧绔彛',
-        //   align: "center",
-        //   dataIndex: 'port',
-        // },
-        // {
-        //   title: '鍧愭爣鏁伴噺',
-        //   align: "center",
-        //   dataIndex: 'coordinateNum',
-        // },
-        // {
-        //   title: '璁惧鐘舵��',
-        //   align: "center",
-        //   dataIndex: 'equipmentStatus_dictText',
-        // },
-        // {
-        //   title: '閲嶉噺',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda3',
-        // },
-        // {
-        //   title: '閲嶉噺璁¢噺鍗曚綅',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda4_dictText',
-        // },
-        // {
-        //   title: '鍔熻兘浣嶇疆',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda5',
-        // },
-        // {
-        //   title: '瀹夎浣嶇疆',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda2',
-        // },
-        // {
-        //   title: '鍑哄巶鏃ユ湡',
-        //   align: "center",
-        //   dataIndex: 'leaveFactoryDate',
-        // },
-        // {
-        //   title: '绔嬮」鍗″彿',
-        //   align: "center",
-        //   dataIndex: 'projectApprovalNo',
-        // },
-        // {
-        //   title: '璧勯噾鏉ユ簮',
-        //   align: "center",
-        //   dataIndex: 'fundSource',
-        // },
-        // {
-        //   title: '楠屾敹鏃ユ湡',
-        //   align: "center",
-        //   dataIndex: 'acceptanceCheckDate',
-        // },
-        // {
-        //   title: '鍑哄巶缂栧彿',
-        //   align: "center",
-        //   dataIndex: 'factoryNo',
-        // },
-        // {
-        //   title: '璧勪骇鍒堕�犲晢',
-        //   align: "center",
-        //   dataIndex: 'constructorId_dictText',
-        // },
-        // {
-        //   title: '璧勪骇鐨勬潵婧愬浗瀹�',
-        //   align: "center",
-        //   dataIndex: 'sourceCountry',
-        // }, 
-        {
-          title: '宸ヨ壓鍙傛暟绠$悊',
-          align: "center",
-          dataIndex: 'processParameters',
-          scopedSlots: { customRender: 'processParameters' },
-        },
-        {
-          title: '宸ヨ壓鍙傛暟妯℃澘',
-          align: "center",
-          dataIndex: 'processParametersTemplateId_dictText',
-        },
-        {
-          title: '璁惧绮惧害绠$悊',
-          align: "center",
-          dataIndex: 'precisionParameters',
-          scopedSlots: { customRender: 'precisionParameters' },
-        },
-        {
-          title: '绮惧害鍙傛暟妯℃澘',
-          align: "center",
-          dataIndex: 'precisionParametersTemplateId_dictText',
-        },
-        // {
-        //   title: '澶囨敞',
-        //   align: "center",
-        //   dataIndex: 'remark',
-        // },
-        {
-          title: '鎿嶄綔',
-          align: "center",
-          dataIndex: 'action',
-          scopedSlots: {
-            customRender: 'action',
-          },
-          width: 147,
-          fixed: 'right',
-        },
-      ],
-      url: {
-        list: "/eam/equipment/getEquipmentTZList",
-        delete: "/eam/equipment/delete",
-        deleteBatch: "/eam/equipment/deleteBatch",
-        active: "/eam/equipment/active",
-        exportXlsUrl: '/eam/equipment/exportXls',
-        importExcelUrl: "/eam/equipment/importExcel",
-        loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
-      },
-      dictOptions: {
-      },
-      /* 鍒嗛〉鍙傛暟 */
-      ipagination: {
-        current: 1,
-        pageSize: 10,
-        pageSizeOptions: ['5', '10', '20', '50'],
-        showTotal: (total, range) => {
-          return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
-        },
-        showQuickJumper: true,
-        showSizeChanger: true,
-        total: 0
-      },
-      selectedMainId: '',
-      superFieldList: [],
-      equipmentProcessParametersMainId: '',
-      equipmentDocumentMainId: '',
-      equipmentPrecisionParametersMainId: '',
-      precisionParametersTemplateId: '',
-      isOpenPrecision: true,
-      isOpenProcess: true,
-      treeData: [],
-      labelCol: {
-        xs: { span: 24 },
-        sm: { span: 5 },
-      },
-      wrapperCol: {
-        xs: { span: 24 },
-        sm: { span: 16 },
-      },
-      mainId: '',
     }
   },
-  created() {
-    this.getSuperFieldList();
-    this.initOptions();
-  },
-  computed: {
-    importExcelUrl: function () {
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    }
-  },
-  methods: {
-    initDictConfig() {
-    },
-    equipmentResumeShow(record) {
-      this.$refs.EquipmentResumeDrawer.visible = true
-      this.$refs.EquipmentResumeDrawer.title = '璁惧灞ュ巻'
-      this.$refs.EquipmentResumeDrawer.handleShow(record)
-    },
-    clickThenSelect(record) {
-      return {
-        on: {
-          click: () => {
-            this.onSelectChange(record.id.split(","), [record]);
-          }
-        }
-      }
-    },
-    onClearSelected() {
-      this.selectedRowKeys = [];
-      this.selectionRows = [];
-      this.selectedMainId = ''
-    },
-    onSelectChange(selectedRowKeys, selectionRows) {
-      if (selectedRowKeys.length == 1) {
-        this.selectedMainId = selectedRowKeys[0]
-        this.precisionParametersTemplateId = selectionRows[0].precisionParametersTemplateId;
-        this.isOpenProcess = selectionRows[0].processParameters == 1;
-        this.isOpenPrecision = selectionRows[0].precisionParameters == 1;
-      } else {
-        this.selectedMainId = ''
-        this.precisionParametersTemplateId = ''
-      }
-      this.selectedRowKeys = selectedRowKeys;
-      this.selectionRows = selectionRows;
-    },
-    loadData(arg) {
-      if (!this.url.list) {
-        this.$message.error("璇疯缃畊rl.list灞炴��!")
-        return
-      }
-      //鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
-      if (arg === 1) {
-        this.ipagination.current = 1;
-      }
-      this.onClearSelected()
-      this.queryParam.equipmentCategoryUda1 = this.caytegoryParam;
-      var params = this.getQueryParams();//鏌ヨ鏉′欢
-      this.loading = true;
-      getAction(this.url.list, params).then((res) => {
-        if (res.success) {
-          this.dataSource = res.result.records;
-          this.ipagination.total = res.result.total;
-        }
-        if (res.code === 510) {
-          this.$message.warning(res.message)
-        }
-        this.loading = false;
-      })
-    },
-    getSuperFieldList() {
-      let fieldList = [];
-      fieldList.push({ type: 'string', value: 'num', text: '缁熶竴缂栫爜', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'name', text: '璁惧鍚嶇О', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'model', text: '鍨嬪彿', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'specification', text: '瑙勬牸', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentStatus', text: '璁惧鐘舵��', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'technologyStatus', text: 'technologyStatus', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'assetNumber', text: 'assetNumber', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentCategoryId', text: 'equipmentCategoryId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'specificEquipment', text: 'specificEquipment', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentPhoto', text: 'equipmentPhoto', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'constructorId', text: '璧勪骇鍒堕�犲晢', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'supplierId', text: 'supplierId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'factoryNumber', text: 'factoryNumber', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'leaveFactoryDate', text: '鍑哄巶鏃ユ湡', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'acceptanceCheckDate', text: '楠屾敹鏃ユ湡', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'affiliationId', text: 'affiliationId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'manageId', text: '缁存姢閮ㄩ棬ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'manager', text: 'manager', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'useId', text: '浣跨敤閮ㄩ棬ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'functionary', text: 'functionary', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'location', text: 'location', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentImportanceId', text: 'ABC鏍囪瘑ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'processParameters', text: 'processParameters', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'processParametersTemplateId', text: 'processParametersTemplateId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'precisionParameters', text: 'precisionParameters', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'precisionParametersTemplateId', text: 'precisionParametersTemplateId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'verification', text: 'verification', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'verificationPeriod', text: 'verificationPeriod', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'lastVerificationDate', text: 'lastVerificationDate', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'nextVerificationDate', text: 'nextVerificationDate', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'status', text: 'status', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'remark', text: 'remark', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda1', text: '宸ュ尯', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda2', text: '瀹夎浣嶇疆', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda3', text: '閲嶉噺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda4', text: '閲嶉噺璁¢噺鍗曚綅ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda5', text: '鍔熻兘浣嶇疆', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'tenantId', text: 'tenantId', dictCode: '' })
-      fieldList.push({ type: 'int', value: 'delFlag', text: 'delFlag', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'teamId', text: '缁翠慨鐝粍ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'sourceId', text: 'sourceId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'fundSource', text: '璧勯噾鏉ユ簮', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'factoryNo', text: '鍑哄巶缂栧彿', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'mfr', text: '鍒堕�犲晢', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'sourceCountry', text: '璧勪骇鏉ユ簮鍥藉', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'gpo', text: '鎬诲姛鐜�', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'keyEquipmentIdentification', text: '鍏抽敭璁惧鏍囪瘑', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'securityConfiguration', text: '瀹夊叏閰嶇疆', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'coolingSystem', text: '鍐峰嵈绯荤粺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'fireExtinguisher', text: '鐏伀鍣�', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'fireExtinguisherValidityPeriod', text: '鐏伀鍣ㄦ湁鏁堟湡', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'operatingSystem', text: '鎿嶄綔绯荤粺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'system', text: '绯荤粺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'port', text: '绔彛', dictCode: '' })
-      fieldList.push({ type: 'BigDecimal', value: 'coordinateNum', text: '鍧愭爣鏁伴噺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'projectApprovalNo', text: '绔嬮」鍗″彿', dictCode: '' })
-      this.superFieldList = fieldList
-    },
-    editProcess(record) {
-      this.$refs.processEditModel.edit(record);
-    },
-    editPrecision(record) {
-      this.$refs.precisionEditModel.edit(record);
-    },
-    initOptions() {
-      getAction(this.url.loadOptions).then(res => {
-        if (res.success) {
-          this.treeData = res.result
-        } else {
-          this.$message.warning(res.message)
-        }
-      })
-    },
-    handleUpdateABC() {
-      this.$refs.updateABC.add();
-    },
-    handleUpdateWarranty() {
-      this.$refs.updateWarranty.add();
-    },
-    handleEditSpareParts(record) {
-      this.$refs.modalFormSpareParts.edit(record);
-    },
-    handleTechnologyStatus(record) {
-      //璺敱鏄痚am/EquipmentCalibrationOrder
-      this.$router.push({
-        path: '/eam/EquipmentCalibrationOrder',
-        query: {
-          equipmentId: record.id,
-          technologyStatus: record.technologyStatus,
-          technologyStatusVerificationType: record.technologyStatusVerificationType,
-        }
-      })
-    },
-
-  }
 }
 </script>
 <style scoped>
diff --git a/src/views/eam/EquipmentListOfRide.vue b/src/views/eam/EquipmentListOfRide.vue
index 74cb269..ffee7ad 100644
--- a/src/views/eam/EquipmentListOfRide.vue
+++ b/src/views/eam/EquipmentListOfRide.vue
@@ -1,1169 +1,22 @@
 <template>
-  <a-card
-    :bordered="false"
-    title="杞﹀彴"
-  >
-    <!-- 鏌ヨ鍖哄煙 -->
-    <div class="table-page-search-wrapper">
-      <a-form
-        layout="inline"
-        @keyup.enter.native="searchQuery"
-      >
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-item
-              label="璁惧鎵�灞炲垎绫�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                :dictCode="'mom_eam_equipment_category,name,id,equipment_category_uda1='+'\''+caytegoryParam+'\''"
-                placeholder="璇疯緭鍏ユ悳绱㈡潯浠跺苟閫夋嫨"
-                v-model="queryParam.equipmentCategoryId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="缁熶竴缂栫爜"
-            >
-              <a-input
-                placeholder="璇疯緭鍏ヨ澶囩粺涓�缂栫爜鏌ヨ"
-                v-model="queryParam.num"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="璁惧鍚嶇О"
-            >
-              <a-input
-                placeholder="璇疯緭鍏ヨ澶囧悕绉版煡璇�"
-                v-model="queryParam.name"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鍨嬪彿"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <a-input
-                v-model="queryParam.model"
-                placeholder="璇疯緭鍏ュ瀷鍙�"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-item
-              label="宸ュ尯"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨宸ュ尯"
-                :triggerChange="true"
-                dictCode="mom_base_area,name,id,del_flag!='1'"
-                v-model="queryParam.factoryModelId"
-              />
-            </a-form-item>
-          </a-col>
-          <!-- <a-col :span="6">
-            <a-form-item
-              label="杞﹂棿"
-              :labelCol="labelCol"
-            :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨璧勮溅闂�"
-                :triggerChange="true"
-                dictCode="mom_base_factory_model,name,id,del_flag!='1'"
-                v-model="queryParam.factoryModelId"
-              />
-            </a-form-item>
-          </a-col> -->
-          <a-col :span="6">
-            <a-form-item
-              label="缁存姢閮ㄩ棬"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <!-- <a-tree-select
-                style="width: 100%"
-                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-                :tree-data="treeData"
-                placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
-                tree-default-expand-all
-                v-model="queryParam.manageId"
-              /> -->
-              <j-dict-select-tag
-                dictCode="sys_depart,depart_name,id"
-                placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
-                v-model="queryParam.manageId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="浣跨敤閮ㄩ棬"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <!-- <a-tree-select
-                style="width: 100%"
-                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-                :tree-data="treeData"
-                placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
-                tree-default-expand-all
-                v-model="queryParam.useId"
-              /> -->
-              <j-dict-select-tag
-                dictCode="sys_depart,depart_name,id"
-                placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
-                v-model="queryParam.useId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鏄惁鐢熶骇绾胯澶�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨"
-                :triggerChange="true"
-                dictCode="is_product"
-                v-model="queryParam.isLineEquip"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-item
-              label="ABC鏍囪瘑"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨ABC鏍囪瘑"
-                :triggerChange="true"
-                dictCode="ABC-standard-result"
-                v-model="queryParam.equipmentImportanceId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鎶�鏈姸鎬�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨鎶�鏈姸鎬�"
-                :triggerChange="true"
-                dictCode="technology_status"
-                v-model="queryParam.technologyStatus"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="璁惧鐘舵��"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨璁惧鐘舵��"
-                :triggerChange="true"
-                dictCode="equipment_status"
-                v-model="queryParam.equipmentStatus"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鍏抽敭璁惧鏍囪瘑"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                :triggerChange="true"
-                placeholder="璇烽�夋嫨鍏抽敭璁惧鏍囪瘑"
-                dictCode="specific_equipment"
-                v-model="queryParam.specificEquipment"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-model-item
-              label="璐ㄤ繚寮�濮嬫棩鏈�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-date
-                style="width: 100%;"
-                placeholder="璇烽�夋嫨寮�濮嬫棩鏈�"
-                class="query-group-cust"
-                v-model="queryParam.warrantyStart"
-              ></j-date>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-model-item
-              label="璐ㄤ繚缁撴潫鏃ユ湡"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-date
-                style="width: 100%;"
-                placeholder="璇烽�夋嫨缁撴潫鏃ユ湡"
-                class="query-group-cust"
-                v-model="queryParam.warrantyEnd"
-              ></j-date>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="缁翠慨鐝粍"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨缁翠慨鐝粍"
-                :triggerChange="true"
-                dictCode="mom_base_team,name,id,del_flag!='1'"
-                v-model="queryParam.teamId"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 鏌ヨ鍖哄煙-END -->
-
-    <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
-    <div class="table-operator">
-      <a-button
-        type="primary"
-        @click="searchQuery"
-        icon="search"
-      >鏌ヨ</a-button>
-      <a-button
-        @click="searchReset"
-        icon="reload"
-      >閲嶇疆</a-button>
-      <a-button
-        @click="handleAdd"
-        type="primary"
-        icon="plus"
-        v-has="'equipmentAccount:add&delete&import&Edit'"
-      >鏂板</a-button>
-      <a-button
-        type="primary"
-        icon="download"
-        @click="handleExportXls('璁惧鍙拌处')"
-        v-has="'equipmentAccount:outport'"
-      >瀵煎嚭</a-button>
-      <a-upload
-        name="file"
-        :showUploadList="false"
-        :multiple="false"
-        :headers="tokenHeader"
-        :action="importExcelUrl"
-        @change="handleImportExcel"
-      >
-        <a-button
-          type="primary"
-          icon="import"
-          v-has="'equipmentAccount:add&delete&import&Edit'"
-        >瀵煎叆</a-button>
-      </a-upload>
-      <a-button
-        :disabled="selectedRowKeys.length==0"
-        @click="handleUpdateABC"
-        type="primary"
-        icon="font-colors"
-        v-has="'equipmentAccount:add&delete&import&Edit'"
-      >ABC鏍囪瘑鍙樻洿</a-button>
-      <a-button
-        :disabled="selectedRowKeys.length==0"
-        @click="handleUpdateWarranty"
-        type="primary"
-        icon="calendar"
-        v-has="'equipmentAccount:add&delete&import&Edit'"
-      >璐ㄤ繚鏈熷彉鏇�</a-button>
-    </div>
-    <!-- table鍖哄煙-begin -->
-    <div>
-      <div
-        class="ant-alert ant-alert-info"
-        style="margin-bottom: 16px;"
-      >
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
-        <a
-          style="margin-left: 24px"
-          @click="onClearSelected"
-        >娓呯┖</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :scroll="{x:true}"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'checkbox'}"
-        :customRow="clickThenSelect"
-        @change="handleTableChange"
-      >
-        <template
-          slot="technologyStatus"
-          slot-scope="text,record"
-        >
-          <a
-            href="javascript:eam/EquipmentCalibrationOrder;"
-            @click="handleTechnologyStatus(record)"
-          >{{record.technologyStatus_dictText}}</a>
-        </template>
-
-        <template
-          slot="htmlSlot"
-          slot-scope="text"
-        >
-          <div v-html="text"></div>
-        </template>
-        <template
-          slot="imgSlot"
-          slot-scope="text,record"
-        >
-          <span
-            v-if="!text"
-            style="font-size: 12px;font-style: italic;"
-          >鏃犲浘鐗�</span>
-          <img
-            v-else
-            :src="getImgView(text)"
-            :preview="record.id"
-            height="25px"
-            alt=""
-            style="max-width:80px;font-size: 12px;font-style: italic;"
-          />
-        </template>
-        <template
-          slot="fileSlot"
-          slot-scope="text"
-        >
-          <span
-            v-if="!text"
-            style="font-size: 12px;font-style: italic;"
-          >鏃犳枃浠�</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)"
-          >
-            涓嬭浇
-          </a-button>
-        </template>
-
-        <!--宸ヨ壓鍙傛暟涓�у睍绀�-->
-        <span
-          slot="processParameters"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.processParameters==1"
-            status="success"
-          />
-          <span
-            v-if="record.processParameters==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.processParameters==0"
-            status="error"
-          />
-          <span
-            v-if="record.processParameters==0"
-            class="error"
-          >鍚�</span>
-        </span>
-        <span
-          slot="processParameters"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.processParameters==1"
-            status="success"
-          />
-          <span
-            v-if="record.processParameters==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.processParameters==0"
-            status="error"
-          />
-          <span
-            v-if="record.processParameters==0"
-            class="error"
-          >鍚�</span>
-        </span>
-        <span
-          slot="precisionParameters"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.precisionParameters==1"
-            status="success"
-          />
-          <span
-            v-if="record.precisionParameters==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.precisionParameters==0"
-            status="error"
-          />
-          <span
-            v-if="record.precisionParameters==0"
-            class="error"
-          >鍚�</span>
-        </span>
-        <span
-          slot="verification"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.verification==1"
-            status="success"
-          />
-          <span
-            v-if="record.verification==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.verification==0"
-            status="error"
-          />
-          <span
-            v-if="record.verification==0"
-            class="error"
-          >鍚�</span>
-        </span>
-
-        <span
-          slot="name"
-          slot-scope="text"
-        >
-          <j-ellipsis
-            :value="text"
-            :length="8"
-          />
-        </span>
-
-        <template
-          slot="num"
-          slot-scope="text,record"
-        >
-          <a
-            href="javascript:;"
-            @click="handleDetail(record)"
-          >{{record.num}}</a>
-        </template>
-
-        <span
-          slot="action"
-          slot-scope="text, record"
-        >
-          <!-- class="table-operation" -->
-          <!-- <a
-          href="javascript:;"
-          @click="equipmentStructuresShow(record)"
-        >璁惧缁撴瀯</a>
-        <a-divider type="vertical" /> -->
-          <a
-            href="javascript:;"
-            @click='handleDetail(record)'
-          >璇︽儏</a>
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">
-              鏇村
-              <a-icon type="down" />
-            </a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="equipmentResumeShow(record)">璁惧灞ュ巻</a>
-              </a-menu-item>
-              <a-menu-item
-                v-has="'accountSons:add&edit&delete&submit'"
-                v-if="record.processParameters==1"
-              >
-                <a @click="editProcess(record)">宸ヨ壓鍙傛暟缁存姢</a>
-              </a-menu-item>
-              <a-menu-item
-                v-has="'accountSons:add&edit&delete&submit'"
-                v-if="record.precisionParameters==1"
-              >
-                <a @click="editPrecision(record)">绮惧害鍙傛暟缁存姢</a>
-              </a-menu-item>
-              <a-menu-item v-has="'equipmentAccount:add&delete&import&Edit'">
-                <a @click="handleEdit(record)">缂栬緫</a>
-              </a-menu-item>
-              <a-menu-item v-has="'equipmentAccount:add&delete&import&Edit'">
-                <a @click="handleEditSpareParts(record)">缂栬緫澶囦欢</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm
-                  title="纭畾鍒犻櫎鍚�?"
-                  @confirm="() => handleDelete(record.id)"
-                  v-has="'equipmentAccount:add&delete&import&Edit'"
-                >
-                  <a>鍒犻櫎</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-      </a-table>
-    </div>
-    <equipment-resume-drawer
-      ref="EquipmentResumeDrawer"
-      @ok="modalFormOk"
-    ></equipment-resume-drawer>
-
-    <a-tabs defaultActiveKey="1">
-      <a-tab-pane
-        tab="宸ヨ壓鍙傛暟"
-        key="1"
-      >
-        <EquipmentProcessParametersList
-          :mainId="selectedMainId"
-          :isOpen="isOpenProcess"
-        />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="璁惧绮惧害"
-        key="2"
-        forceRender
-      >
-        <EquipmentPrecisionParametersList
-          :isOpen="isOpenPrecision"
-          :mainId="precisionParametersTemplateId"
-        />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="璁惧鏂囨。"
-        key="3"
-        forceRender
-      >
-        <EquipmentDocumentList :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="澶囦欢"
-        key="4"
-        forceRender
-      >
-        <EquipmentSpareParts :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="ABC鏍囪瘑鍙樻洿璁板綍"
-        key="5"
-        forceRender
-      >
-        <equipment-update-ABC-list :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="璐ㄤ繚鏈熷彉鏇�"
-        key="6"
-        forceRender
-      >
-        <equipment-update-warranty-list :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="鏃ヤ繚鏍囧噯"
-        key="7"
-        forceRender
-      >
-        <daily-maintenance-list :mainId="selectedMainId"></daily-maintenance-list>
-      </a-tab-pane>
-      <a-tab-pane
-        tab="浜屼繚鏍囧噯"
-        key="8"
-        forceRender
-      >
-        <second-maintenance-list :mainId="selectedMainId"></second-maintenance-list>
-      </a-tab-pane>
-      <a-tab-pane
-        tab="涓変繚鏍囧噯"
-        key="9"
-        forceRender
-      >
-        <third-maintenance-list :mainId="selectedMainId"></third-maintenance-list>
-      </a-tab-pane>
-    </a-tabs>
-    <equipment-modal
-      ref="modalForm"
-      @ok="modalFormOk"
-      :caytegoryParam="caytegoryParam"
-    ></equipment-modal>
-    <process-edit-model ref="processEditModel"></process-edit-model>
-    <precision-edit-model ref="precisionEditModel"></precision-edit-model>
-    <aBC-update-edit-model
-      @ok="modalFormOk"
-      :updateList="selectionRows"
-      ref="updateABC"
-    ></aBC-update-edit-model>
-    <warranty-update-model
-      :updateList="selectionRows"
-      ref="updateWarranty"
-    ></warranty-update-model>
-    <EquipmentSparePartsModal
-      ref="modalFormSpareParts"
-      @ok="modalFormOk"
-    />
-  </a-card>
+  <equipment-list-of-all :caytegoryParam="caytegoryParam"></equipment-list-of-all>
 </template>
 
 <script>
 
-import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-import { mixinDevice } from '@/utils/mixin'
-import EquipmentModal from './modules/equipmentNew/EquipmentModal'
-import { getAction } from '@/api/manage'
-import EquipmentProcessParametersList from './modules/equipmentNew/EquipmentProcessParametersList'
-import EquipmentDocumentList from './modules/equipmentNew/EquipmentDocumentList'
-import EquipmentPrecisionParametersList from './modules/equipmentNew/EquipmentPrecisionParametersList'
-import '@/assets/less/TableExpand.less'
-import EquipmentResumeDrawer from './modules/equipmentNew/EquipmentResume/EquipmentResumeDrawer'
-import JSearchSelectTag from '../../components/dict/JSearchSelectTag.vue'
-import ProcessEditModel from './modules/equipmentNew/edit/ProcessEditModel.vue'
-import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
-import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
-import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
-import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
-import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
-import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts'
-import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
-import StandardOfInspection from './modules/equipmentNew/StandardOfInspection.vue'
-import StandardOfMaintenance from './modules/equipmentNew/StandardOfMaintenance.vue'
-import DailyMaintenanceList from './modules/equipmentNew/DailyMaintenanceList.vue'
-import SecondMaintenanceList from './modules/equipmentNew/SecondMaintenanceList.vue'
-import ThirdMaintenanceList from './modules/equipmentNew/ThirdMaintenanceList.vue'
-import JEllipsis from '@/components/jeecg/JEllipsis'
+import EquipmentListOfAll from './EquipmentListOfAll.vue'
+
 export default {
   name: "EquipmentList",
-  mixins: [JeecgListMixin, mixinDevice],
   components: {
-    EquipmentProcessParametersList,
-    EquipmentDocumentList,
-    EquipmentPrecisionParametersList,
-    EquipmentModal,
-    EquipmentResumeDrawer,
-    JSearchSelectTag,
-    ProcessEditModel,
-    PrecisionEditModel,
-    EquipmentUpdateABCList,
-    EquipmentUpdateWarrantyList,
-    ABCUpdateEditModel,
-    WarrantyUpdateModel,
-    EquipmentSpareParts,
-    EquipmentSparePartsModal,
-    StandardOfInspection,
-    StandardOfMaintenance,
-    DailyMaintenanceList,
-    SecondMaintenanceList,
-    ThirdMaintenanceList,
-    JEllipsis
+    EquipmentListOfAll,
   },
   data() {
     return {
       description: '璁惧鍙拌处绠$悊椤甸潰',
       caytegoryParam: 'ride',
-      // 琛ㄥご
-      columns: [
-        {
-          title: '#',
-          dataIndex: '',
-          key: 'rowIndex',
-          align: 'center',
-          customRender: function (t, r, index) {
-            return parseInt(index) + 1
-          },
-          width: 50,
-        },
-        {
-          title: '璁惧绫诲瀷',
-          align: "center",
-          dataIndex: 'equipmentCategoryId_dictText',
-        },
-        {
-          title: '鏄惁鐢熶骇绾胯澶�',
-          align: "center",
-          dataIndex: 'isLineEquip_dictText',
-        },
-        {
-          title: '鍏抽敭璁惧鏍囪瘑',
-          align: "center",
-          dataIndex: 'specificEquipment_dictText',
-        },
-        {
-          title: '缁熶竴缂栫爜',
-          align: "center",
-          dataIndex: 'num',
-          scopedSlots: { customRender: 'num' },
-        },
-        {
-          title: '璁惧鍚嶇О',
-          align: "center",
-          dataIndex: 'name',
-          scopedSlots: { customRender: 'name' },
-        },
-        {
-          title: '鍨嬪彿',
-          align: "center",
-          dataIndex: 'model',
-        },
-        {
-          title: '瑙勬牸',
-          align: "center",
-          dataIndex: 'specification',
-        },
-        {
-          title: '鎬诲姛鐜�',
-          align: "center",
-          dataIndex: 'gpo',
-        },
-        // {
-        //   title: '浣跨敤閮ㄩ棬',
-        //   align: "center",
-        //   dataIndex: 'useId_dictText',
-        // },
-        // {
-        //   title: '缁存姢閮ㄩ棬',
-        //   align: "center",
-        //   dataIndex: 'manageId_dictText',
-        // },
-        {
-          title: '缁翠慨鐝粍',
-          align: "center",
-          dataIndex: 'teamId_dictText',
-        },
-        {
-          title: 'ABC鏍囪瘑',
-          align: "center",
-          dataIndex: 'equipmentImportanceId',
-        },
-        // {
-        //   title: '鍏抽敭璁惧鏍囪瘑',
-        //   align: "center",
-        //   dataIndex: 'specificEquipment_dictText',
-        // },
-        {
-          title: '鎶�鏈姸鎬�',
-          align: "center",
-          dataIndex: 'technologyStatus_dictText',
-          scopedSlots: { customRender: 'technologyStatus' },
-        },
-        {
-          title: '鎶�鏈姸鎬侀壌瀹氱被鍨�',
-          align: "center",
-          dataIndex: 'technologyStatusVerificationType_dictText',
-        },
-        {
-          title: '涓嬫鎶�鏈姸鎬侀壌瀹氭椂闂�',
-          align: "center",
-          dataIndex: 'nextTechnologyStatusQualificationTime',
-        },
-        {
-          title: '鐢熶骇绾跨紪鍙�',
-          align: "center",
-          dataIndex: 'lineId_dictText',
-        },
-        {
-          title: '涓昏澶�?',
-          align: "center",
-          dataIndex: 'isMeta_dictText',
-        },
-        // {
-        //   title: '宸ュ尯',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda1',
-        // },
-        // {
-        //   title: '瀹夊叏閰嶇疆',
-        //   align: "center",
-        //   dataIndex: 'securityConfiguration',
-        // },
-        // {
-        //   title: '鍐峰嵈绯荤粺',
-        //   align: "center",
-        //   dataIndex: 'coolingSystem',
-        // },
-        // {
-        //   title: '鐏伀鍣�',
-        //   align: "center",
-        //   dataIndex: 'fireExtinguisher',
-        // },
-
-        // {
-        //   title: '鐏伀鍣ㄦ湁鏁堟湡',
-        //   align: "center",
-        //   dataIndex: 'fireExtinguisherValidityPeriod',
-        // },
-        // {
-        //   title: '鎿嶄綔绯荤粺',
-        //   align: "center",
-        //   dataIndex: 'operatingSystem',
-        // },
-        // {
-        //   title: '绯荤粺',
-        //   align: "center",
-        //   dataIndex: 'system',
-        // },
-        // {
-        //   title: '璁惧绔彛',
-        //   align: "center",
-        //   dataIndex: 'port',
-        // },
-        // {
-        //   title: '鍧愭爣鏁伴噺',
-        //   align: "center",
-        //   dataIndex: 'coordinateNum',
-        // },
-        // {
-        //   title: '璁惧鐘舵��',
-        //   align: "center",
-        //   dataIndex: 'equipmentStatus_dictText',
-        // },
-        // {
-        //   title: '閲嶉噺',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda3',
-        // },
-        // {
-        //   title: '閲嶉噺璁¢噺鍗曚綅',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda4_dictText',
-        // },
-        // {
-        //   title: '鍔熻兘浣嶇疆',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda5',
-        // },
-        // {
-        //   title: '瀹夎浣嶇疆',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda2',
-        // },
-        // {
-        //   title: '鍑哄巶鏃ユ湡',
-        //   align: "center",
-        //   dataIndex: 'leaveFactoryDate',
-        // },
-        // {
-        //   title: '绔嬮」鍗″彿',
-        //   align: "center",
-        //   dataIndex: 'projectApprovalNo',
-        // },
-        // {
-        //   title: '璧勯噾鏉ユ簮',
-        //   align: "center",
-        //   dataIndex: 'fundSource',
-        // },
-        // {
-        //   title: '楠屾敹鏃ユ湡',
-        //   align: "center",
-        //   dataIndex: 'acceptanceCheckDate',
-        // },
-        // {
-        //   title: '鍑哄巶缂栧彿',
-        //   align: "center",
-        //   dataIndex: 'factoryNo',
-        // },
-        // {
-        //   title: '璧勪骇鍒堕�犲晢',
-        //   align: "center",
-        //   dataIndex: 'constructorId_dictText',
-        // },
-        // {
-        //   title: '璧勪骇鐨勬潵婧愬浗瀹�',
-        //   align: "center",
-        //   dataIndex: 'sourceCountry',
-        // }, 
-        {
-          title: '宸ヨ壓鍙傛暟绠$悊',
-          align: "center",
-          dataIndex: 'processParameters',
-          scopedSlots: { customRender: 'processParameters' },
-        },
-        {
-          title: '宸ヨ壓鍙傛暟妯℃澘',
-          align: "center",
-          dataIndex: 'processParametersTemplateId_dictText',
-        },
-        {
-          title: '璁惧绮惧害绠$悊',
-          align: "center",
-          dataIndex: 'precisionParameters',
-          scopedSlots: { customRender: 'precisionParameters' },
-        },
-        {
-          title: '绮惧害鍙傛暟妯℃澘',
-          align: "center",
-          dataIndex: 'precisionParametersTemplateId_dictText',
-        },
-        // {
-        //   title: '澶囨敞',
-        //   align: "center",
-        //   dataIndex: 'remark',
-        // },
-        {
-          title: '鎿嶄綔',
-          align: "center",
-          dataIndex: 'action',
-          scopedSlots: {
-            customRender: 'action',
-          },
-          width: 147,
-          fixed: 'right',
-        },
-      ],
-      url: {
-        list: "/eam/equipment/getEquipmentTZList",
-        delete: "/eam/equipment/delete",
-        deleteBatch: "/eam/equipment/deleteBatch",
-        active: "/eam/equipment/active",
-        exportXlsUrl: '/eam/equipment/exportXls',
-        importExcelUrl: "/eam/equipment/importExcel",
-        loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
-      },
-      dictOptions: {
-      },
-      /* 鍒嗛〉鍙傛暟 */
-      ipagination: {
-        current: 1,
-        pageSize: 10,
-        pageSizeOptions: ['5', '10', '20', '50'],
-        showTotal: (total, range) => {
-          return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
-        },
-        showQuickJumper: true,
-        showSizeChanger: true,
-        total: 0
-      },
-      selectedMainId: '',
-      superFieldList: [],
-      equipmentProcessParametersMainId: '',
-      equipmentDocumentMainId: '',
-      equipmentPrecisionParametersMainId: '',
-      precisionParametersTemplateId: '',
-      isOpenPrecision: true,
-      isOpenProcess: true,
-      treeData: [],
-      labelCol: {
-        xs: { span: 24 },
-        sm: { span: 5 },
-      },
-      wrapperCol: {
-        xs: { span: 24 },
-        sm: { span: 16 },
-      },
-      mainId: '',
     }
   },
-  created() {
-    this.getSuperFieldList();
-    this.initOptions();
-  },
-  computed: {
-    importExcelUrl: function () {
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    }
-  },
-  methods: {
-    initDictConfig() {
-    },
-    equipmentResumeShow(record) {
-      this.$refs.EquipmentResumeDrawer.visible = true
-      this.$refs.EquipmentResumeDrawer.title = '璁惧灞ュ巻'
-      this.$refs.EquipmentResumeDrawer.handleShow(record)
-    },
-    clickThenSelect(record) {
-      return {
-        on: {
-          click: () => {
-            this.onSelectChange(record.id.split(","), [record]);
-          }
-        }
-      }
-    },
-    onClearSelected() {
-      this.selectedRowKeys = [];
-      this.selectionRows = [];
-      this.selectedMainId = ''
-    },
-    onSelectChange(selectedRowKeys, selectionRows) {
-      if (selectedRowKeys.length == 1) {
-        this.selectedMainId = selectedRowKeys[0]
-        this.precisionParametersTemplateId = selectionRows[0].precisionParametersTemplateId;
-        this.isOpenProcess = selectionRows[0].processParameters == 1;
-        this.isOpenPrecision = selectionRows[0].precisionParameters == 1;
-      } else {
-        this.selectedMainId = ''
-        this.precisionParametersTemplateId = ''
-      }
-      this.selectedRowKeys = selectedRowKeys;
-      this.selectionRows = selectionRows;
-    },
-    loadData(arg) {
-      if (!this.url.list) {
-        this.$message.error("璇疯缃畊rl.list灞炴��!")
-        return
-      }
-      //鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
-      if (arg === 1) {
-        this.ipagination.current = 1;
-      }
-      this.onClearSelected()
-      this.queryParam.equipmentCategoryUda1 = this.caytegoryParam;
-      var params = this.getQueryParams();//鏌ヨ鏉′欢
-      this.loading = true;
-      getAction(this.url.list, params).then((res) => {
-        if (res.success) {
-          this.dataSource = res.result.records;
-          this.ipagination.total = res.result.total;
-        }
-        if (res.code === 510) {
-          this.$message.warning(res.message)
-        }
-        this.loading = false;
-      })
-    },
-    getSuperFieldList() {
-      let fieldList = [];
-      fieldList.push({ type: 'string', value: 'num', text: '缁熶竴缂栫爜', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'name', text: '璁惧鍚嶇О', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'model', text: '鍨嬪彿', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'specification', text: '瑙勬牸', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentStatus', text: '璁惧鐘舵��', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'technologyStatus', text: 'technologyStatus', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'assetNumber', text: 'assetNumber', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentCategoryId', text: 'equipmentCategoryId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'specificEquipment', text: 'specificEquipment', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentPhoto', text: 'equipmentPhoto', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'constructorId', text: '璧勪骇鍒堕�犲晢', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'supplierId', text: 'supplierId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'factoryNumber', text: 'factoryNumber', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'leaveFactoryDate', text: '鍑哄巶鏃ユ湡', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'acceptanceCheckDate', text: '楠屾敹鏃ユ湡', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'affiliationId', text: 'affiliationId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'manageId', text: '缁存姢閮ㄩ棬ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'manager', text: 'manager', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'useId', text: '浣跨敤閮ㄩ棬ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'functionary', text: 'functionary', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'location', text: 'location', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentImportanceId', text: 'ABC鏍囪瘑ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'processParameters', text: 'processParameters', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'processParametersTemplateId', text: 'processParametersTemplateId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'precisionParameters', text: 'precisionParameters', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'precisionParametersTemplateId', text: 'precisionParametersTemplateId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'verification', text: 'verification', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'verificationPeriod', text: 'verificationPeriod', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'lastVerificationDate', text: 'lastVerificationDate', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'nextVerificationDate', text: 'nextVerificationDate', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'status', text: 'status', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'remark', text: 'remark', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda1', text: '宸ュ尯', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda2', text: '瀹夎浣嶇疆', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda3', text: '閲嶉噺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda4', text: '閲嶉噺璁¢噺鍗曚綅ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda5', text: '鍔熻兘浣嶇疆', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'tenantId', text: 'tenantId', dictCode: '' })
-      fieldList.push({ type: 'int', value: 'delFlag', text: 'delFlag', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'teamId', text: '缁翠慨鐝粍ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'sourceId', text: 'sourceId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'fundSource', text: '璧勯噾鏉ユ簮', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'factoryNo', text: '鍑哄巶缂栧彿', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'mfr', text: '鍒堕�犲晢', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'sourceCountry', text: '璧勪骇鏉ユ簮鍥藉', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'gpo', text: '鎬诲姛鐜�', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'keyEquipmentIdentification', text: '鍏抽敭璁惧鏍囪瘑', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'securityConfiguration', text: '瀹夊叏閰嶇疆', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'coolingSystem', text: '鍐峰嵈绯荤粺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'fireExtinguisher', text: '鐏伀鍣�', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'fireExtinguisherValidityPeriod', text: '鐏伀鍣ㄦ湁鏁堟湡', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'operatingSystem', text: '鎿嶄綔绯荤粺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'system', text: '绯荤粺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'port', text: '绔彛', dictCode: '' })
-      fieldList.push({ type: 'BigDecimal', value: 'coordinateNum', text: '鍧愭爣鏁伴噺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'projectApprovalNo', text: '绔嬮」鍗″彿', dictCode: '' })
-      this.superFieldList = fieldList
-    },
-    editProcess(record) {
-      this.$refs.processEditModel.edit(record);
-    },
-    editPrecision(record) {
-      this.$refs.precisionEditModel.edit(record);
-    },
-    initOptions() {
-      getAction(this.url.loadOptions).then(res => {
-        if (res.success) {
-          this.treeData = res.result
-        } else {
-          this.$message.warning(res.message)
-        }
-      })
-    },
-    handleUpdateABC() {
-      this.$refs.updateABC.add();
-    },
-    handleUpdateWarranty() {
-      this.$refs.updateWarranty.add();
-    },
-    handleEditSpareParts(record) {
-      this.$refs.modalFormSpareParts.edit(record);
-    },
-    handleTechnologyStatus(record) {
-      //璺敱鏄痚am/EquipmentCalibrationOrder
-      this.$router.push({
-        path: '/eam/EquipmentCalibrationOrder',
-        query: {
-          equipmentId: record.id,
-          technologyStatus: record.technologyStatus,
-          technologyStatusVerificationType: record.technologyStatusVerificationType,
-        }
-      })
-    },
-
-  }
 }
 </script>
 <style scoped>
diff --git a/src/views/eam/EquipmentListOfTester.vue b/src/views/eam/EquipmentListOfTester.vue
index 63ca641..06d1242 100644
--- a/src/views/eam/EquipmentListOfTester.vue
+++ b/src/views/eam/EquipmentListOfTester.vue
@@ -1,1168 +1,22 @@
 <template>
-  <a-card
-    :bordered="false"
-    title="璇曢獙鍣�"
-  >
-    <!-- 鏌ヨ鍖哄煙 -->
-    <div class="table-page-search-wrapper">
-      <a-form
-        layout="inline"
-        @keyup.enter.native="searchQuery"
-      >
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-item
-              label="璁惧鎵�灞炲垎绫�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                :dictCode="'mom_eam_equipment_category,name,id,equipment_category_uda1='+'\''+caytegoryParam+'\''"
-                placeholder="璇疯緭鍏ユ悳绱㈡潯浠跺苟閫夋嫨"
-                v-model="queryParam.equipmentCategoryId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="缁熶竴缂栫爜"
-            >
-              <a-input
-                placeholder="璇疯緭鍏ヨ澶囩粺涓�缂栫爜鏌ヨ"
-                v-model="queryParam.num"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="璁惧鍚嶇О"
-            >
-              <a-input
-                placeholder="璇疯緭鍏ヨ澶囧悕绉版煡璇�"
-                v-model="queryParam.name"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鍨嬪彿"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <a-input
-                v-model="queryParam.model"
-                placeholder="璇疯緭鍏ュ瀷鍙�"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-item
-              label="宸ュ尯"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨宸ュ尯"
-                :triggerChange="true"
-                dictCode="mom_base_area,name,id,del_flag!='1'"
-                v-model="queryParam.factoryModelId"
-              />
-            </a-form-item>
-          </a-col>
-          <!-- <a-col :span="6">
-            <a-form-item
-              label="杞﹂棿"
-              :labelCol="labelCol"
-            :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨璧勮溅闂�"
-                :triggerChange="true"
-                dictCode="mom_base_factory_model,name,id,del_flag!='1'"
-                v-model="queryParam.factoryModelId"
-              />
-            </a-form-item>
-          </a-col> -->
-          <a-col :span="6">
-            <a-form-item
-              label="缁存姢閮ㄩ棬"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <!-- <a-tree-select
-                style="width: 100%"
-                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-                :tree-data="treeData"
-                placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
-                tree-default-expand-all
-                v-model="queryParam.manageId"
-              /> -->
-              <j-dict-select-tag
-                dictCode="sys_depart,depart_name,id"
-                placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
-                v-model="queryParam.manageId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="浣跨敤閮ㄩ棬"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <!-- <a-tree-select
-                style="width: 100%"
-                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-                :tree-data="treeData"
-                placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
-                tree-default-expand-all
-                v-model="queryParam.useId"
-              /> -->
-              <j-dict-select-tag
-                dictCode="sys_depart,depart_name,id"
-                placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
-                v-model="queryParam.useId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鏄惁鐢熶骇绾胯澶�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨"
-                :triggerChange="true"
-                dictCode="is_product"
-                v-model="queryParam.isLineEquip"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-item
-              label="ABC鏍囪瘑"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨ABC鏍囪瘑"
-                :triggerChange="true"
-                dictCode="ABC-standard-result"
-                v-model="queryParam.equipmentImportanceId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鎶�鏈姸鎬�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨鎶�鏈姸鎬�"
-                :triggerChange="true"
-                dictCode="technology_status"
-                v-model="queryParam.technologyStatus"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="璁惧鐘舵��"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨璁惧鐘舵��"
-                :triggerChange="true"
-                dictCode="equipment_status"
-                v-model="queryParam.equipmentStatus"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鍏抽敭璁惧鏍囪瘑"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                :triggerChange="true"
-                placeholder="璇烽�夋嫨鍏抽敭璁惧鏍囪瘑"
-                dictCode="specific_equipment"
-                v-model="queryParam.specificEquipment"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-model-item
-              label="璐ㄤ繚寮�濮嬫棩鏈�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-date
-                style="width: 100%;"
-                placeholder="璇烽�夋嫨寮�濮嬫棩鏈�"
-                class="query-group-cust"
-                v-model="queryParam.warrantyStart"
-              ></j-date>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-model-item
-              label="璐ㄤ繚缁撴潫鏃ユ湡"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-date
-                style="width: 100%;"
-                placeholder="璇烽�夋嫨缁撴潫鏃ユ湡"
-                class="query-group-cust"
-                v-model="queryParam.warrantyEnd"
-              ></j-date>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="缁翠慨鐝粍"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨缁翠慨鐝粍"
-                :triggerChange="true"
-                dictCode="mom_base_team,name,id,del_flag!='1'"
-                v-model="queryParam.teamId"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 鏌ヨ鍖哄煙-END -->
-
-    <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
-    <div class="table-operator">
-      <a-button
-        type="primary"
-        @click="searchQuery"
-        icon="search"
-      >鏌ヨ</a-button>
-      <a-button
-        @click="searchReset"
-        icon="reload"
-      >閲嶇疆</a-button>
-      <a-button
-        @click="handleAdd"
-        type="primary"
-        icon="plus"
-        v-has="'equipmentAccount:add&delete&import&Edit'"
-      >鏂板</a-button>
-      <a-button
-        type="primary"
-        icon="download"
-        @click="handleExportXls('璁惧鍙拌处')"
-        v-has="'equipmentAccount:outport'"
-      >瀵煎嚭</a-button>
-      <a-upload
-        name="file"
-        :showUploadList="false"
-        :multiple="false"
-        :headers="tokenHeader"
-        :action="importExcelUrl"
-        @change="handleImportExcel"
-      >
-        <a-button
-          type="primary"
-          icon="import"
-          v-has="'equipmentAccount:add&delete&import&Edit'"
-        >瀵煎叆</a-button>
-      </a-upload>
-      <a-button
-        :disabled="selectedRowKeys.length==0"
-        @click="handleUpdateABC"
-        type="primary"
-        icon="font-colors"
-        v-has="'equipmentAccount:add&delete&import&Edit'"
-      >ABC鏍囪瘑鍙樻洿</a-button>
-      <a-button
-        :disabled="selectedRowKeys.length==0"
-        @click="handleUpdateWarranty"
-        type="primary"
-        icon="calendar"
-        v-has="'equipmentAccount:add&delete&import&Edit'"
-      >璐ㄤ繚鏈熷彉鏇�</a-button>
-    </div>
-    <!-- table鍖哄煙-begin -->
-    <div>
-      <div
-        class="ant-alert ant-alert-info"
-        style="margin-bottom: 16px;"
-      >
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
-        <a
-          style="margin-left: 24px"
-          @click="onClearSelected"
-        >娓呯┖</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :scroll="{x:true}"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'checkbox'}"
-        :customRow="clickThenSelect"
-        @change="handleTableChange"
-      >
-        <template
-          slot="technologyStatus"
-          slot-scope="text,record"
-        >
-          <a
-            href="javascript:eam/EquipmentCalibrationOrder;"
-            @click="handleTechnologyStatus(record)"
-          >{{record.technologyStatus_dictText}}</a>
-        </template>
-        <template
-          slot="htmlSlot"
-          slot-scope="text"
-        >
-          <div v-html="text"></div>
-        </template>
-        <template
-          slot="imgSlot"
-          slot-scope="text,record"
-        >
-          <span
-            v-if="!text"
-            style="font-size: 12px;font-style: italic;"
-          >鏃犲浘鐗�</span>
-          <img
-            v-else
-            :src="getImgView(text)"
-            :preview="record.id"
-            height="25px"
-            alt=""
-            style="max-width:80px;font-size: 12px;font-style: italic;"
-          />
-        </template>
-        <template
-          slot="fileSlot"
-          slot-scope="text"
-        >
-          <span
-            v-if="!text"
-            style="font-size: 12px;font-style: italic;"
-          >鏃犳枃浠�</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)"
-          >
-            涓嬭浇
-          </a-button>
-        </template>
-
-        <!--宸ヨ壓鍙傛暟涓�у睍绀�-->
-        <span
-          slot="processParameters"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.processParameters==1"
-            status="success"
-          />
-          <span
-            v-if="record.processParameters==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.processParameters==0"
-            status="error"
-          />
-          <span
-            v-if="record.processParameters==0"
-            class="error"
-          >鍚�</span>
-        </span>
-        <span
-          slot="processParameters"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.processParameters==1"
-            status="success"
-          />
-          <span
-            v-if="record.processParameters==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.processParameters==0"
-            status="error"
-          />
-          <span
-            v-if="record.processParameters==0"
-            class="error"
-          >鍚�</span>
-        </span>
-        <span
-          slot="precisionParameters"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.precisionParameters==1"
-            status="success"
-          />
-          <span
-            v-if="record.precisionParameters==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.precisionParameters==0"
-            status="error"
-          />
-          <span
-            v-if="record.precisionParameters==0"
-            class="error"
-          >鍚�</span>
-        </span>
-        <span
-          slot="verification"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.verification==1"
-            status="success"
-          />
-          <span
-            v-if="record.verification==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.verification==0"
-            status="error"
-          />
-          <span
-            v-if="record.verification==0"
-            class="error"
-          >鍚�</span>
-        </span>
-
-        <span
-          slot="name"
-          slot-scope="text"
-        >
-          <j-ellipsis
-            :value="text"
-            :length="8"
-          />
-        </span>
-
-        <template
-          slot="num"
-          slot-scope="text,record"
-        >
-          <a
-            href="javascript:;"
-            @click="handleDetail(record)"
-          >{{record.num}}</a>
-        </template>
-
-        <span
-          slot="action"
-          slot-scope="text, record"
-        >
-          <!-- class="table-operation" -->
-          <!-- <a
-          href="javascript:;"
-          @click="equipmentStructuresShow(record)"
-        >璁惧缁撴瀯</a>
-        <a-divider type="vertical" /> -->
-          <a
-            href="javascript:;"
-            @click='handleDetail(record)'
-          >璇︽儏</a>
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">
-              鏇村
-              <a-icon type="down" />
-            </a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="equipmentResumeShow(record)">璁惧灞ュ巻</a>
-              </a-menu-item>
-              <a-menu-item
-                v-has="'accountSons:add&edit&delete&submit'"
-                v-if="record.processParameters==1"
-              >
-                <a @click="editProcess(record)">宸ヨ壓鍙傛暟缁存姢</a>
-              </a-menu-item>
-              <a-menu-item
-                v-has="'accountSons:add&edit&delete&submit'"
-                v-if="record.precisionParameters==1"
-              >
-                <a @click="editPrecision(record)">绮惧害鍙傛暟缁存姢</a>
-              </a-menu-item>
-              <a-menu-item v-has="'equipmentAccount:add&delete&import&Edit'">
-                <a @click="handleEdit(record)">缂栬緫</a>
-              </a-menu-item>
-              <a-menu-item v-has="'equipmentAccount:add&delete&import&Edit'">
-                <a @click="handleEditSpareParts(record)">缂栬緫澶囦欢</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm
-                  title="纭畾鍒犻櫎鍚�?"
-                  @confirm="() => handleDelete(record.id)"
-                  v-has="'equipmentAccount:add&delete&import&Edit'"
-                >
-                  <a>鍒犻櫎</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-      </a-table>
-    </div>
-    <equipment-resume-drawer
-      ref="EquipmentResumeDrawer"
-      @ok="modalFormOk"
-    ></equipment-resume-drawer>
-
-    <a-tabs defaultActiveKey="1">
-      <a-tab-pane
-        tab="宸ヨ壓鍙傛暟"
-        key="1"
-      >
-        <EquipmentProcessParametersList
-          :mainId="selectedMainId"
-          :isOpen="isOpenProcess"
-        />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="璁惧绮惧害"
-        key="2"
-        forceRender
-      >
-        <EquipmentPrecisionParametersList
-          :isOpen="isOpenPrecision"
-          :mainId="precisionParametersTemplateId"
-        />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="璁惧鏂囨。"
-        key="3"
-        forceRender
-      >
-        <EquipmentDocumentList :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="澶囦欢"
-        key="4"
-        forceRender
-      >
-        <EquipmentSpareParts :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="ABC鏍囪瘑鍙樻洿璁板綍"
-        key="5"
-        forceRender
-      >
-        <equipment-update-ABC-list :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="璐ㄤ繚鏈熷彉鏇�"
-        key="6"
-        forceRender
-      >
-        <equipment-update-warranty-list :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="鏃ヤ繚鏍囧噯"
-        key="7"
-        forceRender
-      >
-        <daily-maintenance-list :mainId="selectedMainId"></daily-maintenance-list>
-      </a-tab-pane>
-      <a-tab-pane
-        tab="浜屼繚鏍囧噯"
-        key="8"
-        forceRender
-      >
-        <second-maintenance-list :mainId="selectedMainId"></second-maintenance-list>
-      </a-tab-pane>
-      <a-tab-pane
-        tab="涓変繚鏍囧噯"
-        key="9"
-        forceRender
-      >
-        <third-maintenance-list :mainId="selectedMainId"></third-maintenance-list>
-      </a-tab-pane>
-    </a-tabs>
-    <equipment-modal
-      ref="modalForm"
-      @ok="modalFormOk"
-      :caytegoryParam="caytegoryParam"
-    ></equipment-modal>
-    <process-edit-model ref="processEditModel"></process-edit-model>
-    <precision-edit-model ref="precisionEditModel"></precision-edit-model>
-    <aBC-update-edit-model
-      @ok="modalFormOk"
-      :updateList="selectionRows"
-      ref="updateABC"
-    ></aBC-update-edit-model>
-    <warranty-update-model
-      :updateList="selectionRows"
-      ref="updateWarranty"
-    ></warranty-update-model>
-    <EquipmentSparePartsModal
-      ref="modalFormSpareParts"
-      @ok="modalFormOk"
-    />
-  </a-card>
+  <equipment-list-of-all :caytegoryParam="caytegoryParam"></equipment-list-of-all>
 </template>
 
 <script>
 
-import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-import { mixinDevice } from '@/utils/mixin'
-import EquipmentModal from './modules/equipmentNew/EquipmentModal'
-import { getAction } from '@/api/manage'
-import EquipmentProcessParametersList from './modules/equipmentNew/EquipmentProcessParametersList'
-import EquipmentDocumentList from './modules/equipmentNew/EquipmentDocumentList'
-import EquipmentPrecisionParametersList from './modules/equipmentNew/EquipmentPrecisionParametersList'
-import '@/assets/less/TableExpand.less'
-import EquipmentResumeDrawer from './modules/equipmentNew/EquipmentResume/EquipmentResumeDrawer'
-import JSearchSelectTag from '../../components/dict/JSearchSelectTag.vue'
-import ProcessEditModel from './modules/equipmentNew/edit/ProcessEditModel.vue'
-import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
-import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
-import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
-import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
-import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
-import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts'
-import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
-import StandardOfInspection from './modules/equipmentNew/StandardOfInspection.vue'
-import StandardOfMaintenance from './modules/equipmentNew/StandardOfMaintenance.vue'
-import DailyMaintenanceList from './modules/equipmentNew/DailyMaintenanceList.vue'
-import SecondMaintenanceList from './modules/equipmentNew/SecondMaintenanceList.vue'
-import ThirdMaintenanceList from './modules/equipmentNew/ThirdMaintenanceList.vue'
-import JEllipsis from '@/components/jeecg/JEllipsis'
+import EquipmentListOfAll from './EquipmentListOfAll.vue'
+
 export default {
   name: "EquipmentList",
-  mixins: [JeecgListMixin, mixinDevice],
   components: {
-    EquipmentProcessParametersList,
-    EquipmentDocumentList,
-    EquipmentPrecisionParametersList,
-    EquipmentModal,
-    EquipmentResumeDrawer,
-    JSearchSelectTag,
-    ProcessEditModel,
-    PrecisionEditModel,
-    EquipmentUpdateABCList,
-    EquipmentUpdateWarrantyList,
-    ABCUpdateEditModel,
-    WarrantyUpdateModel,
-    EquipmentSpareParts,
-    EquipmentSparePartsModal,
-    StandardOfInspection,
-    StandardOfMaintenance,
-    DailyMaintenanceList,
-    SecondMaintenanceList,
-    ThirdMaintenanceList,
-    JEllipsis
+    EquipmentListOfAll,
   },
   data() {
     return {
       description: '璁惧鍙拌处绠$悊椤甸潰',
       caytegoryParam: 'tester',
-      // 琛ㄥご
-      columns: [
-        {
-          title: '#',
-          dataIndex: '',
-          key: 'rowIndex',
-          align: 'center',
-          customRender: function (t, r, index) {
-            return parseInt(index) + 1
-          },
-          width: 50,
-        },
-        {
-          title: '璁惧绫诲瀷',
-          align: "center",
-          dataIndex: 'equipmentCategoryId_dictText',
-        },
-        {
-          title: '鏄惁鐢熶骇绾胯澶�',
-          align: "center",
-          dataIndex: 'isLineEquip_dictText',
-        },
-        {
-          title: '鍏抽敭璁惧鏍囪瘑',
-          align: "center",
-          dataIndex: 'specificEquipment_dictText',
-        },
-        {
-          title: '缁熶竴缂栫爜',
-          align: "center",
-          dataIndex: 'num',
-          scopedSlots: { customRender: 'num' },
-        },
-        {
-          title: '璁惧鍚嶇О',
-          align: "center",
-          dataIndex: 'name',
-          scopedSlots: { customRender: 'name' },
-        },
-        {
-          title: '鍨嬪彿',
-          align: "center",
-          dataIndex: 'model',
-        },
-        {
-          title: '瑙勬牸',
-          align: "center",
-          dataIndex: 'specification',
-        },
-        {
-          title: '鎬诲姛鐜�',
-          align: "center",
-          dataIndex: 'gpo',
-        },
-        {
-          title: '浣跨敤閮ㄩ棬',
-          align: "center",
-          dataIndex: 'useId_dictText',
-        },
-        // {
-        //   title: '缁存姢閮ㄩ棬',
-        //   align: "center",
-        //   dataIndex: 'manageId_dictText',
-        // },
-        // {
-        //   title: '缁翠慨鐝粍',
-        //   align: "center",
-        //   dataIndex: 'teamId_dictText',
-        // },
-        {
-          title: 'ABC鏍囪瘑',
-          align: "center",
-          dataIndex: 'equipmentImportanceId',
-        },
-        // {
-        //   title: '鍏抽敭璁惧鏍囪瘑',
-        //   align: "center",
-        //   dataIndex: 'specificEquipment_dictText',
-        // },
-        {
-          title: '鎶�鏈姸鎬�',
-          align: "center",
-          dataIndex: 'technologyStatus_dictText',
-          scopedSlots: { customRender: 'technologyStatus' },
-        },
-        {
-          title: '鎶�鏈姸鎬侀壌瀹氱被鍨�',
-          align: "center",
-          dataIndex: 'technologyStatusVerificationType_dictText',
-        },
-        {
-          title: '涓嬫鎶�鏈姸鎬侀壌瀹氭椂闂�',
-          align: "center",
-          dataIndex: 'nextTechnologyStatusQualificationTime',
-        },
-        {
-          title: '鐢熶骇绾跨紪鍙�',
-          align: "center",
-          dataIndex: 'lineId_dictText',
-        },
-        {
-          title: '涓昏澶�?',
-          align: "center",
-          dataIndex: 'isMeta_dictText',
-        },
-        // {
-        //   title: '宸ュ尯',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda1',
-        // },
-        // {
-        //   title: '瀹夊叏閰嶇疆',
-        //   align: "center",
-        //   dataIndex: 'securityConfiguration',
-        // },
-        // {
-        //   title: '鍐峰嵈绯荤粺',
-        //   align: "center",
-        //   dataIndex: 'coolingSystem',
-        // },
-        // {
-        //   title: '鐏伀鍣�',
-        //   align: "center",
-        //   dataIndex: 'fireExtinguisher',
-        // },
-
-        // {
-        //   title: '鐏伀鍣ㄦ湁鏁堟湡',
-        //   align: "center",
-        //   dataIndex: 'fireExtinguisherValidityPeriod',
-        // },
-        // {
-        //   title: '鎿嶄綔绯荤粺',
-        //   align: "center",
-        //   dataIndex: 'operatingSystem',
-        // },
-        // {
-        //   title: '绯荤粺',
-        //   align: "center",
-        //   dataIndex: 'system',
-        // },
-        // {
-        //   title: '璁惧绔彛',
-        //   align: "center",
-        //   dataIndex: 'port',
-        // },
-        // {
-        //   title: '鍧愭爣鏁伴噺',
-        //   align: "center",
-        //   dataIndex: 'coordinateNum',
-        // },
-        // {
-        //   title: '璁惧鐘舵��',
-        //   align: "center",
-        //   dataIndex: 'equipmentStatus_dictText',
-        // },
-        // {
-        //   title: '閲嶉噺',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda3',
-        // },
-        // {
-        //   title: '閲嶉噺璁¢噺鍗曚綅',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda4_dictText',
-        // },
-        // {
-        //   title: '鍔熻兘浣嶇疆',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda5',
-        // },
-        // {
-        //   title: '瀹夎浣嶇疆',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda2',
-        // },
-        // {
-        //   title: '鍑哄巶鏃ユ湡',
-        //   align: "center",
-        //   dataIndex: 'leaveFactoryDate',
-        // },
-        // {
-        //   title: '绔嬮」鍗″彿',
-        //   align: "center",
-        //   dataIndex: 'projectApprovalNo',
-        // },
-        // {
-        //   title: '璧勯噾鏉ユ簮',
-        //   align: "center",
-        //   dataIndex: 'fundSource',
-        // },
-        // {
-        //   title: '楠屾敹鏃ユ湡',
-        //   align: "center",
-        //   dataIndex: 'acceptanceCheckDate',
-        // },
-        // {
-        //   title: '鍑哄巶缂栧彿',
-        //   align: "center",
-        //   dataIndex: 'factoryNo',
-        // },
-        // {
-        //   title: '璧勪骇鍒堕�犲晢',
-        //   align: "center",
-        //   dataIndex: 'constructorId_dictText',
-        // },
-        // {
-        //   title: '璧勪骇鐨勬潵婧愬浗瀹�',
-        //   align: "center",
-        //   dataIndex: 'sourceCountry',
-        // }, 
-        {
-          title: '宸ヨ壓鍙傛暟绠$悊',
-          align: "center",
-          dataIndex: 'processParameters',
-          scopedSlots: { customRender: 'processParameters' },
-        },
-        {
-          title: '宸ヨ壓鍙傛暟妯℃澘',
-          align: "center",
-          dataIndex: 'processParametersTemplateId_dictText',
-        },
-        {
-          title: '璁惧绮惧害绠$悊',
-          align: "center",
-          dataIndex: 'precisionParameters',
-          scopedSlots: { customRender: 'precisionParameters' },
-        },
-        {
-          title: '绮惧害鍙傛暟妯℃澘',
-          align: "center",
-          dataIndex: 'precisionParametersTemplateId_dictText',
-        },
-        // {
-        //   title: '澶囨敞',
-        //   align: "center",
-        //   dataIndex: 'remark',
-        // },
-        {
-          title: '鎿嶄綔',
-          align: "center",
-          dataIndex: 'action',
-          scopedSlots: {
-            customRender: 'action',
-          },
-          width: 147,
-          fixed: 'right',
-        },
-      ],
-      url: {
-        list: "/eam/equipment/getEquipmentTZList",
-        delete: "/eam/equipment/delete",
-        deleteBatch: "/eam/equipment/deleteBatch",
-        active: "/eam/equipment/active",
-        exportXlsUrl: '/eam/equipment/exportXls',
-        importExcelUrl: "/eam/equipment/importExcel",
-        loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
-      },
-      dictOptions: {
-      },
-      /* 鍒嗛〉鍙傛暟 */
-      ipagination: {
-        current: 1,
-        pageSize: 10,
-        pageSizeOptions: ['5', '10', '20', '50'],
-        showTotal: (total, range) => {
-          return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
-        },
-        showQuickJumper: true,
-        showSizeChanger: true,
-        total: 0
-      },
-      selectedMainId: '',
-      superFieldList: [],
-      equipmentProcessParametersMainId: '',
-      equipmentDocumentMainId: '',
-      equipmentPrecisionParametersMainId: '',
-      precisionParametersTemplateId: '',
-      isOpenPrecision: true,
-      isOpenProcess: true,
-      treeData: [],
-      labelCol: {
-        xs: { span: 24 },
-        sm: { span: 5 },
-      },
-      wrapperCol: {
-        xs: { span: 24 },
-        sm: { span: 16 },
-      },
-      mainId: '',
     }
   },
-  created() {
-    this.getSuperFieldList();
-    this.initOptions();
-  },
-  computed: {
-    importExcelUrl: function () {
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    }
-  },
-  methods: {
-    initDictConfig() {
-    },
-    equipmentResumeShow(record) {
-      this.$refs.EquipmentResumeDrawer.visible = true
-      this.$refs.EquipmentResumeDrawer.title = '璁惧灞ュ巻'
-      this.$refs.EquipmentResumeDrawer.handleShow(record)
-    },
-    clickThenSelect(record) {
-      return {
-        on: {
-          click: () => {
-            this.onSelectChange(record.id.split(","), [record]);
-          }
-        }
-      }
-    },
-    onClearSelected() {
-      this.selectedRowKeys = [];
-      this.selectionRows = [];
-      this.selectedMainId = ''
-    },
-    onSelectChange(selectedRowKeys, selectionRows) {
-      if (selectedRowKeys.length == 1) {
-        this.selectedMainId = selectedRowKeys[0]
-        this.precisionParametersTemplateId = selectionRows[0].precisionParametersTemplateId;
-        this.isOpenProcess = selectionRows[0].processParameters == 1;
-        this.isOpenPrecision = selectionRows[0].precisionParameters == 1;
-      } else {
-        this.selectedMainId = ''
-        this.precisionParametersTemplateId = ''
-      }
-      this.selectedRowKeys = selectedRowKeys;
-      this.selectionRows = selectionRows;
-    },
-    loadData(arg) {
-      if (!this.url.list) {
-        this.$message.error("璇疯缃畊rl.list灞炴��!")
-        return
-      }
-      //鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
-      if (arg === 1) {
-        this.ipagination.current = 1;
-      }
-      this.onClearSelected()
-      this.queryParam.equipmentCategoryUda1 = this.caytegoryParam;
-      var params = this.getQueryParams();//鏌ヨ鏉′欢
-      this.loading = true;
-      getAction(this.url.list, params).then((res) => {
-        if (res.success) {
-          this.dataSource = res.result.records;
-          this.ipagination.total = res.result.total;
-        }
-        if (res.code === 510) {
-          this.$message.warning(res.message)
-        }
-        this.loading = false;
-      })
-    },
-    getSuperFieldList() {
-      let fieldList = [];
-      fieldList.push({ type: 'string', value: 'num', text: '缁熶竴缂栫爜', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'name', text: '璁惧鍚嶇О', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'model', text: '鍨嬪彿', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'specification', text: '瑙勬牸', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentStatus', text: '璁惧鐘舵��', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'technologyStatus', text: 'technologyStatus', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'assetNumber', text: 'assetNumber', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentCategoryId', text: 'equipmentCategoryId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'specificEquipment', text: 'specificEquipment', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentPhoto', text: 'equipmentPhoto', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'constructorId', text: '璧勪骇鍒堕�犲晢', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'supplierId', text: 'supplierId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'factoryNumber', text: 'factoryNumber', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'leaveFactoryDate', text: '鍑哄巶鏃ユ湡', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'acceptanceCheckDate', text: '楠屾敹鏃ユ湡', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'affiliationId', text: 'affiliationId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'manageId', text: '缁存姢閮ㄩ棬ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'manager', text: 'manager', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'useId', text: '浣跨敤閮ㄩ棬ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'functionary', text: 'functionary', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'location', text: 'location', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentImportanceId', text: 'ABC鏍囪瘑ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'processParameters', text: 'processParameters', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'processParametersTemplateId', text: 'processParametersTemplateId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'precisionParameters', text: 'precisionParameters', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'precisionParametersTemplateId', text: 'precisionParametersTemplateId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'verification', text: 'verification', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'verificationPeriod', text: 'verificationPeriod', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'lastVerificationDate', text: 'lastVerificationDate', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'nextVerificationDate', text: 'nextVerificationDate', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'status', text: 'status', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'remark', text: 'remark', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda1', text: '宸ュ尯', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda2', text: '瀹夎浣嶇疆', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda3', text: '閲嶉噺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda4', text: '閲嶉噺璁¢噺鍗曚綅ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda5', text: '鍔熻兘浣嶇疆', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'tenantId', text: 'tenantId', dictCode: '' })
-      fieldList.push({ type: 'int', value: 'delFlag', text: 'delFlag', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'teamId', text: '缁翠慨鐝粍ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'sourceId', text: 'sourceId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'fundSource', text: '璧勯噾鏉ユ簮', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'factoryNo', text: '鍑哄巶缂栧彿', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'mfr', text: '鍒堕�犲晢', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'sourceCountry', text: '璧勪骇鏉ユ簮鍥藉', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'gpo', text: '鎬诲姛鐜�', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'keyEquipmentIdentification', text: '鍏抽敭璁惧鏍囪瘑', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'securityConfiguration', text: '瀹夊叏閰嶇疆', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'coolingSystem', text: '鍐峰嵈绯荤粺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'fireExtinguisher', text: '鐏伀鍣�', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'fireExtinguisherValidityPeriod', text: '鐏伀鍣ㄦ湁鏁堟湡', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'operatingSystem', text: '鎿嶄綔绯荤粺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'system', text: '绯荤粺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'port', text: '绔彛', dictCode: '' })
-      fieldList.push({ type: 'BigDecimal', value: 'coordinateNum', text: '鍧愭爣鏁伴噺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'projectApprovalNo', text: '绔嬮」鍗″彿', dictCode: '' })
-      this.superFieldList = fieldList
-    },
-    editProcess(record) {
-      this.$refs.processEditModel.edit(record);
-    },
-    editPrecision(record) {
-      this.$refs.precisionEditModel.edit(record);
-    },
-    initOptions() {
-      getAction(this.url.loadOptions).then(res => {
-        if (res.success) {
-          this.treeData = res.result
-        } else {
-          this.$message.warning(res.message)
-        }
-      })
-    },
-    handleUpdateABC() {
-      this.$refs.updateABC.add();
-    },
-    handleUpdateWarranty() {
-      this.$refs.updateWarranty.add();
-    },
-    handleEditSpareParts(record) {
-      this.$refs.modalFormSpareParts.edit(record);
-    },
-    handleTechnologyStatus(record) {
-      //璺敱鏄痚am/EquipmentCalibrationOrder
-      this.$router.push({
-        path: '/eam/EquipmentCalibrationOrder',
-        query: {
-          equipmentId: record.id,
-          technologyStatus: record.technologyStatus,
-          technologyStatusVerificationType: record.technologyStatusVerificationType,
-        }
-      })
-    },
-
-  }
 }
 </script>
 <style scoped>
diff --git a/src/views/eam/EquipmentListOfTruck.vue b/src/views/eam/EquipmentListOfTruck.vue
index eb285c7..529a7a9 100644
--- a/src/views/eam/EquipmentListOfTruck.vue
+++ b/src/views/eam/EquipmentListOfTruck.vue
@@ -1,1163 +1,22 @@
 <template>
-  <a-card
-    :bordered="false"
-    title="杩愯緭杞�"
-  >
-    <!-- 鏌ヨ鍖哄煙 -->
-    <div class="table-page-search-wrapper">
-      <a-form
-        layout="inline"
-        @keyup.enter.native="searchQuery"
-      >
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-item
-              label="璁惧鎵�灞炲垎绫�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                :dictCode="'mom_eam_equipment_category,name,id,equipment_category_uda1='+'\''+caytegoryParam+'\''"
-                placeholder="璇疯緭鍏ユ悳绱㈡潯浠跺苟閫夋嫨"
-                v-model="queryParam.equipmentCategoryId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="缁熶竴缂栫爜"
-            >
-              <a-input
-                placeholder="璇疯緭鍏ヨ澶囩粺涓�缂栫爜鏌ヨ"
-                v-model="queryParam.num"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="璁惧鍚嶇О"
-            >
-              <a-input
-                placeholder="璇疯緭鍏ヨ澶囧悕绉版煡璇�"
-                v-model="queryParam.name"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鍨嬪彿"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <a-input
-                v-model="queryParam.model"
-                placeholder="璇疯緭鍏ュ瀷鍙�"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-item
-              label="宸ュ尯"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨宸ュ尯"
-                :triggerChange="true"
-                dictCode="mom_base_area,name,id,del_flag!='1'"
-                v-model="queryParam.factoryModelId"
-              />
-            </a-form-item>
-          </a-col>
-          <!-- <a-col :span="6">
-            <a-form-item
-              label="杞﹂棿"
-              :labelCol="labelCol"
-            :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨璧勮溅闂�"
-                :triggerChange="true"
-                dictCode="mom_base_factory_model,name,id,del_flag!='1'"
-                v-model="queryParam.factoryModelId"
-              />
-            </a-form-item>
-          </a-col> -->
-          <a-col :span="6">
-            <a-form-item
-              label="缁存姢閮ㄩ棬"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <!-- <a-tree-select
-                style="width: 100%"
-                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-                :tree-data="treeData"
-                placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
-                tree-default-expand-all
-                v-model="queryParam.manageId"
-              /> -->
-              <j-dict-select-tag
-                dictCode="sys_depart,depart_name,id"
-                placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
-                v-model="queryParam.manageId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="浣跨敤閮ㄩ棬"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <!-- <a-tree-select
-                style="width: 100%"
-                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-                :tree-data="treeData"
-                placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
-                tree-default-expand-all
-                v-model="queryParam.useId"
-              /> -->
-              <j-dict-select-tag
-                dictCode="sys_depart,depart_name,id"
-                placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
-                v-model="queryParam.useId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鏄惁鐢熶骇绾胯澶�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨"
-                :triggerChange="true"
-                dictCode="is_product"
-                v-model="queryParam.isLineEquip"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-item
-              label="ABC鏍囪瘑"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨ABC鏍囪瘑"
-                :triggerChange="true"
-                dictCode="ABC-standard-result"
-                v-model="queryParam.equipmentImportanceId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鎶�鏈姸鎬�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨鎶�鏈姸鎬�"
-                :triggerChange="true"
-                dictCode="technology_status"
-                v-model="queryParam.technologyStatus"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="璁惧鐘舵��"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨璁惧鐘舵��"
-                :triggerChange="true"
-                dictCode="equipment_status"
-                v-model="queryParam.equipmentStatus"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鍏抽敭璁惧鏍囪瘑"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                :triggerChange="true"
-                placeholder="璇烽�夋嫨鍏抽敭璁惧鏍囪瘑"
-                dictCode="specific_equipment"
-                v-model="queryParam.specificEquipment"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-model-item
-              label="璐ㄤ繚寮�濮嬫棩鏈�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-date
-                style="width: 100%;"
-                placeholder="璇烽�夋嫨寮�濮嬫棩鏈�"
-                class="query-group-cust"
-                v-model="queryParam.warrantyStart"
-              ></j-date>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-model-item
-              label="璐ㄤ繚缁撴潫鏃ユ湡"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-date
-                style="width: 100%;"
-                placeholder="璇烽�夋嫨缁撴潫鏃ユ湡"
-                class="query-group-cust"
-                v-model="queryParam.warrantyEnd"
-              ></j-date>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="缁翠慨鐝粍"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨缁翠慨鐝粍"
-                :triggerChange="true"
-                dictCode="mom_base_team,name,id,del_flag!='1'"
-                v-model="queryParam.teamId"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 鏌ヨ鍖哄煙-END -->
-
-    <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
-    <div class="table-operator">
-      <a-button
-        type="primary"
-        @click="searchQuery"
-        icon="search"
-      >鏌ヨ</a-button>
-      <a-button
-        @click="searchReset"
-        icon="reload"
-      >閲嶇疆</a-button>
-      <a-button
-        @click="handleAdd"
-        type="primary"
-        icon="plus"
-        v-has="'equipmentAccount:add&delete&import&Edit'"
-      >鏂板</a-button>
-      <a-button
-        type="primary"
-        icon="download"
-        @click="handleExportXls('璁惧鍙拌处')"
-        v-has="'equipmentAccount:outport'"
-      >瀵煎嚭</a-button>
-      <a-upload
-        name="file"
-        :showUploadList="false"
-        :multiple="false"
-        :headers="tokenHeader"
-        :action="importExcelUrl"
-        @change="handleImportExcel"
-      >
-        <a-button
-          type="primary"
-          icon="import"
-          v-has="'equipmentAccount:add&delete&import&Edit'"
-        >瀵煎叆</a-button>
-      </a-upload>
-      <a-button
-        :disabled="selectedRowKeys.length==0"
-        @click="handleUpdateABC"
-        type="primary"
-        icon="font-colors"
-        v-has="'equipmentAccount:add&delete&import&Edit'"
-      >ABC鏍囪瘑鍙樻洿</a-button>
-      <a-button
-        :disabled="selectedRowKeys.length==0"
-        @click="handleUpdateWarranty"
-        type="primary"
-        icon="calendar"
-        v-has="'equipmentAccount:add&delete&import&Edit'"
-      >璐ㄤ繚鏈熷彉鏇�</a-button>
-    </div>
-    <!-- table鍖哄煙-begin -->
-    <div>
-      <div
-        class="ant-alert ant-alert-info"
-        style="margin-bottom: 16px;"
-      >
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
-        <a
-          style="margin-left: 24px"
-          @click="onClearSelected"
-        >娓呯┖</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :scroll="{x:true}"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'checkbox'}"
-        :customRow="clickThenSelect"
-        @change="handleTableChange"
-      >
-        <template
-          slot="technologyStatus"
-          slot-scope="text,record"
-        >
-          <a
-            href="javascript:eam/EquipmentCalibrationOrder;"
-            @click="handleTechnologyStatus(record)"
-          >{{record.technologyStatus_dictText}}</a>
-        </template>
-        <template
-          slot="htmlSlot"
-          slot-scope="text"
-        >
-          <div v-html="text"></div>
-        </template>
-        <template
-          slot="imgSlot"
-          slot-scope="text,record"
-        >
-          <span
-            v-if="!text"
-            style="font-size: 12px;font-style: italic;"
-          >鏃犲浘鐗�</span>
-          <img
-            v-else
-            :src="getImgView(text)"
-            :preview="record.id"
-            height="25px"
-            alt=""
-            style="max-width:80px;font-size: 12px;font-style: italic;"
-          />
-        </template>
-        <template
-          slot="fileSlot"
-          slot-scope="text"
-        >
-          <span
-            v-if="!text"
-            style="font-size: 12px;font-style: italic;"
-          >鏃犳枃浠�</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)"
-          >
-            涓嬭浇
-          </a-button>
-        </template>
-
-        <!--宸ヨ壓鍙傛暟涓�у睍绀�-->
-        <span
-          slot="processParameters"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.processParameters==1"
-            status="success"
-          />
-          <span
-            v-if="record.processParameters==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.processParameters==0"
-            status="error"
-          />
-          <span
-            v-if="record.processParameters==0"
-            class="error"
-          >鍚�</span>
-        </span>
-        <span
-          slot="processParameters"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.processParameters==1"
-            status="success"
-          />
-          <span
-            v-if="record.processParameters==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.processParameters==0"
-            status="error"
-          />
-          <span
-            v-if="record.processParameters==0"
-            class="error"
-          >鍚�</span>
-        </span>
-        <span
-          slot="precisionParameters"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.precisionParameters==1"
-            status="success"
-          />
-          <span
-            v-if="record.precisionParameters==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.precisionParameters==0"
-            status="error"
-          />
-          <span
-            v-if="record.precisionParameters==0"
-            class="error"
-          >鍚�</span>
-        </span>
-        <span
-          slot="verification"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.verification==1"
-            status="success"
-          />
-          <span
-            v-if="record.verification==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.verification==0"
-            status="error"
-          />
-          <span
-            v-if="record.verification==0"
-            class="error"
-          >鍚�</span>
-        </span>
-
-        <span
-          slot="name"
-          slot-scope="text"
-        >
-          <j-ellipsis
-            :value="text"
-            :length="8"
-          />
-        </span>
-
-        <template
-          slot="num"
-          slot-scope="text,record"
-        >
-          <a
-            href="javascript:;"
-            @click="handleDetail(record)"
-          >{{record.num}}</a>
-        </template>
-
-        <span
-          slot="action"
-          slot-scope="text, record"
-        >
-          <!-- class="table-operation" -->
-          <!-- <a
-          href="javascript:;"
-          @click="equipmentStructuresShow(record)"
-        >璁惧缁撴瀯</a>
-        <a-divider type="vertical" /> -->
-          <a
-            href="javascript:;"
-            @click='handleDetail(record)'
-          >璇︽儏</a>
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">
-              鏇村
-              <a-icon type="down" />
-            </a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="equipmentResumeShow(record)">璁惧灞ュ巻</a>
-              </a-menu-item>
-              <a-menu-item
-                v-has="'accountSons:add&edit&delete&submit'"
-                v-if="record.processParameters==1"
-              >
-                <a @click="editProcess(record)">宸ヨ壓鍙傛暟缁存姢</a>
-              </a-menu-item>
-              <a-menu-item
-                v-has="'accountSons:add&edit&delete&submit'"
-                v-if="record.precisionParameters==1"
-              >
-                <a @click="editPrecision(record)">绮惧害鍙傛暟缁存姢</a>
-              </a-menu-item>
-              <a-menu-item v-has="'equipmentAccount:add&delete&import&Edit'">
-                <a @click="handleEdit(record)">缂栬緫</a>
-              </a-menu-item>
-              <a-menu-item v-has="'equipmentAccount:add&delete&import&Edit'">
-                <a @click="handleEditSpareParts(record)">缂栬緫澶囦欢</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm
-                  title="纭畾鍒犻櫎鍚�?"
-                  @confirm="() => handleDelete(record.id)"
-                  v-has="'equipmentAccount:add&delete&import&Edit'"
-                >
-                  <a>鍒犻櫎</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-      </a-table>
-    </div>
-    <equipment-resume-drawer
-      ref="EquipmentResumeDrawer"
-      @ok="modalFormOk"
-    ></equipment-resume-drawer>
-
-    <a-tabs defaultActiveKey="1">
-      <a-tab-pane
-        tab="宸ヨ壓鍙傛暟"
-        key="1"
-      >
-        <EquipmentProcessParametersList
-          :mainId="selectedMainId"
-          :isOpen="isOpenProcess"
-        />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="璁惧绮惧害"
-        key="2"
-        forceRender
-      >
-        <EquipmentPrecisionParametersList
-          :isOpen="isOpenPrecision"
-          :mainId="precisionParametersTemplateId"
-        />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="璁惧鏂囨。"
-        key="3"
-        forceRender
-      >
-        <EquipmentDocumentList :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="澶囦欢"
-        key="4"
-        forceRender
-      >
-        <EquipmentSpareParts :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="ABC鏍囪瘑鍙樻洿璁板綍"
-        key="5"
-        forceRender
-      >
-        <equipment-update-ABC-list :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="璐ㄤ繚鏈熷彉鏇�"
-        key="6"
-        forceRender
-      >
-        <equipment-update-warranty-list :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="鏃ヤ繚鏍囧噯"
-        key="7"
-        forceRender
-      >
-        <daily-maintenance-list :mainId="selectedMainId"></daily-maintenance-list>
-      </a-tab-pane>
-      <a-tab-pane
-        tab="浜屼繚鏍囧噯"
-        key="8"
-        forceRender
-      >
-        <second-maintenance-list :mainId="selectedMainId"></second-maintenance-list>
-      </a-tab-pane>
-      <a-tab-pane
-        tab="涓変繚鏍囧噯"
-        key="9"
-        forceRender
-      >
-        <third-maintenance-list :mainId="selectedMainId"></third-maintenance-list>
-      </a-tab-pane>
-    </a-tabs>
-    <equipment-modal
-      ref="modalForm"
-      @ok="modalFormOk"
-      :caytegoryParam="caytegoryParam"
-    ></equipment-modal>
-    <process-edit-model ref="processEditModel"></process-edit-model>
-    <precision-edit-model ref="precisionEditModel"></precision-edit-model>
-    <aBC-update-edit-model
-      @ok="modalFormOk"
-      :updateList="selectionRows"
-      ref="updateABC"
-    ></aBC-update-edit-model>
-    <warranty-update-model
-      :updateList="selectionRows"
-      ref="updateWarranty"
-    ></warranty-update-model>
-    <EquipmentSparePartsModal
-      ref="modalFormSpareParts"
-      @ok="modalFormOk"
-    />
-  </a-card>
+  <equipment-list-of-all :caytegoryParam="caytegoryParam"></equipment-list-of-all>
 </template>
 
 <script>
 
-import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-import { mixinDevice } from '@/utils/mixin'
-import EquipmentModal from './modules/equipmentNew/EquipmentModal'
-import { getAction } from '@/api/manage'
-import EquipmentProcessParametersList from './modules/equipmentNew/EquipmentProcessParametersList'
-import EquipmentDocumentList from './modules/equipmentNew/EquipmentDocumentList'
-import EquipmentPrecisionParametersList from './modules/equipmentNew/EquipmentPrecisionParametersList'
-import '@/assets/less/TableExpand.less'
-import EquipmentResumeDrawer from './modules/equipmentNew/EquipmentResume/EquipmentResumeDrawer'
-import JSearchSelectTag from '../../components/dict/JSearchSelectTag.vue'
-import ProcessEditModel from './modules/equipmentNew/edit/ProcessEditModel.vue'
-import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
-import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
-import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
-import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
-import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
-import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts'
-import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
-import StandardOfInspection from './modules/equipmentNew/StandardOfInspection.vue'
-import StandardOfMaintenance from './modules/equipmentNew/StandardOfMaintenance.vue'
-import DailyMaintenanceList from './modules/equipmentNew/DailyMaintenanceList.vue'
-import SecondMaintenanceList from './modules/equipmentNew/SecondMaintenanceList.vue'
-import ThirdMaintenanceList from './modules/equipmentNew/ThirdMaintenanceList.vue'
-import JEllipsis from '@/components/jeecg/JEllipsis'
+import EquipmentListOfAll from './EquipmentListOfAll.vue'
+
 export default {
   name: "EquipmentList",
-  mixins: [JeecgListMixin, mixinDevice],
   components: {
-    EquipmentProcessParametersList,
-    EquipmentDocumentList,
-    EquipmentPrecisionParametersList,
-    EquipmentModal,
-    EquipmentResumeDrawer,
-    JSearchSelectTag,
-    ProcessEditModel,
-    PrecisionEditModel,
-    EquipmentUpdateABCList,
-    EquipmentUpdateWarrantyList,
-    ABCUpdateEditModel,
-    WarrantyUpdateModel,
-    EquipmentSpareParts,
-    EquipmentSparePartsModal,
-    StandardOfInspection,
-    StandardOfMaintenance,
-    DailyMaintenanceList,
-    SecondMaintenanceList,
-    ThirdMaintenanceList,
-    JEllipsis
+    EquipmentListOfAll,
   },
   data() {
     return {
       description: '璁惧鍙拌处绠$悊椤甸潰',
       caytegoryParam: 'truck',
-      // 琛ㄥご
-      columns: [
-        {
-          title: '#',
-          dataIndex: '',
-          key: 'rowIndex',
-          align: 'center',
-          customRender: function (t, r, index) {
-            return parseInt(index) + 1
-          },
-          width: 50,
-        },
-        {
-          title: '璁惧绫诲瀷',
-          align: "center",
-          dataIndex: 'equipmentCategoryId_dictText',
-        },
-        {
-          title: '鏄惁鐢熶骇绾胯澶�',
-          align: "center",
-          dataIndex: 'isLineEquip_dictText',
-        },
-        {
-          title: '鍏抽敭璁惧鏍囪瘑',
-          align: "center",
-          dataIndex: 'specificEquipment_dictText',
-        },
-        {
-          title: '缁熶竴缂栫爜',
-          align: "center",
-          dataIndex: 'num',
-          scopedSlots: { customRender: 'num' },
-        },
-        {
-          title: '璁惧鍚嶇О',
-          align: "center",
-          dataIndex: 'name',
-          scopedSlots: { customRender: 'name' },
-        },
-        {
-          title: '鍨嬪彿',
-          align: "center",
-          dataIndex: 'model',
-        },
-        {
-          title: '瑙勬牸',
-          align: "center",
-          dataIndex: 'specification',
-        },
-        {
-          title: '鎬诲姛鐜�',
-          align: "center",
-          dataIndex: 'gpo',
-        },
-        // {
-        //   title: '浣跨敤閮ㄩ棬',
-        //   align: "center",
-        //   dataIndex: 'useId_dictText',
-        // },
-        // {
-        //   title: '缁存姢閮ㄩ棬',
-        //   align: "center",
-        //   dataIndex: 'manageId_dictText',
-        // },
-        {
-          title: '缁翠慨鐝粍',
-          align: "center",
-          dataIndex: 'teamId_dictText',
-        },
-        {
-          title: 'ABC鏍囪瘑',
-          align: "center",
-          dataIndex: 'equipmentImportanceId',
-        },
-        {
-          title: '鍏抽敭璁惧鏍囪瘑',
-          align: "center",
-          dataIndex: 'specificEquipment_dictText',
-        },
-        {
-          title: '鎶�鏈姸鎬�',
-          align: "center",
-          dataIndex: 'technologyStatus_dictText',
-          scopedSlots: { customRender: 'technologyStatus' },
-        },
-        {
-          title: '鎶�鏈姸鎬侀壌瀹氱被鍨�',
-          align: "center",
-          dataIndex: 'technologyStatusVerificationType_dictText',
-        },
-        {
-          title: '鐢熶骇绾跨紪鍙�',
-          align: "center",
-          dataIndex: 'lineId_dictText',
-        },
-        {
-          title: '涓昏澶�?',
-          align: "center",
-          dataIndex: 'isMeta_dictText',
-        },
-        // {
-        //   title: '宸ュ尯',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda1',
-        // },
-        // {
-        //   title: '瀹夊叏閰嶇疆',
-        //   align: "center",
-        //   dataIndex: 'securityConfiguration',
-        // },
-        // {
-        //   title: '鍐峰嵈绯荤粺',
-        //   align: "center",
-        //   dataIndex: 'coolingSystem',
-        // },
-        // {
-        //   title: '鐏伀鍣�',
-        //   align: "center",
-        //   dataIndex: 'fireExtinguisher',
-        // },
-
-        // {
-        //   title: '鐏伀鍣ㄦ湁鏁堟湡',
-        //   align: "center",
-        //   dataIndex: 'fireExtinguisherValidityPeriod',
-        // },
-        // {
-        //   title: '鎿嶄綔绯荤粺',
-        //   align: "center",
-        //   dataIndex: 'operatingSystem',
-        // },
-        // {
-        //   title: '绯荤粺',
-        //   align: "center",
-        //   dataIndex: 'system',
-        // },
-        // {
-        //   title: '璁惧绔彛',
-        //   align: "center",
-        //   dataIndex: 'port',
-        // },
-        // {
-        //   title: '鍧愭爣鏁伴噺',
-        //   align: "center",
-        //   dataIndex: 'coordinateNum',
-        // },
-        // {
-        //   title: '璁惧鐘舵��',
-        //   align: "center",
-        //   dataIndex: 'equipmentStatus_dictText',
-        // },
-        // {
-        //   title: '閲嶉噺',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda3',
-        // },
-        // {
-        //   title: '閲嶉噺璁¢噺鍗曚綅',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda4_dictText',
-        // },
-        // {
-        //   title: '鍔熻兘浣嶇疆',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda5',
-        // },
-        // {
-        //   title: '瀹夎浣嶇疆',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda2',
-        // },
-        // {
-        //   title: '鍑哄巶鏃ユ湡',
-        //   align: "center",
-        //   dataIndex: 'leaveFactoryDate',
-        // },
-        // {
-        //   title: '绔嬮」鍗″彿',
-        //   align: "center",
-        //   dataIndex: 'projectApprovalNo',
-        // },
-        // {
-        //   title: '璧勯噾鏉ユ簮',
-        //   align: "center",
-        //   dataIndex: 'fundSource',
-        // },
-        // {
-        //   title: '楠屾敹鏃ユ湡',
-        //   align: "center",
-        //   dataIndex: 'acceptanceCheckDate',
-        // },
-        // {
-        //   title: '鍑哄巶缂栧彿',
-        //   align: "center",
-        //   dataIndex: 'factoryNo',
-        // },
-        // {
-        //   title: '璧勪骇鍒堕�犲晢',
-        //   align: "center",
-        //   dataIndex: 'constructorId_dictText',
-        // },
-        // {
-        //   title: '璧勪骇鐨勬潵婧愬浗瀹�',
-        //   align: "center",
-        //   dataIndex: 'sourceCountry',
-        // }, 
-        {
-          title: '宸ヨ壓鍙傛暟绠$悊',
-          align: "center",
-          dataIndex: 'processParameters',
-          scopedSlots: { customRender: 'processParameters' },
-        },
-        {
-          title: '宸ヨ壓鍙傛暟妯℃澘',
-          align: "center",
-          dataIndex: 'processParametersTemplateId_dictText',
-        },
-        {
-          title: '璁惧绮惧害绠$悊',
-          align: "center",
-          dataIndex: 'precisionParameters',
-          scopedSlots: { customRender: 'precisionParameters' },
-        },
-        {
-          title: '绮惧害鍙傛暟妯℃澘',
-          align: "center",
-          dataIndex: 'precisionParametersTemplateId_dictText',
-        },
-        // {
-        //   title: '澶囨敞',
-        //   align: "center",
-        //   dataIndex: 'remark',
-        // },
-        {
-          title: '鎿嶄綔',
-          align: "center",
-          dataIndex: 'action',
-          scopedSlots: {
-            customRender: 'action',
-          },
-          width: 147,
-          fixed: 'right',
-        },
-      ],
-      url: {
-        list: "/eam/equipment/getEquipmentTZList",
-        delete: "/eam/equipment/delete",
-        deleteBatch: "/eam/equipment/deleteBatch",
-        active: "/eam/equipment/active",
-        exportXlsUrl: '/eam/equipment/exportXls',
-        importExcelUrl: "/eam/equipment/importExcel",
-        loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
-      },
-      dictOptions: {
-      },
-      /* 鍒嗛〉鍙傛暟 */
-      ipagination: {
-        current: 1,
-        pageSize: 20,
-        pageSizeOptions: ['5', '10', '20', '50'],
-        showTotal: (total, range) => {
-          return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
-        },
-        showQuickJumper: true,
-        showSizeChanger: true,
-        total: 0
-      },
-      selectedMainId: '',
-      superFieldList: [],
-      equipmentProcessParametersMainId: '',
-      equipmentDocumentMainId: '',
-      equipmentPrecisionParametersMainId: '',
-      precisionParametersTemplateId: '',
-      isOpenPrecision: true,
-      isOpenProcess: true,
-      treeData: [],
-      labelCol: {
-        xs: { span: 24 },
-        sm: { span: 5 },
-      },
-      wrapperCol: {
-        xs: { span: 24 },
-        sm: { span: 16 },
-      },
-      mainId: '',
     }
   },
-  created() {
-    this.getSuperFieldList();
-    this.initOptions();
-  },
-  computed: {
-    importExcelUrl: function () {
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    }
-  },
-  methods: {
-    initDictConfig() {
-    },
-    equipmentResumeShow(record) {
-      this.$refs.EquipmentResumeDrawer.visible = true
-      this.$refs.EquipmentResumeDrawer.title = '璁惧灞ュ巻'
-      this.$refs.EquipmentResumeDrawer.handleShow(record)
-    },
-    clickThenSelect(record) {
-      return {
-        on: {
-          click: () => {
-            this.onSelectChange(record.id.split(","), [record]);
-          }
-        }
-      }
-    },
-    onClearSelected() {
-      this.selectedRowKeys = [];
-      this.selectionRows = [];
-      this.selectedMainId = ''
-    },
-    onSelectChange(selectedRowKeys, selectionRows) {
-      if (selectedRowKeys.length == 1) {
-        this.selectedMainId = selectedRowKeys[0]
-        this.precisionParametersTemplateId = selectionRows[0].precisionParametersTemplateId;
-        this.isOpenProcess = selectionRows[0].processParameters == 1;
-        this.isOpenPrecision = selectionRows[0].precisionParameters == 1;
-      } else {
-        this.selectedMainId = ''
-        this.precisionParametersTemplateId = ''
-      }
-      this.selectedRowKeys = selectedRowKeys;
-      this.selectionRows = selectionRows;
-    },
-    loadData(arg) {
-      if (!this.url.list) {
-        this.$message.error("璇疯缃畊rl.list灞炴��!")
-        return
-      }
-      //鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
-      if (arg === 1) {
-        this.ipagination.current = 1;
-      }
-      this.onClearSelected()
-      this.queryParam.equipmentCategoryUda1 = this.caytegoryParam;
-      var params = this.getQueryParams();//鏌ヨ鏉′欢
-      this.loading = true;
-      getAction(this.url.list, params).then((res) => {
-        if (res.success) {
-          this.dataSource = res.result.records;
-          this.ipagination.total = res.result.total;
-        }
-        if (res.code === 510) {
-          this.$message.warning(res.message)
-        }
-        this.loading = false;
-      })
-    },
-    getSuperFieldList() {
-      let fieldList = [];
-      fieldList.push({ type: 'string', value: 'num', text: '缁熶竴缂栫爜', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'name', text: '璁惧鍚嶇О', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'model', text: '鍨嬪彿', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'specification', text: '瑙勬牸', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentStatus', text: '璁惧鐘舵��', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'technologyStatus', text: 'technologyStatus', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'assetNumber', text: 'assetNumber', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentCategoryId', text: 'equipmentCategoryId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'specificEquipment', text: 'specificEquipment', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentPhoto', text: 'equipmentPhoto', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'constructorId', text: '璧勪骇鍒堕�犲晢', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'supplierId', text: 'supplierId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'factoryNumber', text: 'factoryNumber', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'leaveFactoryDate', text: '鍑哄巶鏃ユ湡', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'acceptanceCheckDate', text: '楠屾敹鏃ユ湡', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'affiliationId', text: 'affiliationId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'manageId', text: '缁存姢閮ㄩ棬ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'manager', text: 'manager', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'useId', text: '浣跨敤閮ㄩ棬ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'functionary', text: 'functionary', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'location', text: 'location', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentImportanceId', text: 'ABC鏍囪瘑ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'processParameters', text: 'processParameters', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'processParametersTemplateId', text: 'processParametersTemplateId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'precisionParameters', text: 'precisionParameters', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'precisionParametersTemplateId', text: 'precisionParametersTemplateId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'verification', text: 'verification', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'verificationPeriod', text: 'verificationPeriod', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'lastVerificationDate', text: 'lastVerificationDate', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'nextVerificationDate', text: 'nextVerificationDate', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'status', text: 'status', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'remark', text: 'remark', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda1', text: '宸ュ尯', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda2', text: '瀹夎浣嶇疆', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda3', text: '閲嶉噺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda4', text: '閲嶉噺璁¢噺鍗曚綅ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda5', text: '鍔熻兘浣嶇疆', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'tenantId', text: 'tenantId', dictCode: '' })
-      fieldList.push({ type: 'int', value: 'delFlag', text: 'delFlag', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'teamId', text: '缁翠慨鐝粍ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'sourceId', text: 'sourceId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'fundSource', text: '璧勯噾鏉ユ簮', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'factoryNo', text: '鍑哄巶缂栧彿', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'mfr', text: '鍒堕�犲晢', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'sourceCountry', text: '璧勪骇鏉ユ簮鍥藉', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'gpo', text: '鎬诲姛鐜�', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'keyEquipmentIdentification', text: '鍏抽敭璁惧鏍囪瘑', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'securityConfiguration', text: '瀹夊叏閰嶇疆', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'coolingSystem', text: '鍐峰嵈绯荤粺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'fireExtinguisher', text: '鐏伀鍣�', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'fireExtinguisherValidityPeriod', text: '鐏伀鍣ㄦ湁鏁堟湡', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'operatingSystem', text: '鎿嶄綔绯荤粺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'system', text: '绯荤粺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'port', text: '绔彛', dictCode: '' })
-      fieldList.push({ type: 'BigDecimal', value: 'coordinateNum', text: '鍧愭爣鏁伴噺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'projectApprovalNo', text: '绔嬮」鍗″彿', dictCode: '' })
-      this.superFieldList = fieldList
-    },
-    editProcess(record) {
-      this.$refs.processEditModel.edit(record);
-    },
-    editPrecision(record) {
-      this.$refs.precisionEditModel.edit(record);
-    },
-    initOptions() {
-      getAction(this.url.loadOptions).then(res => {
-        if (res.success) {
-          this.treeData = res.result
-        } else {
-          this.$message.warning(res.message)
-        }
-      })
-    },
-    handleUpdateABC() {
-      this.$refs.updateABC.add();
-    },
-    handleUpdateWarranty() {
-      this.$refs.updateWarranty.add();
-    },
-    handleEditSpareParts(record) {
-      this.$refs.modalFormSpareParts.edit(record);
-    },
-    handleTechnologyStatus(record) {
-      //璺敱鏄痚am/EquipmentCalibrationOrder
-      this.$router.push({
-        path: '/eam/EquipmentCalibrationOrder',
-        query: {
-          equipmentId: record.id,
-          technologyStatus: record.technologyStatus,
-          technologyStatusVerificationType: record.technologyStatusVerificationType,
-        }
-      })
-    },
-
-  }
 }
 </script>
 <style scoped>
diff --git a/src/views/eam/EquipmentListOfWeldingMachine.vue b/src/views/eam/EquipmentListOfWeldingMachine.vue
index 2ec1631..641d02b 100644
--- a/src/views/eam/EquipmentListOfWeldingMachine.vue
+++ b/src/views/eam/EquipmentListOfWeldingMachine.vue
@@ -1,1164 +1,22 @@
 <template>
-  <a-card
-    :bordered="false"
-    title="鐒婃満"
-  >
-    <!-- 鏌ヨ鍖哄煙 -->
-    <div class="table-page-search-wrapper">
-      <a-form
-        layout="inline"
-        @keyup.enter.native="searchQuery"
-      >
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-item
-              label="璁惧鎵�灞炲垎绫�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                dictCode="mom_eam_equipment_category,name,id,equipment_category_uda1 = 'weldingMachine'"
-                placeholder="璇疯緭鍏ユ悳绱㈡潯浠跺苟閫夋嫨"
-                v-model="queryParam.equipmentCategoryId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="缁熶竴缂栫爜"
-            >
-              <a-input
-                placeholder="璇疯緭鍏ヨ澶囩粺涓�缂栫爜鏌ヨ"
-                v-model="queryParam.num"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="璁惧鍚嶇О"
-            >
-              <a-input
-                placeholder="璇疯緭鍏ヨ澶囧悕绉版煡璇�"
-                v-model="queryParam.name"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鍨嬪彿"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <a-input
-                v-model="queryParam.model"
-                placeholder="璇疯緭鍏ュ瀷鍙�"
-              ></a-input>
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-item
-              label="宸ュ尯"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨宸ュ尯"
-                :triggerChange="true"
-                dictCode="mom_base_area,name,id,del_flag!='1'"
-                v-model="queryParam.factoryModelId"
-              />
-            </a-form-item>
-          </a-col>
-          <!-- <a-col :span="6">
-            <a-form-item
-              label="杞﹂棿"
-              :labelCol="labelCol"
-            :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨璧勮溅闂�"
-                :triggerChange="true"
-                dictCode="mom_base_factory_model,name,id,del_flag!='1'"
-                v-model="queryParam.factoryModelId"
-              />
-            </a-form-item>
-          </a-col> -->
-          <a-col :span="6">
-            <a-form-item
-              label="缁存姢閮ㄩ棬"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <!-- <a-tree-select
-                style="width: 100%"
-                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-                :tree-data="treeData"
-                placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
-                tree-default-expand-all
-                v-model="queryParam.manageId"
-              /> -->
-              <j-dict-select-tag
-                dictCode="sys_depart,depart_name,id"
-                placeholder="璇烽�夋嫨缁存姢閮ㄩ棬"
-                v-model="queryParam.manageId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="浣跨敤閮ㄩ棬"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <!-- <a-tree-select
-                style="width: 100%"
-                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-                :tree-data="treeData"
-                placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
-                tree-default-expand-all
-                v-model="queryParam.useId"
-              /> -->
-              <j-dict-select-tag
-                dictCode="sys_depart,depart_name,id"
-                placeholder="璇烽�夋嫨浣跨敤閮ㄩ棬"
-                v-model="queryParam.useId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鏄惁鐢熶骇绾胯澶�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨"
-                :triggerChange="true"
-                dictCode="is_product"
-                v-model="queryParam.isLineEquip"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-item
-              label="ABC鏍囪瘑"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨ABC鏍囪瘑"
-                :triggerChange="true"
-                dictCode="ABC-standard-result"
-                v-model="queryParam.equipmentImportanceId"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鎶�鏈姸鎬�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨鎶�鏈姸鎬�"
-                :triggerChange="true"
-                dictCode="technology_status"
-                v-model="queryParam.technologyStatus"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="璁惧鐘舵��"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨璁惧鐘舵��"
-                :triggerChange="true"
-                dictCode="equipment_status"
-                v-model="queryParam.equipmentStatus"
-              />
-            </a-form-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="鍏抽敭璁惧鏍囪瘑"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                :triggerChange="true"
-                placeholder="璇烽�夋嫨鍏抽敭璁惧鏍囪瘑"
-                dictCode="specific_equipment"
-                v-model="queryParam.specificEquipment"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-        <a-row :gutter="24">
-          <a-col :span="6">
-            <a-form-model-item
-              label="璐ㄤ繚寮�濮嬫棩鏈�"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-date
-                style="width: 100%;"
-                placeholder="璇烽�夋嫨寮�濮嬫棩鏈�"
-                class="query-group-cust"
-                v-model="queryParam.warrantyStart"
-              ></j-date>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-model-item
-              label="璐ㄤ繚缁撴潫鏃ユ湡"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-date
-                style="width: 100%;"
-                placeholder="璇烽�夋嫨缁撴潫鏃ユ湡"
-                class="query-group-cust"
-                v-model="queryParam.warrantyEnd"
-              ></j-date>
-            </a-form-model-item>
-          </a-col>
-          <a-col :span="6">
-            <a-form-item
-              label="缁翠慨鐝粍"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-            >
-              <j-dict-select-tag
-                allow-clear
-                placeholder="璇烽�夋嫨缁翠慨鐝粍"
-                :triggerChange="true"
-                dictCode="mom_base_team,name,id,del_flag!='1'"
-                v-model="queryParam.teamId"
-              />
-            </a-form-item>
-          </a-col>
-        </a-row>
-      </a-form>
-    </div>
-    <!-- 鏌ヨ鍖哄煙-END -->
-
-    <!-- 鎿嶄綔鎸夐挳鍖哄煙 -->
-    <div class="table-operator">
-      <a-button
-        type="primary"
-        @click="searchQuery"
-        icon="search"
-      >鏌ヨ</a-button>
-      <a-button
-        @click="searchReset"
-        icon="reload"
-      >閲嶇疆</a-button>
-      <a-button
-        @click="handleAdd"
-        type="primary"
-        icon="plus"
-        v-has="'equipmentAccount:add&delete&import&Edit'"
-      >鏂板</a-button>
-      <a-button
-        type="primary"
-        icon="download"
-        @click="handleExportXls('璁惧鍙拌处')"
-        v-has="'equipmentAccount:outport'"
-      >瀵煎嚭</a-button>
-      <a-upload
-        name="file"
-        :showUploadList="false"
-        :multiple="false"
-        :headers="tokenHeader"
-        :action="importExcelUrl"
-        @change="handleImportExcel"
-      >
-        <a-button
-          type="primary"
-          icon="import"
-          v-has="'equipmentAccount:add&delete&import&Edit'"
-        >瀵煎叆</a-button>
-      </a-upload>
-      <a-button
-        :disabled="selectedRowKeys.length==0"
-        @click="handleUpdateABC"
-        type="primary"
-        icon="font-colors"
-        v-has="'equipmentAccount:add&delete&import&Edit'"
-      >ABC鏍囪瘑鍙樻洿</a-button>
-      <a-button
-        :disabled="selectedRowKeys.length==0"
-        @click="handleUpdateWarranty"
-        type="primary"
-        icon="calendar"
-        v-has="'equipmentAccount:add&delete&import&Edit'"
-      >璐ㄤ繚鏈熷彉鏇�</a-button>
-    </div>
-    <!-- table鍖哄煙-begin -->
-    <div>
-      <div
-        class="ant-alert ant-alert-info"
-        style="margin-bottom: 16px;"
-      >
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
-        <a
-          style="margin-left: 24px"
-          @click="onClearSelected"
-        >娓呯┖</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :scroll="{x:true}"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'checkbox'}"
-        :customRow="clickThenSelect"
-        @change="handleTableChange"
-      >
-        <template
-          slot="technologyStatus"
-          slot-scope="text,record"
-        >
-          <a
-            href="javascript:eam/EquipmentCalibrationOrder;"
-            @click="handleTechnologyStatus(record)"
-          >{{record.technologyStatus_dictText}}</a>
-        </template>
-        <template
-          slot="htmlSlot"
-          slot-scope="text"
-        >
-          <div v-html="text"></div>
-        </template>
-        <template
-          slot="imgSlot"
-          slot-scope="text,record"
-        >
-          <span
-            v-if="!text"
-            style="font-size: 12px;font-style: italic;"
-          >鏃犲浘鐗�</span>
-          <img
-            v-else
-            :src="getImgView(text)"
-            :preview="record.id"
-            height="25px"
-            alt=""
-            style="max-width:80px;font-size: 12px;font-style: italic;"
-          />
-        </template>
-        <template
-          slot="fileSlot"
-          slot-scope="text"
-        >
-          <span
-            v-if="!text"
-            style="font-size: 12px;font-style: italic;"
-          >鏃犳枃浠�</span>
-          <a-button
-            v-else
-            :ghost="true"
-            type="primary"
-            icon="download"
-            size="small"
-            @click="downloadFile(text)"
-          >
-            涓嬭浇
-          </a-button>
-        </template>
-
-        <!--宸ヨ壓鍙傛暟涓�у睍绀�-->
-        <span
-          slot="processParameters"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.processParameters==1"
-            status="success"
-          />
-          <span
-            v-if="record.processParameters==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.processParameters==0"
-            status="error"
-          />
-          <span
-            v-if="record.processParameters==0"
-            class="error"
-          >鍚�</span>
-        </span>
-        <span
-          slot="processParameters"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.processParameters==1"
-            status="success"
-          />
-          <span
-            v-if="record.processParameters==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.processParameters==0"
-            status="error"
-          />
-          <span
-            v-if="record.processParameters==0"
-            class="error"
-          >鍚�</span>
-        </span>
-        <span
-          slot="precisionParameters"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.precisionParameters==1"
-            status="success"
-          />
-          <span
-            v-if="record.precisionParameters==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.precisionParameters==0"
-            status="error"
-          />
-          <span
-            v-if="record.precisionParameters==0"
-            class="error"
-          >鍚�</span>
-        </span>
-        <span
-          slot="verification"
-          slot-scope="text,record"
-        >
-          <a-badge
-            v-if="record.verification==1"
-            status="success"
-          />
-          <span
-            v-if="record.verification==1"
-            class="success"
-          >鏄�</span>
-          <a-badge
-            v-if="record.verification==0"
-            status="error"
-          />
-          <span
-            v-if="record.verification==0"
-            class="error"
-          >鍚�</span>
-        </span>
-
-        <span
-          slot="name"
-          slot-scope="text"
-        >
-          <j-ellipsis
-            :value="text"
-            :length="8"
-          />
-        </span>
-
-        <template
-          slot="num"
-          slot-scope="text,record"
-        >
-          <a
-            href="javascript:;"
-            @click="handleDetail(record)"
-          >{{record.num}}</a>
-        </template>
-
-        <span
-          slot="action"
-          slot-scope="text, record"
-        >
-          <!-- class="table-operation" -->
-          <!-- <a
-          href="javascript:;"
-          @click="equipmentStructuresShow(record)"
-        >璁惧缁撴瀯</a>
-        <a-divider type="vertical" /> -->
-          <a
-            href="javascript:;"
-            @click='handleDetail(record)'
-          >璇︽儏</a>
-          <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">
-              鏇村
-              <a-icon type="down" />
-            </a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="equipmentResumeShow(record)">璁惧灞ュ巻</a>
-              </a-menu-item>
-              <a-menu-item
-                v-has="'accountSons:add&edit&delete&submit'"
-                v-if="record.processParameters==1"
-              >
-                <a @click="editProcess(record)">宸ヨ壓鍙傛暟缁存姢</a>
-              </a-menu-item>
-              <a-menu-item
-                v-has="'accountSons:add&edit&delete&submit'"
-                v-if="record.precisionParameters==1"
-              >
-                <a @click="editPrecision(record)">绮惧害鍙傛暟缁存姢</a>
-              </a-menu-item>
-              <a-menu-item v-has="'equipmentAccount:add&delete&import&Edit'">
-                <a @click="handleEdit(record)">缂栬緫</a>
-              </a-menu-item>
-              <a-menu-item v-has="'equipmentAccount:add&delete&import&Edit'">
-                <a @click="handleEditSpareParts(record)">缂栬緫澶囦欢</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm
-                  title="纭畾鍒犻櫎鍚�?"
-                  @confirm="() => handleDelete(record.id)"
-                  v-has="'equipmentAccount:add&delete&import&Edit'"
-                >
-                  <a>鍒犻櫎</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-      </a-table>
-    </div>
-    <equipment-resume-drawer
-      ref="EquipmentResumeDrawer"
-      @ok="modalFormOk"
-    ></equipment-resume-drawer>
-
-    <a-tabs defaultActiveKey="1">
-      <a-tab-pane
-        tab="宸ヨ壓鍙傛暟"
-        key="1"
-      >
-        <EquipmentProcessParametersList
-          :mainId="selectedMainId"
-          :isOpen="isOpenProcess"
-        />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="璁惧绮惧害"
-        key="2"
-        forceRender
-      >
-        <EquipmentPrecisionParametersList
-          :isOpen="isOpenPrecision"
-          :mainId="precisionParametersTemplateId"
-        />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="璁惧鏂囨。"
-        key="3"
-        forceRender
-      >
-        <EquipmentDocumentList :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="澶囦欢"
-        key="4"
-        forceRender
-      >
-        <EquipmentSpareParts :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="ABC鏍囪瘑鍙樻洿璁板綍"
-        key="5"
-        forceRender
-      >
-        <equipment-update-ABC-list :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="璐ㄤ繚鏈熷彉鏇�"
-        key="6"
-        forceRender
-      >
-        <equipment-update-warranty-list :mainId="selectedMainId" />
-      </a-tab-pane>
-      <a-tab-pane
-        tab="鏃ヤ繚鏍囧噯"
-        key="7"
-        forceRender
-      >
-        <daily-maintenance-list :mainId="selectedMainId"></daily-maintenance-list>
-      </a-tab-pane>
-      <a-tab-pane
-        tab="浜屼繚鏍囧噯"
-        key="8"
-        forceRender
-      >
-        <second-maintenance-list :mainId="selectedMainId"></second-maintenance-list>
-      </a-tab-pane>
-      <a-tab-pane
-        tab="涓変繚鏍囧噯"
-        key="9"
-        forceRender
-      >
-        <third-maintenance-list :mainId="selectedMainId"></third-maintenance-list>
-      </a-tab-pane>
-    </a-tabs>
-    <equipment-modal
-      ref="modalForm"
-      @ok="modalFormOk"
-      :caytegoryParam="caytegoryParam"
-    ></equipment-modal>
-    <process-edit-model ref="processEditModel"></process-edit-model>
-    <precision-edit-model ref="precisionEditModel"></precision-edit-model>
-    <aBC-update-edit-model
-      @ok="modalFormOk"
-      :updateList="selectionRows"
-      ref="updateABC"
-    ></aBC-update-edit-model>
-    <warranty-update-model
-      :updateList="selectionRows"
-      ref="updateWarranty"
-    ></warranty-update-model>
-    <EquipmentSparePartsModal
-      ref="modalFormSpareParts"
-      @ok="modalFormOk"
-    />
-  </a-card>
+  <equipment-list-of-all :caytegoryParam="caytegoryParam"></equipment-list-of-all>
 </template>
 
 <script>
 
-import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-import { mixinDevice } from '@/utils/mixin'
-import EquipmentModal from './modules/equipmentNew/EquipmentModal'
-import { getAction } from '@/api/manage'
-import EquipmentProcessParametersList from './modules/equipmentNew/EquipmentProcessParametersList'
-import EquipmentDocumentList from './modules/equipmentNew/EquipmentDocumentList'
-import EquipmentPrecisionParametersList from './modules/equipmentNew/EquipmentPrecisionParametersList'
-import '@/assets/less/TableExpand.less'
-import EquipmentResumeDrawer from './modules/equipmentNew/EquipmentResume/EquipmentResumeDrawer'
-import JSearchSelectTag from '../../components/dict/JSearchSelectTag.vue'
-import ProcessEditModel from './modules/equipmentNew/edit/ProcessEditModel.vue'
-import PrecisionEditModel from './modules/equipmentNew/edit/PrecisionEditModel'
-import EquipmentUpdateABCList from './modules/equipmentNew/EquipmentUpdateABCList.vue'
-import EquipmentUpdateWarrantyList from './modules/equipmentNew/EquipmentUpdateWarrantyList.vue'
-import ABCUpdateEditModel from './modules/equipmentNew/edit/ABCUpdateEditModel'
-import WarrantyUpdateModel from './modules/equipmentNew/edit/WarrantyUpdateModel.vue'
-import EquipmentSpareParts from './modules/equipmentNew/EquipmentSpareParts'
-import EquipmentSparePartsModal from './modules/equipmentNew/EquipmentSparePartsModal'
-import StandardOfInspection from './modules/equipmentNew/StandardOfInspection.vue'
-import StandardOfMaintenance from './modules/equipmentNew/StandardOfMaintenance.vue'
-import DailyMaintenanceList from './modules/equipmentNew/DailyMaintenanceList.vue'
-import SecondMaintenanceList from './modules/equipmentNew/SecondMaintenanceList.vue'
-import ThirdMaintenanceList from './modules/equipmentNew/ThirdMaintenanceList.vue'
-import JEllipsis from '@/components/jeecg/JEllipsis'
+import EquipmentListOfAll from './EquipmentListOfAll.vue'
+
 export default {
   name: "EquipmentList",
-  mixins: [JeecgListMixin, mixinDevice],
   components: {
-    EquipmentProcessParametersList,
-    EquipmentDocumentList,
-    EquipmentPrecisionParametersList,
-    EquipmentModal,
-    EquipmentResumeDrawer,
-    JSearchSelectTag,
-    ProcessEditModel,
-    PrecisionEditModel,
-    EquipmentUpdateABCList,
-    EquipmentUpdateWarrantyList,
-    ABCUpdateEditModel,
-    WarrantyUpdateModel,
-    EquipmentSpareParts,
-    EquipmentSparePartsModal,
-    StandardOfInspection,
-    StandardOfMaintenance,
-    DailyMaintenanceList,
-    SecondMaintenanceList,
-    ThirdMaintenanceList,
-    JEllipsis
+    EquipmentListOfAll,
   },
   data() {
     return {
       description: '璁惧鍙拌处绠$悊椤甸潰',
       caytegoryParam: 'weldingMachine',
-      // 琛ㄥご
-      columns: [
-        {
-          title: '#',
-          dataIndex: '',
-          key: 'rowIndex',
-          align: 'center',
-          customRender: function (t, r, index) {
-            return parseInt(index) + 1
-          },
-          width: 50,
-        },
-        {
-          title: '璁惧绫诲瀷',
-          align: "center",
-          dataIndex: 'equipmentCategoryId_dictText',
-        },
-        {
-          title: '鏄惁鐢熶骇绾胯澶�',
-          align: "center",
-          dataIndex: 'isLineEquip_dictText',
-        },
-        {
-          title: '鍏抽敭璁惧鏍囪瘑',
-          align: "center",
-          dataIndex: 'specificEquipment_dictText',
-        },
-        {
-          title: '缁熶竴缂栫爜',
-          align: "center",
-          dataIndex: 'num',
-          scopedSlots: { customRender: 'num' },
-        },
-        {
-          title: '璁惧鍚嶇О',
-          align: "center",
-          dataIndex: 'name',
-          scopedSlots: { customRender: 'name' },
-        },
-        {
-          title: '鍨嬪彿',
-          align: "center",
-          dataIndex: 'model',
-        },
-        {
-          title: '瑙勬牸',
-          align: "center",
-          dataIndex: 'specification',
-        },
-        {
-          title: '鎬诲姛鐜�',
-          align: "center",
-          dataIndex: 'gpo',
-        },
-        // {
-        //   title: '浣跨敤閮ㄩ棬',
-        //   align: "center",
-        //   dataIndex: 'useId_dictText',
-        // },
-        // {
-        //   title: '缁存姢閮ㄩ棬',
-        //   align: "center",
-        //   dataIndex: 'manageId_dictText',
-        // },
-        {
-          title: '缁翠慨鐝粍',
-          align: "center",
-          dataIndex: 'teamId_dictText',
-        },
-        {
-          title: 'ABC鏍囪瘑',
-          align: "center",
-          dataIndex: 'equipmentImportanceId',
-        },
-
-        {
-          title: '鎶�鏈姸鎬�',
-          align: "center",
-          dataIndex: 'technologyStatus_dictText',
-          scopedSlots: { customRender: 'technologyStatus' },
-        },
-        {
-          title: '鎶�鏈姸鎬侀壌瀹氱被鍨�',
-          align: "center",
-          dataIndex: 'technologyStatusVerificationType_dictText',
-        },
-        {
-          title: '涓嬫鎶�鏈姸鎬侀壌瀹氭椂闂�',
-          align: "center",
-          dataIndex: 'nextTechnologyStatusQualificationTime',
-        },
-        {
-          title: '鐢熶骇绾跨紪鍙�',
-          align: "center",
-          dataIndex: 'lineId_dictText',
-        },
-        {
-          title: '涓昏澶�?',
-          align: "center",
-          dataIndex: 'isMeta_dictText',
-        },
-        // {
-        //   title: '宸ュ尯',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda1',
-        // },
-        // {
-        //   title: '瀹夊叏閰嶇疆',
-        //   align: "center",
-        //   dataIndex: 'securityConfiguration',
-        // },
-        // {
-        //   title: '鍐峰嵈绯荤粺',
-        //   align: "center",
-        //   dataIndex: 'coolingSystem',
-        // },
-        // {
-        //   title: '鐏伀鍣�',
-        //   align: "center",
-        //   dataIndex: 'fireExtinguisher',
-        // },
-
-        // {
-        //   title: '鐏伀鍣ㄦ湁鏁堟湡',
-        //   align: "center",
-        //   dataIndex: 'fireExtinguisherValidityPeriod',
-        // },
-        // {
-        //   title: '鎿嶄綔绯荤粺',
-        //   align: "center",
-        //   dataIndex: 'operatingSystem',
-        // },
-        // {
-        //   title: '绯荤粺',
-        //   align: "center",
-        //   dataIndex: 'system',
-        // },
-        // {
-        //   title: '璁惧绔彛',
-        //   align: "center",
-        //   dataIndex: 'port',
-        // },
-        // {
-        //   title: '鍧愭爣鏁伴噺',
-        //   align: "center",
-        //   dataIndex: 'coordinateNum',
-        // },
-        // {
-        //   title: '璁惧鐘舵��',
-        //   align: "center",
-        //   dataIndex: 'equipmentStatus_dictText',
-        // },
-        // {
-        //   title: '閲嶉噺',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda3',
-        // },
-        // {
-        //   title: '閲嶉噺璁¢噺鍗曚綅',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda4_dictText',
-        // },
-        // {
-        //   title: '鍔熻兘浣嶇疆',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda5',
-        // },
-        // {
-        //   title: '瀹夎浣嶇疆',
-        //   align: "center",
-        //   dataIndex: 'equipmentUda2',
-        // },
-        // {
-        //   title: '鍑哄巶鏃ユ湡',
-        //   align: "center",
-        //   dataIndex: 'leaveFactoryDate',
-        // },
-        // {
-        //   title: '绔嬮」鍗″彿',
-        //   align: "center",
-        //   dataIndex: 'projectApprovalNo',
-        // },
-        // {
-        //   title: '璧勯噾鏉ユ簮',
-        //   align: "center",
-        //   dataIndex: 'fundSource',
-        // },
-        // {
-        //   title: '楠屾敹鏃ユ湡',
-        //   align: "center",
-        //   dataIndex: 'acceptanceCheckDate',
-        // },
-        // {
-        //   title: '鍑哄巶缂栧彿',
-        //   align: "center",
-        //   dataIndex: 'factoryNo',
-        // },
-        // {
-        //   title: '璧勪骇鍒堕�犲晢',
-        //   align: "center",
-        //   dataIndex: 'constructorId_dictText',
-        // },
-        // {
-        //   title: '璧勪骇鐨勬潵婧愬浗瀹�',
-        //   align: "center",
-        //   dataIndex: 'sourceCountry',
-        // }, 
-        {
-          title: '宸ヨ壓鍙傛暟绠$悊',
-          align: "center",
-          dataIndex: 'processParameters',
-          scopedSlots: { customRender: 'processParameters' },
-        },
-        {
-          title: '宸ヨ壓鍙傛暟妯℃澘',
-          align: "center",
-          dataIndex: 'processParametersTemplateId_dictText',
-        },
-        {
-          title: '璁惧绮惧害绠$悊',
-          align: "center",
-          dataIndex: 'precisionParameters',
-          scopedSlots: { customRender: 'precisionParameters' },
-        },
-        {
-          title: '绮惧害鍙傛暟妯℃澘',
-          align: "center",
-          dataIndex: 'precisionParametersTemplateId_dictText',
-        },
-        // {
-        //   title: '澶囨敞',
-        //   align: "center",
-        //   dataIndex: 'remark',
-        // },
-        {
-          title: '鎿嶄綔',
-          align: "center",
-          dataIndex: 'action',
-          scopedSlots: {
-            customRender: 'action',
-          },
-          width: 147,
-          fixed: 'right',
-        },
-      ],
-      url: {
-        list: "/eam/equipment/getEquipmentTZList",
-        delete: "/eam/equipment/delete",
-        deleteBatch: "/eam/equipment/deleteBatch",
-        active: "/eam/equipment/active",
-        exportXlsUrl: '/eam/equipment/exportXls',
-        importExcelUrl: "/eam/equipment/importExcel",
-        loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
-      },
-      dictOptions: {
-      },
-      /* 鍒嗛〉鍙傛暟 */
-      ipagination: {
-        current: 1,
-        pageSize: 10,
-        pageSizeOptions: ['5', '10', '20', '50'],
-        showTotal: (total, range) => {
-          return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
-        },
-        showQuickJumper: true,
-        showSizeChanger: true,
-        total: 0
-      },
-      selectedMainId: '',
-      superFieldList: [],
-      equipmentProcessParametersMainId: '',
-      equipmentDocumentMainId: '',
-      equipmentPrecisionParametersMainId: '',
-      precisionParametersTemplateId: '',
-      isOpenPrecision: true,
-      isOpenProcess: true,
-      treeData: [],
-      labelCol: {
-        xs: { span: 24 },
-        sm: { span: 5 },
-      },
-      wrapperCol: {
-        xs: { span: 24 },
-        sm: { span: 16 },
-      },
-      mainId: '',
     }
   },
-  created() {
-    this.getSuperFieldList();
-    this.initOptions();
-  },
-  computed: {
-    importExcelUrl: function () {
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    }
-  },
-  methods: {
-    initDictConfig() {
-    },
-    equipmentResumeShow(record) {
-      this.$refs.EquipmentResumeDrawer.visible = true
-      this.$refs.EquipmentResumeDrawer.title = '璁惧灞ュ巻'
-      this.$refs.EquipmentResumeDrawer.handleShow(record)
-    },
-    clickThenSelect(record) {
-      return {
-        on: {
-          click: () => {
-            this.onSelectChange(record.id.split(","), [record]);
-          }
-        }
-      }
-    },
-    onClearSelected() {
-      this.selectedRowKeys = [];
-      this.selectionRows = [];
-      this.selectedMainId = ''
-    },
-    onSelectChange(selectedRowKeys, selectionRows) {
-      if (selectedRowKeys.length == 1) {
-        this.selectedMainId = selectedRowKeys[0]
-        this.precisionParametersTemplateId = selectionRows[0].precisionParametersTemplateId;
-        this.isOpenProcess = selectionRows[0].processParameters == 1;
-        this.isOpenPrecision = selectionRows[0].precisionParameters == 1;
-      } else {
-        this.selectedMainId = ''
-        this.precisionParametersTemplateId = ''
-      }
-      this.selectedRowKeys = selectedRowKeys;
-      this.selectionRows = selectionRows;
-    },
-    loadData(arg) {
-      if (!this.url.list) {
-        this.$message.error("璇疯缃畊rl.list灞炴��!")
-        return
-      }
-      //鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
-      if (arg === 1) {
-        this.ipagination.current = 1;
-      }
-      this.onClearSelected()
-      this.queryParam.equipmentCategoryUda1 = this.caytegoryParam;
-      var params = this.getQueryParams();//鏌ヨ鏉′欢
-      this.loading = true;
-      getAction(this.url.list, params).then((res) => {
-        if (res.success) {
-          this.dataSource = res.result.records;
-          this.ipagination.total = res.result.total;
-        }
-        if (res.code === 510) {
-          this.$message.warning(res.message)
-        }
-        this.loading = false;
-      })
-    },
-    getSuperFieldList() {
-      let fieldList = [];
-      fieldList.push({ type: 'string', value: 'num', text: '缁熶竴缂栫爜', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'name', text: '璁惧鍚嶇О', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'model', text: '鍨嬪彿', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'specification', text: '瑙勬牸', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentStatus', text: '璁惧鐘舵��', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'technologyStatus', text: 'technologyStatus', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'assetNumber', text: 'assetNumber', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentCategoryId', text: 'equipmentCategoryId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'specificEquipment', text: 'specificEquipment', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentPhoto', text: 'equipmentPhoto', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'constructorId', text: '璧勪骇鍒堕�犲晢', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'supplierId', text: 'supplierId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'factoryNumber', text: 'factoryNumber', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'leaveFactoryDate', text: '鍑哄巶鏃ユ湡', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'acceptanceCheckDate', text: '楠屾敹鏃ユ湡', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'affiliationId', text: 'affiliationId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'manageId', text: '缁存姢閮ㄩ棬ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'manager', text: 'manager', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'useId', text: '浣跨敤閮ㄩ棬ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'functionary', text: 'functionary', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'location', text: 'location', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentImportanceId', text: 'ABC鏍囪瘑ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'processParameters', text: 'processParameters', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'processParametersTemplateId', text: 'processParametersTemplateId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'precisionParameters', text: 'precisionParameters', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'precisionParametersTemplateId', text: 'precisionParametersTemplateId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'verification', text: 'verification', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'verificationPeriod', text: 'verificationPeriod', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'lastVerificationDate', text: 'lastVerificationDate', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'nextVerificationDate', text: 'nextVerificationDate', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'status', text: 'status', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'remark', text: 'remark', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda1', text: '宸ュ尯', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda2', text: '瀹夎浣嶇疆', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda3', text: '閲嶉噺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda4', text: '閲嶉噺璁¢噺鍗曚綅ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'equipmentUda5', text: '鍔熻兘浣嶇疆', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'tenantId', text: 'tenantId', dictCode: '' })
-      fieldList.push({ type: 'int', value: 'delFlag', text: 'delFlag', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'teamId', text: '缁翠慨鐝粍ID', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'sourceId', text: 'sourceId', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'fundSource', text: '璧勯噾鏉ユ簮', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'factoryNo', text: '鍑哄巶缂栧彿', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'mfr', text: '鍒堕�犲晢', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'sourceCountry', text: '璧勪骇鏉ユ簮鍥藉', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'gpo', text: '鎬诲姛鐜�', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'keyEquipmentIdentification', text: '鍏抽敭璁惧鏍囪瘑', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'securityConfiguration', text: '瀹夊叏閰嶇疆', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'coolingSystem', text: '鍐峰嵈绯荤粺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'fireExtinguisher', text: '鐏伀鍣�', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'fireExtinguisherValidityPeriod', text: '鐏伀鍣ㄦ湁鏁堟湡', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'operatingSystem', text: '鎿嶄綔绯荤粺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'system', text: '绯荤粺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'port', text: '绔彛', dictCode: '' })
-      fieldList.push({ type: 'BigDecimal', value: 'coordinateNum', text: '鍧愭爣鏁伴噺', dictCode: '' })
-      fieldList.push({ type: 'string', value: 'projectApprovalNo', text: '绔嬮」鍗″彿', dictCode: '' })
-      this.superFieldList = fieldList
-    },
-    editProcess(record) {
-      this.$refs.processEditModel.edit(record);
-    },
-    editPrecision(record) {
-      this.$refs.precisionEditModel.edit(record);
-    },
-    initOptions() {
-      getAction(this.url.loadOptions).then(res => {
-        if (res.success) {
-          this.treeData = res.result
-        } else {
-          this.$message.warning(res.message)
-        }
-      })
-    },
-    handleUpdateABC() {
-      this.$refs.updateABC.add();
-    },
-    handleUpdateWarranty() {
-      this.$refs.updateWarranty.add();
-    },
-    handleEditSpareParts(record) {
-      this.$refs.modalFormSpareParts.edit(record);
-    },
-    handleTechnologyStatus(record) {
-      //璺敱鏄痚am/EquipmentCalibrationOrder
-      this.$router.push({
-        path: '/eam/EquipmentCalibrationOrder',
-        query: {
-          equipmentId: record.id,
-          technologyStatus: record.technologyStatus,
-          technologyStatusVerificationType: record.technologyStatusVerificationType,
-        }
-      })
-    },
-
-  }
 }
 </script>
 <style scoped>
diff --git a/src/views/eam/EquipmentMaintenancePlanList.vue b/src/views/eam/EquipmentMaintenancePlanList.vue
index 0b94b4a..63d907a 100644
--- a/src/views/eam/EquipmentMaintenancePlanList.vue
+++ b/src/views/eam/EquipmentMaintenancePlanList.vue
@@ -1,6 +1,6 @@
 <template>
   <a-card
-    title="淇濆吇璁″垝"
+    title=""
     :bordered="false"
   >
     <!-- 鏌ヨ鍖哄煙 -->
diff --git a/src/views/eam/EquipmentOfLine.vue b/src/views/eam/EquipmentOfLine.vue
index 1c48942..481cbf7 100644
--- a/src/views/eam/EquipmentOfLine.vue
+++ b/src/views/eam/EquipmentOfLine.vue
@@ -1,7 +1,7 @@
 <template>
   <a-card
     :bordered="false"
-    title="鐢熶骇绾�"
+    title=""
   >
     <!-- 鏌ヨ鍖哄煙 -->
     <div class="table-page-search-wrapper">
diff --git a/src/views/eam/EquipmentSealList.vue b/src/views/eam/EquipmentSealList.vue
index 25b01dd..e31a565 100644
--- a/src/views/eam/EquipmentSealList.vue
+++ b/src/views/eam/EquipmentSealList.vue
@@ -1,6 +1,6 @@
 <template>
   <a-card
-    title='璁惧灏佸瓨'
+    title=''
     :bordered="false"
   >
     <!-- 鏌ヨ鍖哄煙 -->
diff --git a/src/views/eam/EquipmentTransferInList.vue b/src/views/eam/EquipmentTransferInList.vue
index 0fe667c..5df824c 100644
--- a/src/views/eam/EquipmentTransferInList.vue
+++ b/src/views/eam/EquipmentTransferInList.vue
@@ -1,6 +1,6 @@
 <template>
   <a-card
-    title='璁惧璋冨叆'
+    title=''
     :bordered='false'
   >
     <div class='table-page-search-wrapper'>
diff --git a/src/views/eam/EquipmentTransferList.vue b/src/views/eam/EquipmentTransferList.vue
index 248fa2a..dcfc611 100644
--- a/src/views/eam/EquipmentTransferList.vue
+++ b/src/views/eam/EquipmentTransferList.vue
@@ -1,6 +1,6 @@
 <template>
   <a-card
-    title='璁惧璋冨嚭'
+    title=''
     :bordered='false'
   >
     <div class='table-page-search-wrapper'>
diff --git a/src/views/eam/EquipmentUnsealList.vue b/src/views/eam/EquipmentUnsealList.vue
index 1259867..e0a70ec 100644
--- a/src/views/eam/EquipmentUnsealList.vue
+++ b/src/views/eam/EquipmentUnsealList.vue
@@ -1,6 +1,6 @@
 <template>
   <a-card
-    title='璁惧鍚皝'
+    title=''
     :bordered="false"
   >
     <!-- 鏌ヨ鍖哄煙 -->
diff --git a/src/views/eam/FaultCauseChart.vue b/src/views/eam/FaultCauseChart.vue
index 9b72d85..3c585a2 100644
--- a/src/views/eam/FaultCauseChart.vue
+++ b/src/views/eam/FaultCauseChart.vue
@@ -1,6 +1,6 @@
 <template>
   <a-card
-    title="璁惧鏁呴殰绫诲瀷缁熻"
+    title=""
     :bordered="true"
   >
     <!-- 鏌ヨ鍖哄煙 -->
diff --git a/src/views/eam/InspectionCycleList.vue b/src/views/eam/InspectionCycleList.vue
index 5621339..85b6c3e 100644
--- a/src/views/eam/InspectionCycleList.vue
+++ b/src/views/eam/InspectionCycleList.vue
@@ -1,7 +1,7 @@
 <template>
   <a-card
     :bordered="false"
-    title="鐐规鍛ㄦ湡瑙勫垯"
+    title=""
   >
     <!-- 鏌ヨ鍖哄煙 -->
     <div class="table-page-search-wrapper">
@@ -78,7 +78,7 @@
         icon="search"
       >鏌ヨ</a-button>
       <a-button
-        type="primary"
+        type="info"
         @click="searchReset"
         icon="reload"
         style="margin-left: 8px"
diff --git a/src/views/eam/InspectionReportForms.vue b/src/views/eam/InspectionReportForms.vue
index 2229622..f379173 100644
--- a/src/views/eam/InspectionReportForms.vue
+++ b/src/views/eam/InspectionReportForms.vue
@@ -1,7 +1,7 @@
 <template>
   <a-card
     :bordered="false"
-    title="鐢熶骇璁惧鑷富缁存姢鐐规琛�"
+    title=""
   >
     <!-- 鏌ヨ鍖哄煙 -->
     <div class="table-page-search-wrapper">
diff --git a/src/views/eam/MTBF.vue b/src/views/eam/MTBF.vue
index 8aeeb24..ebbbb25 100644
--- a/src/views/eam/MTBF.vue
+++ b/src/views/eam/MTBF.vue
@@ -1,7 +1,7 @@
 <template>
   <a-card
     :bordered="false"
-    title="鏁呴殰绫诲瀷缁熻"
+    title=""
   >
     <!-- 鏌ヨ鍖哄煙 -->
     <div class="table-page-search-wrapper">
diff --git a/src/views/eam/MaintenanceCycleList.vue b/src/views/eam/MaintenanceCycleList.vue
index f3f6985..02a1e8d 100644
--- a/src/views/eam/MaintenanceCycleList.vue
+++ b/src/views/eam/MaintenanceCycleList.vue
@@ -1,6 +1,6 @@
 <template>
   <a-card
-    title="淇濆吇鍛ㄦ湡瑙勫垯"
+    title=""
     :bordered="false"
   >
     <!-- 鏌ヨ鍖哄煙 -->
@@ -78,7 +78,7 @@
         icon="search"
       >鏌ヨ</a-button>
       <a-button
-        type="primary"
+        type="info"
         @click="searchReset"
         icon="reload"
         style="margin-left: 8px"
diff --git a/src/views/eam/MaintenanceSpecialtyList.vue b/src/views/eam/MaintenanceSpecialtyList.vue
index 7f56f4f..5c9eb18 100644
--- a/src/views/eam/MaintenanceSpecialtyList.vue
+++ b/src/views/eam/MaintenanceSpecialtyList.vue
@@ -1,7 +1,7 @@
 <template>
   <a-card
     :bordered="false"
-    title="缁翠繚涓撲笟"
+    title=""
   >
     <!-- 鏌ヨ鍖哄煙 -->
     <div class="table-page-search-wrapper">
diff --git a/src/views/eam/MaintenanceTypeList.vue b/src/views/eam/MaintenanceTypeList.vue
index 2ecf924..8f85146 100644
--- a/src/views/eam/MaintenanceTypeList.vue
+++ b/src/views/eam/MaintenanceTypeList.vue
@@ -1,7 +1,7 @@
 <template>
   <a-card
     :bordered="false"
-    title="淇濆吇绫诲瀷"
+    title=""
   >
     <!-- 鏌ヨ鍖哄煙 -->
     <div class="table-page-search-wrapper">
diff --git a/src/views/eam/MalfunctionRepair.vue b/src/views/eam/MalfunctionRepair.vue
index fa28a84..881a9e2 100644
--- a/src/views/eam/MalfunctionRepair.vue
+++ b/src/views/eam/MalfunctionRepair.vue
@@ -1,7 +1,7 @@
 <template>
   <a-card
     :bordered="false"
-    title="鏁呴殰鎶ヤ慨"
+    title=""
   >
     <!-- 鏌ヨ鍖哄煙 -->
     <div class="table-page-search-wrapper">
diff --git a/src/views/eam/OperationCertificateApplyList.vue b/src/views/eam/OperationCertificateApplyList.vue
index 6c946b0..b361d10 100644
--- a/src/views/eam/OperationCertificateApplyList.vue
+++ b/src/views/eam/OperationCertificateApplyList.vue
@@ -1,6 +1,6 @@
 <template>
   <a-card
-    title="鎿嶄綔璇佺敵璇�"
+    title=""
     :bordered="false"
   >
     <!-- 鏌ヨ鍖哄煙 -->
diff --git a/src/views/eam/OperationCertificateList.vue b/src/views/eam/OperationCertificateList.vue
index 09f931c..fcd027b 100644
--- a/src/views/eam/OperationCertificateList.vue
+++ b/src/views/eam/OperationCertificateList.vue
@@ -1,6 +1,6 @@
 <template>
   <a-card
-    title="鎿嶄綔璇佷功绠$悊"
+    title=""
     :bordered='false'
   >
     <!-- 鏌ヨ鍖哄煙 -->
diff --git a/src/views/eam/PrecisionParametersTemplateList.vue b/src/views/eam/PrecisionParametersTemplateList.vue
index 369d6f7..6818177 100644
--- a/src/views/eam/PrecisionParametersTemplateList.vue
+++ b/src/views/eam/PrecisionParametersTemplateList.vue
@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" title='绮惧害鍙傛暟妯$増'>
+  <a-card :bordered="false" title=''>
     <!-- 鏌ヨ鍖哄煙 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
@@ -20,7 +20,7 @@
           <a-col :xl="6" :lg="7" :md="8" :sm="24">
             <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
               <a-button type="primary" @click="searchQuery" icon="search">鏌ヨ</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
+              <a-button type="info" @click="searchReset" icon="reload" style="margin-left: 8px">閲嶇疆</a-button>
             </span>
           </a-col>
         </a-row>
diff --git a/src/views/eam/PredictiveWorkOrderList.vue b/src/views/eam/PredictiveWorkOrderList.vue
index a9ed8ca..a960d60 100644
--- a/src/views/eam/PredictiveWorkOrderList.vue
+++ b/src/views/eam/PredictiveWorkOrderList.vue
@@ -1,7 +1,7 @@
 <template>
   <a-card
     :bordered="false"
-    title="棰勬祴缁存姢宸ュ崟"
+    title=""
   >
     <!-- 鏌ヨ鍖哄煙 -->
     <div class="table-page-search-wrapper">
diff --git a/src/views/eam/PredictiveWorkPlanList.vue b/src/views/eam/PredictiveWorkPlanList.vue
index bcba22e..98ac356 100644
--- a/src/views/eam/PredictiveWorkPlanList.vue
+++ b/src/views/eam/PredictiveWorkPlanList.vue
@@ -1,6 +1,6 @@
 <template>
   <a-card
-    title="棰勬祴鎬х淮鎶ゆ柟妗�"
+    title=""
     :bordered='false'
   >
     <div class='table-page-search-wrapper'>
diff --git a/src/views/eam/ProcessParametersTemplateList.vue b/src/views/eam/ProcessParametersTemplateList.vue
index 58c0f93..15d348d 100644
--- a/src/views/eam/ProcessParametersTemplateList.vue
+++ b/src/views/eam/ProcessParametersTemplateList.vue
@@ -1,7 +1,7 @@
 <template
 
 >
-  <a-card :bordered="false" title="宸ヨ壓鍙傛暟妯$増">
+  <a-card :bordered="false" title="">
     <!-- 鏌ヨ鍖哄煙 -->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
diff --git a/src/views/eam/ProjectMaintenanceOrderList.vue b/src/views/eam/ProjectMaintenanceOrderList.vue
index e805135..e4d5f92 100644
--- a/src/views/eam/ProjectMaintenanceOrderList.vue
+++ b/src/views/eam/ProjectMaintenanceOrderList.vue
@@ -1,6 +1,6 @@
 <template>
   <a-card
-    title="椤圭洰鎬х淮淇�"
+    title=""
     :bordered='false'
   >
     <!-- 鏌ヨ鍖哄煙 -->
@@ -76,7 +76,7 @@
                 icon='search'
               >鏌ヨ</a-button>
               <a-button
-                type='primary'
+                type='info'
                 @click='searchReset'
                 icon='reload'
                 style='margin-left: 8px'
diff --git a/src/views/eam/QuanlityConfirmList.vue b/src/views/eam/QuanlityConfirmList.vue
index c58fd2d..fbf88cf 100644
--- a/src/views/eam/QuanlityConfirmList.vue
+++ b/src/views/eam/QuanlityConfirmList.vue
@@ -1,6 +1,6 @@
 <template>
   <a-card
-    title="浜у搧璐ㄩ噺闅愭偅纭"
+    title=""
     :bordered="false"
   >
     <!-- 鏌ヨ鍖哄煙 -->
diff --git a/src/views/eam/RepairOrderList.vue b/src/views/eam/RepairOrderList.vue
index d2b0e41..de9322e 100644
--- a/src/views/eam/RepairOrderList.vue
+++ b/src/views/eam/RepairOrderList.vue
@@ -1,6 +1,6 @@
 <template>
   <a-card
-    title="缁翠慨"
+    title=""
     :bordered="false"
   >
     <div class="table-page-search-wrapper">
diff --git a/src/views/eam/RiskPreventionList.vue b/src/views/eam/RiskPreventionList.vue
index f6d052e..deb9ed9 100644
--- a/src/views/eam/RiskPreventionList.vue
+++ b/src/views/eam/RiskPreventionList.vue
@@ -1,7 +1,7 @@
 <template>
   <a-card
     :bordered='false'
-    title='鍗遍櫓闃叉帶'
+    title=''
   >
     <!-- 鏌ヨ鍖哄煙 -->
     <div class='table-page-search-wrapper'>
diff --git a/src/views/eam/SpecialtyMaintenanceOrderList.vue b/src/views/eam/SpecialtyMaintenanceOrderList.vue
index acafc95..5b078d7 100644
--- a/src/views/eam/SpecialtyMaintenanceOrderList.vue
+++ b/src/views/eam/SpecialtyMaintenanceOrderList.vue
@@ -1,7 +1,7 @@
 <template>
   <a-card
     :bordered="false"
-    title="棰勯槻鎬т繚鍏诲伐鍗�"
+    title=""
   >
     <!-- 鏌ヨ鍖哄煙 -->
     <div class="table-page-search-wrapper">
diff --git a/src/views/eam/SpecialtyMaintenancePlanList.vue b/src/views/eam/SpecialtyMaintenancePlanList.vue
index 16bc709..d55dca2 100644
--- a/src/views/eam/SpecialtyMaintenancePlanList.vue
+++ b/src/views/eam/SpecialtyMaintenancePlanList.vue
@@ -1,6 +1,6 @@
 <template>
   <a-card
-    title="棰勯槻鎬т繚鍏绘柟妗�"
+    title=""
     :bordered='false'
   >
     <div class='table-page-search-wrapper'>
diff --git a/src/views/eam/SpecialtyMaintenanceStandardList.vue b/src/views/eam/SpecialtyMaintenanceStandardList.vue
index cf259b8..99f2307 100644
--- a/src/views/eam/SpecialtyMaintenanceStandardList.vue
+++ b/src/views/eam/SpecialtyMaintenanceStandardList.vue
@@ -1,6 +1,6 @@
 <template>
   <a-card
-    title="棰勯槻鎬т繚鍏绘爣鍑�"
+    title=""
     :bordered='false'
   >
     <div class='table-page-search-wrapper'>
diff --git a/src/views/eam/UnitList.vue b/src/views/eam/UnitList.vue
index 720f997..72fdd99 100644
--- a/src/views/eam/UnitList.vue
+++ b/src/views/eam/UnitList.vue
@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered="false" title='璁¢噺鍗曚綅'>
+  <a-card :bordered="false" title=''>
     <!-- 鏌ヨ鍖哄煙 -->
     <div class="table-page-search-wrapper">
       <a-form
diff --git a/src/views/eam/UploadList.vue b/src/views/eam/UploadList.vue
index 3d1da92..6ed40a1 100644
--- a/src/views/eam/UploadList.vue
+++ b/src/views/eam/UploadList.vue
@@ -1,7 +1,7 @@
 <template>
   <a-card
     :bordered="false"
-    title="妯℃澘绠$悊"
+    title=""
   >
     <!-- 鏌ヨ鍖哄煙 -->
     <div class="table-page-search-wrapper">
diff --git a/src/views/eam/modules/equipment/EquipmentResume/EquipmentCalibrationRecord.vue b/src/views/eam/modules/equipment/EquipmentResume/EquipmentCalibrationRecord.vue
index f031a92..c2f415f 100644
--- a/src/views/eam/modules/equipment/EquipmentResume/EquipmentCalibrationRecord.vue
+++ b/src/views/eam/modules/equipment/EquipmentResume/EquipmentCalibrationRecord.vue
@@ -85,7 +85,7 @@
 
         },
         {
-          title: '妫�瀹氭柟寮�',
+          title: '閴村畾鏂瑰紡',
           align: "center",
           dataIndex: 'calibrationTypeName',
 
@@ -96,12 +96,12 @@
           dataIndex: 'calibrationResult',
         },
         {
-          title: '妫�瀹氫汉',
+          title: '閴村畾浜�',
           align: "center",
           dataIndex: 'calibrationUserName',
         },
         {
-          title: '妫�瀹氭椂闂�',
+          title: '閴村畾鏃堕棿',
           align: "center",
           dataIndex: 'calibrationTime',
         },
diff --git a/src/views/eam/modules/equipment/EquipmentResume/EquipmentResumeDrawer.vue b/src/views/eam/modules/equipment/EquipmentResume/EquipmentResumeDrawer.vue
index b38c884..fc222ea 100644
--- a/src/views/eam/modules/equipment/EquipmentResume/EquipmentResumeDrawer.vue
+++ b/src/views/eam/modules/equipment/EquipmentResume/EquipmentResumeDrawer.vue
@@ -154,7 +154,7 @@
               </div>
             </a-tab-pane>
             <a-tab-pane
-              tab='妫�瀹氳褰�'
+              tab='閴村畾璁板綍'
               key="6"
             >
               <div
diff --git a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderModal.vue b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderModal.vue
index 8036c29..46ef5b7 100644
--- a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderModal.vue
+++ b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderModal.vue
@@ -44,14 +44,14 @@
           </a-col>
           <a-col :span='24'>
             <a-form-item
-              label='妫�瀹氭柟寮�'
+              label='閴村畾鏂瑰紡'
               :labelCol='labelCol'
               :wrapperCol='wrapperCol'
             >
               <j-dict-select-tag
                 allow-clear
                 :disabled='disableSubmit'
-                :placeholder="disableSubmit?'':'璇烽�夋嫨妫�瀹氭柟寮�'"
+                :placeholder="disableSubmit?'':'璇烽�夋嫨閴村畾鏂瑰紡'"
                 :triggerChange='true'
                 dictCode='calibration_type'
                 v-decorator="['calibrationType', validatorRules.calibrationType]"
@@ -240,7 +240,7 @@
         },
         calibrationType: {
           rules: [
-            { required: true, message: '璇烽�夋嫨妫�瀹氭柟寮�!' }
+            { required: true, message: '璇烽�夋嫨閴村畾鏂瑰紡!' }
           ]
         },
         managementMode: {
diff --git a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportDrawerList.vue b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportDrawerList.vue
index d489128..7a8424c 100644
--- a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportDrawerList.vue
+++ b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportDrawerList.vue
@@ -227,7 +227,7 @@
 
     handleAdd: function () {
       this.$refs.modalForm.add(this.calibrationOrderId);
-      this.$refs.modalForm.title = "涓婁紶妫�瀹氭姤鍛�";
+      this.$refs.modalForm.title = "涓婁紶閴村畾鎶ュ憡";
       this.$refs.modalForm.disableSubmit = false;
     },
 
diff --git a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportList.vue b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportList.vue
index 6b9272a..89b6ba9 100644
--- a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportList.vue
+++ b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportList.vue
@@ -100,7 +100,7 @@
   },
   data() {
     return {
-      description: '妫�瀹氭姤鍛�',
+      description: '閴村畾鎶ュ憡',
       disableMixinCreated: true,
       columns: [
         {
@@ -284,7 +284,7 @@
     },
 
     handleDownload(record) {
-      downFile(this.url.download, { id: record.id }).then((res) => {
+      downFile(this.url.download, { id: record.upload.id }).then((res) => {
         if (!res) {
           this.$message.warning('鏂囦欢涓嬭浇澶辫触')
           return
diff --git a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportModal.vue b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportModal.vue
index f50b36f..614a252 100644
--- a/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportModal.vue
+++ b/src/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportModal.vue
@@ -258,7 +258,7 @@
       that.model = Object.assign({}, record);
       that.fileList = [];
       that.$nextTick(() => {
-        that.form.setFieldsValue({ num: record.num, fileType: record.type, judgmentResult: record.judgmentResult, remark: record.remark });
+        that.form.setFieldsValue({ num: record.num, fileType: record.type, name: record.name, remark: record.remark });
       });
       that.uploadId = ''
       //鑾峰彇褰撳墠鏂囦欢瀵瑰簲闄勪欢
diff --git a/src/views/eam/modules/equipmentNew/EquipmentCalibrationOrderComponent.vue b/src/views/eam/modules/equipmentNew/EquipmentCalibrationOrderComponent.vue
new file mode 100644
index 0000000..f1e1388
--- /dev/null
+++ b/src/views/eam/modules/equipmentNew/EquipmentCalibrationOrderComponent.vue
@@ -0,0 +1,505 @@
+<template>
+  <a-card
+    :bordered='false'
+    title=''
+  >
+    <!-- table鍖哄煙-begin -->
+    <div>
+      <div
+        class='ant-alert ant-alert-info'
+        style='margin-bottom: 16px;'
+      >
+        <i class='anticon anticon-info-circle ant-alert-icon'></i> 宸查�夋嫨 <a style='font-weight: 600'>{{ selectedRowKeys.length }}</a>椤�
+        <a
+          style='margin-left: 24px'
+          @click='onClearSelected'
+        >娓呯┖</a>
+      </div>
+
+      <a-table
+        ref='table'
+        size='middle'
+        :scroll="{ x: 'calc(1000px + 50%)', y: 900 }"
+        bordered
+        rowKey='id'
+        :columns='columns'
+        :dataSource='dataSource'
+        :pagination='ipagination'
+        :loading='loading'
+        class='j-table-force-nowrap'
+        @change='handleTableChange'
+        :customRow='clickThenSelect'
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'radio'}"
+      >
+
+        <span
+          slot='action'
+          slot-scope='text, record'
+        >
+          <a
+            v-show="record.status === '1' || record.status === '3'"
+            @click='handleAddOrderReport(record)'
+            v-has="'calibrationOrder:write'"
+          >缁撴灉褰曞叆</a>
+
+          <a-divider
+            v-show="record.status === '1' || record.status === '3'"
+            type='vertical'
+          />
+          <a
+            v-show="record.status === '2' && record.equipmentImportance != 'D'"
+            @click='handleTechnologyStatus(record)'
+            v-has="'calibrationOrder:audit'"
+          >缁撴灉瀹℃牳</a>
+
+          <a-divider
+            v-show="record.status === '2' && record.equipmentImportance != 'D'"
+            type='vertical'
+          />
+          <a
+            v-show="record.status === '2' && record.equipmentImportance == 'D'"
+            @click='handleTechnologyStatusAuthenticate(record)'
+            v-has="'calibrationOrder:authenticate'"
+          >D绫绘妧鏈姸鎬侀壌瀹�</a>
+
+          <a-divider
+            v-show="record.status === '2' && record.equipmentImportance == 'D'"
+            type='vertical'
+          />
+          <a @click='handleDetail(record)'>璇︽儏</a>
+          <!--          <a-popconfirm-->
+          <!--            title='纭畾涓嬪彂宸ュ崟鍚�?'-->
+          <!--            @confirm='() => handleOrderIssue(record)'-->
+          <!--          >-->
+          <!--            <a v-if="record.status === '1'">涓嬪彂</a>-->
+          <!--          </a-popconfirm>-->
+          <!--          <a-divider-->
+          <!--            v-if="record.status === '1'"-->
+          <!--            type='vertical'-->
+          <!--          />-->
+          <!--          <a-->
+          <!--            v-if="record.status === '1'"-->
+          <!--            @click='handleEdit(record)'-->
+          <!--          >缂栬緫</a>-->
+          <!--          <a-divider-->
+          <!--            v-if="record.status === '1'"-->
+          <!--            type='vertical'-->
+          <!--          />-->
+          <!--          <a-->
+          <!--            v-if="record.status === '2' "-->
+          <!--            @click='handleOrderExe(record)'-->
+          <!--          >鎵ц</a>-->
+          <!--          <a-divider-->
+          <!--            v-if="record.status === '2'"-->
+          <!--            type='vertical'-->
+          <!--          />-->
+          <!--          <a-->
+          <!--            v-if="record.status === '4'"-->
+          <!--            @click='handleOrderExe(record)'-->
+          <!--          >鏌ョ湅</a>-->
+          <!--          <a-divider-->
+          <!--            v-if="record.status === '4'"-->
+          <!--            type='vertical'-->
+          <!--          />-->
+          <!--          <a-popconfirm-->
+          <!--            title='纭畾鎾ゅ洖宸ュ崟鍚�?'-->
+          <!--            @confirm="() => handleOrderReset(record,'1')"-->
+          <!--          >-->
+          <!--            <a v-if="record.status === '2'">鎾ゅ洖</a>-->
+          <!--          </a-popconfirm>-->
+          <!--          <a-divider-->
+          <!--            v-if="record.status === '2'"-->
+          <!--            type='vertical'-->
+          <!--          />-->
+          <!--          <a-popconfirm-->
+          <!--            title='纭畾鎾ゅ洖宸ュ崟鍚�?'-->
+          <!--            @confirm="() => handleOrderReset(record,'2')"-->
+          <!--          >-->
+          <!--            <a v-if="record.status === '4'">鎾ゅ洖</a>-->
+          <!--          </a-popconfirm>-->
+          <!--          <a-divider-->
+          <!--            v-if="record.status === '4'"-->
+          <!--            type='vertical'-->
+          <!--          />-->
+          <!--          <a-->
+          <!--            v-if="record.status === '4'"-->
+          <!--            @click='handleFinal(record)'-->
+          <!--          >褰曞叆缁撴灉</a>-->
+          <!--          &lt;!&ndash; v-if="record.status === '5'" &ndash;&gt;-->
+          <!--           <a-divider-->
+          <!--             v-if="record.status === '4'"-->
+          <!--             type='vertical'-->
+          <!--           />-->
+          <!--          -->
+          <!--          <a-dropdown>-->
+          <!--             <a @click='handleDetail(record)'>璇︽儏</a>-->
+          <!--            <a class='ant-dropdown-link'>鏇村 <a-icon type='down' /></a>-->
+          <!--            <a-menu slot='overlay'>-->
+          <!--              <a-menu-item>-->
+          <!--                <a @click='handleDetail(record)'>璇︽儏</a>-->
+          <!--              </a-menu-item>-->
+          <!--              <a-menu-item>-->
+          <!--                <a-popconfirm-->
+          <!--                  title='纭畾鍒犻櫎鍚�?'-->
+          <!--                  @confirm='() => handleDelete(record.id)'-->
+          <!--                >-->
+          <!--                  <a v-if="record.status === '1'">鍒犻櫎</a>-->
+          <!--                </a-popconfirm>-->
+          <!--              </a-menu-item>-->
+          <!--            </a-menu>-->
+          <!--          </a-dropdown>-->
+        </span>
+
+        <!-- <span
+          slot='num'
+          slot-scope='text, record'
+        >
+          <a
+            v-if="record.status === '3' || record.status === '2' "
+            class='lot'
+            @click='handleOrderExe(record)'
+          >{{ record.num }}</a>
+
+          <span v-else>{{ record.num }}</span>
+        </span> -->
+      </a-table>
+      <a-tabs defaultActiveKey='2'>
+        <!--        <a-tab-pane  -->
+        <!--          key="1"-->
+        <!--          tab="妫�楠岄」"-->
+        <!--        >-->
+        <!--            <equipment-precision-parameters-list ref="PrecisionParametersList" :calibrationOrderId="mainId"></equipment-precision-parameters-list>-->
+        <!--        </a-tab-pane>-->
+
+        <a-tab-pane
+          key='2'
+          tab='閴村畾鎶ュ憡'
+        >
+          <equipment-calibration-order-report-list
+            ref='EquipmentCalibrationOrderReportList'
+            :calibrationOrderId='calibrationOrderMainId'
+          ></equipment-calibration-order-report-list>
+        </a-tab-pane>
+
+      </a-tabs>
+    </div>
+
+    <equipment-calibration-order-modal
+      ref='modalForm'
+      @ok='modalFormOk'
+    ></equipment-calibration-order-modal>
+
+    <equipment-calibration-order-exe-drawer
+      ref='EquipmentCalibrationOrderExeDrawer'
+      @ok='modalFormOk'
+    ></equipment-calibration-order-exe-drawer>
+    <final-modal
+      ref='finalModal'
+      @ok='modalFormOk'
+    ></final-modal>
+
+    <equipment-calibration-order-report-modal
+      ref='equipmentCalibrationOrderReportModal'
+      @ok='modalFormOk'
+    ></equipment-calibration-order-report-modal>
+
+    <equipment-technology-status-modal
+      ref="EquipmentTechnologyStatusModal"
+      @ok="modalFormOk"
+    ></equipment-technology-status-modal>
+
+    <technology-status-authenticate-modal
+      ref="TechnologyStatusAuthenticateModal"
+      @ok="modalFormOk"
+    ></technology-status-authenticate-modal>
+  </a-card>
+</template>
+
+<script>
+
+import '@/assets/less/TableExpand.less'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import EquipmentCalibrationOrderModal from '@/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderModal'
+import EquipmentCalibrationOrderExeDrawer from '@/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderExeDrawer'
+import { getAction, postAction, requestPut } from '@/api/manage'
+import EquipmentPrecisionParametersList from '@/views/eam/modules/equipmentCalibrationOrder/EquipmentPrecisionParametersList'
+import EquipmentCalibrationOrderReportList
+  from '@/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportList'
+import FinalModal from '@/views/eam/modules/equipmentCalibrationOrder/FinalModal.vue'
+import EquipmentCalibrationOrderReportModal
+  from '@/views/eam/modules/equipmentCalibrationOrder/EquipmentCalibrationOrderReportModal'
+import EquipmentTechnologyStatusModal from '@/views/eam/modules/equipmentCalibrationOrder/EquipmentTechnologyStatusModal'
+import TechnologyStatusAuthenticateModal from '@/views/eam/modules/equipmentCalibrationOrder/TechnologyStatusAuthenticateModal'
+import { interceptorFunc } from 'vxe-table'
+
+export default {
+  name: 'EquipmentCalibrationOrder',
+  mixins: [JeecgListMixin],
+  components: {
+    EquipmentCalibrationOrderModal,
+    EquipmentCalibrationOrderExeDrawer,
+    EquipmentPrecisionParametersList,
+    EquipmentCalibrationOrderReportList,
+    EquipmentCalibrationOrderReportModal,
+    FinalModal,
+    EquipmentTechnologyStatusModal,
+    TechnologyStatusAuthenticateModal
+  },
+  props:{
+    mainId:{
+      type:String,
+      default:'',
+      required:false
+    }
+  },
+  watch:{
+    mainId:{
+      immediate: true,
+      handler(val) {
+        if(!this.mainId){
+          this.queryParam['equipmentId'] = 'NAN'
+          this.loadData(1);
+        }else{
+          this.queryParam['equipmentId'] = val
+          this.queryParam['statusEnums'] = '4'
+          this.loadData(1);
+        }
+      }
+    }
+  },
+  data() {
+    return {
+      description: '鎶�鏈姸鎬侀壌瀹氱鐞�',
+      disableMixinCreated: true,
+      ipagination: {
+        current: 1,
+        pageSize: 10,
+        pageSizeOptions: ['5', '10', '20', '50'],
+        showTotal: (total, range) => {
+          return range[0] + '-' + range[1] + ' 鍏�' + total + '鏉�'
+        },
+        showQuickJumper: true,
+        showSizeChanger: true,
+        total: 0
+      },
+      dictOptions: {},
+      /* 鍒嗛〉鍙傛暟 */
+      // 琛ㄥご
+      columns: [
+        {
+          title: '#',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 60,
+          align: 'center',
+          customRender: function (t, r, index) {
+            return parseInt(index) + 1
+          }
+        },
+
+        {
+          title: '宸ュ崟鍙�',
+          align: 'center',
+          dataIndex: 'num'
+          // scopedSlots: { customRender: 'num' }
+        },
+        {
+          title: '鐘舵��',
+          align: 'center',
+          dataIndex: 'status_dictText'
+        },
+        {
+          title: '鍒ゅ畾缁撴灉',
+          align: 'center',
+          dataIndex: 'calibrationResult_dictText'
+        },
+        // {
+        //   title: '妫�瀹氭柟寮�',
+        //   align: 'center',
+        //   dataIndex: 'calibrationType_dictText'
+        // },
+        {
+          title: '缁熶竴缂栫爜',
+          align: 'center',
+          dataIndex: 'equipmentNum'
+        },
+        {
+          title: '璁惧鍚嶇О',
+          align: 'center',
+          dataIndex: 'equipmentName'
+        },
+        {
+          title: '鍨嬪彿',
+          align: 'center',
+          dataIndex: 'equipmentModel'
+        },
+        {
+          title: '瑙勬牸',
+          align: 'center',
+          dataIndex: 'equipmentSpecification'
+        },
+        // {
+        //   title: '鍒ゅ畾渚濇嵁',
+        //   align: 'center',
+        //   dataIndex: 'managementMode_dictText'
+        // },
+
+        // {
+        //   title: '鍒涘缓浜�',
+        //   align: 'center',
+        //   dataIndex: 'createBy'
+        // },
+        {
+          title: '鍒涘缓鏃ユ湡',
+          align: 'center',
+          dataIndex: 'createTime'
+        },
+        // {
+        //   title: '妫�瀹氫汉',
+        //   align: 'center',
+        //   dataIndex: 'calibrationUserId_dictText'
+        // },
+        {
+          title: '瀹屾垚鏃堕棿',
+          align: 'center',
+          dataIndex: 'calibrationTime'
+        },
+        {
+          title: '瀹℃牳鎰忚',
+          align: 'center',
+          dataIndex: 'remark'
+        },
+        // {
+        //   title: '涓嬪彂鏃堕棿',
+        //   align: 'center',
+        //   dataIndex: 'issueTime'
+        // },
+        {
+          title: '鎿嶄綔',
+          dataIndex: 'action',
+          align: 'center',
+          width: 200,
+          fixed: 'right',
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
+      url: {
+        list: '/eam/calibrationOrder/listNew',
+        delete: '/eam/calibrationOrder/delete',
+        edit: '/eam/calibrationOrder/editStatus'
+      },
+      calibrationOrderMainId: ''
+    }
+  },
+
+  computed: {
+    importExcelUrl: function () {
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+    }
+  },
+  created() {
+    //浠庤矾鐢变腑鑾峰彇鏌ヨ鏉′欢
+    // if (this.$route.query) {
+    //   this.queryParam.equipmentId = this.$route.query.equipmentId;
+    //   //鏌ヨ鏉′欢鎸夋椂闂村�掑簭
+    //   this.queryParam.sort = 'createTime';
+    //   this.queryParam.order = 'desc';
+    // }
+    // this.loadData()
+    this.initDictConfig();
+  },
+
+  methods: {
+
+    onSelectChange(selectedRowKeys, selectionRows) {
+      if (selectedRowKeys.length == 1) {
+        this.calibrationOrderMainId = selectedRowKeys[0]
+      } else {
+        this.calibrationOrderMainId = '-1'
+      }
+      this.selectedRowKeys = selectedRowKeys
+      this.selectionRows = selectionRows
+    },
+
+    handleTechnologyStatus(record) {
+      this.$refs.EquipmentTechnologyStatusModal.edit(record);
+      this.$refs.EquipmentTechnologyStatusModal.title = "瀹℃牳";
+      this.$refs.EquipmentTechnologyStatusModal.disableSubmit = false;
+    },
+
+    handleTechnologyStatusAuthenticate: function (record) {
+      this.$refs.TechnologyStatusAuthenticateModal.edit(record);
+      this.$refs.TechnologyStatusAuthenticateModal.title = "鎶�鏈姸鎬佺紪杈�";
+      this.$refs.TechnologyStatusAuthenticateModal.disableSubmit = false;
+
+    },
+
+    handleOrderExe(record) {
+      this.$refs.EquipmentCalibrationOrderExeDrawer.visible = true
+      this.$refs.EquipmentCalibrationOrderExeDrawer.title = '閴村畾宸ュ崟鎵ц'
+      this.$refs.EquipmentCalibrationOrderExeDrawer.handleShow(record)
+      if (record.status === '4') {
+        this.$refs.EquipmentCalibrationOrderExeDrawer.buttonDistable = true//淇濆瓨銆佹殏瀛樸�佹姤宸�
+        this.$refs.EquipmentCalibrationOrderExeDrawer.revocationDistable = true//鎾ら攢鎸夐挳
+        this.$refs.EquipmentCalibrationOrderExeDrawer.SWbuttonDistable = true//鎻愪氦鎸夐挳
+      } else if (record.status === '2') {
+        this.$refs.EquipmentCalibrationOrderExeDrawer.buttonDistable = false//淇濆瓨銆佹殏瀛樸�佹姤宸�
+        this.$refs.EquipmentCalibrationOrderExeDrawer.revocationDistable = true//鎾ら攢鎸夐挳
+        this.$refs.EquipmentCalibrationOrderExeDrawer.SWbuttonDistable = false//鎻愪氦鎸夐挳
+      }
+
+    },
+
+    handleOrderIssue(record) {
+      const that = this
+      requestPut(that.url.edit, { id: record.id, status: '2' }).then((res) => {
+        if (res.success) {
+          that.$message.success('宸ュ崟涓嬪彂鎴愬姛锛�')
+          that.loadData()
+        } else {
+          that.$message.warning('宸ュ崟涓嬪彂澶辫触锛�')
+        }
+      })
+    },
+    //鎾ゅ洖
+    handleOrderReset(record, status) {
+      const that = this
+      requestPut(that.url.edit, { id: record.id, status: status }).then((res) => {
+        if (res.success) {
+          that.$message.success('宸ュ崟鎾ゅ洖鎴愬姛锛�')
+          that.loadData()
+        } else {
+          that.$message.warning('宸ュ崟鎾ゅ洖澶辫触锛�')
+        }
+      })
+    },
+    onClearSelected() {
+      this.selectedRowKeys = []
+      this.selectionRows = []
+      this.calibrationOrderMainId = ''
+    },
+    clickThenSelect(record) {
+      return {
+        on: {
+          click: () => {
+            this.onSelectChange(record.id.split(','), [record])
+          }
+        }
+      }
+    },
+    // 鐩存帴涓婁紶閴村畾鎶ュ憡
+    handleAddOrderReport: function (record) {
+      this.$refs.equipmentCalibrationOrderReportModal.add(record.id)
+      this.$refs.equipmentCalibrationOrderReportModal.title = '涓婁紶閴村畾鎶ュ憡'
+      this.$refs.equipmentCalibrationOrderReportModal.disableSubmit = false
+    },
+    handleFinal(record) {
+      this.$refs.finalModal.edit(record)
+    },
+    
+  }
+}
+</script>
+<style scoped>
+@import '~@assets/less/common.less';
+</style>
\ No newline at end of file
diff --git a/src/views/eam/modules/equipmentNew/EquipmentModal.vue b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
index c932f92..c3d98d7 100644
--- a/src/views/eam/modules/equipmentNew/EquipmentModal.vue
+++ b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
@@ -395,7 +395,7 @@
         <a-row>
           <a-col :span='6'>
             <a-form-model-item
-              label='鎿嶄綔绯荤粺'
+              label='鏄惁鏈夋搷浣滅郴缁�'
               :labelCol='labelCol'
               :wrapperCol='wrapperCol'
               prop='operatingSystem'
@@ -415,7 +415,7 @@
             v-if="model.operatingSystem=='yes'"
           >
             <a-form-model-item
-              label='绯荤粺'
+              label='绯荤粺淇℃伅'
               :labelCol='labelCol'
               :wrapperCol='wrapperCol'
               prop='system'
@@ -493,14 +493,14 @@
           </a-col>
           <a-col :span='6'>
             <a-form-model-item
-              label='鎶�鏈姸鎬佹瀹氬懆鏈�'
+              label='鎶�鏈姸鎬侀壌瀹氬懆鏈�'
               :labelCol='labelCol'
               :wrapperCol='wrapperCol'
               prop='checkPeriod'
             >
               <j-dict-select-tag
                 allow-clear
-                placeholder='璇烽�夋嫨鎶�鏈姸鎬佹瀹氬懆鏈� '
+                placeholder='璇烽�夋嫨鎶�鏈姸鎬侀壌瀹氬懆鏈� '
                 :triggerChange='true'
                 dictCode='check_period'
                 v-model='model.checkPeriod'
@@ -1128,7 +1128,7 @@
           { required: true, message: '璇烽�夋嫨璁惧鐘舵��!' }
         ],
         workCenterId: [
-          { required: false, message: '璇烽�夋嫨涓績!' }
+          { required: true, message: '璇烽�夋嫨涓績!' }
         ],
         factoryModelId: [
           { required: false, message: '璇烽�夋嫨宸ュ尯!' }
diff --git a/src/views/eam/modules/equipmentNew/RepairOrderListComponent.vue b/src/views/eam/modules/equipmentNew/RepairOrderListComponent.vue
new file mode 100644
index 0000000..1000165
--- /dev/null
+++ b/src/views/eam/modules/equipmentNew/RepairOrderListComponent.vue
@@ -0,0 +1,840 @@
+<template>
+  <a-card
+    title=""
+    :bordered="false"
+  >
+    <!-- table鍖哄煙-begin -->
+    <div>
+      <div
+        class="ant-alert ant-alert-info"
+        style="margin-bottom: 16px;"
+      >
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 宸查�夋嫨 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>椤�
+        <a
+          style="margin-left: 24px"
+          @click="onClearSelected"
+        >娓呯┖</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        bordered
+        rowKey="id"
+        class="j-table-force-nowrap"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        @change="handleTableChange"
+        :customRow="clickThenSelect"
+        :rowClassName="tableRowClass"
+        :scroll="{ x: 'calc(1700px + 50%)', y: 900 }"
+      >
+        <span
+          slot="jell"
+          slot-scope="text"
+        >
+          <j-ellipsis
+            :value="text"
+            :length="8"
+          />
+        </span>
+        <span
+          slot="specificEquipment"
+          slot-scope="text"
+        >
+          <a-icon
+            type="check"
+            style="color: chartreuse;"
+            v-if="text==='0'"
+          />
+          <a-icon
+            type="close"
+            v-else
+            style="color:red;"
+          />
+        </span>
+        <span
+          slot="num"
+          slot-scope="text, record"
+        >
+          <a
+            v-if="record.status === '3' || record.status === '4' ||record.status === '5'  ||record.status === '7' "
+            class="lot"
+            @click="handleOrderExe(record)"
+          ><j-ellipsis
+              :value="text"
+              :length="15"
+            /></a>
+          <span v-else> <j-ellipsis
+              :value="text"
+              :length="15"
+            /></span>
+        </span>
+        <span
+          slot="action"
+          slot-scope="text, record"
+        >
+          <a-popconfirm
+            title="纭畾涓嬪彂宸ュ崟鍚�?"
+            @confirm="() => handleDistribute(record)"
+          >
+            <a v-if="record.status == '0'">涓嬪彂</a>
+          </a-popconfirm>
+          <a-divider
+            v-if="record.status == '0'"
+            type="vertical"
+          />
+          <a-popconfirm
+            title="纭畾鎾ゅ洖宸ュ崟鍚�?"
+            @confirm="() => handleWithdraw(record)"
+          >
+            <a v-if="record.status == '1'">鎾ゅ洖</a>
+          </a-popconfirm>
+          <a-divider
+            v-if="record.status == '1'"
+            type="vertical"
+          />
+          <a-popconfirm
+            title="纭畾棰嗗彇宸ュ崟鍚�?"
+            @confirm="() => handleReceive(record)"
+          >
+            <a v-if="record.status == '1' && record.dispatchMethod == '2'">棰嗗彇</a>
+          </a-popconfirm>
+          <a
+            v-if="record.status == '1' && record.dispatchMethod == '1'  "
+            @click="handleAssignOrder(record)"
+          >娲惧伐</a>
+          <!-- <a
+            v-if="record.status == '2' && record.dispatchMethod != null "
+            @click="handleAssignOrder(record)"
+          >鏀规淳</a> -->
+          <a-divider
+            v-if="record.status == '1' || record.status == '2' "
+            type="vertical"
+          />
+          <a
+            v-if="record.status === '2' || record.status === '3' "
+            @click="handleOrderExe(record)"
+            v-has="'repair:excute'"
+          >鎵ц</a>
+          <a-divider
+            v-if="record.status === '2' || record.status === '3' "
+            type="vertical"
+          />
+          <a
+            v-if="record.status === '0'"
+            @click="handleEditPre(record)"
+          >缂栬緫</a>
+          <a-divider
+            v-if="record.status === '0'"
+            type="vertical"
+          />
+          <a-dropdown>
+            <a class="ant-dropdown-link">鏇村 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">璇︽儏</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm
+                  title="纭畾鍒犻櫎鍚�?"
+                  @confirm="() => handleDelete(record.id)"
+                >
+                  <a v-if="record.status === '0'">鍒犻櫎</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+        <template
+          slot="equipmentNum"
+          slot-scope="text, record"
+        >
+          <a-popover title="鏁呴殰鍘熷洜缁熻">
+            <template slot="content">
+              <p
+                v-for="(faultCauseMap, index) in record.equipmentFaultCause"
+                :key="index"
+              >
+                <span class="fontweight">{{ faultCauseMap.faultCause }}锛歿{ faultCauseMap.total }}</span>
+              </p>
+            </template>
+            <span>
+              {{ record.equipmentNum }}
+            </span>
+          </a-popover>
+        </template>
+
+        <template
+          slot="faultCauseCount"
+          slot-scope="text, record"
+        >
+          <a-popover title="鏁呴殰鍘熷洜缁熻">
+            <template slot="content">
+              <p
+                v-for="(faultCauseMap, index) in record.allFaultCause"
+                :key="index"
+              >
+                <span class="fontweight">{{ faultCauseMap.faultCause }}锛歿{ faultCauseMap.total }}</span>
+              </p>
+            </template>
+            <span>
+              {{ record.faultCauseCount }}
+            </span>
+          </a-popover>
+        </template>
+
+      </a-table>
+    </div>
+
+    <a-tabs
+      type="card"
+      defaultActiveKey="1"
+    >
+      <a-tab-pane
+        tab="鏁呴殰鎻忚堪"
+        key="1"
+      >
+        <FaultDescriptionList ref="FaultDescriptionList" />
+      </a-tab-pane>
+      <a-tab-pane
+        tab="缁翠慨瑕佹眰"
+        key="2"
+        v-if="false"
+      >
+        <RepairOrderDetailList
+          :mainId="repairOrderDetailMainId"
+          :addStatus="sonsAddStatus"
+        />
+      </a-tab-pane>
+      <a-tab-pane
+        tab="璁″垝鐢ㄦ枡"
+        key="3"
+        forceRender
+        v-if="false"
+      >
+        <RepairOrderPlanMaterialList
+          :addStatus="sonsAddStatus"
+          :mainId="repairOrderPlanMaterialMainId"
+        />
+      </a-tab-pane>
+      <a-tab-pane
+        tab="鍗遍櫓闃叉帶"
+        key="4"
+        forceRender
+        v-if="false"
+      >
+        <RepairOrderRiskPreventionList
+          :addStatus="sonsAddStatus"
+          :mainId="repairOrderRiskPreventionMainId"
+        />
+      </a-tab-pane>
+      <a-tab-pane
+        tab="浣滀笟鎸囧涔�"
+        key="5"
+        forceRender
+        v-if="false"
+      >
+        <EquipmentDocumentList
+          :addStatus="sonsAddStatus"
+          :mainId="equipmentDocumentMainId"
+        />
+      </a-tab-pane>
+      <a-tab-pane
+        tab="瀹為檯鐢ㄦ枡"
+        key="6"
+        forceRender
+        v-if="false"
+      >
+        <!-- v-if="!sonsAddStatus&&selectedRowKeys.length!=0" -->
+        <RepairOrderActualMaterialList :mainId="repairOrderActualMaterialMainId" />
+      </a-tab-pane>
+      <a-tab-pane
+        tab="瀹為檯宸ユ椂"
+        key="7"
+        forceRender
+        v-if="!sonsAddStatus&&selectedRowKeys.length!=0"
+      >
+        <RepairOrderActualWorkHoursList :mainId="repairOrderActualWorkHoursMainId" />
+      </a-tab-pane>
+      <a-tab-pane
+        tab="鏁呴殰鍒嗘瀽"
+        key="8"
+        forceRender
+        v-if="!sonsAddStatus&&selectedRowKeys.length!=0"
+      >
+        <RepairOrderFaultAnalysisList :mainId="repairOrderFaultAnalysisMainId" />
+      </a-tab-pane>
+    </a-tabs>
+    <repairOrder-modal
+      ref="modalForm"
+      @ok="modalFormOk"
+      :isSelfCreate="isSelfCreate"
+    ></repairOrder-modal>
+    <repair-order-assign-task
+      ref="RepairOrderAssignModal"
+      @ok="modalFormOk"
+    >
+    </repair-order-assign-task>
+    <repair-order-excute-drawer
+      ref="repairOrderExcuteDrawer"
+      @ok="modalFormOk"
+      :repairOrderId="repairOrderFaultAnalysisMainId"
+      :repairOrder="excuteRepairOrder"
+    >
+    </repair-order-excute-drawer>
+    <fault-report-repair
+      ref="FaultReportRepair"
+      @ok="modalFormOk"
+    ></fault-report-repair>
+  </a-card>
+</template>
+<script>
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import RepairOrderModal from '@/views/eam/modules/repairorder/RepairOrderModal'
+import { getAction } from '@/api/manage'
+import JEllipsis from '@/components/jeecg/JEllipsis'
+import RepairOrderDetailList from '@/views/eam/RepairOrderDetailList'
+import RepairOrderRiskPreventionList from '@/views/eam/RepairOrderRiskPreventionList'
+import RepairOrderFaultAnalysisList from '@/views/eam/RepairOrderFaultAnalysisList'
+import RepairOrderPlanMaterialList from '@/views/eam/RepairOrderPlanMaterialList'
+import RepairOrderActualMaterialList from '@/views/eam/RepairOrderActualMaterialList'
+import RepairOrderActualWorkHoursList from '@/views/eam/RepairOrderActualWorkHoursList'
+import EquipmentDocumentList from '@/views/eam/RepairOrderEquipmentDocumentList'
+import '@/assets/less/TableExpand.less'
+import { putAction } from '@/api/manage'
+import RepairOrderAssignTask from '@/views/eam/modules/repairorder/RepairOrderAssignTask'
+import RepairOrderExcuteDrawer from '@/views/eam/modules/repairorder/repairOrderExcuteDrawer'
+import FaultDescriptionList from '@/views/eam/FaultDescriptionList'
+import FaultReportRepair from '@/views/eam/modules/repairorder/moudles/select/FaultReportRepair.vue'
+import store from '@/store'
+import dayjs from 'dayjs'
+import moment from 'moment'
+export default {
+  name: "RepairOrderList",
+  mixins: [JeecgListMixin],
+  components: {
+    JEllipsis,
+    RepairOrderDetailList,
+    RepairOrderRiskPreventionList,
+    RepairOrderFaultAnalysisList,
+    RepairOrderPlanMaterialList,
+    RepairOrderActualMaterialList,
+    RepairOrderActualWorkHoursList,
+    EquipmentDocumentList,
+    RepairOrderModal,
+    RepairOrderAssignTask,
+    RepairOrderExcuteDrawer,
+    FaultDescriptionList,
+    FaultReportRepair,
+    store
+  },
+  props:{
+    mainId:{
+      type:String,
+      default:'',
+      required:false
+    }
+  },
+  watch:{
+    mainId:{
+      immediate: true,
+      handler(val) {
+        if(!this.mainId){
+          this.queryParam['equipmentId'] = 'NAN'
+          this.loadData(1);
+        }else{
+          this.queryParam['equipmentId'] = val
+          this.queryParam['statusEnums'] = '4'
+          this.loadData(1);
+        }
+      }
+    },
+    selectionRows() {
+      this.$bus.$emit('repairOrderSelectionRows', this.selectionRows);
+    },
+  },
+  mounted() {
+    let intervalId = setInterval(() => {
+      this.loadData();
+    }, 600 * 1000); // 1000姣锛屽嵆1绉�
+  },
+  data() {
+    return {
+      description: '缁翠慨宸ュ崟绠$悊椤甸潰',
+      // 琛ㄥご
+      faultTime: [],
+      createTimes: [],
+      columns: [
+        {
+          title: '#',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 60,
+          align: "center",
+          customRender: function (t, r, index) {
+            return parseInt(index) + 1;
+          }
+        },
+        {
+          title: '鍏抽敭璁惧',
+          align: "center",
+          dataIndex: 'specificEquipment',
+          width: 90,
+          scopedSlots: { customRender: 'specificEquipment' }
+        },
+        {
+          title: 'ABC鏍囪瘑',
+          align: "center",
+          dataIndex: 'equipmentImportanceId',
+        },
+        {
+          title: '鐘舵��',
+          align: "center",
+          dataIndex: 'status_dictText'
+        },
+        {
+          title: '缁翠慨鐘舵��',
+          align: "center",
+          dataIndex: 'repairOrderUda1_dictText',
+          customRender: function (t, r, index) {
+            return t === null || r.repairOrderUda1 === null ? '/' : t;
+          }
+        },
+        {
+          title: '鍗曟嵁鍙�',
+          align: "center",
+          dataIndex: 'num',
+          scopedSlots: { customRender: 'num' }
+        },
+        // {
+        //   title: '涓氬姟绫诲瀷',
+        //   align: "center",
+        //   dataIndex: 'businessType_dictText'
+        // },
+        {
+          title: '缁熶竴缂栫爜',
+          align: "center",
+          dataIndex: 'equipmentNum',
+          scopedSlots: { customRender: 'equipmentNum' }
+        },
+        {
+          title: '璁惧鍚嶇О',
+          align: "center",
+          dataIndex: 'equipmentName'
+        },
+        {
+          title: '璁惧鍨嬪彿',
+          align: "center",
+          dataIndex: 'equipmentModel'
+        },
+        {
+          title: '浣跨敤閮ㄩ棬',
+          align: "center",
+          dataIndex: 'departId_dictText'
+        },
+        // {
+        //   title: '绱ф�ョ▼搴�',
+        //   align: "center",
+        //   dataIndex: 'urgency_dictText'
+        // },
+        // {
+        //   title: '缁翠繚鏂瑰紡',
+        //   align: "center",
+        //   dataIndex: 'maintenanceMethod_dictText'
+        // },
+        // {
+        //   title: '澶栧鍗曚綅',
+        //   align: "center",
+        //   dataIndex: 'outsourcingUnitName'
+        // },
+        {
+          title: '缁翠慨鐝粍',
+          align: "center",
+          dataIndex: 'teamId_dictText',
+          scopedSlots: {
+            customRender: 'jell'
+          }
+        },
+        {
+          title: '璐d换浜�',
+          align: "center",
+          dataIndex: 'responsibilityId_dictText'
+        },
+        // {
+        //   title: '娲惧伐鏂瑰紡',
+        //   align: "center",
+        //   dataIndex: 'dispatchMethod_dictText'
+        // },
+        // {
+        //   title: '鐗圭璁惧',
+        //   align: "center",
+        //   dataIndex: 'specificEquipment_dictText'
+        // },
+        {
+          title: '鏁呴殰鏃堕棿',
+          align: "center",
+          dataIndex: 'faultTime'
+        },
+        // {
+        //   title: '鎶ヤ慨浜�',
+        //   align: "center",
+        //   dataIndex: 'errUda2',
+        // },
+        {
+          title: '鏁呴殰鎻忚堪',
+          align: "center",
+          dataIndex: 'faultDescription',
+          scopedSlots: {
+            customRender: 'jell'
+          }
+        },
+        {
+          title: '鏁呴殰鍘熷洜',
+          align: "center",
+          dataIndex: 'faultCauseCount',
+          scopedSlots: { customRender: 'faultCauseCount' }
+        },
+        // {
+        //   title: '鏁呴殰鐜拌薄',
+        //   align: "center",
+        //   dataIndex: 'faultPhenomenon'
+        // },
+        // {
+        //   title: '鏁呴殰鎺掗櫎',
+        //   align: "center",
+        //   dataIndex: 'faultRemove'
+        // },
+        // {
+        //   title: '棰勯槻鎺柦',
+        //   align: "center",
+        //   dataIndex: 'preventiveMeasure'
+        // },
+        // {
+        //   title: '鏁呴殰鐓х墖',
+        //   align: "center",
+        //   dataIndex: 'photo',
+        //   scopedSlots: { customRender: 'imgSlot' }
+        // },
+        // {
+        //   title: '鏄惁鍋滄満',
+        //   align: "center",
+        //   dataIndex: 'isStop_dictText'
+        // },
+        // {
+        //   title: '宸ユ椂瀹氶',
+        //   align: "center",
+        //   dataIndex: 'workingHourQuota'
+        // },
+        // {
+        //   title: '瀹為檯宸ユ椂',
+        //   align: "center",
+        //   dataIndex: 'actualHour'
+        // },
+        // {
+        //   title: '璁″垝寮�濮嬫椂闂�',
+        //   align: "center",
+        //   dataIndex: 'planStartTime'
+        // },
+        // {
+        //   title: '璁″垝缁撴潫鏃堕棿',
+        //   align: "center",
+        //   dataIndex: 'planEndTime'
+        // },
+        // {
+        //   title: '瀹為檯寮�濮嬫椂闂�',
+        //   align: "center",
+        //   dataIndex: 'actualStartTime'
+        // },
+        // {
+        //   title: '瀹為檯缁撴潫鏃堕棿',
+        //   align: "center",
+        //   dataIndex: 'actualEndTime'
+        // },
+        {
+          title: '鍒涘缓浜�',
+          align: "center",
+          dataIndex: 'createBy'
+        },
+        {
+          title: '鍒涘缓鏃堕棿',
+          align: "center",
+          dataIndex: 'createTime'
+        },
+        {
+          title: '鎿嶄綔',
+          dataIndex: 'action',
+          align: "center",
+          fixed: "right",
+          width: 130,
+          scopedSlots: { customRender: 'action' },
+        }
+
+      ],
+      url: {
+        list: "/eam/repairOrder/list",
+        delete: "/eam/repairOrder/delete",
+        deleteBatch: "/eam/repairOrder/deleteBatch",
+        exportXlsUrl: "/eam/repairOrder/exportXls",
+        importExcelUrl: "eam/repairOrder/importExcel",
+        orderDistribute: "eam/repairOrder/distribute",
+        orderWithdraw: "eam/repairOrder/withdraw",
+        orderDispatch: "eam/repairOrder/dispatch",
+        orderReceive: "eam/repairOrder/receive",
+        orderStart: "eam/repairOrder/start"
+      },
+      /* 鍒嗛〉鍙傛暟 */
+      ipagination: {
+        current: 1,
+        pageSize: 20,
+        pageSizeOptions: ['5', '10', '20', '50'],
+        showTotal: (total, range) => {
+          return range[0] + "-" + range[1] + " 鍏�" + total + "鏉�"
+        },
+        showQuickJumper: true,
+        showSizeChanger: true,
+        total: 0
+      },
+      selectedMainId: '',
+      // superFieldList: [],
+      repairOrderDetailMainId: '',
+      repairOrderRiskPreventionMainId: '',
+      repairOrderFaultAnalysisMainId: '',
+      repairOrderPlanMaterialMainId: '',
+      repairOrderActualMaterialMainId: '',
+      repairOrderActualWorkHoursMainId: '',
+      equipmentDocumentMainId: '',
+      isSelfCreate: '1',
+      excuteRepairOrder: {},
+      assignTaskList: [],
+      sonsAddStatus: false,
+    }
+  },
+  computed: {
+    importExcelUrl: function () {
+      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+    },
+    rowSelection() {
+      return {
+        type: 'checkbox',
+        onChange: (selectedRowKeys, selectedRows) => {
+          this.onSelectChange(selectedRowKeys, selectedRows);
+        },
+        getCheckboxProps: record => ({
+          props: {
+          },
+        }),
+        selectedRowKeys: this.selectedRowKeys,
+      };
+    },
+  },
+  methods: {
+    timeChange() {
+      this.queryParam.faultStartTime = moment(this.faultTime[0]).format("YYYY-MM-DD HH:mm:ss")
+      this.queryParam.faultEndTime = moment(this.faultTime[1]).format("YYYY-MM-DD HH:mm:ss")
+    },
+    timeChangeCreate() {
+      this.queryParam.createStartTime = moment(this.createTimes[0]).format("YYYY-MM-DD HH:mm:ss")
+      this.queryParam.createEndTime = moment(this.createTimes[1]).format("YYYY-MM-DD HH:mm:ss")
+    },
+    clickThenSelect(record) {
+      return {
+        on: {
+          click: () => {
+            this.onSelectChange(record.id.split(","), [record]);
+          }
+        }
+      }
+    },
+    onClearSelected() {
+      this.selectedRowKeys = [];
+      this.selectionRows = [];
+      this.selectedMainId = ''
+      this.repairOrderDetailMainId = ''
+      this.repairOrderRiskPreventionMainId = ''
+      this.repairOrderFaultAnalysisMainId = ''
+      this.repairOrderPlanMaterialMainId = ''
+      this.repairOrderActualMaterialMainId = ''
+      this.repairOrderActualWorkHoursMainId = ''
+      this.equipmentDocumentMainId = ''
+    },
+    onSelectChange(selectedRowKeys, selectionRows) {
+      if (selectedRowKeys.length == 1) {
+        this.selectedMainId = selectedRowKeys[0]
+        this.repairOrderDetailMainId = selectionRows[0]['id']
+        this.repairOrderRiskPreventionMainId = selectionRows[0]['id']
+        this.repairOrderFaultAnalysisMainId = selectionRows[0]['id']
+        this.repairOrderPlanMaterialMainId = selectionRows[0]['id']
+        this.repairOrderActualMaterialMainId = selectionRows[0]['id']
+        this.repairOrderActualWorkHoursMainId = selectionRows[0]['id']
+        this.equipmentDocumentMainId = selectionRows[0]['id']
+        this.sonsAddStatus = (selectionRows[0]['status'] == '0')
+        this.$refs.FaultDescriptionList.faultId = selectedRowKeys[0]
+      } else {
+        this.$refs.FaultDescriptionList.faultId = '-1'
+        this.selectedMainId = ''
+        this.repairOrderDetailMainId = ''
+        this.repairOrderRiskPreventionMainId = ''
+        this.repairOrderFaultAnalysisMainId = ''
+        this.repairOrderPlanMaterialMainId = ''
+        this.repairOrderActualMaterialMainId = ''
+        this.repairOrderActualWorkHoursMainId = ''
+        this.equipmentDocumentMainId = ''
+      }
+      this.selectedRowKeys = selectedRowKeys;
+      this.selectionRows = selectionRows;
+      this.assignTaskList = [];
+      for (var i = 0; i < selectionRows.length; i++) {
+        if (selectionRows[i].status == '1') {
+          this.assignTaskList.push(selectionRows[i]);
+        }
+      }
+    },
+    loadData(arg) {
+      if (!this.url.list) {
+        this.$message.error("璇疯缃畊rl.list灞炴��!")
+        return
+      }
+      //鍔犺浇鏁版嵁 鑻ヤ紶鍏ュ弬鏁�1鍒欏姞杞界涓�椤电殑鍐呭
+      if (arg === 1) {
+        this.ipagination.current = 1;
+      }
+      this.onClearSelected()
+      this.queryParam.repairOrderType = 0;
+      this.queryParam.userId = store.getters.userInfo.id
+      var params = this.getQueryParams();//鏌ヨ鏉′欢
+      this.loading = true;
+      getAction(this.url.list, params).then((res) => {
+        if (res.success) {
+          this.dataSource = res.result.records;
+          this.ipagination.total = res.result.total;
+        }
+        if (res.code === 510) {
+          this.$message.warning(res.message)
+        }
+        this.loading = false;
+        this.$refs.FaultDescriptionList.faultId = '-1'
+        this.excuteRepairOrder = {}
+      })
+    },
+
+    handleAddPre(isSelfCreate) {
+      this.isSelfCreate = isSelfCreate;
+      this.handleAdd();
+    },
+    handleEditPre(record) {
+      console.log(record);
+      if (record.reportRepairId != null && record.reportRepairId != undefined && record.reportRepairId != '') {
+        this.isSelfCreate = '2';
+      }
+      else if (record.projectMaintenanceOrderId != null && record.projectMaintenanceOrderId != undefined && record.projectMaintenanceOrderId != '') {
+        this.isSelfCreate = '3';
+      } else {
+        this.isSelfCreate = '1';
+      }
+      this.handleEdit(record);
+    },
+    //宸ュ崟娴佺▼鎿嶄綔
+    handleDistribute(record) {
+      putAction(this.url.orderDistribute, record).then(res => {
+        if (res.result) {
+          this.$message.success('涓嬪彂鎴愬姛');
+          this.loadData();
+        } else {
+          this.$message.error('涓嬪彂鍑虹幇寮傚父')
+        }
+      })
+
+    },
+    handleDispatch() {
+      if (this.assignTaskList.length == 0) {
+        this.$message.warn('鎵�閫夊伐鍗曟棤闇�娲惧伐');
+      } else {
+        this.$refs.RepairOrderAssignModal.visible = true
+        this.$refs.RepairOrderAssignModal.title = '缁翠慨宸ュ崟娲惧伐'
+        this.$refs.RepairOrderAssignModal.selectionRows
+        this.$refs.RepairOrderAssignModal.handleShow()
+      }
+    },
+    //鏀规淳
+    handleAssignOrder: function (record) {
+      this.$refs.RepairOrderAssignModal.edit(record)
+      this.$refs.RepairOrderAssignModal.title = '宸ュ崟鏀规淳'
+      this.$refs.RepairOrderAssignModal.disableSubmit = false
+    },
+    handleWithdraw(record) {
+      putAction(this.url.orderWithdraw, record).then(res => {
+        if (res.result) {
+          this.$message.success('鎾ら攢鎴愬姛');
+          this.loadData();
+        } else {
+          this.$message.error('鎾ら攢鍑虹幇寮傚父')
+        }
+      })
+    },
+    handleReceive(record) {
+      putAction(this.url.orderReceive, record).then(res => {
+        if (res.result) {
+          this.$message.success('棰嗗彇鎴愬姛');
+          this.loadData();
+        } else {
+          this.$message.error('棰嗗彇鍑虹幇寮傚父')
+        }
+      })
+    },
+    handleOrderExe(record) {
+      this.excuteRepairOrder = record;
+      this.$refs.repairOrderExcuteDrawer.visible = true
+      this.$refs.repairOrderExcuteDrawer.title = '缁翠慨宸ュ崟鎵ц'
+    },
+
+    searchQuery() {
+      this.loadData(1)
+      this.selectedRowKeys = []
+      this.selectionRows = []
+      this.onClearSelected()
+      this.$refs.FaultDescriptionList.faultId = '-1'
+    },
+
+    searchReset() {
+      this.queryParam = {}
+      this.loadData(1)
+      this.onClearSelected()
+      this.$refs.FaultDescriptionList.faultId = '-1'
+      this.faultTime = []
+      this.createTimes = []
+    },
+    getReports() {
+      this.$refs.FaultReportRepair.title = '鏁呴殰鎶ヤ慨鍗�';
+      this.$refs.FaultReportRepair.loadData();
+      this.$refs.FaultReportRepair.visible = true;
+    },
+    tableRowClass(record, index) {
+      if ("2" === record.status) {
+        if (record.specificEquipment === '0' && dayjs(record.faultTime).add(12, 'hour') < dayjs()) {
+          return 'error'
+        } else if (dayjs(record.faultTime).add(7, 'day') < dayjs()) {
+          return 'primary'
+        }
+      }
+    },
+
+  },
+}
+</script>
+<style lang="less" scoped>
+@import '~@assets/less/common.less';
+
+/deep/.error {
+  color: red;
+  font-weight: bold;
+}
+
+/deep/.primary {
+  color: rgb(255, 0, 251);
+  font-weight: bold;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/eam/modules/inspectionCycle/InspectionCycleForm.vue b/src/views/eam/modules/inspectionCycle/InspectionCycleForm.vue
index fbfa3a4..1c4d6cc 100644
--- a/src/views/eam/modules/inspectionCycle/InspectionCycleForm.vue
+++ b/src/views/eam/modules/inspectionCycle/InspectionCycleForm.vue
@@ -17,7 +17,7 @@
             >
               <a-input
                 v-model="model.code"
-                placeholder="璇疯緭鍏ュ懆鏈熺紪鐮�"
+                placeholder="鑷姩鐢熸垚"
                 :disabled="true"
               ></a-input>
               <!-- :disabled="model.isRevise" -->
diff --git a/src/views/eam/modules/maintenanceCycle/MaintenanceCycleForm.vue b/src/views/eam/modules/maintenanceCycle/MaintenanceCycleForm.vue
index ca8060e..60a5860 100644
--- a/src/views/eam/modules/maintenanceCycle/MaintenanceCycleForm.vue
+++ b/src/views/eam/modules/maintenanceCycle/MaintenanceCycleForm.vue
@@ -17,7 +17,8 @@
             >
               <a-input
                 v-model="model.code"
-                placeholder="璇疯緭鍏ュ懆鏈熺紪鐮�"
+                placeholder="鑷姩鐢熸垚"
+                :disabled="true"
               ></a-input>
             </a-form-model-item>
           </a-col>
@@ -89,14 +90,14 @@
           </a-col>
           <a-col :span="24/2">
             <a-form-model-item
-              label="璁″垝鏃堕棿"
+              label="鏈夋晥鏃堕棿"
               :labelCol="labelCol"
               :wrapperCol="wrapperCol"
               prop="effectiveTime"
             >
               <a-input-number
                 v-model="model.effectiveTime"
-                placeholder="璇疯緭鍏ヨ鍒掓椂闂�"
+                placeholder="璇疯緭鍏ユ湁鏁堟椂闂�"
                 :min=0
                 style="width: 100%"
               />
@@ -280,9 +281,9 @@
       },
       confirmLoading: false,
       validatorRules: {
-        code: [
+        /*code: [
           { required: true, message: '璇疯緭鍏ュ懆鏈熺紪鐮�!' },
-        ],
+        ],*/
         cycle: [
           { required: true, message: '璇疯緭鍏ュ懆鏈�!' },
         ],
diff --git a/src/views/eam/modules/projectMaintenanceOrder/ProjectMaintenanceOrderForm.vue b/src/views/eam/modules/projectMaintenanceOrder/ProjectMaintenanceOrderForm.vue
index 10c1d18..32f21c1 100644
--- a/src/views/eam/modules/projectMaintenanceOrder/ProjectMaintenanceOrderForm.vue
+++ b/src/views/eam/modules/projectMaintenanceOrder/ProjectMaintenanceOrderForm.vue
@@ -18,7 +18,8 @@
             >
               <a-input
                 v-model='model.num'
-                placeholder='璇疯緭鍏ヨ鍒掑崟缂栧彿'
+                placeholder='鑷姩鐢熸垚'
+                :disabled="true"
               ></a-input>
             </a-form-model-item>
           </a-col>
@@ -247,10 +248,10 @@
       addDefaultRowNum: 0,
       model: {},
       validatorRules: {
-        num: [
-          { required: true, message: '璇疯緭鍏ヨ鍒掔紪鍙�!' },
-          { validator: (rule, value, callback) => validateDuplicateValue('mom_eam_project_maintenance_order', 'num', value, this.model.id, callback) }
-        ],
+        // num: [
+        //   { required: true, message: '璇疯緭鍏ヨ鍒掔紪鍙�!' },
+        //   { validator: (rule, value, callback) => validateDuplicateValue('mom_eam_project_maintenance_order', 'num', value, this.model.id, callback) }
+        // ],
         remark: [
           { required: false, message: '璇疯緭鍏ュ娉�!' }
         ]
@@ -313,15 +314,6 @@
             width: '140px',
             align: "center",
             fixed: 'left'
-          },
-          {
-            title: '璧勪骇缂栫爜',
-            key: 'assetNumber',
-            type: JVXETypes.normal,
-            width: '140px',
-            align: "center",
-            fixed: 'left',
-            defaultValue: ''
           },
           {
             title: '澶栧鍗曚綅',
@@ -684,6 +676,7 @@
     /** 璋冪敤瀹宔dit()鏂规硶涔嬪悗浼氳嚜鍔ㄨ皟鐢ㄦ鏂规硶 */
     editAfter() {
       this.$nextTick(() => {
+        this.model.file = this.model.annex;
       })
       // 鍔犺浇瀛愯〃鏁版嵁
       if (this.model.id) {
diff --git a/src/views/eam/modules/repairorder/moudles/select/ProjectMaintenanceOrder.vue b/src/views/eam/modules/repairorder/moudles/select/ProjectMaintenanceOrder.vue
index d588c20..dd8d4e4 100644
--- a/src/views/eam/modules/repairorder/moudles/select/ProjectMaintenanceOrder.vue
+++ b/src/views/eam/modules/repairorder/moudles/select/ProjectMaintenanceOrder.vue
@@ -50,6 +50,7 @@
                   icon="search"
                 >鏌ヨ</a-button>
                 <a-button
+                  type="info"
                   @click="searchReset"
                   icon="reload"
                   style="margin-left:8px;"
diff --git a/src/views/spare/SparePartCancellingStocksList.vue b/src/views/spare/SparePartCancellingStocksList.vue
index 7491ca9..ab87275 100644
--- a/src/views/spare/SparePartCancellingStocksList.vue
+++ b/src/views/spare/SparePartCancellingStocksList.vue
@@ -1,6 +1,6 @@
 <template>
   <a-card
-    title='澶囦欢閫�搴�'
+    title=''
     :bordered='false'
   >
     <div class='table-page-search-wrapper'>
diff --git a/src/views/spare/SparePartOutboundList.vue b/src/views/spare/SparePartOutboundList.vue
index cea17dc..18faf45 100644
--- a/src/views/spare/SparePartOutboundList.vue
+++ b/src/views/spare/SparePartOutboundList.vue
@@ -1,6 +1,6 @@
 <template>
   <a-card
-    title="澶囦欢鍑哄簱"
+    title=""
     :bordered='false'
   >
     <div class='table-page-search-wrapper'>
diff --git a/src/views/spare/SparePartPurchaseStorageList.vue b/src/views/spare/SparePartPurchaseStorageList.vue
index 5e3d0ad..6155647 100644
--- a/src/views/spare/SparePartPurchaseStorageList.vue
+++ b/src/views/spare/SparePartPurchaseStorageList.vue
@@ -1,6 +1,6 @@
 <template>
   <a-card
-    title='澶囦欢鍏ュ簱'
+    title=''
     :bordered='false'
   >
     <div class='table-page-search-wrapper'>
diff --git a/src/views/spare/SparePartReceiveList.vue b/src/views/spare/SparePartReceiveList.vue
index efbc3ee..8232939 100644
--- a/src/views/spare/SparePartReceiveList.vue
+++ b/src/views/spare/SparePartReceiveList.vue
@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered='false'  title='澶囦欢棰嗙敤闇�姹�'>
+  <a-card :bordered='false'  title=''>
     <div class='table-page-search-wrapper'>
       <a-form layout='inline' @keyup.enter.native='searchQuery'>
         <a-row :gutter='24'>
diff --git a/src/views/spare/SparePartScrapList.vue b/src/views/spare/SparePartScrapList.vue
index 2c73121..4613af8 100644
--- a/src/views/spare/SparePartScrapList.vue
+++ b/src/views/spare/SparePartScrapList.vue
@@ -1,5 +1,5 @@
 <template>
-  <a-card :bordered='false' title='澶囦欢鎶ュ簾'>
+  <a-card :bordered='false' title=''>
     <!-- 鏌ヨ鍖哄煙 -->
     <!--    <div class="table-page-search-wrapper">
           <a-form layout="inline" @keyup.enter.native="searchQuery">
diff --git a/src/views/spare/SparePartScrapRequirementList.vue b/src/views/spare/SparePartScrapRequirementList.vue
index e526f82..8b32ac0 100644
--- a/src/views/spare/SparePartScrapRequirementList.vue
+++ b/src/views/spare/SparePartScrapRequirementList.vue
@@ -1,5 +1,5 @@
 <template>
-  <a-card title='澶囦欢闇�姹傜敵璇�' :bordered='false'>
+  <a-card title='' :bordered='false'>
     <div class='table-page-search-wrapper'>
       <a-form layout='inline' @keyup.enter.native='searchQuery'>
         <a-row :gutter='24'>
diff --git a/src/views/spare/SpartPartRequirement.vue b/src/views/spare/SpartPartRequirement.vue
index 34a85d5..e3d6988 100644
--- a/src/views/spare/SpartPartRequirement.vue
+++ b/src/views/spare/SpartPartRequirement.vue
@@ -1,6 +1,6 @@
 <template>
   <a-card
-    title="澶囦欢璇疯喘"
+    title=""
     :bordered='false'
   >
     <div class='table-page-search-wrapper'>

--
Gitblit v1.9.3