From d9eb3f8449df7791df436f3d69f91814ba6ff79b Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 06 三月 2025 09:47:03 +0800
Subject: [PATCH] art: 设备台账-分类设备 页面修改,直接引用 所有设备页面,统一编码和修改

---
 src/views/eam/EquipmentListOfFilesCarousel.vue   | 1154 ------
 src/views/eam/EquipmentListOfPressureVessel.vue  | 1150 ------
 src/views/eam/EquipmentListOfRide.vue            | 1155 ------
 src/views/eam/EquipmentListOfTester.vue          | 1154 ------
 src/views/eam/EquipmentListOfWeldingMachine.vue  | 1150 ------
 src/views/eam/EquipmentListOfTruck.vue           | 1149 ------
 src/views/eam/EquipmentListOfMetrological.vue    | 1154 ------
 src/views/eam/EquipmentListOfEnvProEquipment.vue | 1161 ------
 src/views/eam/EquipmentListOfCrane.vue           | 1140 ------
 9 files changed, 36 insertions(+), 10,331 deletions(-)

diff --git a/src/views/eam/EquipmentListOfCrane.vue b/src/views/eam/EquipmentListOfCrane.vue
index d5e765b..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 d41704c..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 2b9b3bb..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 1a92f73..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 2123df3..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/EquipmentListOfRide.vue b/src/views/eam/EquipmentListOfRide.vue
index 4c31aee..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 a1fda8d..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 65e3fa6..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 459e47f..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>

--
Gitblit v1.9.3