diff --git a/src/api/system/equipmentNew.js b/src/api/system/equipmentNew.js
index e1a5f5af..c5f83d58 100644
--- a/src/api/system/equipmentNew.js
+++ b/src/api/system/equipmentNew.js
@@ -10,6 +10,46 @@ export function listUser(query) {
   })
 }
 
+export function selectResourceList(query) {
+  return request({
+    url: '/material-mall/deptConfig/selectResourceList',
+    method: 'get',
+    params: query
+  })
+}
+
+export function selectInventoryList(query) {
+  return request({
+    url: '/material-mall/deptConfig/selectInventoryList',
+    method: 'get',
+    params: query
+  })
+}
+
+export function insertResource(data) {
+  return request({
+    url: '/material-mall/deptConfig/insertResource',
+    method: 'post',
+    data: data
+  })
+}
+
+export function getCategoryList(query) {
+  return request({
+    url: '/material-mall/deptConfig/getCategoryList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 删除用户
+export function deleteResource(userId) {
+  return request({
+    url: '/material-mall/deptConfig/deleteResourceById/' + userId,
+    method: 'post'
+  })
+}
+
 export function addUser(data) {
   return request({
     url: '/material-mall/deptConfig/add',
@@ -26,7 +66,6 @@ export function selectConfigList(data) {
   })
 }
 
-
 // 查询用户详细
 export function getUser(userId) {
   return request({
@@ -149,7 +188,7 @@ export function updateEquipmentConfig(data) {
 // 查询部门下拉树结构
 export function deptTreeSelect() {
   return request({
-     url: '/material-mall/deptConfig/deptTree',
+    url: '/material-mall/deptConfig/deptTree',
     method: 'get'
   })
 }
@@ -178,7 +217,7 @@ export function confirmPassword(password) {
   return request({
     url: '/system/user/confirmPassword',
     method: 'post',
-    data:data
+    data: data
   })
 }
 
diff --git a/src/views/system/equipment/correlationTable.vue b/src/views/system/equipment/correlationTable.vue
new file mode 100644
index 00000000..5189044f
--- /dev/null
+++ b/src/views/system/equipment/correlationTable.vue
@@ -0,0 +1,292 @@
+<template>
+  <div class="tab-table-wrapper">
+    <!-- 表格头部：标题自定义 + 新增按钮（显隐可控） -->
+    <div class="table-header">
+      <!-- 标题：父组件传递，默认空 -->
+      <h3>{{ tableTitle }}</h3>
+      <!-- 新增按钮：通过showAddBtn控制显隐 -->
+      <div>
+        <el-button
+          v-if="showAddBtn"
+          size="small"
+          type="primary"
+          icon="el-icon-plus"
+          @click="handleAddClick"
+        >
+          新增
+        </el-button>
+        <el-button
+          v-if="showOwnBtn"
+          size="small"
+          type="primary"
+          icon="el-icon-plus"
+          @click="handleOwnClick"
+        >
+          自用新增
+        </el-button>
+        <el-button
+          v-if="showSharingBtn"
+          size="small"
+          type="primary"
+          icon="el-icon-plus"
+          @click="handleSharingClick"
+        >
+          共享新增
+        </el-button>
+        <el-button
+          v-if="showRentalBtn"
+          size="small"
+          type="primary"
+          icon="el-icon-plus"
+          @click="handleRentalClick"
+        >
+          外租新增
+        </el-button>
+      </div>
+
+    </div>
+
+    <!-- 表格滚动容器：独立滚动，表头固定 -->
+    <div class="table-content" v-loading="loading">
+      <el-table
+        class="project-table"
+        :data="tableData"
+        highlight-current-row
+        border
+        stripe
+        :empty-text="emptyText"
+      >
+        <el-table-column
+          type="index"
+          width="55"
+          label="序号"
+          align="center"
+          :index="calcTableIndex"
+        />
+        <!-- 改造后完整表格列代码（兼容Vue2/Vue3） -->
+        <el-table-column
+          v-for="(column, index) in tableColumns"
+          :key="index"
+          :label="column.label"
+          :prop="column.prop"
+          :min-width="column.minWidth"
+          align="center"
+          show-overflow-tooltip
+        >
+          <!-- 作用域插槽：获取当前行数据scope.row，当前列配置column -->
+          <template slot-scope="scope"> <!-- Vue3可写v-slot="scope"，效果一致 -->
+            <!-- 判断：当前列有dictMap映射 → 渲染映射文字，无则渲染原始值 -->
+            <span v-if="column.dictMap">
+      <!-- 若字段值可能为null/undefined，添加兜底显示 -->
+      {{ column.dictMap[scope.row[column.prop]] || '未知' }}
+    </span>
+            <span v-else>
+      {{ scope.row[column.prop] || '-' }} <!-- 原始值兜底：空值显示- -->
+    </span>
+          </template>
+        </el-table-column>
+        <!-- 操作列：通过showActionCol控制显隐 -->
+        <el-table-column
+          v-if="showActionCol"
+          label="操作"
+          align="center"
+          width="100"
+        >
+          <template slot-scope="scope">
+            <el-button type="text" text-color="danger" @click="handleDeleteClick(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <!-- 分页组件：无数据时隐藏 -->
+    <div class="pagination-wrapper" v-if="total > 0">
+      <pagination
+        :total="total"
+        :page.sync="pageNum"
+        :limit.sync="pageSize"
+        @pagination="handlePageChange"
+        background
+        layout="total, sizes, prev, pager, next"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'EquipmentTable',
+  // 父组件传递的属性：新增标题、新增按钮显隐、操作列显隐配置，均添加默认值
+  props: {
+    // 新增：表格标题（自定义）
+    tableTitle: {
+      type: String,
+      default: ''
+    },
+    // 新增：是否显示新增按钮（true显示/false隐藏）
+    showAddBtn: {
+      type: Boolean,
+      default: true
+    },
+    showOwnBtn: {
+      type: Boolean,
+      default: true
+    },
+    showSharingBtn: {
+      type: Boolean,
+      default: true
+    },
+    showRentalBtn: {
+      type: Boolean,
+      default: true
+    },
+    // 新增：是否显示操作列（true显示/false隐藏）
+    showActionCol: {
+      type: Boolean,
+      default: true
+    },
+    // 原有属性：保持不变
+    tableData: {
+      type: Array,
+      required: true,
+      default: () => []
+    },
+    tableColumns: {
+      type: Array,
+      required: true,
+      default: () => []
+    },
+    loading: {
+      type: Boolean,
+      default: false
+    },
+    total: {
+      type: Number,
+      default: 0
+    },
+    pageNum: {
+      type: Number,
+      required: true,
+      default: 1
+    },
+    pageSize: {
+      type: Number,
+      required: true,
+      default: 10
+    },
+    emptyText: {
+      type: String,
+      default: '暂无数据'
+    }
+  },
+  methods: {
+    // 计算表格序号：基于父组件传递的分页参数
+    calcTableIndex(index) {
+      return (this.pageNum - 1) * this.pageSize + index + 1
+    },
+    // 触发新增事件：通知父组件打开新增弹窗
+    handleAddClick() {
+      this.$emit('add')
+    },
+    handleOwnClick() {
+      this.$emit('own')
+    },
+    handleSharingClick() {
+      this.$emit('sharing')
+    },
+    handleRentalClick() {
+      this.$emit('rental')
+    },
+    // 触发删除事件：传递当前行数据给父组件
+    handleDeleteClick(row) {
+      this.$emit('delete', row)
+    },
+    // 触发分页切换事件：传递新的分页参数给父组件
+    handlePageChange() {
+      this.$emit('pagination', {
+        pageNum: this.pageNum,
+        pageSize: this.pageSize
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+// 完全复用原有表格样式，兼容无标题/无按钮的布局
+.tab-table-wrapper {
+  display: flex;
+  flex-direction: column;
+  padding: 16px;
+  box-sizing: border-box;
+
+  .table-header {
+    display: flex;
+    align-items: center;
+    margin-bottom: 12px;
+    flex-shrink: 0;
+    justify-content: space-between;
+    // 兼容无标题时的布局，避免按钮左移
+    h3 {
+      margin: 0;
+      white-space: nowrap;
+    }
+  }
+
+  .table-content {
+    flex: 1;
+    overflow: auto;
+    -ms-overflow-style: none;
+    scrollbar-width: none;
+    position: relative;
+
+    &::-webkit-scrollbar {
+      display: none;
+    }
+  }
+
+  .pagination-wrapper {
+    margin-top: 12px;
+    text-align: right;
+    flex-shrink: 0;
+    padding-right: 4px;
+  }
+}
+
+.project-table {
+  width: 100%;
+  --el-table-row-height: 56px;
+  --el-table-header-text-color: #333;
+  --el-table-header-background-color: #fafafa;
+  --el-table-row-hover-bg-color: #f6fbfa;
+
+  :deep(.el-table__header-wrapper) {
+    position: sticky;
+    top: 0;
+    z-index: 10;
+    background-color: var(--el-table-header-background-color) !important;
+  }
+
+  :deep(.el-table__header th) {
+    border-bottom: 1px solid #ebeef5;
+    border-right: 1px solid #ebeef5;
+    white-space: nowrap;
+    font-weight: 600;
+  }
+
+  :deep(.el-table__body tr:hover > td) {
+    background-color: var(--el-table-row-hover-bg-color) !important;
+  }
+
+  :deep(.el-table__fixed-right) {
+    box-shadow: -2px 0 6px rgba(0, 0, 0, 0.02);
+  }
+}
+
+// 空数据样式
+:deep(.el-table__empty-text) {
+  color: #909399;
+  font-size: 14px;
+  padding: 20px 0;
+}
+</style>
diff --git a/src/views/system/equipment/index.vue b/src/views/system/equipment/index.vue
index 852400ef..bb56b8c7 100644
--- a/src/views/system/equipment/index.vue
+++ b/src/views/system/equipment/index.vue
@@ -1,1099 +1,1247 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="20" style="height: 100%;background-color: #EEEEEE;">
-      <!--公司数据-->
-      <el-col :span="5" :xs="24"
-              style="height: 99%;margin-top: 10px;background-color:#FFFFFF;border-radius: 8px 8px 8px 8px;"
-      >
-        <div class="head-container">
-          <el-input v-model="deptName" placeholder="请输入公司名称" clearable size="small" suffix-icon="el-icon-search"
-                    style="margin-bottom: 20px;margin-top: 20px;"
+    <el-row :gutter="20" style="height: 100%;">
+      <!-- 左侧部门树结构 -->
+      <el-col :span="5" :xs="24" class="tree-col-wrapper">
+        <div class="tree-content" v-loading="treeLoading">
+          <el-input
+            v-model="deptName"
+            placeholder="请输入公司名称"
+            clearable
+            size="small"
+            suffix-icon="el-icon-search"
+            @clear="handleDeptSearchClear"
+            class="tree-search-input"
           />
-        </div>
-        <div class="head-container">
-          <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
-                   :filter-node-method="filterNode" ref="tree" node-key="id" default-expand-all highlight-current
-                   @node-click="handleNodeClick"
+          <el-tree
+            :data="deptOptions"
+            :props="treeProps"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            ref="treeRef"
+            node-key="id"
+            default-expand-all
+            highlight-current
+            @node-click="handleNodeClick"
+            empty-text="暂无部门数据"
           />
         </div>
       </el-col>
-      <!--装备数据-->
-      <el-col :span="19" :xs="24" style="background-color: #EEEEEE;height: 100%;margin-top: 10px">
-        <el-form style="background-color: #FFFFFF;border-radius: 8px 8px 8px 8px;line-height: 40px; padding:0 10px 0 10px;"
-                 :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
-                 label-width="100px"
+
+      <!-- 右侧主内容：标签页+表格子组件 -->
+      <el-col :span="19" :xs="24" class="main-col-wrapper">
+        <el-tabs
+          v-model="activeTab"
+          @tab-click="handleTabClick"
+          class="main-tabs"
+          type="border-card"
+          v-if="deptOptions.length"
         >
-          <el-tabs v-model="activeTab" @tab-click="handleTabClick">
-            <el-tab-pane label="线路" name="0"></el-tab-pane>
-            <el-tab-pane label="变电" name="1"></el-tab-pane>
-            <el-tab-pane label="电缆" name="2"></el-tab-pane>
-          </el-tabs>
-        </el-form>
-
-        <div class="card-container content-box" style="margin-top: 1%;">
-          <div class="card-header operation-header"
-               style="padding: 10px 20px;margin-bottom: 15px;border-bottom: 0px solid #F0F0F0;justify-content:end;"
+          <el-tab-pane
+            v-for="tab in mainTabList"
+            :key="tab.name"
+            :label="tab.label"
+            :name="tab.name"
+            class="tab-pane-container"
           >
-            <el-row :gutter="10" class="mb8" style="text-align: right;">
-              <el-col :span="1.5">
-                <el-button type="primary" icon="el-icon-plus" style="background: #2CBAB2;" size="mini"
-                           @click="handleAdd"
-                >新增
-                </el-button>
-              </el-col>
-            </el-row>
-          </div>
-          <el-table
-            height="546"
-            :data="userList"
-            highlight-current-row
-            style="width: 100%"
-            v-loading="loading"
-            border stripe
-          >
-            <el-table-column
-              type="index"
-              width="55"
-              label="序号"
-              align="center"
-              :index="(index) => (queryParams.pageNum - 1) * queryParams.pageSize + index + 1"
+            <EquipmentTable
+              :table-data="tableData[tab.key].list"
+              :table-columns="mainTableColumns"
+              :loading="tableData[tab.key].loading"
+              :total="tableData[tab.key].total"
+              :page-num="tableData[tab.key].pageNum"
+              :page-size="tableData[tab.key].pageSize"
+              :empty-text="`暂无${tab.label}装备配置数据`"
+              @add="handleTableAdd"
+              @relate="handleTableRelate"
+              @edit="handleTableEdit"
+              @delete="handleTableDelete"
+              @pagination="(page) => handleTablePagination(tab.key, page)"
             />
-            <el-table-column
-              v-for="(column, index) in tableColumns"
-              show-overflow-tooltip
-              :key="index"
-              :label="column.label"
-              :prop="column.prop"
-              align="center"
-            />
-            <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="130">
-              <template slot-scope="scope">
-                <!-- 关联 -->
-                <el-button
-                  type="text"
-                  @click="handleEdit(scope.row)"
-                >
-                  关联
-                </el-button>
-
-                <!-- 编辑 -->
-                <el-button
-                  type="text"
-                  @click="handleEdit(scope.row)"
-                >
-                  编辑
-                </el-button>
-
-                <!-- 删除 -->
-                <el-button
-                  type="text"
-                  @click="handleDelete(scope.row)"
-                  style="color: #FF5129"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-
-          <pagination :total="total" :page.sync="queryParams.pageNum"
-                      :limit.sync="queryParams.pageSize" @pagination="getList"
-          />
+          </el-tab-pane>
+        </el-tabs>
+        <div class="empty-tip" v-else>
+          <i class="el-icon-info-circle"/>
+          请先在左侧选择所属公司
         </div>
-
       </el-col>
     </el-row>
 
+    <!-- 新增/编辑主弹窗 -->
+    <el-dialog
+      :title="dialogTitle"
+      :visible.sync="dialogOpen"
+      width="800px"
+      custom-class="edit-dialog"
+      @close="handleDialogClose"
+      destroy-on-close
+      lock-scroll
 
-    <!-- 添加或修改用户配置对话框 -->
-    <div class="container-box">
-      <el-dialog :title="title" :visible.sync="open" width="600px" custom-class="import-dialog" top="0px">
-        <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+    >
+      <el-form
+        ref="formRef"
+        :model="formData.mainForm"
+        :rules="formRules.mainRules"
+        label-width="160px"
+        label-position="right"
+        class="dialog-form"
 
-          <el-form-item label="项目名称" prop="typeName">
-            <el-input v-model="form.typeName" placeholder="请输入项目名称" maxlength="30"/>
-          </el-form-item>
-
-
-          <el-form-item label="类型" prop="type">
-            <el-select v-model="form.type" placeholder="请选择类型" style="width: 100%;">
-              <el-option label="山地" value="山地"></el-option>
-              <el-option label="平原" value="平原"></el-option>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="电压等级" prop="vol">
-            <el-select v-model="form.vol" placeholder="请选择电压等级" style="width: 100%;">
-              <el-option v-for="dict in dict.type.voltage_type" :key="dict.value" :label="dict.label"
-                         :value="dict.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-
-
-          <el-form-item label="配置标注台" prop="configValue">
-            <el-input-number v-model="form.configValue" :min="1" :max="1000"></el-input-number>
-          </el-form-item>
-
-
-          <el-form-item label="装备类型" prop="jijuType">
-            <el-select v-model="form.jijuType" placeholder="请选择装备类型" style="width: 100%;">
-              <el-option v-for="dict in dict.type.ma_machine_status" :key="dict.value" :label="dict.label"
-                         :value="dict.value"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-
-
-          <el-form-item label="配置说明" prop="configDescription">
-            <el-input v-model="form.configDescription" type="textarea" placeholder="请输入配置说明"></el-input>
-          </el-form-item>
-
-          <el-form-item label="配置率赋值" prop="configRateType">
-            <el-radio-group v-model="form.configRateType">
-              <el-radio :label="'none'">无分</el-radio>
-              <el-radio :label="'custom'">
-                自定义
-                <el-input-number
-                  v-if="form.configRateType === 'custom'"
-                  v-model="form.configRate"
-                  :min="1"
-                  :max="1000"
-                  size="small"
-                  style="margin-left: 10px; width: 180px"
-                />
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-
-          <el-form-item label="是否新型装备" prop="isNew">
-            <el-radio-group v-model="form.isNew">
-              <el-radio :label="'1'">是</el-radio>
-              <el-radio :label="'0'">否</el-radio>
-            </el-radio-group>
-          </el-form-item>
-
-          <el-form-item label="特殊装备配置原因">
-            <el-input v-model="form.remark" type="textarea" placeholder="请输入特殊装备配置原因" maxlength="200"
-            ></el-input>
-          </el-form-item>
-
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button @click="cancel" size="mini">取 消</el-button>
-          <el-button type="primary" @click="submitForm" size="mini" style="background: #2CBAB2;">确 定</el-button>
+      >
+        <el-form-item label="项目名称" prop="typeName">
+          <el-input v-model="formData.mainForm.typeName" placeholder="请输入项目名称" maxlength="30" show-word-limit/>
+        </el-form-item>
+        <el-form-item label="类型" prop="type">
+          <el-select v-model="formData.mainForm.type" placeholder="请选择类型" style="width: 100%;" clearable>
+            <el-option label="山地" value="山地"/>
+            <el-option label="平原" value="平原"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="电压等级" prop="vol">
+          <el-select v-model="formData.mainForm.vol" placeholder="请选择电压等级" style="width: 100%;" clearable>
+            <el-option
+              v-for="dict in lineTypeOptions"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="配置标注台" prop="configValue">
+          <el-input-number v-model="formData.mainForm.configValue" :min="1" :max="1000" style="width: 100%;"/>
+        </el-form-item>
+        <el-form-item label="装备类型" prop="jijuType">
+          <el-select v-model="formData.mainForm.jijuType" @change="handleJijuTypeChange" placeholder="请选择装备类型"
+                     style="width: 100%;" clearable
+          >
+            <el-option
+              v-for="dict in jijuTypeOptions"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="配置说明" prop="configDescription">
+          <el-input
+            v-model="formData.mainForm.configDescription"
+            type="textarea"
+            placeholder="请输入配置说明"
+            maxlength="200"
+            show-word-limit
+            rows="3"
+          />
+        </el-form-item>
+        <el-form-item label="配置率赋值" prop="configRateType">
+          <el-radio-group v-model="formData.mainForm.configRateType">
+            <el-radio :label="'none'">无分</el-radio>
+            <el-radio :label="'custom'">
+              自定义
+              <el-input-number
+                v-if="formData.mainForm.configRateType === 'custom'"
+                v-model="formData.mainForm.configRate"
+                :min="1"
+                :max="1000"
+                size="small"
+                style="margin-left: 10px; width: 180px"
+              />
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="特殊装备配置原因" prop="remark">
+          <el-input
+            v-model="formData.mainForm.remark"
+            type="textarea"
+            placeholder="请输入特殊装备配置原因"
+            maxlength="200"
+            show-word-limit
+            rows="3"
+          />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="dialogOpen = false">取消</el-button>
+          <el-button type="primary" @click="handleFormSubmit" :loading="submitLoading">
+            {{ isEdit ? '保存' : '新增' }}
+          </el-button>
         </div>
-      </el-dialog>
-    </div>
+      </template>
+    </el-dialog>
 
+    <!-- 关联弹窗：多表格联动 -->
+    <el-dialog
+      :title="correlationTitle"
+      :visible.sync="correlationOpen"
+      width="80%"
+      top="0"
+      append-to-body
+      @close="handleCorrelationClose"
+      destroy-on-close
+      lock-scroll
+    >
+      <div class="correlation-table-container">
+        <CorrelationTable
+          :table-data="tableData.fuzzy.list"
+          :table-columns="tableColumns.fuzzy"
+          :loading="tableData.fuzzy.loading"
+          :total="tableData.fuzzy.total"
+          :page-num="tableData.fuzzy.pageNum"
+          :page-size="tableData.fuzzy.pageSize"
+          empty-text="暂无匹配数据"
+          tableTitle="模糊匹配"
+          :showAddBtn="true"
+          :showOwnBtn="false"
+          :showSharingBtn="false"
+          :showRentalBtn="false"
+          :showActionCol="true"
+          @add="handleFuzzyTableAdd"
+          @delete="handleCorrelationDelete"
+          @pagination="(page) => handleCorrelationPagination('fuzzy', page)"
+        />
+        <CorrelationTable
+          :table-data="tableData.classification.list"
+          :table-columns="tableColumns.classification"
+          :loading="tableData.classification.loading"
+          :total="tableData.classification.total"
+          :page-num="tableData.classification.pageNum"
+          :page-size="tableData.classification.pageSize"
+          tableTitle="分类匹配"
+          :showAddBtn="true"
+          :showOwnBtn="false"
+          :showSharingBtn="false"
+          :showRentalBtn="false"
+          :showActionCol="true"
+          empty-text="暂无分类数据"
+          @add="handleClassificationTableAdd"
+          @delete="handleCorrelationDelete"
+          @pagination="(page) => handleCorrelationPagination('classification', page)"
+        />
+        <CorrelationTable
+          :table-data="tableData.instance.list"
+          :table-columns="tableColumns.instance"
+          :loading="tableData.instance.loading"
+          :total="tableData.instance.total"
+          :page-num="tableData.instance.pageNum"
+          :page-size="tableData.instance.pageSize"
+          empty-text="暂无实例数据"
+          tableTitle="实列匹配"
+          :showAddBtn="false"
+          :showOwnBtn="true"
+          :showSharingBtn="true"
+          :showRentalBtn="true"
+          :showActionCol="true"
+          @add="handleInstanceTableAdd"
+          @own="handleInstanceTableOwn"
+          @sharing="handleInstanceSharingAdd"
+          @rental="handleInstanceRentalAdd"
+          @delete="handleCorrelationDelete"
+          @pagination="(page) => handleCorrelationPagination('instance', page)"
+        />
+        <CorrelationTable
+          :table-data="tableData.inventory.list"
+          :table-columns="tableColumns.inventory"
+          :loading="tableData.inventory.loading"
+          :total="tableData.inventory.total"
+          :page-num="tableData.inventory.pageNum"
+          :page-size="tableData.inventory.pageSize"
+          empty-text="暂无数据"
+          tableTitle="匹配清单"
+          :showAddBtn="false"
+          :showOwnBtn="false"
+          :showSharingBtn="false"
+          :showRentalBtn="false"
+          :showActionCol="false"
+          @pagination="(page) => handleCorrelationPagination('inventory', page)"
+        />
+      </div>
+    </el-dialog>
 
+    <!-- 1. 模糊匹配独立新增弹窗（原有保留，修复后逻辑） -->
+    <el-dialog
+      :title="fuzzyTitle"
+      :visible.sync="fuzzyOpen"
+      width="40%"
+      @close="handleFuzzyClose"
+      destroy-on-close
+      lock-scroll
+    >
+      <el-form
+        ref="fuzzyFormRef"
+        :model="formData.fuzzyForm"
+        :rules="formRules.fuzzyRules"
+        label-width="110px"
+        label-position="right"
+        class="dialog-form"
+      >
+        <el-form-item label="匹配名称" prop="matchingName">
+          <el-input v-model="formData.fuzzyForm.matchingName" placeholder="请输入匹配名称" maxlength="100"
+                    show-word-limit
+          />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="fuzzyOpen = false">取消</el-button>
+          <el-button type="primary" @click="handleFuzzyConfirm" :loading="submitLoading">确定</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 2. 分类匹配独立新增弹窗（与模糊逻辑一致，新增category字段） -->
+    <el-dialog
+      :title="classificationTitle"
+      :visible.sync="classificationOpen"
+      width="40%"
+      @close="handleClassificationClose"
+      destroy-on-close
+      lock-scroll
+    >
+      <el-form
+        ref="classificationFormRef"
+        :model="formData.classificationForm"
+        :rules="formRules.classificationRules"
+        label-width="110px"
+        label-position="right"
+        class="dialog-form"
+
+      >
+        <el-form-item label="分类" prop="matchingName">
+          <el-select v-model="formData.classificationForm.matchingName" placeholder="请选择分类" style="width: 100%;"
+                     clearable filterable @change="handleCategoryChange"
+          >
+            <el-option
+              v-for="item in categoryList"
+              :key="item.uniqueKey"
+              :label="`${item.equipmentName}(${item.devType})`"
+              :value="item.typeId"
+            />
+          </el-select>
+
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="classificationOpen = false">取消</el-button>
+          <el-button type="primary" @click="handleClassificationConfirm" :loading="submitLoading">确定</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 3. 实例匹配独立新增弹窗（与分类逻辑一致，字段完全相同） -->
+    <el-dialog
+      :title="instanceTitle"
+      :visible.sync="instanceOpen"
+      width="40%"
+      @close="handleInstanceClose"
+      destroy-on-close
+      lock-scroll
+    >
+      <el-form
+        ref="instanceFormRef"
+        :model="formData.instanceForm"
+        :rules="formRules.instanceRules"
+        label-width="110px"
+        label-position="right"
+        class="dialog-form"
+      >
+        <el-form-item label="匹配名称" prop="matchingName">
+          <el-input v-model="formData.instanceForm.matchingName" placeholder="请输入匹配名称" maxlength="100"
+                    show-word-limit
+          />
+        </el-form-item>
+        <el-form-item label="类型" prop="category">
+          <el-input v-model="formData.instanceForm.category" placeholder="请输入类型" maxlength="50"
+                    show-word-limit
+          />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="instanceOpen = false">取消</el-button>
+          <el-button type="primary" @click="handleInstanceConfirm" :loading="submitLoading">确定</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script>
+// 引入表格子组件
+import EquipmentTable from './table.vue'
+import CorrelationTable from './correlationTable.vue'
+// 接口统一引入
 import {
-  listUser,
-  addUser,
-  getUser,
-  delUser,
-  updateEquipmentConfig,
-  deptTreeSelect,
-  selectConfigList
+  listUser, addUser, getUser, delUser, updateEquipmentConfig,
+  deptTreeSelect, selectResourceList, insertResource, deleteResource, getCategoryList, selectInventoryList
 } from '@/api/system/equipmentNew'
 
 export default {
   name: 'EquipmentNew',
-  dicts: ['voltage_type', 'ma_machine_status', 'sys_login_type', 'sys_user_permanent'],
+  components: { EquipmentTable, CorrelationTable },
+  dicts: ['voltage_type', 'ma_machine_status'],
   data() {
     return {
-      // 默认选中“施工装备”
-      activeTab: '0',
-      // 表头
-      tableColumns: [
-        { label: '项目名称', prop: 'typeName' },
-        { label: '类型', prop: 'type' },
-        { label: '电压等级', prop: 'vol' },
-        { label: '配置标准（台）', prop: 'configValue' },
-        { label: '装备种类', prop: 'jijuType' },
-        { label: '配置说明', prop: 'configDescription' },
-        { label: '装备配置率赋值', prop: 'configRate' },
-        { label: '特殊装备配备原因', prop: 'remark' },
-        { label: '数量', prop: 'num' }
+      // 主标签页配置：统一管理，便于扩展
+      mainTabList: [
+        { name: '0', key: 'line', label: '线路工程' },
+        { name: '1', key: 'power', label: '变电工程' },
+        { name: '2', key: 'cable', label: '电缆工程' }
       ],
-      // 遮罩层
-      loading: true,
-      // 显示搜索条件
-      showSearch: true,
-      // 总条数
-      total: 0,
-      // 装备表格数据
-      userList: null,
-      // 部门树选项
-      deptOptions: undefined,
-      // 部门名称
-      deptName: undefined,
-      // 当前选择的部门ID
-      currentDeptId: null,
-      // 当前选择的部门名称
-      currentDeptName: '',
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        deptId: '',
-        configType: '0'
-      },
-      defaultProps: {
-        children: 'children',
-        label: 'deptName'
-      },
+      lineTypeOptions: [
+        { label: '35kV', value: '35kV' }, // value可根据后端需求改为编码（如'35kV'）
+        { label: '110kV', value: '110kV' },
+        { label: '220kV', value: '220kV' },
+        { label: '500kV', value: '500kV' },
+        { label: '特高压', value: '特高压' }
+      ],
+      jijuTypeOptions: [{ label: '通用装备', value: '通用装备' }, // value可根据后端需求改为编码（如'35kV'）
+        { label: '专用设备', value: '专用设备' },
+        { label: '新型装备', value: '新型装备' }
+      ],
+      activeTab: '0', // 激活的主标签页
 
-      // 是否显示弹出层
-      open: false,
-      // 弹出层标题
-      title: '',
-      // 表单参数
-      form: {
-        id: null,
-        typeName: '',          // 项目名称
-        type: '',              // 类型
-        vol: '',               // 电压等级
-        configValue: 1,        // 配置标注台，默认1
-        jijuType: '',            // 装备类型
-        configDescription: '', // 配置说明
-        configRateType: 'none',// 配置率赋值类型，默认无分
-        configRate: 0,         // 自定义配置率
-        isNew: '0',          // 是否新型装备，默认否
-        remark: ''             // 特殊装备配置原因
-      },
-
-      // 表单校验
-      rules: {
-        // 项目名称
-        typeName: [
-          { required: true, message: '项目名称不能为空', trigger: 'blur' },
-          { min: 1, max: 30, message: '项目名称长度不能超过30个字符', trigger: 'blur' }
+      // 所有表格列配置：聚合管理，按业务分类
+      tableColumns: {
+        main: [
+          { label: '项目名称', prop: 'typeName', minWidth: 120 },
+          { label: '类型', prop: 'type', minWidth: 80 },
+          { label: '电压等级', prop: 'vol', minWidth: 100 },
+          { label: '配置标准（台）', prop: 'configValue', minWidth: 120 },
+          { label: '装备种类', prop: 'jijuType', minWidth: 120 },
+          { label: '配置说明', prop: 'configDescription', minWidth: 150 },
+          { label: '装备配置率赋值', prop: 'configRate', minWidth: 120 },
+          { label: '特殊装备配备原因', prop: 'remark', minWidth: 150 },
+          { label: '数量', prop: 'num', minWidth: 80 }
         ],
-
-        // 类型
-        type: [
-          { required: true, message: '请选择类型', trigger: 'change' }
+        fuzzy: [
+          { label: '名称', prop: 'matchingName', minWidth: 120 },
+          { label: '数量', prop: 'quantity', minWidth: 80 },
+          { label: '外租数量', prop: 'outsourced', minWidth: 100 },
+          { label: '共享数量', prop: 'shared', minWidth: 120 },
+          { label: '自有数量', prop: 'selfOwned', minWidth: 120 }
         ],
-
-        // 电压等级
-        vol: [
-          { required: true, message: '请选择电压等级', trigger: 'change' }
-        ],
-
-        // 配置标注台
-        configValue: [
-          { required: true, message: '请输入配置标注台数量', trigger: 'change' },
-          { type: 'number', min: 1, max: 1000, message: '配置标注台数量必须在1-1000之间', trigger: 'change' }
-        ],
-
-        // 装备类型
-        jijuType: [
-          { required: true, message: '请选择装备类型', trigger: 'change' }
-        ],
-
-        // 配置说明
-        configDescription: [
-          { required: true, message: '请输入配置说明', trigger: 'blur' },
-          { max: 200, message: '配置说明长度不能超过200个字符', trigger: 'blur' }
-        ],
-
-        // 配置率赋值类型
-        configRateType: [
-          { required: true, message: '请选择配置率赋值类型', trigger: 'change' }
-        ],
-
-        // 自定义配置率
-        configRate: [
+        classification: [
+          { label: '名称', prop: 'name', minWidth: 400 },
           {
-            required: true,
-            message: '请输入自定义配置率',
-            trigger: 'change',
-            validator: (rule, value, callback) => {
-              if (this.form.configRateType === 'custom') {
-                if (value === '' || value === null || isNaN(value)) {
-                  callback(new Error('自定义配置率不能为空'))
-                } else if (value < 0 || value > 1000) {
-                  callback(new Error('自定义配置率必须在0-1000之间'))
-                } else {
-                  callback()
-                }
-              } else {
-                callback()
-              }
-            }
-          }
+            label: '类型', prop: 'category', minWidth: 80,// 混合场景：先判断值，再返回文字
+            dictMap: { 0: '装备', 1: '工具' }
+          },
+          { label: '数量', prop: 'quantity', minWidth: 80 },
+          { label: '外租数量', prop: 'outsourced', minWidth: 100 },
+          { label: '共享数量', prop: 'shared', minWidth: 120 },
+          { label: '自有数量', prop: 'selfOwned', minWidth: 120 }
         ],
-
-        // 是否新型装备
-        isNew: [
-          { required: true, message: '请选择是否新型装备', trigger: 'change' }
+        instance: [
+          { label: '名称', prop: 'name', minWidth: 120 },
+          {
+            label: '类型', prop: 'category', minWidth: 120,
+            dictMap: { 0: '装备', 1: '工具' }
+          },
+          { label: '数量', prop: 'quantity', minWidth: 80 }
+        ],
+        inventory: [
+          {
+            label: '实列类型', prop: 'type', minWidth: 120,
+            dictMap: { 0: '自用', 1: '共享', 2: '外租' }
+          },
+          { label: '名称', prop: 'name', minWidth: 120 },
+          {
+            label: '类型', prop: 'category', minWidth: 80,
+            dictMap: { 0: '装备', 1: '工具' }
+          },
+          { label: '数量', prop: 'num', minWidth: 80 }
         ]
+      },
+
+      // 左侧部门树配置
+      treeLoading: false,
+      deptOptions: [],
+      categoryList: [],
+      deptName: '',
+      treeProps: { children: 'children', label: 'deptName' },
+      currentDeptId: null,
+      configId: null,
+
+      // 所有表格状态：聚合管理
+      tableData: {
+        line: { list: [], loading: false, total: 0, pageNum: 1, pageSize: 10 },
+        power: { list: [], loading: false, total: 0, pageNum: 1, pageSize: 10 },
+        cable: { list: [], loading: false, total: 0, pageNum: 1, pageSize: 10 },
+        fuzzy: { list: [], loading: false, total: 0, pageNum: 1, pageSize: 10 },
+        classification: { list: [], loading: false, total: 0, pageNum: 1, pageSize: 10 },
+        instance: { list: [], loading: false, total: 0, pageNum: 1, pageSize: 10 },
+        inventory: { list: [], loading: false, total: 0, pageNum: 1, pageSize: 10 }
+      },
+
+      // 弹窗状态：主弹窗+三个独立关联弹窗（完全独立）
+      dialogOpen: false,
+      correlationOpen: false,
+      fuzzyOpen: false,        // 模糊弹窗显隐
+      classificationOpen: false,// 分类弹窗显隐
+      instanceOpen: false,     // 实例弹窗显隐
+      dialogTitle: '',
+      correlationTitle: '',
+      fuzzyTitle: '新增模糊匹配',
+      classificationTitle: '新增分类匹配',
+      instanceTitle: '新增实例匹配',
+      isEdit: false,
+      submitLoading: false,
+
+      // 表单数据：主表单+三个独立关联表单（字段按需配置，完全独立）
+      formData: {
+        // 主表单
+        mainForm: {
+          id: null,
+          typeName: '',
+          type: '',
+          vol: '',
+          configValue: 1,
+          jijuType: '',
+          configDescription: '',
+          configRateType: 'none',
+          configRate: 0,
+          isNew: '0',
+          remark: '',
+          deptId: '',
+          configType: ''
+        },
+        // 1. 模糊匹配表单（仅matchingName）
+        fuzzyForm: {
+          matchingName: '',
+          matchingType: '0', // 固定0：模糊匹配
+          configId: ''
+        },
+        // 2. 分类匹配表单（matchingName+category）
+        classificationForm: {
+          matchingName: '',
+          name: '',
+          category: '',
+          matchingType: '1', // 固定1：分类匹配
+          configId: ''
+        },
+        // 3. 实例匹配表单（matchingName+category）
+        instanceForm: {
+          matchingName: '',
+          category: '',
+          matchingType: '2', // 固定2：实例匹配
+          configId: ''
+        }
+      },
+
+      // 校验规则：主规则+三个独立关联规则（按需配置，完全独立）
+      formRules: {
+        // 主表单规则
+        mainRules: {
+          typeName: [
+            { required: true, message: '请输入项目名称', trigger: 'blur' },
+            { max: 30, message: '项目名称长度不能超过30个字符', trigger: 'blur' }
+          ],
+          type: [{ required: true, message: '请选择类型', trigger: 'change' }],
+          vol: [{ required: true, message: '请选择电压等级', trigger: 'change' }],
+          configValue: [
+            { required: true, message: '请设置配置标注台数量', trigger: 'change' },
+            { type: 'number', min: 1, max: 1000, message: '数量范围1-1000', trigger: 'change' }
+          ],
+          jijuType: [{ required: true, message: '请选择装备类型', trigger: 'change' }],
+          configDescription: [
+            { required: true, message: '请输入配置说明', trigger: 'blur' },
+            { max: 200, message: '配置说明长度不能超过200个字符', trigger: 'blur' }
+          ],
+          configRateType: [{ required: true, message: '请选择配置率赋值类型', trigger: 'change' }],
+          configRate: [{ validator: this.validateConfigRate, trigger: 'change' }],
+          isNew: [{ required: true, message: '请选择是否新型装备', trigger: 'change' }]
+        },
+        // 1. 模糊匹配规则（仅校验matchingName）
+        fuzzyRules: {
+          matchingName: [
+            { required: true, message: '请输入匹配名称', trigger: 'blur' },
+            { max: 100, message: '匹配名称长度不能超过100个字符', trigger: 'blur' }
+          ]
+        },
+        // 2. 分类匹配规则（校验matchingName+category）
+        classificationRules: {
+          matchingName: [
+            { required: true, message: '请选择分类', trigger: 'change' }
+          ]
+        },
+        // 3. 实例匹配规则（与分类一致，校验matchingName+category）
+        instanceRules: {
+          matchingName: [
+            { required: true, message: '请输入匹配名称', trigger: 'blur' },
+            { max: 100, message: '匹配名称长度不能超过100个字符', trigger: 'blur' }
+          ],
+          category: [
+            { required: true, message: '请输入类型', trigger: 'blur' },
+            { max: 50, message: '类型长度不能超过50个字符', trigger: 'blur' }
+          ]
+        }
       }
     }
   },
   watch: {
-    deptName(val) {
-      console.log('部门名称:', val)
-      this.$refs.tree.filter(val)
+    deptName: {
+      handler(val) {
+        this.$nextTick(() => this.$refs.treeRef?.filter(val))
+      },
+      immediate: false
+    },
+    currentDeptId: {
+      handler(val) {
+        val && this.loadMainTabData(this.activeTab)
+      },
+      immediate: false
     }
   },
   created() {
     this.getDeptTree()
-    this.getList()
+  },
+  computed: {
+    mainTableColumns() {
+      return this.tableColumns.main
+    },
+    formRef() {
+      return this.$refs.formRef
+    }
+    // 移除所有关联表单的computed引用，直接在方法中通过$refs获取，避免缓存问题
   },
   methods: {
-
-    /** 查询部门下拉树结构 */
-    getDeptTree() {
-      deptTreeSelect().then(response => {
-        // 根据API实际响应结构处理
-        let treeData = response.data
-
-        // 如果API返回的是标准响应格式
-        if (response.code && response.data) {
-          treeData = response.data
+    // 通用配置率校验
+    validateConfigRate(rule, value, callback) {
+      if (this.formData.mainForm.configRateType === 'custom') {
+        if (value === undefined || value === null) {
+          callback(new Error('请输入自定义配置率'))
+        } else if (value < 1 || value > 1000) {
+          callback(new Error('自定义配置率范围1-1000'))
+        } else {
+          callback()
         }
-
-        this.deptOptions = treeData || []
-      }).catch(error => {
-        console.error('获取部门树失败:', error)
-        this.$message.error('获取部门树失败')
-      })
+      } else {
+        callback()
+      }
+    },
+    async getCategoryList() {
+      const res = await getCategoryList()
+      if (res.code === 200) {
+        this.categoryList = res.data.map(item => ({
+          ...item,
+          uniqueKey: `${item.typeId}-${item.type}` // 生成唯一key
+        }))
+      }
     },
 
-    // 节点单击事件
+    // 左侧部门树相关方法
+    async getDeptTree() {
+      try {
+        this.treeLoading = true
+        const res = await deptTreeSelect()
+        this.deptOptions = res.code === 200 ? res.data : []
+      } catch (err) {
+        console.error('获取部门树失败：', err)
+        this.$message.error('获取部门树失败，请稍后重试')
+      } finally {
+        this.treeLoading = false
+      }
+    },
     handleNodeClick(data) {
-      this.currentDeptId = data.deptId // 保存当前选择的部门ID
-      this.currentDeptName = data.deptName // 保存当前选择的部门名称
-      this.queryParams.deptId = data.deptId
-      this.handleQuery()
+      this.currentDeptId = data.id || data.deptId
+    },
+    handleDeptSearchClear() {
+      this.deptName = ''
+      this.$refs.treeRef?.setCurrentKey(null)
+      this.currentDeptId = null
+      this.clearAllMainTabData()
     },
-
-    // 筛选节点
     filterNode(value, data) {
       if (!value) return true
-      return data.deptName.indexOf(value) !== -1
+      return data.deptName?.toLowerCase().includes(value.toLowerCase())
     },
 
+    // 主标签页核心方法
     handleTabClick(tab) {
-      // 根据标签页设置 queryParams.type 或其他标识
-      this.queryParams.configType = tab.name
-      this.handleQuery()
+      this.activeTab = tab.name
+      const tabConfig = this.tableData[tab.key]
+      tabConfig.pageNum = 1
+      this.loadMainTabData(tab.name)
     },
-
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1
-      this.getList()
+    async loadMainTabData(tabName) {
+      if (!this.currentDeptId) return
+      const tab = this.mainTabList.find(item => item.name === tabName)
+      const tabConfig = this.tableData[tab.key]
+      tabConfig.loading = true
+      try {
+        const queryParams = {
+          deptId: this.currentDeptId,
+          configType: tabName,
+          pageNum: tabConfig.pageNum,
+          pageSize: tabConfig.pageSize
+        }
+        const res = await listUser(queryParams)
+        const { rows = [], total = 0 } = res || {}
+        tabConfig.list = rows.map(item => ({ ...item, basicConfig: item.basicConfig || '' }))
+        tabConfig.total = total
+      } catch (err) {
+        console.error(`加载${tab.label}数据失败：`, err)
+        this.$message.error(`加载${tab.label}数据失败，请稍后重试`)
+        tabConfig.list = []
+        tabConfig.total = 0
+      } finally {
+        tabConfig.loading = false
+      }
     },
-
-    /** 查询装备列表 */
-    getList() {
-      this.loading = true
-      listUser(this.queryParams).then(response => {
-        this.userList = (response.rows || []).map(item => {
-          // 确保每行都有basicConfig属性
-          if (item.basicConfig === undefined) {
-            item.basicConfig = ''
-          }
-          return item
-        })
-        this.total = response.total || 0
-        this.loading = false
-      }).catch(error => {
-        console.error('获取装备列表失败:', error)
-        this.loading = false
+    clearAllMainTabData() {
+      this.mainTabList.forEach(tab => {
+        this.tableData[tab.key] = { ...this.tableData[tab.key], list: [], total: 0, pageNum: 1 }
       })
     },
-
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm('queryForm')
-      this.currentDeptId = null // 重置部门ID
-      this.currentDeptName = '' // 重置部门名称
-      if (this.$refs.tree) {
-        this.$refs.tree.setCurrentKey(null)
-      }
-      this.handleQuery()
+    handleTablePagination(tabKey, { pageNum, pageSize }) {
+      this.tableData[tabKey].pageNum = pageNum
+      this.tableData[tabKey].pageSize = pageSize
+      const tab = this.mainTabList.find(item => item.key === tabKey)
+      this.loadMainTabData(tab.name)
     },
 
-    /** 新增按钮操作 */
-    handleAdd() {
-      if (this.queryParams.deptId) {
+    // 关联弹窗核心方法
+    async handleTableRelate(row) {
+      if (!row?.id) return
+      this.configId = row.id
+      await Promise.all([
+        this.loadCorrelationData('fuzzy'),
+        this.loadCorrelationData('classification'),
+        this.loadCorrelationData('instance'),
+        this.loadCorrelationData('inventory')
+      ])
+      this.correlationTitle = `关联${this.mainTabList.find(t => t.name === row.configType)?.label}装备配置`
+      this.correlationOpen = true
+    },
+    async loadCorrelationData(tabKey) {
+      const tabConfig = this.tableData[tabKey]
+      tabConfig.loading = true
+      try {
+        let matchingType = ''
+        if (tabKey === 'fuzzy') {
+          matchingType = '0'
+        } else if (tabKey === 'classification') {
+          matchingType = '1'
+        } else if (tabKey === 'instance') matchingType = '2'
+        const queryParams = {
+          deptId: this.currentDeptId,
+          configId: this.configId,
+          matchingType: matchingType,
+          pageNum: tabConfig.pageNum,
+          pageSize: tabConfig.pageSize
+        }
+        const res = tabKey === 'inventory' ? await selectInventoryList(queryParams) : await selectResourceList(queryParams)
+        tabConfig.list = res.rows || []
+        tabConfig.total = res.total || 0
+      } catch (err) {
+        console.error(`加载${tabKey}关联数据失败：`, err)
+        this.$message.error(`加载${tabKey}关联数据失败，请稍后重试`)
+        tabConfig.list = []
+        tabConfig.total = 0
+      } finally {
+        tabConfig.loading = false
+      }
+    },
+    handleCorrelationPagination(tabKey, { pageNum, pageSize }) {
+      this.tableData[tabKey].pageNum = pageNum
+      this.tableData[tabKey].pageSize = pageSize
+      this.loadCorrelationData(tabKey)
+    },
+    handleCorrelationClose() {
+      this.configId = null
+      ;['fuzzy', 'classification', 'instance'].forEach(key => {
+        this.tableData[key].pageNum = 1
+      })
+      this.loadMainTabData(this.activeTab)
 
-      } else {
-        this.$message.error('请选择公司')
-        return false
-      }
-      // 初始化表单字段
-      this.form = {
-        id: null,
-        typeName: '',          // 项目名称
-        type: '',              // 类型
-        vol: '',               // 电压等级
-        configValue: 1,        // 配置标注台，默认最小值1
-        jijuType: '',            // 装备类型
-        configDescription: '', // 配置说明
-        configRateType: 'none',// 配置率赋值类型，默认无分
-        configRate: 0,         // 自定义配置率
-        isNew: '0',          // 是否新型装备，默认否
-        remark: ''             // 特殊装备配置原因
-      }
-      // **重置表单校验状态**
-      if (this.$refs.form) {
-        this.$refs.form.resetFields()
-      }
-      this.open = true
-      this.title = '新增'
     },
 
-    handleEdit(row) {
-      if (!row || !row.id) return
-
-      // 1. 设置弹窗标题
-      this.title = '编辑'
-
-      // 2. 调用 getUser 获取最新数据
-      getUser(row.id).then(response => {
-        const data = response.data || {}
-        const isCustomRate = data.configRate && Number(data.configRate) > 0
-        // 3. 给表单赋值
-        this.form = {
+    // 主表格操作方法
+    handleTableAdd() {
+      if (!this.currentDeptId) {
+        this.$message.warning('请先在左侧选择所属公司')
+        return
+      }
+      this.isEdit = false
+      this.dialogTitle = `新增${this.mainTabList.find(t => t.name === this.activeTab)?.label}装备配置`
+      this.initForm('main')
+      this.dialogOpen = true
+    },
+    async handleTableEdit(row) {
+      if (!row?.id) return
+      const tab = this.mainTabList.find(item => item.name === row.configType)
+      const tabConfig = this.tableData[tab.key]
+      tabConfig.loading = true
+      try {
+        const res = await getUser(row.id)
+        const data = res.data || {}
+        this.isEdit = true
+        this.dialogTitle = `编辑${tab.label}装备配置`
+        this.formData.mainForm = {
           ...data,
-          configRateType: isCustomRate ? 'custom' : 'none',
-          configRate: isCustomRate ? Number(data.configRate) : 0,
+          configRateType: data.configRate && Number(data.configRate) > 0 ? 'custom' : 'none',
+          configRate: Number(data.configRate) || 0,
           isNew: data.isNew || '0'
         }
-        // 4. 弹出表单
-        this.open = true
-        // 5. 重置表单校验状态
-        if (this.$refs.form) {
-          this.$refs.form.resetFields()
-        }
-      }).catch(err => {
-        console.error('获取用户信息失败', err)
-        this.$message.error('获取用户信息失败')
-      })
+        this.dialogOpen = true
+      } catch (err) {
+        console.error('获取装备配置详情失败：', err)
+        this.$message.error('获取详情失败，请稍后重试')
+      } finally {
+        tabConfig.loading = false
+      }
     },
-
-    // 删除
-    handleDelete(row) {
-      if (!row) return
-      this.$confirm('确定删除此条记录吗?', '提示', {
+    handleTableDelete(row) {
+      if (!row?.id) return
+      this.$confirm('确定删除此条装备配置记录吗？删除后不可恢复！', '温馨提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        // 调用删除接口
-        delUser(row.id).then(() => {
+        type: 'warning',
+        confirmButtonClass: 'el-button--danger'
+      }).then(async() => {
+        try {
+          await delUser(row.id)
           this.$message.success('删除成功')
-          this.getList()
-        }).catch(err => {
-          console.error('删除失败', err)
-          this.$message.error('删除失败')
-        })
-      }).catch(() => {
-        // 取消操作
+          await this.loadMainTabData(row.configType)
+        } catch (err) {
+          console.error('删除装备配置失败：', err)
+          this.$message.error('删除失败，请稍后重试')
+        }
       })
     },
 
-    // 取消按钮
-    cancel() {
-      this.open = false
-      // **重置表单校验状态**
-      if (this.$refs.form) {
-        this.$refs.form.resetFields()
-      }
-      this.reset()
+    // 关联表格删除方法（精准刷新对应表格）
+    handleCorrelationDelete(row) {
+      if (!row?.id) return
+      this.$confirm('确定删除此条关联数据吗？', '温馨提示', { type: 'warning' }).then(async() => {
+        try {
+          // 待实现：关联数据删除接口
+          await deleteResource(row.id)
+          this.$message.success('删除成功')
+          // 根据matchingType精准刷新对应表格
+          let tabKey = ''
+          if (row.matchingType === '0') {
+            tabKey = 'fuzzy'
+          } else if (row.matchingType === '1') {
+            tabKey = 'classification'
+          } else if (row.matchingType === '2') tabKey = 'instance'
+          await this.loadCorrelationData(tabKey)
+          await this.loadCorrelationData('inventory')
+        } catch (err) {
+          this.$message.error('删除失败，请稍后重试')
+        }
+      })
     },
 
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs['form'].validate(valid => {
-        if (!valid) return
-
-        // 根据配置率赋值类型处理 configRate
-        if (this.form.configRateType === 'none') {
-          this.form.configRate = 0
+    async handleFormSubmit() {
+      try {
+        await this.formRef.validate()
+        this.submitLoading = true
+        if (this.formData.mainForm.configRateType === 'none') {
+          this.formData.mainForm.configRate = 0
         }
-
-        // 判断是新增还是修改
-        if (this.form.id != undefined) {
-          // 修改操作
-          updateEquipmentConfig(this.form)
-            .then(() => {
-              this.$message.success('修改成功')
-              this.open = false
-              this.getList()
-            })
-            .catch(err => {
-              console.error('修改失败', err)
-              this.$message.error('修改失败')
-            })
+        const res = this.isEdit
+          ? await updateEquipmentConfig(this.formData.mainForm)
+          : await addUser(this.formData.mainForm)
+        if (res.code === 200) {
+          this.$message.success(this.isEdit ? '修改成功' : '新增成功')
+          this.dialogOpen = false
+          await this.loadMainTabData(this.formData.mainForm.configType)
         } else {
-          // 新增操作才需要 deptId 和 configType
-          this.form.deptId = this.queryParams.deptId
-          this.form.configType = this.queryParams.configType
-          addUser(this.form)
-            .then(() => {
-              this.$message.success('新增成功')
-              this.open = false
-              this.getList()
-            })
-            .catch(err => {
-              console.error('新增失败', err)
-              this.$message.error('新增失败')
-            })
+          this.$message.error(res.message || (this.isEdit ? '修改失败' : '新增失败'))
         }
+      } catch (err) {
+        console.error('表单提交失败：', err)
+      } finally {
+        this.submitLoading = false
+      }
+    },
+    handleDialogClose() {
+      this.formRef?.clearValidate()
+      this.submitLoading = false
+    },
+
+    // ====================== 模糊匹配独立弹窗方法（修复后） ======================
+    handleFuzzyTableAdd() {
+      this.initForm('fuzzy')
+      this.fuzzyOpen = true
+      this.$nextTick(() => {
+        this.$refs.fuzzyFormRef?.clearValidate()
       })
+    },
+    initForm(type) {
+      if (type === 'fuzzy') {
+        this.formData.fuzzyForm = {
+          matchingName: '',
+          matchingType: '0',
+          configId: this.configId
+        }
+      } else if (type === 'classification') {
+        this.formData.classificationForm = {
+          matchingName: '',
+          category: '',
+          matchingType: '1',
+          configId: this.configId
+        }
+      } else if (type === 'instance') {
+        this.formData.instanceForm = {
+          matchingName: '',
+          category: '',
+          matchingType: '2',
+          configId: this.configId
+        }
+      } else if (type === 'main') {
+        this.formData.mainForm = {
+          id: null,
+          typeName: '',
+          type: '',
+          vol: '',
+          configValue: 1,
+          jijuType: '',
+          configDescription: '',
+          configRateType: 'none',
+          configRate: 0,
+          isNew: '0',
+          remark: '',
+          deptId: this.currentDeptId,
+          configType: this.activeTab
+        }
+      }
+    },
+    async handleFuzzyConfirm() {
+      const fuzzyForm = this.$refs.fuzzyFormRef
+      if (!fuzzyForm) {
+        this.$message.warning('表单加载中，请稍候再试')
+        return
+      }
+      try {
+        await fuzzyForm.validate()
+        this.submitLoading = true
+        const res = await insertResource(this.formData.fuzzyForm)
+        if (res.code === 200) {
+          this.$message.success('新增模糊匹配成功')
+          this.fuzzyOpen = false
+          await this.loadCorrelationData('fuzzy')
+          await this.loadCorrelationData('inventory')
+        } else {
+          this.$message.error(res.message || '新增模糊匹配失败')
+        }
+      } catch (err) {
+        console.error('新增模糊匹配失败：', err)
+      } finally {
+        this.submitLoading = false
+      }
+    },
+    handleFuzzyClose() {
+      this.$refs.fuzzyFormRef?.clearValidate()
+      this.initForm('fuzzy')
+    },
+
+    // ====================== 分类匹配独立弹窗方法（与模糊逻辑一致） ======================
+    handleClassificationTableAdd() {
+      this.initForm('classification')
+      this.classificationOpen = true
+      this.getCategoryList()
+      this.$nextTick(() => {
+        this.$refs.classificationFormRef?.clearValidate()
+      })
+    },
+    // 分类选择-变化事件：获取选中项完整数据（搜索后依然生效）
+    handleCategoryChange(selectedTypeId) {
+      // 判空：清空选择/搜索无结果时，重置自定义字段
+      if (!selectedTypeId) {
+        this.formData.classificationForm.selectedCategory = null
+        this.formData.classificationForm.category = '' // 清空分类名称存储
+        return
+      }
+      // 反向查找选中项的完整对象，获取所有自定义字段
+      const selectedItem = this.categoryList.find(
+        item => item.typeId === selectedTypeId
+      )
+      if (selectedItem) {
+        // 存储完整对象和分类名称，方便后续提交/展示
+        this.formData.classificationForm.matchingName = selectedItem.typeId
+        this.formData.classificationForm.category = selectedItem.type
+        this.formData.classificationForm.name = selectedItem.equipmentName
+      }
+    },
+    handleJijuTypeChange(selectedTypeId) {
+      // 判空：清空选择/搜索无结果时，重置自定义字段
+      if (!selectedTypeId) {
+        this.formData.mainForm.jijuType = null
+        this.formData.mainForm.isNew = '0' // 清空分类名称存储
+      } else {
+        if (selectedTypeId == '新型装备') {
+          this.formData.mainForm.jijuType = selectedTypeId
+          this.formData.mainForm.isNew = '1' // 清空分类名称存储
+        }
+      }
+    },
+    async handleClassificationConfirm() {
+      const classificationForm = this.$refs.classificationFormRef
+      if (!classificationForm) {
+        this.$message.warning('表单加载中，请稍候再试')
+        return
+      }
+      try {
+        await classificationForm.validate()
+        this.submitLoading = true
+        const res = await insertResource(this.formData.classificationForm)
+        if (res.code === 200) {
+          this.$message.success('新增分类匹配成功')
+          this.classificationOpen = false
+          await this.loadCorrelationData('classification')
+          await this.loadCorrelationData('inventory')
+        } else {
+          this.$message.error(res.message || '新增分类匹配失败')
+        }
+      } catch (err) {
+        console.error('新增分类匹配失败：', err)
+      } finally {
+        this.submitLoading = false
+      }
+    },
+    handleClassificationClose() {
+      this.$refs.classificationFormRef?.clearValidate()
+      this.initForm('classification')
+    },
+
+    // ====================== 实例匹配独立弹窗方法（与分类逻辑一致） ======================
+    handleInstanceTableAdd() {
+      this.initForm('instance')
+      this.instanceOpen = true
+      this.$nextTick(() => {
+        this.$refs.instanceFormRef?.clearValidate()
+      })
+    },
+    handleInstanceTableOwn() {
+      this.initForm('instance')
+      this.instanceOpen = true
+      this.$nextTick(() => {
+        this.$refs.instanceFormRef?.clearValidate()
+      })
+    },
+    handleInstanceSharingAdd() {
+      this.initForm('instance')
+      this.instanceOpen = true
+      this.$nextTick(() => {
+        this.$refs.instanceFormRef?.clearValidate()
+      })
+    },
+    handleInstanceRentalAdd() {
+      this.initForm('instance')
+      this.instanceOpen = true
+      this.$nextTick(() => {
+        this.$refs.instanceFormRef?.clearValidate()
+      })
+    },
+    async handleInstanceConfirm() {
+      const instanceForm = this.$refs.instanceFormRef
+      if (!instanceForm) {
+        this.$message.warning('表单加载中，请稍候再试')
+        return
+      }
+      try {
+        await instanceForm.validate()
+        this.submitLoading = true
+        const res = await insertResource(this.formData.instanceForm)
+        if (res.code === 200) {
+          this.$message.success('新增实例匹配成功')
+          this.instanceOpen = false
+          await this.loadCorrelationData('instance')
+          await this.loadCorrelationData('inventory')
+        } else {
+          this.$message.error(res.message || '新增实例匹配失败')
+        }
+      } catch (err) {
+        console.error('新增实例匹配失败：', err)
+      } finally {
+        this.submitLoading = false
+      }
+    },
+    handleInstanceClose() {
+      this.$refs.instanceFormRef?.clearValidate()
+      this.initForm('instance')
     }
   }
 }
 </script>
 
-
-<style lang="scss" scoped>
-.container-box {
-  //弹出层的高度
-  ::v-deep .el-dialog.import-dialog {
-    position: fixed;
-    right: -70%;
-    height: 100vh;
-
-  }
-
-  //弹出层里内容的高度
-  ::v-deep .el-dialog__body {
-    height: 86vh !important;
-    overflow-y: auto;
-  }
-
-  ::v-deep.el-dialog__header {
-    border-bottom: 1px solid #F0F0F0;
-  }
-
-
-}
-</style>
-
-<style lang="scss" scoped>
+<style scoped lang="scss">
 .app-container {
-  background-color: #f5f7fa;
+  background: #f5f7fa;
   height: calc(100vh - 84px);
+  box-sizing: border-box;
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+}
 
-  /* 隐藏 el-tabs 底部线条 */
-    ::v-deep(.el-tabs__nav-wrap)::after {
-    background: transparent !important;
-    height: 0 !important;
-    display: none !important;
+.el-row {
+  height: 100%;
+  display: flex;
+  flex: 1;
+}
+
+.tree-col-wrapper {
+  height: 100%;
+
+  .tree-content {
+    height: 100%;
+    background: #fff;
+    padding: 16px;
+    border-radius: 4px;
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
+    overflow: auto;
+    -ms-overflow-style: none;
+    scrollbar-width: none;
+
+    &::-webkit-scrollbar {
+      display: none;
+    }
+  }
+
+  .tree-search-input {
+    width: 100%;
+    margin-bottom: 20px;
   }
 }
 
-/* 搜索区域收起/展开按钮 */
-.search-toggle-btn {
-  color: #409eff;
-  padding: 5px 10px;
+.main-col-wrapper {
+  height: 100%;
+  padding: 0 !important;
+
+  .main-tabs {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+    background: #fff;
+    border-radius: 4px;
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
+    overflow: hidden;
+
+    :deep(.el-tabs__header) {
+      margin: 0;
+      padding: 0 16px;
+      border-bottom: 1px solid #ebeef5;
+    }
+
+    :deep(.el-tabs__content) {
+      flex: 1;
+      height: 100% !important;
+      padding: 0;
+      overflow: hidden;
+    }
+  }
+
+  .tab-pane-container {
+    height: 100%;
+    display: flex;
+    flex-direction: column;
+  }
+
+  .empty-tip {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 80px;
+    background: #fff;
+    border-radius: 4px;
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
+    color: #909399;
+    font-size: 14px;
+
+    i {
+      font-size: 18px;
+      margin-right: 8px;
+      color: #409eff;
+    }
+  }
 }
 
-/* 固定操作栏样式 */
-.sticky-bar {
-  position: sticky;
-  top: 0;
-  z-index: 10;
-  box-shadow: 0 2px 10px rgba(0, 0, 0, 0.1);
+.dialog-form {
+  :deep(.el-form-item) {
+    margin-bottom: 16px;
+  }
+
+  :deep(.el-textarea) {
+    width: 100%;
+  }
 }
 
-/* 字段设置弹窗样式 */
-.field-setting-group {
+.dialog-footer {
+  text-align: right;
+  padding: 10px 20px 0;
+  margin-top: 8px;
+}
+
+:deep(.edit-dialog) {
+  :deep(.el-dialog__body) {
+    max-height: 80vh;
+    overflow-y: auto;
+    padding: 20px;
+  }
+
+  :deep(.el-dialog__header) {
+    border-bottom: 1px solid #F0F0F0;
+    padding: 15px 20px;
+  }
+}
+
+:deep(.correlation-dialog) {
+  width: 80% !important;
+  max-height: 90vh;
   display: flex;
-  flex-wrap: wrap;
-  gap: 10px;
-  max-height: 400px;
+  flex-direction: column;
+
+  :deep(.el-dialog__body) {
+    flex: 1;
+    padding: 20px;
+    overflow: hidden;
+  }
+
+  :deep(.el-dialog__header) {
+    border-bottom: 1px solid #F0F0F0;
+    padding: 15px 20px;
+  }
+}
+
+.correlation-table-container {
+  height: 86vh;
   overflow-y: auto;
-  padding-right: 10px;
 }
 
-.field-setting-group .el-checkbox {
-  width: calc(50% - 10px);
-  margin-bottom: 10px;
+:deep(.el-button--primary) {
+  background: #2CBAB2 !important;
+  border-color: #2CBAB2 !important;
 }
 
-/* 原有样式保持不变 */
-.page-header {
-  margin-bottom: 20px;
-  padding-bottom: 15px;
-  border-bottom: 1px solid #e4e7ed;
+:deep(.el-button--text) {
+  color: #2CBAB2 !important;
 }
 
-.page-title {
-  font-size: 20px;
-  color: #1f2d3d;
-  margin-bottom: 5px;
-  font-weight: 500;
+:deep(.el-button--text.text-color--danger) {
+  color: #FF5129 !important;
 }
 
-.page-desc {
+:deep(.el-tree__empty-text),
+:deep(.el-table__empty-text) {
+  color: #909399;
   font-size: 14px;
-  color: #8392a5;
+  padding: 20px 0;
 }
 
-.card-container {
-  background-color: #fff;
-  border-radius: 4px;
-  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.05);
-  overflow: hidden;
-}
-
-.content-box {
-  height: calc(100vh - 200px);
-}
-
-.card-container-btn {
-  /* 使用 clip-path 创建三角形形状 */
-  clip-path: polygon(0 0, 100% 50%, 0 100%);
-  width: 40px;
-  height: 70px;
-  background-color: red;
-  position: relative;
-  cursor: pointer;
-  transition: all 0.3s ease;
-}
-
-.card-header {
-  padding: 14px;
-  border-bottom: 1px solid #e4e7ed;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.card-title {
-  font-size: 15px;
-  color: #1f2d3d;
-  font-weight: 500;
-}
-
-.table-count {
-  font-size: 12px;
-  color: #8392a5;
-}
-
-.tree-container {
-  height: calc(100vh - 174px);
-  overflow: auto;
-  padding: 15px;
-}
-
-.tree-container::-webkit-scrollbar {
-  display: none;
-}
-
-.query-buttons {
-  display: flex;
-  justify-content: flex-end;
-  align-items: center;
-  gap: 10px;
-}
-
-.query-btn {
-  background-color: #409eff;
-  border-color: #409eff;
-}
-
-.reset-btn {
-  background-color: #f5f7fa;
-  color: #606266;
-  border-color: #dcdfe6;
-}
-
-.export-btn {
-  background-color: #67c23a;
-  border-color: #67c23a;
-}
-
-.status-operation-bar {
-  background-color: #fff;
-  border-radius: 4px;
-  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.05);
-  padding: 15px 20px;
-  margin-bottom: 20px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.status-stats {
-  display: flex;
-  gap: 25px;
-}
-
-.stat-item {
-  display: flex;
-  align-items: center;
-}
-
-.stat-label {
-  color: #606266;
-  margin-right: 5px;
-  font-size: 14px;
-}
-
-.stat-value {
-  font-size: 16px;
-  font-weight: 500;
-  color: #1f2d3d;
-}
-
-.operation-buttons {
-  width: 100%;
-}
-
-.operation-btn {
-  display: inline-flex;
-  align-items: center;
-  gap: 4px;
-}
-
-.pagination-container {
-  padding: 15px 20px;
-  display: flex;
-  justify-content: flex-end;
-  align-items: center;
-}
-
-.opt-btn {
-  padding: 5px 8px;
-  margin: 0 2px;
-}
-
-.view-btn {
-  color: #00a288;
-}
-
-.edit-btn {
-  color: #00a288;
-}
-
-.delete-btn {
-  color: #00a288;
-}
-
-/* 弹窗表单样式 */
-.detail-form {
-  max-height: 60vh;
-  overflow-y: auto;
-  padding-right: 10px;
-}
-
-/* 滚动条美化 */
 ::-webkit-scrollbar {
   width: 6px;
   height: 6px;
 }
 
-::-webkit-scrollbar-track {
-  background: #f1f1f1;
-  border-radius: 3px;
-}
-
 ::-webkit-scrollbar-thumb {
-  background: #c1c1c1;
   border-radius: 3px;
+  background: #e5e5e5;
 }
 
-::-webkit-scrollbar-thumb:hover {
-  background: #a8a8a8;
-}
-
-/* 特征值输入框和删除按钮容器 */
-.feature-value-container {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-}
-
-.delete-feature-btn {
-  padding: 0;
-  height: 100%;
-  display: flex;
-  align-items: center;
-}
-
-
-.col-center {
-  display: flex;
-  align-items: center; /* 垂直居中 */
-  /* 如果需要整列高度充满父容器，可添加：height: 100%; */
-}
-
-.demo-table-expand {
-  font-size: 0;
-}
-
-.demo-table-expand label {
-  width: 90px;
-  color: #99a9bf;
-}
-
-
-.card-container {
-  position: relative; /* 新增：为按钮绝对定位提供参考 */
-}
-
-.collapse-btn {
-  /* 修改：将按钮定位在右侧中间 */
-  position: absolute;
-  right: 0;
-  top: 50%;
-  transform: translateY(-50%);
-  background: white;
-  color: #606266;
-  padding: 2px;
-  z-index: 10; /* 确保按钮在最上层 */
-}
-
-/* 优化按钮悬停效果 */
-.collapse-btn:hover {
-  background: white;
-  color: #409eff;
-}
-
-/* 折叠状态的样式和过渡动画 */
-.tree-column {
-  transition: all 0.3s ease;
-  display: flex;
-  flex-direction: row;
-}
-
-::v-deep .el-table {
-  // 启用斑马纹
-  &.el-table--striped .el-table__body {
-    tr.el-table__row--striped td {
-      background-color: #f6fbfa !important; // 浅紫色
-    }
-  }
-
-  .el-table__header {
-    background: #e9f0ee;
-
-    th {
-      background: #e9f0ee !important;
-      color: #606266;
-      font-weight: 600;
-      height: 50px;
-    }
-  }
-
-  &.el-table--striped .el-table__body tr.el-table__row:hover > td.el-table__cell {
-    background-color: #ccf1e9 !important;
-  }
-}
-
-
-/* 修复被动事件监听器警告 */
-.el-dialog__wrapper {
-  touch-action: none;
-}
-
-.disabled-row {
-  background-color: #f5f7fa !important;
-  color: #909399;
-  cursor: not-allowed;
-}
-
-.disabled-row:hover td {
-  background-color: #f5f7fa !important;
-}
-
-/* 优化后的部门信息样式 */
-.current-dept-info {
-  display: flex;
-  align-items: center;
-  margin: 20px 0 0 0;
-  padding: 9px 15px;
-  background: rgba(44, 186, 178, 0.1);
-  border: 1px solid #2CBAB2;
-  border-radius: 6px;
-  box-shadow: 0 2px 8px rgba(64, 158, 255, 0.1);
-}
-
-.dept-title {
-  font-weight: 600;
-  color: #606266;
-  margin-right: 10px;
-  font-size: 14px;
-}
-
-.dept-name {
-  font-weight: 300;
-  font-size: 16px;
-  color: #2CBAB2;
-  text-shadow: 0 1px 1px rgba(0, 0, 0, 0.1);
-}
-
-.dept-placeholder {
-  margin: 20px 0 0 0;
-  padding: 9px 15px;
-  background-color: #F5F5F5;
-  border-radius: 6px;
-  color: #B3B3B3;
-  font-size: 14px;
-  border: 1px solid #dcdfe6;
-}
-
-/* 配置弹窗表头样式 */
-.config-table-header {
-  display: flex;
-  font-weight: bold;
-  color: #3F3F3F;
-  margin-bottom: 8px;
-  align-items: center;
-  height: 60px;
-  background: #E9F0EE;
-  border-radius: 0px 0px 0px 0px;
-  border: 1px solid #F5F5F5;
-}
-
-.config-th {
-  display: inline-block;
-  text-align: left;
-  font-size: 14px;
-  margin-right: 10px;
-}
-
-.config-table-row {
-  display: flex;
-  align-items: center;
-  margin-bottom: 10px;
-}
-
-/* 新增装备名称显示样式 */
-.equipment-title {
-  margin-bottom: 20px;
-  padding: 10px 15px;
-  background: rgba(44, 186, 178, 0.1);
-  border-radius: 4px 4px 4px 4px;
-  border: 1px solid #2CBAB2;
-}
-
-.title-label {
-  font-weight: bold;
-  color: #606266;
-}
-
-.title-value {
-  font-weight: 400;
-  font-size: 14px;
-  color: #2CBAB2;
-  line-height: 22px;
-  text-align: left;
-  font-style: normal;
-  text-transform: none;
-}
-
-.type-tag-modern {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  min-width: 70px;
-  height: 32px;
-  padding: 0 16px;
-  font-size: 13px;
-  font-weight: 600;
-  line-height: 1;
-  border-radius: 16px;
-  border: none;
-  box-sizing: border-box;
-  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
-  box-shadow: 0 3px 6px rgba(0, 0, 0, 0.1);
-  letter-spacing: 0.5px;
-}
-
-.type-equipment-modern {
-  background: linear-gradient(135deg, #409EFF 0%, #1a7be0 100%);
-  color: white;
-  position: relative;
-  overflow: hidden;
-}
-
-.type-equipment-modern::before {
-  content: '';
-  position: absolute;
-  top: 0;
-  left: -100%;
-  width: 100%;
-  height: 100%;
-  background: linear-gradient(90deg, transparent, rgba(255, 255, 255, 0.2), transparent);
-  transition: left 0.5s ease;
-}
-
-.type-equipment-modern:hover::before {
-  left: 100%;
-}
-
-.type-tool-modern {
-  background: linear-gradient(135deg, #67C23A 0%, #4a9c2a 100%);
-  color: white;
-}
-
-.tag-icon {
-  margin-right: 6px;
-  font-size: 14px;
-}
-
-.type-tag-modern:hover {
-  transform: translateY(-2px);
-  box-shadow: 0 6px 12px rgba(0, 0, 0, 0.15);
-}
-
-.el-tag.el-tag--warning {
-  background-color: rgba(255, 171, 41, 0.1);
-  border-color: rgba(255, 171, 41, 0.1);
-  color: #FFAB29;
-  background: rgba(255, 171, 41, 0.1);
-  border-radius: 4px 4px 4px 4px;
-  border: 1px solid #FFAB29;
-  font-weight: 400;
-}
-
-.el-tag {
-  background-color: rgba(52, 226, 199, 0.1);
-  border-color: rgba(52, 226, 199, 0.1);
-  color: #34E2C7;
-  font-weight: 400;
-  background: rgba(52, 226, 199, 0.1);
-  border-radius: 4px 4px 4px 4px;
-  border: 1px solid #34E2C7;
-}
-
-.el-button--text {
-  font-family: Microsoft YaHei, Microsoft YaHei;
-  font-weight: 400;
-  font-size: 14px;
-  color: #2CBAB2;
-  line-height: 22px;
-  text-align: left;
-  font-style: normal;
-  text-transform: none;
-}
-
-.el-button--primary {
-  background: #2CBAB2;
-}
-
-.del {
-  margin-left: 6.5%;
-  font-weight: 400;
-  font-size: 14px;
-  color: #FF5129;
-  line-height: 22px;
-  text-align: left;
-  font-style: normal;
-  text-transform: none;
+::-webkit-scrollbar-track {
+  background: transparent;
 }
 </style>
diff --git a/src/views/system/equipment/table.vue b/src/views/system/equipment/table.vue
new file mode 100644
index 00000000..e1ae4db6
--- /dev/null
+++ b/src/views/system/equipment/table.vue
@@ -0,0 +1,210 @@
+<template>
+  <div class="tab-table-wrapper">
+    <!-- 表格头部：新增按钮 -->
+    <div class="table-header">
+      <el-button type="primary" icon="el-icon-plus" @click="handleAddClick">
+        新增
+      </el-button>
+    </div>
+
+    <!-- 表格滚动容器：独立滚动，表头固定 -->
+    <div class="table-content" v-loading="loading">
+      <el-table
+        class="project-table"
+        :data="tableData"
+        highlight-current-row
+        border
+        stripe
+        :empty-text="emptyText"
+      >
+        <el-table-column
+          type="index"
+          width="55"
+          label="序号"
+          align="center"
+          :index="calcTableIndex"
+        />
+        <el-table-column
+          v-for="(column, index) in tableColumns"
+          :key="index"
+          :label="column.label"
+          :prop="column.prop"
+          :min-width="column.minWidth"
+          align="center"
+          show-overflow-tooltip
+        />
+        <el-table-column label="操作" align="center" width="200">
+          <template slot-scope="scope">
+            <el-button type="text" @click="handleRelateClick(scope.row)">关联</el-button>
+            <el-button type="text" @click="handleEditClick(scope.row)">编辑</el-button>
+            <el-button type="text" text-color="danger" @click="handleDeleteClick(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+
+    <!-- 分页组件：无数据时隐藏 -->
+    <div class="pagination-wrapper" v-if="total > 0">
+      <pagination
+        :total="total"
+        :page.sync="pageNum"
+        :limit.sync="pageSize"
+        @pagination="handlePageChange"
+        background
+        layout="total, sizes, prev, pager, next"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'EquipmentTable',
+  // 父组件传递的属性：规范类型，添加默认值
+  props: {
+    // 表格数据
+    tableData: {
+      type: Array,
+      required: true,
+      default: () => []
+    },
+    // 表格列配置
+    tableColumns: {
+      type: Array,
+      required: true,
+      default: () => []
+    },
+    // 加载状态
+    loading: {
+      type: Boolean,
+      default: false
+    },
+    // 总条数
+    total: {
+      type: Number,
+      default: 0
+    },
+    // 当前页码
+    pageNum: {
+      type: Number,
+      required: true,
+      default: 1
+    },
+    // 每页条数
+    pageSize: {
+      type: Number,
+      required: true,
+      default: 10
+    },
+    // 空数据提示文本（支持不同标签页自定义）
+    emptyText: {
+      type: String,
+      default: '暂无数据'
+    }
+  },
+  methods: {
+    // 计算表格序号：基于父组件传递的分页参数
+    calcTableIndex(index) {
+      return (this.pageNum - 1) * this.pageSize + index + 1
+    },
+    // 触发新增事件：通知父组件打开新增弹窗
+    handleAddClick() {
+      this.$emit('add')
+    },
+    // 触发关联事件：传递当前行数据给父组件
+    handleRelateClick(row) {
+      this.$emit('relate', row)
+    },
+    // 触发编辑事件：传递当前行数据给父组件
+    handleEditClick(row) {
+      this.$emit('edit', row)
+    },
+    // 触发删除事件：传递当前行数据给父组件
+    handleDeleteClick(row) {
+      this.$emit('delete', row)
+    },
+    // 触发分页切换事件：传递新的分页参数给父组件
+    handlePageChange() {
+      this.$emit('pagination', {
+        pageNum: this.pageNum,
+        pageSize: this.pageSize
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+// 完全复用原有表格样式，无修改
+.tab-table-wrapper {
+  height: calc(99vh - 84px);
+  display: flex;
+  flex-direction: column;
+  padding: 16px;
+  box-sizing: border-box;
+
+  .table-header {
+    display: flex;
+    align-items: center;
+    margin-bottom: 12px;
+    flex-shrink: 0;
+    justify-content: flex-end;
+  }
+
+  .table-content {
+    flex: 1;
+    overflow: auto;
+    -ms-overflow-style: none;
+    scrollbar-width: none;
+    position: relative;
+
+    &::-webkit-scrollbar {
+      display: none;
+    }
+  }
+
+  .pagination-wrapper {
+    margin-top: 12px;
+    text-align: right;
+    flex-shrink: 0;
+    padding-right: 4px;
+  }
+}
+
+.project-table {
+  width: 100%;
+  --el-table-row-height: 56px;
+  --el-table-header-text-color: #333;
+  --el-table-header-background-color: #fafafa;
+  --el-table-row-hover-bg-color: #f6fbfa;
+
+  :deep(.el-table__header-wrapper) {
+    position: sticky;
+    top: 0;
+    z-index: 10;
+    background-color: var(--el-table-header-background-color) !important;
+  }
+
+  :deep(.el-table__header th) {
+    border-bottom: 1px solid #ebeef5;
+    border-right: 1px solid #ebeef5;
+    white-space: nowrap;
+    font-weight: 600;
+  }
+
+  :deep(.el-table__body tr:hover > td) {
+    background-color: var(--el-table-row-hover-bg-color) !important;
+  }
+
+  :deep(.el-table__fixed-right) {
+    box-shadow: -2px 0 6px rgba(0, 0, 0, 0.02);
+  }
+}
+
+// 空数据样式
+:deep(.el-table__empty-text) {
+  color: #909399;
+  font-size: 14px;
+  padding: 20px 0;
+}
+</style>