From f6fbd2a219d2d35ace0f29374e6884d156ee93eb Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Wed, 29 Oct 2025 18:03:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/EquipmentTypeConfig/index.vue | 4140 ++++++++++++-----------
 1 file changed, 2108 insertions(+), 2032 deletions(-)

diff --git a/src/views/EquipmentTypeConfig/index.vue b/src/views/EquipmentTypeConfig/index.vue
index 7495e14b..fb08488c 100644
--- a/src/views/EquipmentTypeConfig/index.vue
+++ b/src/views/EquipmentTypeConfig/index.vue
@@ -1,2272 +1,2348 @@
 <template>
-  <div class="app-container">
-    <el-row :gutter="24" class="main-content" type="justify">
-      <!-- 左侧树形结构 -->
-      <el-col :span="collapsed ? 1 : 5" class="tree-column">
-        <div class="card-container" v-if="!collapsed">
-          <div class="card-header">
-            <span class="card-title">装备分类</span>
-          </div>
-          <el-tree
-            v-if="!collapsed"
-            :data="treeData"
-            :props="defaultProps"
-            :indent="6"
-            @node-click="handleNodeClick"
-            default-expand-all
-            class="tree-container"
-            :loading="treeLoading"
-            :key="collapsed"
-          />
-        </div>
+    <div class="app-container">
+        <el-row :gutter="24" class="main-content" type="justify">
+            <!-- 左侧树形结构 -->
+            <el-col :span="collapsed ? 1 : 5" class="tree-column">
+                <div class="card-container" v-if="!collapsed">
+                    <div class="card-header">
+                        <span class="card-title">装备分类---</span>
+                    </div>
+                    <el-tree
+                        v-if="!collapsed"
+                        :data="treeData"
+                        :props="defaultProps"
+                        :indent="6"
+                        @node-click="handleNodeClick"
+                        default-expand-all
+                        class="tree-container"
+                        :loading="treeLoading"
+                        :key="collapsed"
+                    />
+                </div>
 
-        <!-- 折叠/展开控制按钮 -->
-        <div style="position: relative; width:15px; height: calc(100vh - 130px); margin-left: 5px;">
-          <el-button
-            size="mini"
-            @click="toggleCollapse"
-            class="collapse-btn"
-            :icon="collapsed ? 'el-icon-d-arrow-right' : 'el-icon-d-arrow-left'"
-          />
-        </div>
-      </el-col>
+                <!-- 折叠/展开控制按钮 -->
+                <div style="position: relative; width: 15px; height: calc(100vh - 130px); margin-left: 5px">
+                    <el-button
+                        size="mini"
+                        @click="toggleCollapse"
+                        class="collapse-btn"
+                        :icon="collapsed ? 'el-icon-d-arrow-right' : 'el-icon-d-arrow-left'"
+                    />
+                </div>
+            </el-col>
 
-      <!-- 右侧内容区域 -->
-      <el-col :span="collapsed ? 23 : 19" style="padding-left: 0;">
-        <el-card class="content-box">
-        <!-- 新增按钮区域 -->
-        <el-row style="margin-bottom: 10px;">
-          <el-col :span="24" style="text-align: right;">
-            <el-button type="primary" @click="handleAdd">新增</el-button>
-          </el-col>
+            <!-- 右侧内容区域 -->
+            <el-col :span="collapsed ? 23 : 19" style="padding-left: 0">
+                <el-card class="content-box">
+                    <!-- 新增按钮区域 -->
+                    <el-row style="margin-bottom: 10px">
+                        <el-col :span="24" style="text-align: right">
+                            <el-button type="primary" @click="handleAdd">新增</el-button>
+                        </el-col>
+                    </el-row>
+                    <div class="table-container">
+                        <el-table
+                            :data="tableData"
+                            style="width: 100%"
+                            border
+                            stripe
+                            height="100%"
+                            :loading="tableLoading"
+                        >
+                            <el-table-column
+                                align="center"
+                                show-overflow-tooltip
+                                type="index"
+                                label="序号"
+                                width="50"
+                            />
+
+                            <el-table-column
+                                align="center"
+                                show-overflow-tooltip
+                                prop="level1"
+                                label="所属专业"
+                                width="180"
+                            />
+                            <el-table-column
+                                align="center"
+                                show-overflow-tooltip
+                                prop="level2"
+                                label="施工主工序"
+                                width="180"
+                            />
+                            <el-table-column
+                                align="center"
+                                show-overflow-tooltip
+                                prop="level3"
+                                label="施工子工序"
+                                min-width="180"
+                            />
+                            <el-table-column
+                                align="center"
+                                show-overflow-tooltip
+                                prop="level4"
+                                label="装备大类"
+                                min-width="200"
+                            />
+                            <el-table-column
+                                align="center"
+                                show-overflow-tooltip
+                                prop="level5"
+                                label="装备小类"
+                                min-width="200"
+                            />
+                            <el-table-column
+                                align="center"
+                                show-overflow-tooltip
+                                prop="level6"
+                                label="装备名称"
+                                min-width="200"
+                            />
+                            <el-table-column
+                                align="center"
+                                show-overflow-tooltip
+                                prop="createBy"
+                                label="创建人"
+                                min-width="200"
+                            />
+                            <el-table-column
+                                align="center"
+                                show-overflow-tooltip
+                                prop="createTime"
+                                label="创建时间"
+                                min-width="200"
+                            />
+                            <el-table-column
+                                align="center"
+                                show-overflow-tooltip
+                                prop="updateBy"
+                                label="更新人"
+                                min-width="200"
+                            />
+                            <el-table-column
+                                align="center"
+                                show-overflow-tooltip
+                                prop="updateTime"
+                                label="更新时间"
+                                min-width="200"
+                            />
+
+                            <el-table-column align="center" fixed="right" min-width="200" label="操作">
+                                <template slot-scope="scope">
+                                    <el-button type="text" size="mini" @click="onHandlePreview(scope.row)">
+                                        <i class="el-icon-view"></i> 查看
+                                    </el-button>
+                                    <el-button type="text" size="mini" @click="onHandleEdit(scope.row)">
+                                        <i class="el-icon-edit"></i> 编辑
+                                    </el-button>
+                                    <el-button type="text" size="mini" @click="onHandleDelete(scope.row)">
+                                        <i class="el-icon-delete"></i> 删除
+                                    </el-button>
+                                    <el-button type="text" size="mini" @click="onHandleConfig(scope.row)">
+                                        <i class="el-icon-setting"></i> 配置特征项
+                                    </el-button>
+                                </template>
+                            </el-table-column>
+                        </el-table>
+                    </div>
+                    <div class="pagination-wrapper">
+                        <pagination
+                            :total="total"
+                            :page.sync="queryParams.pageNum"
+                            :limit.sync="queryParams.pageSize"
+                            @pagination="getDeviceList"
+                            layout="total, sizes, prev, pager, next, jumper"
+                        />
+                    </div>
+                </el-card>
+            </el-col>
         </el-row>
-        <div class="table-container">
-        <el-table
-          :data="tableData"
-          style="width: 100%"
-          border
-          stripe
-          height="100%"
-          :loading="tableLoading"
+
+        <!-- 查看弹窗 -->
+        <el-dialog
+            :title="`查看装备 - ${formData.deviceName || ''}`"
+            :visible.sync="previewDialogVisible"
+            width="600px"
+            :close-on-click-modal="false"
+            :before-close="handlePreviewClose"
         >
-          <el-table-column align="center" show-overflow-tooltip type="index" label="序号" width="50" />
+            <el-form ref="previewForm" :model="formData" label-width="100px" size="small" class="detail-form" disabled>
+                <el-row :gutter="20">
+                    <el-col :span="24" v-if="formData.level1">
+                        <el-form-item label="所属专业">
+                            <el-input v-model="formData.level1" placeholder="无" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24" v-if="formData.level2">
+                        <el-form-item label="施工主工序">
+                            <el-input v-model="formData.level2" placeholder="无" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24" v-if="formData.level3">
+                        <el-form-item label="施工子工序">
+                            <el-input v-model="formData.level3" placeholder="无" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24" v-if="formData.level4">
+                        <el-form-item label="装备大类">
+                            <el-input v-model="formData.level4" placeholder="无" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24" v-if="formData.level5">
+                        <el-form-item label="装备小类">
+                            <el-input v-model="formData.level5" placeholder="无" />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24" v-if="formData.level6">
+                        <el-form-item label="装备名称">
+                            <el-input v-model="formData.level6" placeholder="无" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="handlePreviewClose">关闭</el-button>
+            </div>
+        </el-dialog>
 
-          <el-table-column align="center" show-overflow-tooltip prop="level1" label="所属专业" width="180" />
-          <el-table-column align="center" show-overflow-tooltip prop="level2" label="施工主工序" width="180" />
-          <el-table-column align="center" show-overflow-tooltip prop="level3" label="施工子工序" min-width="180" />
-          <el-table-column align="center" show-overflow-tooltip prop="level4" label="装备大类" min-width="200"/>
-          <el-table-column align="center" show-overflow-tooltip prop="level5" label="装备小类" min-width="200"/>
-          <el-table-column align="center" show-overflow-tooltip prop="level6" label="装备名称" min-width="200" />
-          <el-table-column align="center" show-overflow-tooltip prop="createBy" label="创建人" min-width="200" />
-          <el-table-column align="center" show-overflow-tooltip prop="createTime" label="创建时间" min-width="200" />
-          <el-table-column align="center" show-overflow-tooltip prop="updateBy" label="更新人" min-width="200" />
-          <el-table-column align="center" show-overflow-tooltip prop="updateTime" label="更新时间" min-width="200" />
-
-          <el-table-column align="center" fixed="right" min-width="200" label="操作">
-            <template slot-scope="scope">
-              <el-button type="text" size="mini" @click="onHandlePreview(scope.row)">
-                <i class="el-icon-view"></i> 查看
-              </el-button>
-              <el-button type="text" size="mini" @click="onHandleEdit(scope.row)">
-                <i class="el-icon-edit"></i> 编辑
-              </el-button>
-              <el-button type="text" size="mini" @click="onHandleDelete(scope.row)">
-                <i class="el-icon-delete"></i> 删除
-              </el-button>
-              <el-button type="text" size="mini" @click="onHandleConfig(scope.row)">
-                <i class="el-icon-setting"></i> 配置特征项
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-        </div>
-        <div class="pagination-wrapper">
-        <pagination
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getDeviceList"
-          layout="total, sizes, prev, pager, next, jumper"
-        />
-        </div>
-      </el-card>
-      </el-col>
-    </el-row>
-
-    <!-- 查看弹窗 -->
-    <el-dialog
-      :title="`查看装备 - ${formData.deviceName || ''}`"
-      :visible.sync="previewDialogVisible"
-      width="600px"
-      :close-on-click-modal="false"
-      :before-close="handlePreviewClose"
-    >
-      <el-form
-        ref="previewForm"
-        :model="formData"
-        label-width="100px"
-        size="small"
-        class="detail-form"
-        disabled
-      >
-        <el-row :gutter="20">
-          <el-col :span="24" v-if="formData.level1">
-            <el-form-item label="所属专业">
-              <el-input v-model="formData.level1" placeholder="无"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" v-if="formData.level2">
-            <el-form-item label="施工主工序">
-              <el-input v-model="formData.level2" placeholder="无"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" v-if="formData.level3">
-            <el-form-item label="施工子工序">
-              <el-input v-model="formData.level3" placeholder="无"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" v-if="formData.level4">
-            <el-form-item label="装备大类">
-              <el-input v-model="formData.level4" placeholder="无"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" v-if="formData.level5">
-            <el-form-item label="装备小类">
-              <el-input v-model="formData.level5" placeholder="无"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" v-if="formData.level6">
-            <el-form-item label="装备名称">
-              <el-input v-model="formData.level6" placeholder="无"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="handlePreviewClose">关闭</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 编辑弹窗（核心修改：支持查看路径+修改分类） -->
-    <el-dialog
-      :title="`编辑装备 - ${formData.deviceName || ''}`"
-      :visible.sync="editDialogVisible"
-      width="70%"
-      :close-on-click-modal="false"
-      :before-close="handleEditClose"
-    >
-      <el-form
-        ref="editForm"
-        :model="formData"
-        :rules="editFormRules"
-        label-width="120px"
-        size="small"
-        class="detail-form"
-      >
-        <el-row :gutter="20">
-          <!-- 核心修改1：分类路径展示+修改入口 -->
-          <el-col :span="24">
-            <el-form-item label="装备分类" prop="categoryPath">
-              <!-- 路径展示区（点击可展开修改） -->
-              <div class="category-display" @click="showCategoryEditor = true">
-                <el-input
-                  v-model="categoryPathText"
-                  readonly
-                  placeholder="无分类路径"
-                  style="width: 100%;"
-                />
-                <span class="edit-category-btn">点击修改</span>
-              </div>
-              <!-- 分类修改级联选择器（默认隐藏） -->
-              <el-cascader
-                v-if="showCategoryEditor"
-                v-model="formData.categoryPath"
-                :options="processedTreeData"
-                :props="cascaderProps"
-                placeholder="请选择装备分类（最多六级）"
-                clearable
-                style="width: 100%; margin-top: 8px;"
-                @change="handleEditCategoryChange"
-                filterable
-                popper-class="six-level-cascader"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="装备名称" prop="deviceName">
-              <el-input
-                v-model="formData.deviceName"
-                placeholder="请输入装备名称"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="handleEditClose">取消</el-button>
-        <el-button type="primary" @click="submitEditForm">保存</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 新增弹窗 -->
-    <el-dialog
-      :title="'新增装备'"
-      :visible.sync="addDialogVisible"
-      width="70%"
-      :close-on-click-modal="false"
-      :before-close="handleAddClose"
-    >
-      <el-form
-        ref="addForm"
-        :model="addFormData"
-        :rules="addFormRules"
-        label-width="120px"
-        size="small"
-        class="detail-form"
-      >
-        <el-row :gutter="20">
-          <el-col :span="24">
-            <el-form-item label="装备分类" prop="categoryPath">
-              <el-cascader
-                v-model="addFormData.categoryPath"
-                :options="processedTreeData"
-                :props="cascaderProps"
-                placeholder="请选择装备分类（最多六级）"
-                clearable
-                style="width: 100%;"
-                @change="handleCategoryChange"
-                filterable
-                popper-class="six-level-cascader"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="装备名称" prop="deviceName">
-              <el-input
-                v-model="addFormData.deviceName"
-                placeholder="请输入装备名称"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="handleAddClose">取消</el-button>
-        <el-button type="primary" @click="submitAddForm">保存</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 配置特征项弹窗（含特征值展示与新增） -->
-    <!-- 配置特征项弹窗（含特征值展示与新增） -->
-    <!-- 配置特征项弹窗（仅替换此段） -->
-    <el-dialog
-      :title="`配置特征项 - ${currentEquipmentName || '未选择装备'}`"
-      :visible.sync="configDialogVisible"
-      width="800px"
-      :close-on-click-modal="false"
-      :before-close="handleConfigClose"
-      class="feature-config-dialog"
-    >
-      <div class="feature-config-container">
-        <!-- 左侧：特征项选择区 -->
-        <div class="feature-selection-panel">
-          <div class="panel-header">
-            <span class="panel-title">特征项列表</span>
-            <el-button type="text" size="mini" @click="showCreateFeatureDialog">
-              <i class="el-icon-plus"></i> 新建
-            </el-button>
-            <el-button type="text" size="mini" @click="refreshFeatureList" :loading="featureLoading">
-              <i class="el-icon-refresh"></i> 刷新
-            </el-button>
-          </div>
-
-          <div class="feature-list">
-            <div
-              v-for="feature in featureItemList"
-              :key="feature.id"
-              class="feature-item"
-              :class="{ active: configForm.featureId === feature.id, 'has-value': hasFeatureValue(feature.id) }"
-              @click="selectFeature(feature)"
+        <!-- 编辑弹窗（核心修改：支持查看路径+修改分类） -->
+        <el-dialog
+            :title="`编辑装备 - ${formData.deviceName || ''}`"
+            :visible.sync="editDialogVisible"
+            width="70%"
+            :close-on-click-modal="false"
+            :before-close="handleEditClose"
+        >
+            <el-form
+                ref="editForm"
+                :model="formData"
+                :rules="editFormRules"
+                label-width="120px"
+                size="small"
+                class="detail-form"
             >
-              <div class="feature-info">
-                <span class="feature-name">{{ feature.propertyName }}</span>
-                <span class="feature-type">{{ getInputTypeText(feature.inputType) }}</span>
-              </div>
-              <div class="feature-required">
-                <el-tag v-if="feature.mustHave === '1'" size="mini" type="danger">必填</el-tag>
-                <el-tag v-else size="mini" type="info">选填</el-tag>
-                <el-button
-                  type="text"
-                  size="mini"
-                  icon="el-icon-delete"
-                  @click.stop="handleDeleteFeature(feature)"
-                  style="color: #f56c6c; margin-left: 8px;"
-                />
-              </div>
+                <el-row :gutter="20">
+                    <!-- 核心修改1：分类路径展示+修改入口 -->
+                    <el-col :span="24">
+                        <el-form-item label="装备分类" prop="categoryPath">
+                            <!-- 路径展示区（点击可展开修改） -->
+                            <div class="category-display" @click="showCategoryEditor = true">
+                                <el-input
+                                    v-model="categoryPathText"
+                                    readonly
+                                    placeholder="无分类路径"
+                                    style="width: 100%"
+                                />
+                                <span class="edit-category-btn">点击修改</span>
+                            </div>
+                            <!-- 分类修改级联选择器（默认隐藏） -->
+                            <el-cascader
+                                v-if="showCategoryEditor"
+                                v-model="formData.categoryPath"
+                                :options="processedTreeData"
+                                :props="cascaderProps"
+                                placeholder="请选择装备分类（最多六级）"
+                                clearable
+                                style="width: 100%; margin-top: 8px"
+                                @change="handleEditCategoryChange"
+                                filterable
+                                popper-class="six-level-cascader"
+                            />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="装备名称" prop="deviceName">
+                            <el-input v-model="formData.deviceName" placeholder="请输入装备名称" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="handleEditClose">取消</el-button>
+                <el-button type="primary" @click="submitEditForm">保存</el-button>
             </div>
-            <div v-if="featureItemList.length === 0" class="empty-feature">
-              <i class="el-icon-info"></i>
-              <span>暂无特征项</span>
+        </el-dialog>
+
+        <!-- 新增弹窗 -->
+        <el-dialog
+            :title="'新增装备'"
+            :visible.sync="addDialogVisible"
+            width="70%"
+            :close-on-click-modal="false"
+            :before-close="handleAddClose"
+        >
+            <el-form
+                ref="addForm"
+                :model="addFormData"
+                :rules="addFormRules"
+                label-width="120px"
+                size="small"
+                class="detail-form"
+            >
+                <el-row :gutter="20">
+                    <el-col :span="24">
+                        <el-form-item label="装备分类" prop="categoryPath">
+                            <el-cascader
+                                v-model="addFormData.categoryPath"
+                                :options="processedTreeData"
+                                :props="cascaderProps"
+                                placeholder="请选择装备分类（最多六级）"
+                                clearable
+                                style="width: 100%"
+                                @change="handleCategoryChange"
+                                filterable
+                                popper-class="six-level-cascader"
+                            />
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                        <el-form-item label="装备名称" prop="deviceName">
+                            <el-input v-model="addFormData.deviceName" placeholder="请输入装备名称" />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="handleAddClose">取消</el-button>
+                <el-button type="primary" @click="submitAddForm">保存</el-button>
             </div>
-          </div>
-        </div>
+        </el-dialog>
 
-        <!-- 右侧：特征值管理区 -->
-        <div class="feature-value-panel">
-          <div class="current-feature-info" v-if="currentFeature">
+        <!-- 配置特征项弹窗（含特征值展示与新增） -->
+        <!-- 配置特征项弹窗（含特征值展示与新增） -->
+        <!-- 配置特征项弹窗（仅替换此段） -->
+        <el-dialog
+            :title="`配置特征项 - ${currentEquipmentName || '未选择装备'}`"
+            :visible.sync="configDialogVisible"
+            width="800px"
+            :close-on-click-modal="false"
+            :before-close="handleConfigClose"
+            class="feature-config-dialog"
+        >
+            <div class="feature-config-container">
+                <!-- 左侧：特征项选择区 -->
+                <div class="feature-selection-panel">
+                    <div class="panel-header">
+                        <span class="panel-title">特征项列表</span>
+                        <el-button type="text" size="mini" @click="showCreateFeatureDialog">
+                            <i class="el-icon-plus"></i> 新建
+                        </el-button>
+                        <el-button type="text" size="mini" @click="refreshFeatureList" :loading="featureLoading">
+                            <i class="el-icon-refresh"></i> 刷新
+                        </el-button>
+                    </div>
 
-            <h4>当前特征项为：{{ currentFeature.propertyName }}</h4>
-            <div class="feature-meta">
-              <span>输入类型：{{ getInputTypeText(currentFeature.inputType) }}</span>
-              <span>是否必填：{{ currentFeature.mustHave === '1' ? '是' : '否' }}</span>
-            </div>
-          </div>
-
-          <div class="value-management">
-            <!-- 已选特征值展示区（分开展示 + 编辑） -->
-            <div class="selected-values-section">
-<!--              <div class="section-title">-->
-<!--                <span>已选特征值</span>-->
-<!--                <el-button type="text" size="mini" @click="enterEditMode" v-if="!isEditing">-->
-<!--                  <i class="el-icon-edit"></i> 编辑-->
-<!--                </el-button>-->
-<!--                <el-button type="text" size="mini" @click="exitEditMode" v-else>-->
-<!--                  <i class="el-icon-check"></i> 完成-->
-<!--                </el-button>-->
-<!--                <el-tag size="small">{{ selectedFeatureValues.length }} 个</el-tag>-->
-<!--              </div>-->
-<!--              <div class="selected-values-list">-->
-<!--&lt;!&ndash;                <el-tag&ndash;&gt;-->
-<!--&lt;!&ndash;                  v-for="(item, index) in isEditing ? tempSelectedFeatures : selectedFeatureValues"&ndash;&gt;-->
-<!--&lt;!&ndash;                  :key="index"&ndash;&gt;-->
-<!--&lt;!&ndash;                  closable&ndash;&gt;-->
-<!--&lt;!&ndash;                  @close="removeFeatureValue(index)"&ndash;&gt;-->
-<!--&lt;!&ndash;                  @click="handleEditFeature(item)"&ndash;&gt;-->
-<!--&lt;!&ndash;                  :type="item.mustHave === '1' ? 'danger' : 'primary'"&ndash;&gt;-->
-<!--&lt;!&ndash;                  class="value-tag"&ndash;&gt;-->
-<!--&lt;!&ndash;                  :style="{ cursor: 'pointer' }"&ndash;&gt;-->
-<!--&lt;!&ndash;                >&ndash;&gt;-->
-<!--&lt;!&ndash;                  {{ item.propertyName }}: {{ item.propertyValue }}&ndash;&gt;-->
-<!--&lt;!&ndash;                </el-tag>&ndash;&gt;-->
-<!--                <div v-if="isEditing" class="editing-tip">-->
-<!--                  <i class="el-icon-edit" style="color: #409eff;"></i>-->
-<!--                  <span>正在编辑，请重新选择后点击“完成”保存</span>-->
-<!--                </div>-->
-<!--                <div v-if="!isEditing && selectedFeatureValues.length === 0" class="empty-values">-->
-<!--                  <i class="el-icon-tickets"></i>-->
-<!--                  <span>暂无特征值配置</span>-->
-<!--                </div>-->
-<!--              </div>-->
-            </div>
-
-            <!-- 预定义选项展示（下拉/多选） -->
-            <!-- 预定义选项展示与编辑（下拉/多选） -->
-            <div class="predefined-values" v-if="currentFeature && [2, 3].includes(currentFeature.inputType)">
-              <div class="section-title">
-                <span>预定义选项</span>
-                <el-button
-                  type="text"
-                  size="mini"
-                  @click="isEditingPredefined ? savePredefinedValues() : enterPredefinedEdit()"
-                >
-                  <i :class="isEditingPredefined ? 'el-icon-check' : 'el-icon-edit'" />
-                  {{ isEditingPredefined ? '保存' : '编辑' }}
-                </el-button>
-              </div>
-
-              <!-- 编辑模式：可增删 -->
-              <div v-if="isEditingPredefined" class="predefined-edit-area">
-                <el-input
-                  v-model="predefinedInputTemp"
-                  placeholder="输入新选项"
-                  size="mini"
-                  style="width: 160px; margin-right: 8px;"
-                  @keyup.enter="addPredefinedValue"
-                />
-                <el-button type="primary" size="mini" @click="addPredefinedValue">添加</el-button>
-
-                <div class="predefined-list" style="margin-top: 8px;">
-                  <el-tag
-                    v-for="(value, index) in getPredefinedValues(currentFeature)"
-                    :key="index"
-                    size="small"
-                    closable
-                    @close="removePredefinedValue(index)"
-                    style="margin: 4px;"
-                  >
-                    {{ value }}
-                  </el-tag>
+                    <div class="feature-list">
+                        <div
+                            v-for="feature in featureItemList"
+                            :key="feature.id"
+                            class="feature-item"
+                            :class="{
+                                active: configForm.featureId === feature.id,
+                                'has-value': hasFeatureValue(feature.id),
+                            }"
+                            @click="selectFeature(feature)"
+                        >
+                            <div class="feature-info">
+                                <span class="feature-name">{{ feature.propertyName }}</span>
+                                <span class="feature-type">{{ getInputTypeText(feature.inputType) }}</span>
+                            </div>
+                            <div class="feature-required">
+                                <el-tag v-if="feature.mustHave === '1'" size="mini" type="danger">必填</el-tag>
+                                <el-tag v-else size="mini" type="info">选填</el-tag>
+                                <el-button
+                                    type="text"
+                                    size="mini"
+                                    icon="el-icon-delete"
+                                    @click.stop="handleDeleteFeature(feature)"
+                                    style="color: #f56c6c; margin-left: 8px"
+                                />
+                            </div>
+                        </div>
+                        <div v-if="featureItemList.length === 0" class="empty-feature">
+                            <i class="el-icon-info"></i>
+                            <span>暂无特征项</span>
+                        </div>
+                    </div>
                 </div>
-              </div>
 
-              <!-- 非编辑模式：仅展示 + 点击选择 -->
-              <div v-else class="predefined-list">
-                <el-tag
-                  v-for="(value, index) in getPredefinedValues(currentFeature)"
-                  :key="index"
-                  size="small"
-                  @click="selectPredefinedValue(value)"
-                  :class="{ 'predefined-tag': true, 'selected': isPredefinedValueSelected(value) }"
-                  class="predefined-tag"
-                >
-                  {{ value }}
-                </el-tag>
-                <div v-if="getPredefinedValues(currentFeature).length === 0" class="empty-predefined">
-                  <i class="el-icon-info"></i>
-                  <span>暂无预定义选项</span>
+                <!-- 右侧：特征值管理区 -->
+                <div class="feature-value-panel">
+                    <div class="current-feature-info" v-if="currentFeature">
+                        <h4>当前特征项为：{{ currentFeature.propertyName }}</h4>
+                        <div class="feature-meta">
+                            <span>输入类型：{{ getInputTypeText(currentFeature.inputType) }}</span>
+                            <span>是否必填：{{ currentFeature.mustHave === '1' ? '是' : '否' }}</span>
+                        </div>
+                    </div>
+
+                    <div class="value-management">
+                        <!-- 已选特征值展示区（分开展示 + 编辑） -->
+                        <div class="selected-values-section">
+                            <!--              <div class="section-title">-->
+                            <!--                <span>已选特征值</span>-->
+                            <!--                <el-button type="text" size="mini" @click="enterEditMode" v-if="!isEditing">-->
+                            <!--                  <i class="el-icon-edit"></i> 编辑-->
+                            <!--                </el-button>-->
+                            <!--                <el-button type="text" size="mini" @click="exitEditMode" v-else>-->
+                            <!--                  <i class="el-icon-check"></i> 完成-->
+                            <!--                </el-button>-->
+                            <!--                <el-tag size="small">{{ selectedFeatureValues.length }} 个</el-tag>-->
+                            <!--              </div>-->
+                            <!--              <div class="selected-values-list">-->
+                            <!--&lt;!&ndash;                <el-tag&ndash;&gt;-->
+                            <!--&lt;!&ndash;                  v-for="(item, index) in isEditing ? tempSelectedFeatures : selectedFeatureValues"&ndash;&gt;-->
+                            <!--&lt;!&ndash;                  :key="index"&ndash;&gt;-->
+                            <!--&lt;!&ndash;                  closable&ndash;&gt;-->
+                            <!--&lt;!&ndash;                  @close="removeFeatureValue(index)"&ndash;&gt;-->
+                            <!--&lt;!&ndash;                  @click="handleEditFeature(item)"&ndash;&gt;-->
+                            <!--&lt;!&ndash;                  :type="item.mustHave === '1' ? 'danger' : 'primary'"&ndash;&gt;-->
+                            <!--&lt;!&ndash;                  class="value-tag"&ndash;&gt;-->
+                            <!--&lt;!&ndash;                  :style="{ cursor: 'pointer' }"&ndash;&gt;-->
+                            <!--&lt;!&ndash;                >&ndash;&gt;-->
+                            <!--&lt;!&ndash;                  {{ item.propertyName }}: {{ item.propertyValue }}&ndash;&gt;-->
+                            <!--&lt;!&ndash;                </el-tag>&ndash;&gt;-->
+                            <!--                <div v-if="isEditing" class="editing-tip">-->
+                            <!--                  <i class="el-icon-edit" style="color: #409eff;"></i>-->
+                            <!--                  <span>正在编辑，请重新选择后点击“完成”保存</span>-->
+                            <!--                </div>-->
+                            <!--                <div v-if="!isEditing && selectedFeatureValues.length === 0" class="empty-values">-->
+                            <!--                  <i class="el-icon-tickets"></i>-->
+                            <!--                  <span>暂无特征值配置</span>-->
+                            <!--                </div>-->
+                            <!--              </div>-->
+                        </div>
+
+                        <!-- 预定义选项展示（下拉/多选） -->
+                        <!-- 预定义选项展示与编辑（下拉/多选） -->
+                        <div
+                            class="predefined-values"
+                            v-if="currentFeature && [2, 3].includes(currentFeature.inputType)"
+                        >
+                            <div class="section-title">
+                                <span>预定义选项</span>
+                                <el-button
+                                    type="text"
+                                    size="mini"
+                                    @click="isEditingPredefined ? savePredefinedValues() : enterPredefinedEdit()"
+                                >
+                                    <i :class="isEditingPredefined ? 'el-icon-check' : 'el-icon-edit'" />
+                                    {{ isEditingPredefined ? '保存' : '编辑' }}
+                                </el-button>
+                            </div>
+
+                            <!-- 编辑模式：可增删 -->
+                            <div v-if="isEditingPredefined" class="predefined-edit-area">
+                                <el-input
+                                    v-model="predefinedInputTemp"
+                                    placeholder="输入新选项"
+                                    size="mini"
+                                    style="width: 160px; margin-right: 8px"
+                                    @keyup.enter="addPredefinedValue"
+                                />
+                                <el-button type="primary" size="mini" @click="addPredefinedValue">添加</el-button>
+
+                                <div class="predefined-list" style="margin-top: 8px">
+                                    <el-tag
+                                        v-for="(value, index) in getPredefinedValues(currentFeature)"
+                                        :key="index"
+                                        size="small"
+                                        closable
+                                        @close="removePredefinedValue(index)"
+                                        style="margin: 4px"
+                                    >
+                                        {{ value }}
+                                    </el-tag>
+                                </div>
+                            </div>
+
+                            <!-- 非编辑模式：仅展示 + 点击选择 -->
+                            <div v-else class="predefined-list">
+                                <el-tag
+                                    v-for="(value, index) in getPredefinedValues(currentFeature)"
+                                    :key="index"
+                                    size="small"
+                                    @click="selectPredefinedValue(value)"
+                                    :class="{ 'predefined-tag': true, selected: isPredefinedValueSelected(value) }"
+                                    class="predefined-tag"
+                                >
+                                    {{ value }}
+                                </el-tag>
+                                <div v-if="getPredefinedValues(currentFeature).length === 0" class="empty-predefined">
+                                    <i class="el-icon-info"></i>
+                                    <span>暂无预定义选项</span>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
                 </div>
-              </div>
             </div>
-          </div>
-        </div>
-      </div>
 
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="handleConfigClose">取消</el-button>
-        <el-button type="primary" @click="submitConfigForm" :loading="submitLoading">
-          保存配置
-        </el-button>
-      </div>
-    </el-dialog>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="handleConfigClose">取消</el-button>
+                <el-button type="primary" @click="submitConfigForm" :loading="submitLoading"> 保存配置 </el-button>
+            </div>
+        </el-dialog>
 
+        <!-- 在配置特征项弹窗后面添加新建特征项弹窗 -->
+        <el-dialog
+            title="新建特征项"
+            :visible.sync="createFeatureDialogVisible"
+            width="500px"
+            :close-on-click-modal="false"
+            :before-close="handleCreateFeatureClose"
+        >
+            <el-form
+                ref="createFeatureForm"
+                :model="createFeatureForm"
+                :rules="createFeatureRules"
+                label-width="100px"
+                size="small"
+            >
+                <el-form-item label="特征项名称" prop="propertyName">
+                    <el-input
+                        v-model="createFeatureForm.propertyName"
+                        placeholder="请输入特征项名称"
+                        maxlength="50"
+                        show-word-limit
+                    />
+                </el-form-item>
 
-    <!-- 在配置特征项弹窗后面添加新建特征项弹窗 -->
-    <el-dialog
-      title="新建特征项"
-      :visible.sync="createFeatureDialogVisible"
-      width="500px"
-      :close-on-click-modal="false"
-      :before-close="handleCreateFeatureClose"
-    >
-      <el-form
-        ref="createFeatureForm"
-        :model="createFeatureForm"
-        :rules="createFeatureRules"
-        label-width="100px"
-        size="small"
-      >
-        <el-form-item label="特征项名称" prop="propertyName">
-          <el-input
-            v-model="createFeatureForm.propertyName"
-            placeholder="请输入特征项名称"
-            maxlength="50"
-            show-word-limit
-          />
-        </el-form-item>
+                <el-form-item label="输入类型" prop="inputType">
+                    <el-select v-model="createFeatureForm.inputType" placeholder="请选择输入类型" style="width: 100%">
+                        <el-option label="输入框" :value="1" />
+                        <el-option label="下拉选择" :value="2" />
+                        <el-option label="多选" :value="3" />
+                    </el-select>
+                </el-form-item>
 
-        <el-form-item label="输入类型" prop="inputType">
-          <el-select v-model="createFeatureForm.inputType" placeholder="请选择输入类型" style="width: 100%;">
-            <el-option label="输入框" :value="1" />
-            <el-option label="下拉选择" :value="2" />
-            <el-option label="多选" :value="3" />
-          </el-select>
-        </el-form-item>
+                <el-form-item label="是否必填" prop="mustHave">
+                    <el-radio-group v-model="createFeatureForm.mustHave">
+                        <el-radio label="0">选填</el-radio>
+                        <el-radio label="1">必填</el-radio>
+                    </el-radio-group>
+                </el-form-item>
 
-        <el-form-item label="是否必填" prop="mustHave">
-          <el-radio-group v-model="createFeatureForm.mustHave">
-            <el-radio label="0">选填</el-radio>
-            <el-radio label="1">必填</el-radio>
-          </el-radio-group>
-        </el-form-item>
+                <el-form-item label="预定义值" prop="predefinedValues" v-if="createFeatureForm.inputType !== 1">
+                    <el-input
+                        v-model="createFeatureForm.predefinedValues"
+                        type="textarea"
+                        :rows="3"
+                        placeholder="请输入预定义选项，用逗号分隔（仅下拉选择/多选类型需要）"
+                        maxlength="200"
+                        show-word-limit
+                    />
+                    <div class="form-tip">多个选项用逗号分隔，例如：选项1,选项2,选项3</div>
+                </el-form-item>
+            </el-form>
 
-        <el-form-item label="预定义值" prop="predefinedValues" v-if="createFeatureForm.inputType !== 1">
-          <el-input
-            v-model="createFeatureForm.predefinedValues"
-            type="textarea"
-            :rows="3"
-            placeholder="请输入预定义选项，用逗号分隔（仅下拉选择/多选类型需要）"
-            maxlength="200"
-            show-word-limit
-          />
-          <div class="form-tip">多个选项用逗号分隔，例如：选项1,选项2,选项3</div>
-        </el-form-item>
-      </el-form>
-
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="handleCreateFeatureClose">取消</el-button>
-        <el-button type="primary" @click="submitCreateFeature" :loading="createFeatureLoading">保存</el-button>
-      </div>
-    </el-dialog>
-
-  </div>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click="handleCreateFeatureClose">取消</el-button>
+                <el-button type="primary" @click="submitCreateFeature" :loading="createFeatureLoading">保存</el-button>
+            </div>
+        </el-dialog>
+    </div>
 </template>
 
 <script>
 import {
-  getEquipmentTreeAPI,
-  getEquipmentListAPI,
-  getEquipmentCascaderAPI,
-  addEquipmentTypeAPI,
-  getEquipmentTypeDetailAPI,
-  updateEquipmentTypeAPI,
-  deleteEquipmentTypeAPI,
+    getEquipmentTreeAPI,
+    getEquipmentListAPI,
+    getEquipmentCascaderAPI,
+    addEquipmentTypeAPI,
+    getEquipmentTypeDetailAPI,
+    updateEquipmentTypeAPI,
+    deleteEquipmentTypeAPI,
 } from '@/api/EquipmentConfig/index.js'
 
 import {
-  getPropertiesByTypeId,
-  getPropertiesNameByTypeId,
-  addProperty,
-  updateProperty,
-  deleteProperty
+    getPropertiesByTypeId,
+    getPropertiesNameByTypeId,
+    addProperty,
+    updateProperty,
+    deleteProperty,
 } from '@/api/EquipmentConfig/property.js'
 
 export default {
-  name: 'EquipmentConfig',
-  data() {
-    return {
-      isEditing: false,
-      editingFeature: null,
-      tempSelectedFeatures: [],
+    name: 'EquipmentConfig',
+    data() {
+        return {
+            isEditing: false,
+            editingFeature: null,
+            tempSelectedFeatures: [],
 
-      editingPredefinedIndex: -1,
+            editingPredefinedIndex: -1,
 
-      isEditingPredefined: false,
-      predefinedInputTemp: '', // 用于新增预定义值
+            isEditingPredefined: false,
+            predefinedInputTemp: '', // 用于新增预定义值
 
-      queryParams: {
-        deptName: undefined,
-        status: undefined,
-        typeId: undefined,
-        pageNum: 1,
-        pageSize: 10
-      },
-      treeData: [],
-      processedTreeData: [],
-      defaultProps: {
-        children: 'children',
-        label: 'name',
-      },
-      cascaderProps: {
-        value: 'id',
-        label: 'name',
-        children: 'children',
-        checkStrictly: true,
-        expandTrigger: 'click'
-      },
-      treeLoading: false,
-      collapsed: false,
-      tableData: [],
-      total: 0,
-      tableLoading: false,
-      previewDialogVisible: false,
-
-
-      formData: {
-        id: '',
-        categoryPath: [], // 存储分类ID数组（用于提交修改）
-        deviceName: '',
-      },
-
-      // 核心修改2：恢复分类ID校验，确保修改后能提交
-      editFormRules: {
-        categoryPath: [
-          { required: true, message: '请选择装备分类', trigger: 'change' }
-        ],
-        deviceName: [
-          { required: true, message: '请输入装备名称', trigger: 'blur' }
-        ]
-      },
-      editDialogVisible: false,
-      // 核心修改3：新增控制级联选择器显隐的变量
-      showCategoryEditor: false,
-      addDialogVisible: false,
-      addFormData: {
-        categoryPath: [],
-        deviceName: ''
-      },
-      addFormRules: {
-        categoryPath: [
-          { required: true, message: '请选择装备分类（最多六级）', trigger: 'change' }
-        ],
-        deviceName: [
-          { required: true, message: '请输入装备名称', trigger: 'blur' }
-        ]
-      },
-      selectedParentNode: null,
-      levelMapping: new Map(),
-
-      // 核心修改4：存储装备分类路径文本（用于展示）
-      categoryPathText: '',
-
-      // 配置特征项相关数据
-      configDialogVisible: false,
-      currentEquipmentId: '',
-      currentEquipmentName: '',
-      currentFeature: null,
-      featureItemList: [],
-      featureLoading: false,
-      submitLoading: false,
-      configForm: {
-        featureId: ''
-      },
-      addValueForm: {
-        propertyValue: ''
-      },
-      inputStatus: {
-        touched: false
-      },
-      selectedFeatureValues: [],
-
-      // 新建特征项相关数据
-      createFeatureDialogVisible: false,
-      createFeatureLoading: false,
-      createFeatureForm: {
-        propertyName: '',
-        inputType: 1,
-        mustHave: '0',
-        predefinedValues: ''
-      },
-      createFeatureRules: {
-        propertyName: [
-          { required: true, message: '请输入特征项名称', trigger: 'blur' },
-          { min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur' }
-        ],
-        inputType: [
-          { required: true, message: '请选择输入类型', trigger: 'change' }
-        ],
-        mustHave: [
-          { required: true, message: '请选择是否必填', trigger: 'change' }
-        ]
-      },
-
-      // 存储当前装备的 typeId，用于新建特征项
-      currentEquipmentTypeIdForFeature: ''
-    }
-  },
-
-  computed: {
-    // 计算属性：添加按钮是否禁用
-    isAddButtonDisabled() {
-      // 未选择特征项时禁用
-      if (!this.currentFeature) return true;
-
-      // 处理必填项逻辑
-      if (this.currentFeature.mustHave === '1') {
-        // 必填项：值为空时禁用
-        return !this.addValueForm.propertyValue?.trim();
-      }
-
-      // 非必填项：始终可用（即使值为空）
-      return false;
-    }
-  },
-
-  methods: {
-
-    // 新增：进入编辑模式
-    enterEditMode() {
-      this.isEditing = true;
-      this.tempSelectedFeatures = [...this.selectedFeatureValues];
-    },
-    // 新增：退出编辑模式
-    exitEditMode() {
-      this.isEditing = false;
-      this.selectedFeatureValues = [...this.tempSelectedFeatures];
-      this.tempSelectedFeatures = [];
-      this.$message.success('编辑完成');
-    },
-
-
-    // 新增：判断预定义值是否被选中
-    isPredefinedValueSelected(value) {
-      if (this.currentFeature.inputType === 3) {
-        return Array.isArray(this.addValueForm.propertyValue) && this.addValueForm.propertyValue.includes(value);
-      } else if (this.currentFeature.inputType === 2) {
-        return this.addValueForm.propertyValue === value;
-      }
-      return false;
-    },
-    // 选择预定义值（微调：支持多选和下拉，且与编辑状态联动）
-    selectPredefinedValue(value) {
-      // 下拉选择（inputType=2）：单个值赋值
-      if (this.currentFeature.inputType === 2) {
-        this.addValueForm.propertyValue = value;
-      }
-      // 多选（inputType=3）：数组添加/删除值（避免重复）
-      else if (this.currentFeature.inputType === 3) {
-        // 初始化数组（防止undefined）
-        if (!Array.isArray(this.addValueForm.propertyValue)) {
-          this.addValueForm.propertyValue = [];
-        }
-        // 已包含则删除，未包含则添加
-        const valueIndex = this.addValueForm.propertyValue.indexOf(value);
-        if (valueIndex > -1) {
-          this.addValueForm.propertyValue.splice(valueIndex, 1);
-        } else {
-          this.addValueForm.propertyValue.push(value);
-        }
-      }
-      // 编辑状态下，实时更新临时列表（模拟“添加前预览”）
-      if (this.isEditing) {
-        this.handleValueInputForEdit();
-      }
-    },
-    // 新增：编辑状态下输入值处理
-    handleValueInputForEdit() {
-      if (!this.currentFeature || !this.isEditing) return;
-      // 生成待更新的特征值结构
-      const targetValue = this.currentFeature.inputType === 3
-        ? (this.addValueForm.propertyValue || []).join(',')
-        : this.addValueForm.propertyValue || '';
-      // 找到待修改的特征值并更新临时列表
-      const editIndex = this.tempSelectedFeatures.findIndex(
-        feat => feat.id === this.editingFeature.id && feat.propertyValue === this.editingFeature.propertyValue
-      );
-      if (editIndex > -1) {
-        this.tempSelectedFeatures[editIndex] = {
-          ...this.tempSelectedFeatures[editIndex],
-          propertyValue: targetValue
-        };
-      }
-    },
-
-
-
-    // 获取预定义值（针对下拉选择类型）
-    getPredefinedValues(feature) {
-      if (feature.propertyValue && feature.inputType !== 1) {
-        return feature.propertyValue.split(',').map(v => v.trim()).filter(v => v);
-      }
-      return [];
-    },
-
-
-
-    // 动态生成校验规则
-    getDynamicRules() {
-      const rules = {
-        propertyValue: []
-      };
-
-      if (this.currentFeature && this.currentFeature.mustHave === '1') {
-        rules.propertyValue.push({
-          required: true,
-          message: '请输入/选择特征值（必填项）',
-          trigger: ['blur', 'change'],
-          // 多选类型校验数组长度，其他类型校验字符串非空
-          validator: (rule, value, callback) => {
-            if (this.currentFeature.inputType === 3) {
-              // 多选：数组长度大于0
-              if (Array.isArray(value) && value.length > 0) {
-                callback();
-              } else {
-                callback(new Error('请至少选择一个特征值（必填项）'));
-              }
-            } else {
-              // 其他类型：字符串非空
-              if (value?.trim()) {
-                callback();
-              } else {
-                callback(new Error('请输入特征值（必填项）'));
-              }
-            }
-          }
-        });
-
-        // 预定义值校验（下拉+多选都需校验）
-        if ([2, 3].includes(this.currentFeature.inputType)) {
-          rules.propertyValue.push({
-            validator: (rule, value, callback) => {
-              const predefinedValues = this.getPredefinedValues(this.currentFeature);
-              if (predefinedValues.length === 0) {
-                callback();
-                return;
-              }
-              // 多选：校验所有选择的值都在预定义中
-              if (this.currentFeature.inputType === 3) {
-                const invalidValues = (value || []).filter(v => !predefinedValues.includes(v));
-                if (invalidValues.length > 0) {
-                  callback(new Error(`请从预定义值中选择（${predefinedValues.join('、')}）`));
-                } else {
-                  callback();
-                }
-              }
-              // 下拉：校验单个值在预定义中
-              else {
-                if (value && !predefinedValues.includes(value.trim())) {
-                  callback(new Error(`请从预定义值中选择（${predefinedValues.join('、')}）`));
-                } else {
-                  callback();
-                }
-              }
+            queryParams: {
+                deptName: undefined,
+                status: undefined,
+                typeId: undefined,
+                pageNum: 1,
+                pageSize: 10,
             },
-            trigger: ['blur', 'change']
-          });
+            treeData: [],
+            processedTreeData: [],
+            defaultProps: {
+                children: 'children',
+                label: 'name',
+            },
+            cascaderProps: {
+                value: 'id',
+                label: 'name',
+                children: 'children',
+                checkStrictly: true,
+                expandTrigger: 'click',
+            },
+            treeLoading: false,
+            collapsed: false,
+            tableData: [],
+            total: 0,
+            tableLoading: false,
+            previewDialogVisible: false,
+
+            formData: {
+                id: '',
+                categoryPath: [], // 存储分类ID数组（用于提交修改）
+                deviceName: '',
+            },
+
+            // 核心修改2：恢复分类ID校验，确保修改后能提交
+            editFormRules: {
+                categoryPath: [{ required: true, message: '请选择装备分类', trigger: 'change' }],
+                deviceName: [{ required: true, message: '请输入装备名称', trigger: 'blur' }],
+            },
+            editDialogVisible: false,
+            // 核心修改3：新增控制级联选择器显隐的变量
+            showCategoryEditor: false,
+            addDialogVisible: false,
+            addFormData: {
+                categoryPath: [],
+                deviceName: '',
+            },
+            addFormRules: {
+                categoryPath: [{ required: true, message: '请选择装备分类（最多六级）', trigger: 'change' }],
+                deviceName: [{ required: true, message: '请输入装备名称', trigger: 'blur' }],
+            },
+            selectedParentNode: null,
+            levelMapping: new Map(),
+
+            // 核心修改4：存储装备分类路径文本（用于展示）
+            categoryPathText: '',
+
+            // 配置特征项相关数据
+            configDialogVisible: false,
+            currentEquipmentId: '',
+            currentEquipmentName: '',
+            currentFeature: null,
+            featureItemList: [],
+            featureLoading: false,
+            submitLoading: false,
+            configForm: {
+                featureId: '',
+            },
+            addValueForm: {
+                propertyValue: '',
+            },
+            inputStatus: {
+                touched: false,
+            },
+            selectedFeatureValues: [],
+
+            // 新建特征项相关数据
+            createFeatureDialogVisible: false,
+            createFeatureLoading: false,
+            createFeatureForm: {
+                propertyName: '',
+                inputType: 1,
+                mustHave: '0',
+                predefinedValues: '',
+            },
+            createFeatureRules: {
+                propertyName: [
+                    { required: true, message: '请输入特征项名称', trigger: 'blur' },
+                    { min: 1, max: 50, message: '长度在 1 到 50 个字符', trigger: 'blur' },
+                ],
+                inputType: [{ required: true, message: '请选择输入类型', trigger: 'change' }],
+                mustHave: [{ required: true, message: '请选择是否必填', trigger: 'change' }],
+            },
+
+            // 存储当前装备的 typeId，用于新建特征项
+            currentEquipmentTypeIdForFeature: '',
         }
-      } else {
-        // 非必填项长度校验
-        rules.propertyValue.push({
-          validator: (rule, value, callback) => {
-            let targetValue = value;
+    },
+
+    computed: {
+        // 计算属性：添加按钮是否禁用
+        isAddButtonDisabled() {
+            // 未选择特征项时禁用
+            if (!this.currentFeature) return true
+
+            // 处理必填项逻辑
+            if (this.currentFeature.mustHave === '1') {
+                // 必填项：值为空时禁用
+                return !this.addValueForm.propertyValue?.trim()
+            }
+
+            // 非必填项：始终可用（即使值为空）
+            return false
+        },
+    },
+
+    methods: {
+        // 新增：进入编辑模式
+        enterEditMode() {
+            this.isEditing = true
+            this.tempSelectedFeatures = [...this.selectedFeatureValues]
+        },
+        // 新增：退出编辑模式
+        exitEditMode() {
+            this.isEditing = false
+            this.selectedFeatureValues = [...this.tempSelectedFeatures]
+            this.tempSelectedFeatures = []
+            this.$message.success('编辑完成')
+        },
+
+        // 新增：判断预定义值是否被选中
+        isPredefinedValueSelected(value) {
             if (this.currentFeature.inputType === 3) {
-              // 多选：拼接后的字符串长度
-              targetValue = (value || []).join(',');
+                return Array.isArray(this.addValueForm.propertyValue) && this.addValueForm.propertyValue.includes(value)
+            } else if (this.currentFeature.inputType === 2) {
+                return this.addValueForm.propertyValue === value
             }
-            const maxLength = this.currentFeature.inputType === 2 ? 50 : 200;
-            if (targetValue.length <= maxLength) {
-              callback();
-            } else {
-              callback(new Error(`特征值长度不能超过${maxLength}个字符`));
+            return false
+        },
+        // 选择预定义值（微调：支持多选和下拉，且与编辑状态联动）
+        selectPredefinedValue(value) {
+            // 下拉选择（inputType=2）：单个值赋值
+            if (this.currentFeature.inputType === 2) {
+                this.addValueForm.propertyValue = value
             }
-          },
-          trigger: ['blur', 'change']
-        });
-      }
-
-      return rules;
-    },
-
-
-
-    processTreeData(data) {
-      return Array.isArray(data) ? data : (data ? [data] : []);
-    },
-
-    processChildrenData(data, currentLevel = 1) {
-      if (currentLevel > 6) {
-        return [];
-      }
-      return data.map(item => {
-        const nodeId = item.typeId ? Number(item.typeId) : (item.id ? Number(item.id) : '');
-        const processedItem = {
-          id: nodeId,
-          name: item.typeName || item.name,
-          level: currentLevel,
-          parentId: item.parentId ? Number(item.parentId) : null,
-          ...item
-        };
-        if (item.children && item.children.length > 0 && currentLevel < 6) {
-          processedItem.children = this.processChildrenData(item.children, currentLevel + 1);
-        } else {
-          delete processedItem.children;
-        }
-        return processedItem;
-      });
-    },
-
-    handleNodeClick(data, node) {
-      if (data.id === 'all') {
-        this.queryParams.typeId = undefined;
-        this.queryParams.parentId = undefined;
-      } else {
-        this.queryParams.typeId = data.id;
-        this.queryParams.parentId = data.parentId;
-      }
-      this.queryParams.pageNum = 1;
-      this.getDeviceList();
-    },
-
-    handleCategoryChange(value, selectedOptions) {
-      if (value && value.length > 6) {
-        this.$message.warning('最多只能选择6级分类');
-        this.addFormData.categoryPath = value.slice(0, 6);
-        return;
-      }
-      if (selectedOptions && selectedOptions.length > 0) {
-        const lastNode = selectedOptions[selectedOptions.length - 1];
-        this.addFormData.deviceName = lastNode?.name || '';
-        this.selectedParentNode = lastNode;
-      }
-    },
-
-    // 核心修改5：编辑时选择分类后，同步更新路径文本
-    handleEditCategoryChange(value, selectedOptions) {
-      if (value && value.length > 6) {
-        this.$message.warning('最多只能选择6级分类');
-        this.formData.categoryPath = value.slice(0, 6);
-        return;
-      }
-      // 选择新分类后，更新路径文本
-      if (selectedOptions && selectedOptions.length > 0) {
-        const pathNames = selectedOptions.map(option => option.name);
-        this.categoryPathText = pathNames.join(' > ') || '无分类路径';
-      } else {
-        this.categoryPathText = '无分类路径';
-      }
-    },
-
-
-    getFullCategoryPath() {
-      if (!this.formData.currentCategoryInfo || !this.formData.currentCategoryInfo.fullPath) {
-        return '无分类信息';
-      }
-      const path = this.formData.currentCategoryInfo.fullPath;
-      const nonEmptyPath = path.filter(item => item && item.trim() !== '');
-      if (nonEmptyPath.length === 0) {
-        return '根分类';
-      }
-      return nonEmptyPath.join(' > ');
-    },
-
-
-
-    toggleCollapse() {
-      this.collapsed = !this.collapsed;
-    },
-
-    async getDeviceTree() {
-      try {
-        this.treeLoading = true;
-        const res = await getEquipmentTreeAPI();
-        if (res.code === 200) {
-          this.treeData = this.processTreeData(res.data);
-          this.processedTreeData = this.processTreeData(res.data);
-          this.buildLevelMapping(res.data);
-        } else {
-          this.$message.error(res.msg || '获取装备分类树失败');
-        }
-      } catch (error) {
-        this.$message.error('获取装备分类树失败：' + (error.message || '未知错误'));
-      } finally {
-        this.treeLoading = false;
-      }
-    },
-
-    buildLevelMapping(treeData) {
-      this.levelMapping.clear();
-      const buildMap = (nodes, parentPath = [], currentLevel = 1, parentId = null) => {
-        if (!nodes || !Array.isArray(nodes)) return;
-        nodes.forEach(node => {
-          const nodeId = node.typeId || node.id;
-          const nodeName = node.typeName || node.name || '';
-          const nodeLevel = node.level || currentLevel;
-          const currentPath = [...parentPath];
-          while (currentPath.length < nodeLevel - 1) {
-            currentPath.push('');
-          }
-          currentPath[nodeLevel - 1] = nodeName;
-          while (currentPath.length < 6) {
-            currentPath.push('');
-          }
-          this.levelMapping.set(nodeId, {
-            id: nodeId,
-            name: nodeName,
-            level: nodeLevel,
-            parentId: parentId,
-            fullPath: [...currentPath]
-          });
-          if (node.children && node.children.length > 0) {
-            buildMap(node.children, currentPath, nodeLevel + 1, nodeId);
-          }
-        });
-      };
-      buildMap(treeData, [], 1, null);
-    },
-
-    async getDeviceList() {
-      try {
-        this.tableLoading = true;
-        const listRes = await getEquipmentListAPI(this.queryParams);
-        if (listRes.code === 200) {
-          let rawData = [];
-          let totalCount = 0;
-          if (listRes.data && typeof listRes.data === 'object') {
-            if (listRes.data.rows) {
-              rawData = listRes.data.rows;
-              totalCount = listRes.data.total || 0;
-            } else if (Array.isArray(listRes.data)) {
-              rawData = listRes.data;
-              totalCount = rawData.length;
-            } else if (listRes.data.list) {
-              rawData = listRes.data.list;
-              totalCount = listRes.data.total || rawData.length;
-            } else {
-              rawData = [listRes.data];
-              totalCount = 1;
+            // 多选（inputType=3）：数组添加/删除值（避免重复）
+            else if (this.currentFeature.inputType === 3) {
+                // 初始化数组（防止undefined）
+                if (!Array.isArray(this.addValueForm.propertyValue)) {
+                    this.addValueForm.propertyValue = []
+                }
+                // 已包含则删除，未包含则添加
+                const valueIndex = this.addValueForm.propertyValue.indexOf(value)
+                if (valueIndex > -1) {
+                    this.addValueForm.propertyValue.splice(valueIndex, 1)
+                } else {
+                    this.addValueForm.propertyValue.push(value)
+                }
             }
-          } else if (Array.isArray(listRes.data)) {
-            rawData = listRes.data;
-            totalCount = rawData.length;
-          } else {
-            rawData = [];
-            totalCount = 0;
-          }
-          if (rawData.length > 0) {
-            this.tableData = this.transformDataToTable(rawData);
-            this.total = totalCount;
-          } else {
-            this.tableData = [];
-            this.total = 0;
-            this.$message.info('该分类下暂无数据');
-          }
-        } else {
-          this.$message.error(listRes.msg || '获取装备列表失败');
-        }
-      } catch (error) {
-        this.$message.error('获取装备列表失败：' + (error.message || '未知错误'));
-      } finally {
-        this.tableLoading = false;
-      }
-    },
-
-    transformDataToTable(data) {
-      if (!data || !Array.isArray(data)) return [];
-      const tableData = [];
-      data.forEach(item => {
-        const itemId = item.typeId || item.id;
-        const levelInfo = this.levelMapping.get(itemId);
-        let level1 = '', level2 = '', level3 = '', level4 = '', level5 = '', level6 = '';
-        if (levelInfo && levelInfo.fullPath) {
-          const path = levelInfo.fullPath;
-          level1 = path[0] || '';
-          level2 = path[1] || '';
-          level3 = path[2] || '';
-          level4 = path[3] || '';
-          level5 = path[4] || '';
-          level6 = path[5] || '';
-        }
-        tableData.push({
-          id: itemId,
-          level1, level2, level3, level4, level5, level6,
-          createBy: item.createBy || '',
-          createTime: item.createTime || '',
-          updateBy: item.updateBy || '',
-          updateTime: item.updateTime || '',
-          rawData: item
-        });
-      });
-      return tableData;
-    },
-
-    async onHandlePreview(row) {
-      try {
-        const targetId = row.rawData.typeId || row.rawData.id || row.id;
-        if (!targetId) {
-          this.$message.warning('无法获取装备ID，查看失败');
-          return;
-        }
-        const res = await getEquipmentTypeDetailAPI(targetId);
-        if (res.code === 200) {
-          const detailData = res.data;
-          const levelInfo = this.levelMapping.get(targetId) || {};
-          const fullPath = levelInfo.fullPath || ['', '', '', '', '', ''];
-          this.formData = {
-            id: detailData.typeId || detailData.id || targetId,
-            level1: fullPath[0],
-            level2: fullPath[1],
-            level3: fullPath[2],
-            level4: fullPath[3],
-            level5: fullPath[4],
-            level6: detailData.typeName || fullPath[5],
-            categoryPath: [],
-            deviceName: '',
-          };
-          this.previewDialogVisible = true;
-        } else {
-          this.$message.error(res.msg || '获取装备详情失败');
-        }
-      } catch (error) {
-        this.$message.error('获取装备详情失败：' + (error.message || '未知错误'));
-      }
-    },
-
-    handlePreviewClose() {
-      this.previewDialogVisible = false;
-    },
-
-
-    // 点击已选特征值标签，回显到选择器并进入编辑状态
-    handleEditFeature(item) {
-      // 仅支持下拉（2）和多选（3）类型编辑
-      if (![2, 3].includes(item.inputType)) {
-        this.$message.info('仅下拉选择和多选类型支持编辑');
-        return;
-      }
-
-      // 1. 记录待修改的特征值，标记编辑状态
-      this.isEditing = true;
-      this.editingFeature = { ...item }; // 深拷贝避免直接修改原数据
-
-      // 2. 拆分特征值（多选值是逗号分隔字符串，需转数组；下拉是单个值）
-      const targetValue = item.inputType === 3
-        ? item.propertyValue.split(',').map(v => v.trim())  // 多选：字符串转数组
-        : item.propertyValue;                               // 下拉：直接赋值
-
-      // 3. 回显值到选择器，并切换到对应特征项
-      this.addValueForm.propertyValue = targetValue;
-      this.selectFeature({
-        id: item.id,
-        inputType: item.inputType,
-        mustHave: item.mustHave,
-        propertyName: item.propertyName,
-        propertyValue: item.propertyValue // 携带原预定义值，确保选择器选项正确
-      });
-
-      // 4. 临时列表：过滤掉待修改的标签（避免重复显示）
-      this.tempSelectedFeatures = this.selectedFeatureValues.filter(
-        feat => feat.id !== item.id || feat.propertyValue !== item.propertyValue
-      );
-    },
-
-
-    // 核心修改6：打开编辑弹窗时，初始化路径文本和分类ID
-    async onHandleEdit(row) {
-      const targetId = row.rawData.typeId || row.rawData.id || row.id;
-      if (!targetId) {
-        this.$message.warning('无法获取装备ID，编辑失败');
-        return;
-      }
-      const levelInfo = this.levelMapping.get(targetId);
-      if (!levelInfo) {
-        this.$message.warning('未找到该装备的分类信息，无法编辑');
-        return;
-      }
-      // 1. 初始化分类路径文本（如“专业1 > 工序1 > 装备1”）
-      const fullPath = levelInfo.fullPath || [];
-      this.categoryPathText = fullPath.filter(item => item.trim()).join(' > ') || '无分类路径';
-
-      // 2. 初始化分类ID数组（用于提交修改）
-      const categoryPath = this.getCategoryPathById(targetId);
-      this.formData = {
-        id: targetId,
-        categoryPath: categoryPath.map(id => String(id)),
-        deviceName: levelInfo.name || '',
-      };
-
-      // 3. 默认隐藏分类修改器
-      this.showCategoryEditor = false;
-      await this.$nextTick();
-      this.editDialogVisible = true;
-    },
-
-    getCategoryPathById(targetId) {
-      const path = [];
-      let currentId = targetId;
-      while (currentId) {
-        path.unshift(currentId);
-        const currentNodeInfo = this.levelMapping.get(currentId);
-        if (!currentNodeInfo) {
-          console.warn('未找到节点信息:', currentId);
-          break;
-        }
-        currentId = currentNodeInfo.parentId;
-      }
-      return path;
-    },
-
-    // 核心修改7：关闭编辑弹窗时，重置路径文本和显隐状态
-    handleEditClose() {
-      this.editDialogVisible = false;
-      this.resetEditFormData();
-    },
-
-    resetEditFormData() {
-      this.formData = {
-        id: '',
-        categoryPath: [],
-        deviceName: ''
-      };
-      this.categoryPathText = '';
-      this.showCategoryEditor = false;
-      if (this.$refs.editForm) {
-        this.$refs.editForm.resetFields();
-      }
-    },
-
-    // 核心修改8：提交编辑时，携带最新分类ID
-    submitEditForm() {
-      this.$refs.editForm.validate(async (valid) => {
-        if (valid) {
-          try {
-            // 编辑时提交“分类ID+装备名称”（支持分类修改）
-            const categoryPath = this.formData.categoryPath;
-            const parentId = categoryPath.length > 0
-              ? (categoryPath.length > 1 ? categoryPath[categoryPath.length - 1] : null)
-              : null;
-            const submitData = {
-              typeId: this.formData.id,
-              typeName: this.formData.deviceName,
-              parentId:parentId,
-              level: categoryPath.length+1
-            };
-            const res = await updateEquipmentTypeAPI(submitData);
-            if (res.code === 200) {
-              this.$message.success('编辑成功');
-              this.editDialogVisible = false;
-              await this.getDeviceTree();
-              this.getDeviceList();
-            } else {
-              this.$message.error(res.msg || '编辑失败');
+            // 编辑状态下，实时更新临时列表（模拟“添加前预览”）
+            if (this.isEditing) {
+                this.handleValueInputForEdit()
             }
-          } catch (error) {
-            console.error('编辑错误:', error);
-            this.$message.error('编辑失败：' + (error.message || '未知错误'));
-          }
-        } else {
-          this.$message.warning('请完善必填字段后再保存');
-        }
-      });
-    },
-
-    handleAdd() {
-      this.resetAddFormData();
-      this.addDialogVisible = true;
-    },
-
-    handleAddClose() {
-      this.addDialogVisible = false;
-      this.resetAddFormData();
-    },
-
-    resetAddFormData() {
-      this.addFormData = {
-        categoryPath: [],
-        deviceName: ''
-      };
-      this.selectedParentNode = null;
-      if (this.$refs.addForm) {
-        this.$refs.addForm.resetFields();
-      }
-    },
-
-    submitAddForm() {
-      this.$refs.addForm.validate(async (valid) => {
-        if (valid) {
-          try {
-            const categoryPath = this.addFormData.categoryPath;
-            if (categoryPath.length >= 6) {
-              this.$message.warning('最多只能选择6级分类，无法在其下新增');
-              return;
-            }
-            const parentId = categoryPath.length > 0 ? categoryPath[categoryPath.length - 1] : null;
-            const level = categoryPath.length + 1;
-            const submitData = {
-              typeName: this.addFormData.deviceName,
-              parentId: parentId,
-              level: level
-            };
-            const res = await addEquipmentTypeAPI(submitData);
-            if (res.code === 200) {
-              this.$message.success('新增分类成功');
-              this.addDialogVisible = false;
-              await this.getDeviceTree();
-              this.getDeviceList();
-            } else {
-              this.$message.error(res.msg || '新增分类失败');
-            }
-          } catch (error) {
-            this.$message.error('新增分类失败：' + (error.message || '未知错误'));
-          }
-        }
-      });
-    },
-
-    onHandleDelete(row) {
-      this.$confirm('确定要删除该装备吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(async () => {
-        try {
-          const id = row.rawData.id || row.rawData.typeId;
-          const res = await deleteEquipmentTypeAPI(id);
-          if (res.code === 200) {
-            this.$message.success('删除成功');
-            this.getDeviceList();
-          } else {
-            this.$message.error(res.msg || '删除失败');
-          }
-        } catch (error) {
-          this.$message.error('删除失败：' + (error.message || '未知错误'));
-        }
-      });
-    },
-
-    // ========== 特征值配置相关方法 ==========
-    async onHandleConfig(row) {
-      const targetId = row.rawData.typeId || row.rawData.id || row.id;
-      if (!targetId) {
-        this.$message.warning('无法获取装备ID，配置失败');
-        return;
-      }
-
-      this.resetConfigData();
-      this.currentEquipmentId = targetId;
-      this.currentEquipmentTypeIdForFeature = targetId;
-
-      this.currentEquipmentName = row.level6 ||
-        row.rawData.typeName ||
-        row.rawData.name ||
-        '当前装备';
-
-      this.featureLoading = true;
-
-      try {
-        const featureListRes = await getPropertiesByTypeId(this.currentEquipmentId);
-        const equipmentFeatureRes = await getPropertiesByTypeId(targetId);
-
-        if (featureListRes.code === 200) {
-          this.featureItemList = featureListRes.data || [];
-        } else {
-          this.$message.error(featureListRes.msg || '获取特征项列表失败');
-          this.featureItemList = [];
-        }
-
-        if (equipmentFeatureRes.code === 200) {
-          this.selectedFeatureValues = equipmentFeatureRes.data || [];
-        } else {
-          this.$message.error(equipmentFeatureRes.msg || '获取装备已配置特征值失败');
-          this.selectedFeatureValues = [];
-        }
-
-        this.configDialogVisible = true;
-      } catch (error) {
-        this.$message.error('加载配置数据失败：' + (error.message || '未知错误'));
-      } finally {
-        this.featureLoading = false;
-      }
-    },
-
-    resetConfigData() {
-      this.currentFeature = null;
-      this.configForm = { featureId: '' };
-      this.addValueForm = { propertyValue: '' };
-      this.selectedFeatureValues = [];
-      if (this.$refs.addValueForm) {
-        this.$refs.addValueForm.resetFields();
-      }
-    },
-
-    selectFeature(feature) {
-      this.currentFeature = feature;
-      this.configForm.featureId = feature.id;
-      console.log("当前特征项：", feature);
-      console.log("inputType:", feature.inputType);
-      console.log("propertyValue:", feature.propertyValue);
-      console.log("当前选中特征项的预定义值：", feature.propertyValue);
-    },
-
-    hasFeatureValue(featureId) {
-      return this.selectedFeatureValues.some(item => item.id === featureId);
-    },
-
-    getInputTypeText(inputType) {
-      const types = {
-        1: '输入框',
-        2: '下拉选择',
-        3: '多选'
-      };
-      return types[inputType] || '未知类型';
-    },
-
-    //特征值添加逻辑
-    addFeatureValue() {
-      this.$refs.addValueForm.validate((valid) => {
-        if (valid && this.currentFeature) {
-          let values = [];
-          // 处理多选/下拉的值格式（同原有逻辑）
-          if (this.currentFeature.inputType === 3) {
-            values = this.addValueForm.propertyValue || [];
-            if (values.length === 0) {
-              this.$message.warning('请至少选择一个特征值');
-              return;
-            }
-          } else {
-            const value = this.addValueForm.propertyValue?.trim() || '';
-            if (!value) {
-              this.$message.warning('请输入/选择特征值');
-              return;
-            }
-            values = [value];
-          }
-          const targetValue = values.join(',');
-
-          // 新增：判断是否是编辑状态
-          if (this.isEditing && this.editingFeature) {
-            // 编辑逻辑：找到原特征值并更新
-            const editIndex = this.selectedFeatureValues.findIndex(
-              feat => feat.id === this.editingFeature.id && feat.propertyValue === this.editingFeature.propertyValue
-            );
+        },
+        // 新增：编辑状态下输入值处理
+        handleValueInputForEdit() {
+            if (!this.currentFeature || !this.isEditing) return
+            // 生成待更新的特征值结构
+            const targetValue =
+                this.currentFeature.inputType === 3
+                    ? (this.addValueForm.propertyValue || []).join(',')
+                    : this.addValueForm.propertyValue || ''
+            // 找到待修改的特征值并更新临时列表
+            const editIndex = this.tempSelectedFeatures.findIndex(
+                (feat) =>
+                    feat.id === this.editingFeature.id && feat.propertyValue === this.editingFeature.propertyValue,
+            )
             if (editIndex > -1) {
-              // 更新原特征值的propertyValue
-              this.selectedFeatureValues[editIndex] = {
-                ...this.selectedFeatureValues[editIndex],
-                propertyValue: targetValue
-              };
-              this.$message.success('特征值修改成功');
+                this.tempSelectedFeatures[editIndex] = {
+                    ...this.tempSelectedFeatures[editIndex],
+                    propertyValue: targetValue,
+                }
             }
+        },
+
+        // 获取预定义值（针对下拉选择类型）
+        getPredefinedValues(feature) {
+            if (feature.propertyValue && feature.inputType !== 1) {
+                return feature.propertyValue
+                    .split(',')
+                    .map((v) => v.trim())
+                    .filter((v) => v)
+            }
+            return []
+        },
+
+        // 动态生成校验规则
+        getDynamicRules() {
+            const rules = {
+                propertyValue: [],
+            }
+
+            if (this.currentFeature && this.currentFeature.mustHave === '1') {
+                rules.propertyValue.push({
+                    required: true,
+                    message: '请输入/选择特征值（必填项）',
+                    trigger: ['blur', 'change'],
+                    // 多选类型校验数组长度，其他类型校验字符串非空
+                    validator: (rule, value, callback) => {
+                        if (this.currentFeature.inputType === 3) {
+                            // 多选：数组长度大于0
+                            if (Array.isArray(value) && value.length > 0) {
+                                callback()
+                            } else {
+                                callback(new Error('请至少选择一个特征值（必填项）'))
+                            }
+                        } else {
+                            // 其他类型：字符串非空
+                            if (value?.trim()) {
+                                callback()
+                            } else {
+                                callback(new Error('请输入特征值（必填项）'))
+                            }
+                        }
+                    },
+                })
+
+                // 预定义值校验（下拉+多选都需校验）
+                if ([2, 3].includes(this.currentFeature.inputType)) {
+                    rules.propertyValue.push({
+                        validator: (rule, value, callback) => {
+                            const predefinedValues = this.getPredefinedValues(this.currentFeature)
+                            if (predefinedValues.length === 0) {
+                                callback()
+                                return
+                            }
+                            // 多选：校验所有选择的值都在预定义中
+                            if (this.currentFeature.inputType === 3) {
+                                const invalidValues = (value || []).filter((v) => !predefinedValues.includes(v))
+                                if (invalidValues.length > 0) {
+                                    callback(new Error(`请从预定义值中选择（${predefinedValues.join('、')}）`))
+                                } else {
+                                    callback()
+                                }
+                            }
+                            // 下拉：校验单个值在预定义中
+                            else {
+                                if (value && !predefinedValues.includes(value.trim())) {
+                                    callback(new Error(`请从预定义值中选择（${predefinedValues.join('、')}）`))
+                                } else {
+                                    callback()
+                                }
+                            }
+                        },
+                        trigger: ['blur', 'change'],
+                    })
+                }
+            } else {
+                // 非必填项长度校验
+                rules.propertyValue.push({
+                    validator: (rule, value, callback) => {
+                        let targetValue = value
+                        if (this.currentFeature.inputType === 3) {
+                            // 多选：拼接后的字符串长度
+                            targetValue = (value || []).join(',')
+                        }
+                        const maxLength = this.currentFeature.inputType === 2 ? 50 : 200
+                        if (targetValue.length <= maxLength) {
+                            callback()
+                        } else {
+                            callback(new Error(`特征值长度不能超过${maxLength}个字符`))
+                        }
+                    },
+                    trigger: ['blur', 'change'],
+                })
+            }
+
+            return rules
+        },
+
+        processTreeData(data) {
+            return Array.isArray(data) ? data : data ? [data] : []
+        },
+
+        processChildrenData(data, currentLevel = 1) {
+            if (currentLevel > 6) {
+                return []
+            }
+            return data.map((item) => {
+                const nodeId = item.typeId ? Number(item.typeId) : item.id ? Number(item.id) : ''
+                const processedItem = {
+                    id: nodeId,
+                    name: item.typeName || item.name,
+                    level: currentLevel,
+                    parentId: item.parentId ? Number(item.parentId) : null,
+                    ...item,
+                }
+                if (item.children && item.children.length > 0 && currentLevel < 6) {
+                    processedItem.children = this.processChildrenData(item.children, currentLevel + 1)
+                } else {
+                    delete processedItem.children
+                }
+                return processedItem
+            })
+        },
+
+        handleNodeClick(data, node) {
+            if (data.id === 'all') {
+                this.queryParams.typeId = undefined
+                this.queryParams.parentId = undefined
+            } else {
+                this.queryParams.typeId = data.id
+                this.queryParams.parentId = data.parentId
+            }
+            this.queryParams.pageNum = 1
+            this.getDeviceList()
+        },
+
+        handleCategoryChange(value, selectedOptions) {
+            if (value && value.length > 6) {
+                this.$message.warning('最多只能选择6级分类')
+                this.addFormData.categoryPath = value.slice(0, 6)
+                return
+            }
+            if (selectedOptions && selectedOptions.length > 0) {
+                const lastNode = selectedOptions[selectedOptions.length - 1]
+                this.addFormData.deviceName = lastNode?.name || ''
+                this.selectedParentNode = lastNode
+            }
+        },
+
+        // 核心修改5：编辑时选择分类后，同步更新路径文本
+        handleEditCategoryChange(value, selectedOptions) {
+            if (value && value.length > 6) {
+                this.$message.warning('最多只能选择6级分类')
+                this.formData.categoryPath = value.slice(0, 6)
+                return
+            }
+            // 选择新分类后，更新路径文本
+            if (selectedOptions && selectedOptions.length > 0) {
+                const pathNames = selectedOptions.map((option) => option.name)
+                this.categoryPathText = pathNames.join(' > ') || '无分类路径'
+            } else {
+                this.categoryPathText = '无分类路径'
+            }
+        },
+
+        getFullCategoryPath() {
+            if (!this.formData.currentCategoryInfo || !this.formData.currentCategoryInfo.fullPath) {
+                return '无分类信息'
+            }
+            const path = this.formData.currentCategoryInfo.fullPath
+            const nonEmptyPath = path.filter((item) => item && item.trim() !== '')
+            if (nonEmptyPath.length === 0) {
+                return '根分类'
+            }
+            return nonEmptyPath.join(' > ')
+        },
+
+        toggleCollapse() {
+            this.collapsed = !this.collapsed
+        },
+
+        async getDeviceTree() {
+            try {
+                this.treeLoading = true
+                const res = await getEquipmentTreeAPI()
+                if (res.code === 200) {
+                    this.treeData = this.processTreeData(res.data)
+                    this.processedTreeData = this.processTreeData(res.data)
+                    this.buildLevelMapping(res.data)
+                } else {
+                    this.$message.error(res.msg || '获取装备分类树失败')
+                }
+            } catch (error) {
+                this.$message.error('获取装备分类树失败：' + (error.message || '未知错误'))
+            } finally {
+                this.treeLoading = false
+            }
+        },
+
+        buildLevelMapping(treeData) {
+            this.levelMapping.clear()
+            const buildMap = (nodes, parentPath = [], currentLevel = 1, parentId = null) => {
+                if (!nodes || !Array.isArray(nodes)) return
+                nodes.forEach((node) => {
+                    const nodeId = node.typeId || node.id
+                    const nodeName = node.typeName || node.name || ''
+                    const nodeLevel = node.level || currentLevel
+                    const currentPath = [...parentPath]
+                    while (currentPath.length < nodeLevel - 1) {
+                        currentPath.push('')
+                    }
+                    currentPath[nodeLevel - 1] = nodeName
+                    while (currentPath.length < 6) {
+                        currentPath.push('')
+                    }
+                    this.levelMapping.set(nodeId, {
+                        id: nodeId,
+                        name: nodeName,
+                        level: nodeLevel,
+                        parentId: parentId,
+                        fullPath: [...currentPath],
+                    })
+                    if (node.children && node.children.length > 0) {
+                        buildMap(node.children, currentPath, nodeLevel + 1, nodeId)
+                    }
+                })
+            }
+            buildMap(treeData, [], 1, null)
+        },
+
+        async getDeviceList() {
+            try {
+                this.tableLoading = true
+                const listRes = await getEquipmentListAPI(this.queryParams)
+                if (listRes.code === 200) {
+                    let rawData = []
+                    let totalCount = 0
+                    if (listRes.data && typeof listRes.data === 'object') {
+                        if (listRes.data.rows) {
+                            rawData = listRes.data.rows
+                            totalCount = listRes.data.total || 0
+                        } else if (Array.isArray(listRes.data)) {
+                            rawData = listRes.data
+                            totalCount = rawData.length
+                        } else if (listRes.data.list) {
+                            rawData = listRes.data.list
+                            totalCount = listRes.data.total || rawData.length
+                        } else {
+                            rawData = [listRes.data]
+                            totalCount = 1
+                        }
+                    } else if (Array.isArray(listRes.data)) {
+                        rawData = listRes.data
+                        totalCount = rawData.length
+                    } else {
+                        rawData = []
+                        totalCount = 0
+                    }
+                    if (rawData.length > 0) {
+                        this.tableData = this.transformDataToTable(rawData)
+                        this.total = totalCount
+                    } else {
+                        this.tableData = []
+                        this.total = 0
+                        this.$message.info('该分类下暂无数据')
+                    }
+                } else {
+                    this.$message.error(listRes.msg || '获取装备列表失败')
+                }
+            } catch (error) {
+                this.$message.error('获取装备列表失败：' + (error.message || '未知错误'))
+            } finally {
+                this.tableLoading = false
+            }
+        },
+
+        transformDataToTable(data) {
+            if (!data || !Array.isArray(data)) return []
+            const tableData = []
+            data.forEach((item) => {
+                const itemId = item.typeId || item.id
+                const levelInfo = this.levelMapping.get(itemId)
+                let level1 = '',
+                    level2 = '',
+                    level3 = '',
+                    level4 = '',
+                    level5 = '',
+                    level6 = ''
+                if (levelInfo && levelInfo.fullPath) {
+                    const path = levelInfo.fullPath
+                    level1 = path[0] || ''
+                    level2 = path[1] || ''
+                    level3 = path[2] || ''
+                    level4 = path[3] || ''
+                    level5 = path[4] || ''
+                    level6 = path[5] || ''
+                }
+                tableData.push({
+                    id: itemId,
+                    level1,
+                    level2,
+                    level3,
+                    level4,
+                    level5,
+                    level6,
+                    createBy: item.createBy || '',
+                    createTime: item.createTime || '',
+                    updateBy: item.updateBy || '',
+                    updateTime: item.updateTime || '',
+                    rawData: item,
+                })
+            })
+            return tableData
+        },
+
+        async onHandlePreview(row) {
+            try {
+                const targetId = row.rawData.typeId || row.rawData.id || row.id
+                if (!targetId) {
+                    this.$message.warning('无法获取装备ID，查看失败')
+                    return
+                }
+                const res = await getEquipmentTypeDetailAPI(targetId)
+                if (res.code === 200) {
+                    const detailData = res.data
+                    const levelInfo = this.levelMapping.get(targetId) || {}
+                    const fullPath = levelInfo.fullPath || ['', '', '', '', '', '']
+                    this.formData = {
+                        id: detailData.typeId || detailData.id || targetId,
+                        level1: fullPath[0],
+                        level2: fullPath[1],
+                        level3: fullPath[2],
+                        level4: fullPath[3],
+                        level5: fullPath[4],
+                        level6: detailData.typeName || fullPath[5],
+                        categoryPath: [],
+                        deviceName: '',
+                    }
+                    this.previewDialogVisible = true
+                } else {
+                    this.$message.error(res.msg || '获取装备详情失败')
+                }
+            } catch (error) {
+                this.$message.error('获取装备详情失败：' + (error.message || '未知错误'))
+            }
+        },
+
+        handlePreviewClose() {
+            this.previewDialogVisible = false
+        },
+
+        // 点击已选特征值标签，回显到选择器并进入编辑状态
+        handleEditFeature(item) {
+            // 仅支持下拉（2）和多选（3）类型编辑
+            if (![2, 3].includes(item.inputType)) {
+                this.$message.info('仅下拉选择和多选类型支持编辑')
+                return
+            }
+
+            // 1. 记录待修改的特征值，标记编辑状态
+            this.isEditing = true
+            this.editingFeature = { ...item } // 深拷贝避免直接修改原数据
+
+            // 2. 拆分特征值（多选值是逗号分隔字符串，需转数组；下拉是单个值）
+            const targetValue =
+                item.inputType === 3
+                    ? item.propertyValue.split(',').map((v) => v.trim()) // 多选：字符串转数组
+                    : item.propertyValue // 下拉：直接赋值
+
+            // 3. 回显值到选择器，并切换到对应特征项
+            this.addValueForm.propertyValue = targetValue
+            this.selectFeature({
+                id: item.id,
+                inputType: item.inputType,
+                mustHave: item.mustHave,
+                propertyName: item.propertyName,
+                propertyValue: item.propertyValue, // 携带原预定义值，确保选择器选项正确
+            })
+
+            // 4. 临时列表：过滤掉待修改的标签（避免重复显示）
+            this.tempSelectedFeatures = this.selectedFeatureValues.filter(
+                (feat) => feat.id !== item.id || feat.propertyValue !== item.propertyValue,
+            )
+        },
+
+        // 核心修改6：打开编辑弹窗时，初始化路径文本和分类ID
+        async onHandleEdit(row) {
+            const targetId = row.rawData.typeId || row.rawData.id || row.id
+            if (!targetId) {
+                this.$message.warning('无法获取装备ID，编辑失败')
+                return
+            }
+            const levelInfo = this.levelMapping.get(targetId)
+            if (!levelInfo) {
+                this.$message.warning('未找到该装备的分类信息，无法编辑')
+                return
+            }
+            // 1. 初始化分类路径文本（如“专业1 > 工序1 > 装备1”）
+            const fullPath = levelInfo.fullPath || []
+            this.categoryPathText = fullPath.filter((item) => item.trim()).join(' > ') || '无分类路径'
+
+            // 2. 初始化分类ID数组（用于提交修改）
+            const categoryPath = this.getCategoryPathById(targetId)
+            this.formData = {
+                id: targetId,
+                categoryPath: categoryPath.map((id) => String(id)),
+                deviceName: levelInfo.name || '',
+            }
+
+            // 3. 默认隐藏分类修改器
+            this.showCategoryEditor = false
+            await this.$nextTick()
+            this.editDialogVisible = true
+        },
+
+        getCategoryPathById(targetId) {
+            const path = []
+            let currentId = targetId
+            while (currentId) {
+                path.unshift(currentId)
+                const currentNodeInfo = this.levelMapping.get(currentId)
+                if (!currentNodeInfo) {
+                    console.warn('未找到节点信息:', currentId)
+                    break
+                }
+                currentId = currentNodeInfo.parentId
+            }
+            return path
+        },
+
+        // 核心修改7：关闭编辑弹窗时，重置路径文本和显隐状态
+        handleEditClose() {
+            this.editDialogVisible = false
+            this.resetEditFormData()
+        },
+
+        resetEditFormData() {
+            this.formData = {
+                id: '',
+                categoryPath: [],
+                deviceName: '',
+            }
+            this.categoryPathText = ''
+            this.showCategoryEditor = false
+            if (this.$refs.editForm) {
+                this.$refs.editForm.resetFields()
+            }
+        },
+
+        // 核心修改8：提交编辑时，携带最新分类ID
+        submitEditForm() {
+            this.$refs.editForm.validate(async (valid) => {
+                if (valid) {
+                    try {
+                        // 编辑时提交“分类ID+装备名称”（支持分类修改）
+                        const categoryPath = this.formData.categoryPath
+                        const parentId =
+                            categoryPath.length > 0
+                                ? categoryPath.length > 1
+                                    ? categoryPath[categoryPath.length - 1]
+                                    : null
+                                : null
+                        const submitData = {
+                            typeId: this.formData.id,
+                            typeName: this.formData.deviceName,
+                            parentId: parentId,
+                            level: categoryPath.length + 1,
+                        }
+                        const res = await updateEquipmentTypeAPI(submitData)
+                        if (res.code === 200) {
+                            this.$message.success('编辑成功')
+                            this.editDialogVisible = false
+                            await this.getDeviceTree()
+                            this.getDeviceList()
+                        } else {
+                            this.$message.error(res.msg || '编辑失败')
+                        }
+                    } catch (error) {
+                        console.error('编辑错误:', error)
+                        this.$message.error('编辑失败：' + (error.message || '未知错误'))
+                    }
+                } else {
+                    this.$message.warning('请完善必填字段后再保存')
+                }
+            })
+        },
+
+        handleAdd() {
+            this.resetAddFormData()
+            this.addDialogVisible = true
+        },
+
+        handleAddClose() {
+            this.addDialogVisible = false
+            this.resetAddFormData()
+        },
+
+        resetAddFormData() {
+            this.addFormData = {
+                categoryPath: [],
+                deviceName: '',
+            }
+            this.selectedParentNode = null
+            if (this.$refs.addForm) {
+                this.$refs.addForm.resetFields()
+            }
+        },
+
+        submitAddForm() {
+            this.$refs.addForm.validate(async (valid) => {
+                if (valid) {
+                    try {
+                        const categoryPath = this.addFormData.categoryPath
+                        if (categoryPath.length >= 6) {
+                            this.$message.warning('最多只能选择6级分类，无法在其下新增')
+                            return
+                        }
+                        const parentId = categoryPath.length > 0 ? categoryPath[categoryPath.length - 1] : null
+                        const level = categoryPath.length + 1
+                        const submitData = {
+                            typeName: this.addFormData.deviceName,
+                            parentId: parentId,
+                            level: level,
+                        }
+                        const res = await addEquipmentTypeAPI(submitData)
+                        if (res.code === 200) {
+                            this.$message.success('新增分类成功')
+                            this.addDialogVisible = false
+                            await this.getDeviceTree()
+                            this.getDeviceList()
+                        } else {
+                            this.$message.error(res.msg || '新增分类失败')
+                        }
+                    } catch (error) {
+                        this.$message.error('新增分类失败：' + (error.message || '未知错误'))
+                    }
+                }
+            })
+        },
+
+        onHandleDelete(row) {
+            this.$confirm('确定要删除该装备吗？', '提示', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+            }).then(async () => {
+                try {
+                    const id = row.rawData.id || row.rawData.typeId
+                    const res = await deleteEquipmentTypeAPI(id)
+                    if (res.code === 200) {
+                        this.$message.success('删除成功')
+                        this.getDeviceList()
+                    } else {
+                        this.$message.error(res.msg || '删除失败')
+                    }
+                } catch (error) {
+                    this.$message.error('删除失败：' + (error.message || '未知错误'))
+                }
+            })
+        },
+
+        // ========== 特征值配置相关方法 ==========
+        async onHandleConfig(row) {
+            const targetId = row.rawData.typeId || row.rawData.id || row.id
+            if (!targetId) {
+                this.$message.warning('无法获取装备ID，配置失败')
+                return
+            }
+
+            this.resetConfigData()
+            this.currentEquipmentId = targetId
+            this.currentEquipmentTypeIdForFeature = targetId
+
+            this.currentEquipmentName = row.level6 || row.rawData.typeName || row.rawData.name || '当前装备'
+
+            this.featureLoading = true
+
+            try {
+                const featureListRes = await getPropertiesByTypeId(this.currentEquipmentId)
+                const equipmentFeatureRes = await getPropertiesByTypeId(targetId)
+
+                if (featureListRes.code === 200) {
+                    this.featureItemList = featureListRes.data || []
+                } else {
+                    this.$message.error(featureListRes.msg || '获取特征项列表失败')
+                    this.featureItemList = []
+                }
+
+                if (equipmentFeatureRes.code === 200) {
+                    this.selectedFeatureValues = equipmentFeatureRes.data || []
+                } else {
+                    this.$message.error(equipmentFeatureRes.msg || '获取装备已配置特征值失败')
+                    this.selectedFeatureValues = []
+                }
+
+                this.configDialogVisible = true
+            } catch (error) {
+                this.$message.error('加载配置数据失败：' + (error.message || '未知错误'))
+            } finally {
+                this.featureLoading = false
+            }
+        },
+
+        resetConfigData() {
+            this.currentFeature = null
+            this.configForm = { featureId: '' }
+            this.addValueForm = { propertyValue: '' }
+            this.selectedFeatureValues = []
+            if (this.$refs.addValueForm) {
+                this.$refs.addValueForm.resetFields()
+            }
+        },
+
+        selectFeature(feature) {
+            this.currentFeature = feature
+            this.configForm.featureId = feature.id
+            console.log('当前特征项：', feature)
+            console.log('inputType:', feature.inputType)
+            console.log('propertyValue:', feature.propertyValue)
+            console.log('当前选中特征项的预定义值：', feature.propertyValue)
+        },
+
+        hasFeatureValue(featureId) {
+            return this.selectedFeatureValues.some((item) => item.id === featureId)
+        },
+
+        getInputTypeText(inputType) {
+            const types = {
+                1: '输入框',
+                2: '下拉选择',
+                3: '多选',
+            }
+            return types[inputType] || '未知类型'
+        },
+
+        //特征值添加逻辑
+        addFeatureValue() {
+            this.$refs.addValueForm.validate((valid) => {
+                if (valid && this.currentFeature) {
+                    let values = []
+                    // 处理多选/下拉的值格式（同原有逻辑）
+                    if (this.currentFeature.inputType === 3) {
+                        values = this.addValueForm.propertyValue || []
+                        if (values.length === 0) {
+                            this.$message.warning('请至少选择一个特征值')
+                            return
+                        }
+                    } else {
+                        const value = this.addValueForm.propertyValue?.trim() || ''
+                        if (!value) {
+                            this.$message.warning('请输入/选择特征值')
+                            return
+                        }
+                        values = [value]
+                    }
+                    const targetValue = values.join(',')
+
+                    // 新增：判断是否是编辑状态
+                    if (this.isEditing && this.editingFeature) {
+                        // 编辑逻辑：找到原特征值并更新
+                        const editIndex = this.selectedFeatureValues.findIndex(
+                            (feat) =>
+                                feat.id === this.editingFeature.id &&
+                                feat.propertyValue === this.editingFeature.propertyValue,
+                        )
+                        if (editIndex > -1) {
+                            // 更新原特征值的propertyValue
+                            this.selectedFeatureValues[editIndex] = {
+                                ...this.selectedFeatureValues[editIndex],
+                                propertyValue: targetValue,
+                            }
+                            this.$message.success('特征值修改成功')
+                        }
+                        // 退出编辑状态，重置临时数据
+                        this.isEditing = false
+                        this.editingFeature = null
+                        this.tempSelectedFeatures = []
+                    } else {
+                        // 原有新增逻辑：重复校验+添加新特征值
+                        const exists = this.selectedFeatureValues.some(
+                            (item) => item.id === this.currentFeature.id && item.propertyValue === targetValue,
+                        )
+                        if (exists) {
+                            this.$message.warning('该特征值组合已存在')
+                            return
+                        }
+                        this.addFeatureToSelected(targetValue)
+                    }
+
+                    // 重置表单（无论新增还是编辑，都清空选择器）
+                    this.resetAddValueForm()
+                } else {
+                    if (this.currentFeature && this.currentFeature.mustHave === '1') {
+                        this.$message.warning('请输入必填的特征值')
+                    }
+                }
+            })
+        },
+
+        addFeatureToSelected(value) {
+            const newFeature = {
+                id: null,
+                typeId: this.currentEquipmentId,
+                mustHave: this.currentFeature.mustHave,
+                inputType: this.currentFeature.inputType,
+                propertyName: this.currentFeature.propertyName,
+                propertyValue: value,
+                createTime: new Date(),
+            }
+
+            this.selectedFeatureValues.push(newFeature)
+            this.$message.success('特征值添加成功')
+        },
+
+        resetAddValueForm() {
+            // 重置选择器值（多选为空数组，其他为空字符串）
+            this.addValueForm.propertyValue = this.currentFeature?.inputType === 3 ? [] : ''
+            this.inputStatus.touched = false
+
             // 退出编辑状态，重置临时数据
-            this.isEditing = false;
-            this.editingFeature = null;
-            this.tempSelectedFeatures = [];
-          } else {
-            // 原有新增逻辑：重复校验+添加新特征值
-            const exists = this.selectedFeatureValues.some(
-              item => item.id === this.currentFeature.id && item.propertyValue === targetValue
-            );
+            this.isEditing = false
+            this.editingFeature = null
+            this.tempSelectedFeatures = []
+
+            if (this.$refs.addValueForm) {
+                this.$refs.addValueForm.clearValidate()
+            }
+        },
+
+        async removeFeatureValue(index) {
+            // 确定当前操作的是原列表还是临时列表
+            const targetList = this.isEditing ? this.tempSelectedFeatures : this.selectedFeatureValues
+            const removedItem = targetList[index]
+
+            // 如果删除的是待修改特征值，先退出编辑状态
+            if (this.isEditing && this.editingFeature) {
+                this.isEditing = false
+                this.editingFeature = null
+                this.tempSelectedFeatures = []
+            }
+
+            if (removedItem.id) {
+                this.$confirm('确定要删除该特征值吗？', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning',
+                })
+                    .then(async () => {
+                        try {
+                            const res = await deleteProperty(removedItem.id)
+                            if (res.code === 200) {
+                                targetList.splice(index, 1)
+                                this.$message.success('删除成功')
+                            } else {
+                                this.$message.error('删除失败: ' + (res.msg || '未知错误'))
+                            }
+                        } catch (error) {
+                            this.$message.error('删除失败: ' + (error.message || '未知错误'))
+                        }
+                    })
+                    .catch(() => {
+                        this.$message.info('已取消删除')
+                    })
+            } else {
+                targetList.splice(index, 1)
+                this.$message.info('特征值已移除')
+            }
+        },
+
+        async refreshFeatureList() {
+            try {
+                this.featureLoading = true
+                const res = await getPropertiesByTypeId(this.currentEquipmentId)
+                if (res.code === 200) {
+                    this.featureItemList = res.data || []
+                    this.$message.success('特征项列表已刷新')
+                } else {
+                    this.$message.error(res.msg || '刷新特征项列表失败')
+                }
+            } catch (error) {
+                this.$message.error('刷新失败：' + (error.message || '未知错误'))
+            } finally {
+                this.featureLoading = false
+            }
+        },
+
+        showCreateFeatureDialog() {
+            this.currentEquipmentTypeIdForFeature = this.currentEquipmentId
+            this.createFeatureDialogVisible = true
+            this.resetCreateFeatureForm()
+        },
+
+        handleValueInput() {
+            this.inputStatus.touched = true
+        },
+
+        resetCreateFeatureForm() {
+            this.createFeatureForm = {
+                propertyName: '',
+                inputType: 1,
+                mustHave: '0',
+                predefinedValues: '',
+            }
+            if (this.$refs.createFeatureForm) {
+                this.$refs.createFeatureForm.resetFields()
+            }
+        },
+
+        handleCreateFeatureClose() {
+            this.createFeatureDialogVisible = false
+            this.resetCreateFeatureForm()
+        },
+
+        async handleDeleteFeature(feature) {
+            const isInUse = this.selectedFeatureValues.some((item) => item.id === feature.id)
+
+            const confirmMsg = isInUse
+                ? `特征项「${feature.propertyName}」已配置特征值，删除将同步移除相关数据，是否继续？`
+                : `确定要删除特征项「${feature.propertyName}」吗？此操作不可撤销。`
+
+            this.$confirm(confirmMsg, '删除确认', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                type: 'warning',
+            })
+                .then(async () => {
+                    try {
+                        const res = await deleteProperty(feature.id)
+                        if (res.code === 200) {
+                            this.$message.success('特征项删除成功')
+                            await this.refreshFeatureList()
+                            if (this.currentFeature && this.currentFeature.id === feature.id) {
+                                this.currentFeature = null
+                                this.configForm.featureId = ''
+                            }
+                        } else {
+                            this.$message.error(res.msg || '删除失败')
+                        }
+                    } catch (error) {
+                        console.error('删除特征项失败:', error)
+                        this.$message.error('删除失败：' + (error.message || '网络错误'))
+                    }
+                })
+                .catch(() => {
+                    this.$message.info('已取消删除')
+                })
+        },
+
+        async checkFeatureNameExists(propertyName) {
+            try {
+                const res = await getPropertiesNameByTypeId(this.currentEquipmentTypeIdForFeature)
+                if (res.code === 200) {
+                    const existingFeatures = res.data || []
+                    return existingFeatures.some((feature) => feature.propertyName === propertyName)
+                }
+                return false
+            } catch (error) {
+                console.error('检查特征项名称失败:', error)
+                this.$message.error('检查特征项名称失败：' + (error.message || '网络错误'))
+                return false
+            }
+        },
+
+        async submitCreateFeature() {
+            const saveData = {
+                propertyName: this.createFeatureForm.propertyName,
+                inputType: this.createFeatureForm.inputType,
+                mustHave: this.createFeatureForm.mustHave,
+                propertyValue: this.createFeatureForm.predefinedValues,
+                typeId: this.currentEquipmentTypeIdForFeature,
+            }
+            this.$refs.createFeatureForm.validate(async (valid) => {
+                if (valid) {
+                    if (this.createFeatureForm.inputType !== 1 && !this.createFeatureForm.predefinedValues.trim()) {
+                        this.$message.warning('下拉选择/多选类型必须设置预定义选项')
+                        return
+                    }
+
+                    const nameExists = await this.checkFeatureNameExists(this.createFeatureForm.propertyName)
+                    if (nameExists) {
+                        this.$message.warning('该特征项名称已存在，请更换名称')
+                        return
+                    }
+
+                    try {
+                        this.createFeatureLoading = true
+                        const submitData = {
+                            propertyName: this.createFeatureForm.propertyName,
+                            inputType: this.createFeatureForm.inputType,
+                            mustHave: this.createFeatureForm.mustHave,
+                            propertyValue: '',
+                            typeId: this.currentEquipmentTypeIdForFeature,
+                        }
+
+                        if (this.createFeatureForm.inputType !== 1 && this.createFeatureForm.predefinedValues) {
+                            submitData.propertyValue = this.createFeatureForm.predefinedValues.trim()
+                        }
+
+                        console.log('新建特征项数据:', submitData)
+                        console.log('[addProperty] 请求参数:', saveData)
+                        const res = await addProperty(submitData)
+                        if (res.code === 200) {
+                            this.$message.success('特征项创建成功')
+                            this.handleCreateFeatureClose()
+                            await this.refreshFeatureList()
+                        } else {
+                            this.$message.error(res.msg || '特征项创建失败')
+                        }
+                    } catch (error) {
+                        console.error('创建特征项错误:', error)
+                        this.$message.error('特征项创建失败：' + (error.message || '未知错误'))
+                    } finally {
+                        this.createFeatureLoading = false
+                    }
+                }
+            })
+        },
+
+        //////////////////////////////////////////////
+        async submitConfigForm() {
+            if (this.selectedFeatureValues.length === 0) {
+                this.$confirm('确定要保存吗？', '提示', {
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'warning',
+                }).then(() => {
+                    this.saveFeatureConfig()
+                })
+            } else {
+                this.saveFeatureConfig()
+            }
+        },
+
+        async saveFeatureConfig() {
+            try {
+                this.submitLoading = true
+                console.log('开始保存配置，装备ID:', this.currentEquipmentId)
+                console.log('当前特征值列表:', this.selectedFeatureValues)
+
+                const allFeaturesRes = await getPropertiesByTypeId(this.currentEquipmentId)
+                let allExistingFeatures = []
+                if (allFeaturesRes.code === 200) {
+                    allExistingFeatures = allFeaturesRes.data || []
+                }
+                console.log('现有特征值:', allExistingFeatures)
+
+                const featuresToDelete = allExistingFeatures.filter(
+                    (existing) => !this.selectedFeatureValues.some((current) => current.id === existing.id),
+                )
+                console.log('需要删除的特征值:', featuresToDelete)
+
+                // if (featuresToDelete.length > 0) {
+                //   const deletePromises = featuresToDelete.map(item => {
+                //     console.log('删除特征值:', item);
+                //     return deleteProperty(item.id);
+                //   });
+                //   await Promise.all(deletePromises);
+                //   console.log('删除操作完成');
+                // }
+
+                const savePromises = this.selectedFeatureValues.map((item) => {
+                    const saveData = {
+                        typeId: this.currentEquipmentId,
+                        mustHave: item.mustHave,
+                        inputType: item.inputType,
+                        propertyName: item.propertyName,
+                        propertyValue: item.propertyValue,
+                    }
+
+                    if (item.id) {
+                        saveData.id = item.id
+                        return updateProperty(saveData)
+                    } else {
+                        return addProperty(saveData)
+                    }
+                })
+
+                const results = await Promise.allSettled(savePromises)
+                console.log('保存结果:', results)
+
+                const successCount = results.filter(
+                    (result) => result.status === 'fulfilled' && result.value && result.value.code === 200,
+                ).length
+
+                if (successCount === this.selectedFeatureValues.length) {
+                    this.$message.success(`特征项配置保存成功`)
+                    this.handleConfigClose()
+                } else {
+                    const failedCount = this.selectedFeatureValues.length - successCount
+                    this.$message.warning(`特征值保存完成，成功 ${successCount} 个，失败 ${failedCount} 个`)
+                }
+            } catch (error) {
+                console.error('保存特征值配置错误:', error)
+                this.$message.error('保存特征值配置失败：' + (error.message || '未知错误'))
+            } finally {
+                this.submitLoading = false
+            }
+        },
+
+        // 进入预定义选项编辑模式
+        enterPredefinedEdit() {
+            this.isEditingPredefined = true
+            this.predefinedInputTemp = ''
+
+            //  找到当前特征项在 selectedFeatureValues 中的索引
+            this.editingPredefinedIndex = this.selectedFeatureValues.findIndex(
+                (item) => item.id === this.currentFeature.id,
+            )
+        },
+
+        // 保存预定义选项修改
+        async savePredefinedValues() {
+            if (!this.currentFeature || !this.currentFeature.id) return
+
+            const newValues = this.getPredefinedValues(this.currentFeature)
+            if (newValues.length === 0) {
+                this.$message.warning('请至少保留一个预定义选项')
+                return
+            }
+
+            try {
+                const res = await updateProperty({
+                    id: this.currentFeature.id,
+                    propertyName: this.currentFeature.propertyName,
+                    inputType: this.currentFeature.inputType,
+                    mustHave: this.currentFeature.mustHave,
+                    propertyValue: newValues.join(','),
+                    typeId: this.currentEquipmentId,
+                })
+
+                if (res.code === 200) {
+                    this.$message.success('预定义选项已更新')
+
+                    // ✅ 同步更新 selectedFeatureValues 中的对应项
+                    if (this.editingPredefinedIndex >= 0) {
+                        this.selectedFeatureValues[this.editingPredefinedIndex].propertyValue = newValues.join(',')
+                    }
+
+                    this.isEditingPredefined = false
+                    await this.refreshFeatureList()
+                    this.selectFeature(this.currentFeature) // 重新选中当前项
+                } else {
+                    this.$message.error(res.msg || '更新失败')
+                }
+            } catch (error) {
+                this.$message.error('更新预定义选项失败')
+            }
+        },
+
+        // 添加预定义值
+        addPredefinedValue() {
+            const val = this.predefinedInputTemp.trim()
+            if (!val) return
+            const exists = this.getPredefinedValues(this.currentFeature).includes(val)
             if (exists) {
-              this.$message.warning('该特征值组合已存在');
-              return;
+                this.$message.warning('该选项已存在')
+                return
             }
-            this.addFeatureToSelected(targetValue);
-          }
+            const current = this.currentFeature.propertyValue || ''
+            this.currentFeature.propertyValue = current ? `${current},${val}` : val
+            this.predefinedInputTemp = ''
+        },
 
-          // 重置表单（无论新增还是编辑，都清空选择器）
-          this.resetAddValueForm();
-        } else {
-          if (this.currentFeature && this.currentFeature.mustHave === '1') {
-            this.$message.warning('请输入必填的特征值');
-          }
-        }
-      });
-    },
+        // 删除预定义值
+        removePredefinedValue(index) {
+            const list = this.getPredefinedValues(this.currentFeature)
+            list.splice(index, 1)
+            this.currentFeature.propertyValue = list.join(',')
+        },
 
-    addFeatureToSelected(value) {
-      const newFeature = {
-        id: null,
-        typeId: this.currentEquipmentId,
-        mustHave: this.currentFeature.mustHave,
-        inputType: this.currentFeature.inputType,
-        propertyName: this.currentFeature.propertyName,
-        propertyValue: value,
-        createTime: new Date()
-      };
+        handleConfigClose() {
+            this.configDialogVisible = false
+            this.resetConfigData()
+        },
 
-      this.selectedFeatureValues.push(newFeature);
-      this.$message.success('特征值添加成功');
-    },
-
-    resetAddValueForm() {
-      // 重置选择器值（多选为空数组，其他为空字符串）
-      this.addValueForm.propertyValue = this.currentFeature?.inputType === 3 ? [] : '';
-      this.inputStatus.touched = false;
-
-      // 退出编辑状态，重置临时数据
-      this.isEditing = false;
-      this.editingFeature = null;
-      this.tempSelectedFeatures = [];
-
-      if (this.$refs.addValueForm) {
-        this.$refs.addValueForm.clearValidate();
-      }
-    },
-
-    async removeFeatureValue(index) {
-      // 确定当前操作的是原列表还是临时列表
-      const targetList = this.isEditing ? this.tempSelectedFeatures : this.selectedFeatureValues;
-      const removedItem = targetList[index];
-
-      // 如果删除的是待修改特征值，先退出编辑状态
-      if (this.isEditing && this.editingFeature) {
-        this.isEditing = false;
-        this.editingFeature = null;
-        this.tempSelectedFeatures = [];
-      }
-
-      if (removedItem.id) {
-        this.$confirm('确定要删除该特征值吗？', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(async () => {
-          try {
-            const res = await deleteProperty(removedItem.id);
-            if (res.code === 200) {
-              targetList.splice(index, 1);
-              this.$message.success('删除成功');
-            } else {
-              this.$message.error('删除失败: ' + (res.msg || '未知错误'));
+        async getCascaderData() {
+            try {
+                const res = await getEquipmentCascaderAPI()
+                if (res.code === 200) {
+                    this.cascaderOptions = res.data || []
+                } else {
+                    this.$message.error(res.msg || '获取装备分类数据失败')
+                }
+            } catch (error) {
+                this.$message.error('获取装备分类数据失败：' + (error.message || '未知错误'))
             }
-          } catch (error) {
-            this.$message.error('删除失败: ' + (error.message || '未知错误'));
-          }
-        }).catch(() => {
-          this.$message.info('已取消删除');
-        });
-      } else {
-        targetList.splice(index, 1);
-        this.$message.info('特征值已移除');
-      }
+        },
     },
 
-    async refreshFeatureList() {
-      try {
-        this.featureLoading = true;
-        const res = await getPropertiesByTypeId(this.currentEquipmentId);
-        if (res.code === 200) {
-          this.featureItemList = res.data || [];
-          this.$message.success('特征项列表已刷新');
-        } else {
-          this.$message.error(res.msg || '刷新特征项列表失败');
-        }
-      } catch (error) {
-        this.$message.error('刷新失败：' + (error.message || '未知错误'));
-      } finally {
-        this.featureLoading = false;
-      }
+    async created() {
+        await this.getDeviceTree()
+        await this.getDeviceList()
     },
-
-    showCreateFeatureDialog() {
-      this.currentEquipmentTypeIdForFeature = this.currentEquipmentId;
-      this.createFeatureDialogVisible = true;
-      this.resetCreateFeatureForm();
-    },
-
-    handleValueInput() {
-      this.inputStatus.touched = true;
-    },
-
-    resetCreateFeatureForm() {
-      this.createFeatureForm = {
-        propertyName: '',
-        inputType: 1,
-        mustHave: '0',
-        predefinedValues: ''
-      };
-      if (this.$refs.createFeatureForm) {
-        this.$refs.createFeatureForm.resetFields();
-      }
-    },
-
-    handleCreateFeatureClose() {
-      this.createFeatureDialogVisible = false;
-      this.resetCreateFeatureForm();
-    },
-
-    async handleDeleteFeature(feature) {
-      const isInUse = this.selectedFeatureValues.some(item => item.id === feature.id);
-
-      const confirmMsg = isInUse
-        ? `特征项「${feature.propertyName}」已配置特征值，删除将同步移除相关数据，是否继续？`
-        : `确定要删除特征项「${feature.propertyName}」吗？此操作不可撤销。`;
-
-      this.$confirm(confirmMsg, '删除确认', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(async () => {
-        try {
-          const res = await deleteProperty(feature.id);
-          if (res.code === 200) {
-            this.$message.success('特征项删除成功');
-            await this.refreshFeatureList();
-            if (this.currentFeature && this.currentFeature.id === feature.id) {
-              this.currentFeature = null;
-              this.configForm.featureId = '';
-            }
-          } else {
-            this.$message.error(res.msg || '删除失败');
-          }
-        } catch (error) {
-          console.error('删除特征项失败:', error);
-          this.$message.error('删除失败：' + (error.message || '网络错误'));
-        }
-      }).catch(() => {
-        this.$message.info('已取消删除');
-      });
-    },
-
-    async checkFeatureNameExists(propertyName) {
-      try {
-        const res = await getPropertiesNameByTypeId(this.currentEquipmentTypeIdForFeature);
-        if (res.code === 200) {
-          const existingFeatures = res.data || [];
-          return existingFeatures.some(feature => feature.propertyName === propertyName);
-        }
-        return false;
-      } catch (error) {
-        console.error('检查特征项名称失败:', error);
-        this.$message.error('检查特征项名称失败：' + (error.message || '网络错误'));
-        return false;
-      }
-    },
-
-    async submitCreateFeature() {
-
-
-      const saveData = {
-        propertyName: this.createFeatureForm.propertyName,
-        inputType: this.createFeatureForm.inputType,
-        mustHave: this.createFeatureForm.mustHave,
-        propertyValue: this.createFeatureForm.predefinedValues,
-        typeId: this.currentEquipmentTypeIdForFeature
-      };
-      this.$refs.createFeatureForm.validate(async (valid) => {
-        if (valid) {
-          if (this.createFeatureForm.inputType !== 1 && !this.createFeatureForm.predefinedValues.trim()) {
-            this.$message.warning('下拉选择/多选类型必须设置预定义选项');
-            return;
-          }
-
-          const nameExists = await this.checkFeatureNameExists(this.createFeatureForm.propertyName);
-          if (nameExists) {
-            this.$message.warning('该特征项名称已存在，请更换名称');
-            return;
-          }
-
-          try {
-            this.createFeatureLoading = true;
-            const submitData = {
-              propertyName: this.createFeatureForm.propertyName,
-              inputType: this.createFeatureForm.inputType,
-              mustHave: this.createFeatureForm.mustHave,
-              propertyValue: '',
-              typeId: this.currentEquipmentTypeIdForFeature
-            };
-
-            if (this.createFeatureForm.inputType !== 1 && this.createFeatureForm.predefinedValues) {
-              submitData.propertyValue = this.createFeatureForm.predefinedValues.trim();
-            }
-
-            console.log('新建特征项数据:', submitData);
-            console.log('[addProperty] 请求参数:', saveData);
-            const res = await addProperty(submitData);
-            if (res.code === 200) {
-              this.$message.success('特征项创建成功');
-              this.handleCreateFeatureClose();
-              await this.refreshFeatureList();
-            } else {
-              this.$message.error(res.msg || '特征项创建失败');
-            }
-          } catch (error) {
-            console.error('创建特征项错误:', error);
-            this.$message.error('特征项创建失败：' + (error.message || '未知错误'));
-          } finally {
-            this.createFeatureLoading = false;
-          }
-        }
-      });
-    },
-
-    //////////////////////////////////////////////
-    async submitConfigForm() {
-      if (this.selectedFeatureValues.length === 0) {
-        this.$confirm('确定要保存吗？', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          this.saveFeatureConfig();
-        });
-      } else {
-        this.saveFeatureConfig();
-      }
-    },
-
-    async saveFeatureConfig() {
-      try {
-        this.submitLoading = true;
-        console.log('开始保存配置，装备ID:', this.currentEquipmentId);
-        console.log('当前特征值列表:', this.selectedFeatureValues);
-
-        const allFeaturesRes = await getPropertiesByTypeId(this.currentEquipmentId);
-        let allExistingFeatures = [];
-        if (allFeaturesRes.code === 200) {
-          allExistingFeatures = allFeaturesRes.data || [];
-        }
-        console.log('现有特征值:', allExistingFeatures);
-
-        const featuresToDelete = allExistingFeatures.filter(existing =>
-          !this.selectedFeatureValues.some(current => current.id === existing.id)
-        );
-        console.log('需要删除的特征值:', featuresToDelete);
-
-        // if (featuresToDelete.length > 0) {
-        //   const deletePromises = featuresToDelete.map(item => {
-        //     console.log('删除特征值:', item);
-        //     return deleteProperty(item.id);
-        //   });
-        //   await Promise.all(deletePromises);
-        //   console.log('删除操作完成');
-        // }
-
-        const savePromises = this.selectedFeatureValues.map(item => {
-          const saveData = {
-            typeId: this.currentEquipmentId,
-            mustHave: item.mustHave,
-            inputType: item.inputType,
-            propertyName: item.propertyName,
-            propertyValue: item.propertyValue
-          };
-
-          if (item.id) {
-            saveData.id = item.id;
-            return updateProperty(saveData);
-          } else {
-            return addProperty(saveData);
-          }
-        });
-
-        const results = await Promise.allSettled(savePromises);
-        console.log('保存结果:', results);
-
-        const successCount = results.filter(result =>
-          result.status === 'fulfilled' && result.value && result.value.code === 200
-        ).length;
-
-        if (successCount === this.selectedFeatureValues.length) {
-          this.$message.success(`特征项配置保存成功`);
-          this.handleConfigClose();
-        } else {
-          const failedCount = this.selectedFeatureValues.length - successCount;
-          this.$message.warning(`特征值保存完成，成功 ${successCount} 个，失败 ${failedCount} 个`);
-        }
-
-      } catch (error) {
-        console.error('保存特征值配置错误:', error);
-        this.$message.error('保存特征值配置失败：' + (error.message || '未知错误'));
-      } finally {
-        this.submitLoading = false;
-      }
-    },
-
-
-    // 进入预定义选项编辑模式
-    enterPredefinedEdit() {
-      this.isEditingPredefined = true;
-      this.predefinedInputTemp = '';
-
-      //  找到当前特征项在 selectedFeatureValues 中的索引
-      this.editingPredefinedIndex = this.selectedFeatureValues.findIndex(
-        item => item.id === this.currentFeature.id
-      )
-    },
-
-
-    // 保存预定义选项修改
-    async savePredefinedValues() {
-      if (!this.currentFeature || !this.currentFeature.id) return;
-
-      const newValues = this.getPredefinedValues(this.currentFeature);
-      if (newValues.length === 0) {
-        this.$message.warning('请至少保留一个预定义选项');
-        return;
-      }
-
-      try {
-        const res = await updateProperty({
-          id: this.currentFeature.id,
-          propertyName: this.currentFeature.propertyName,
-          inputType: this.currentFeature.inputType,
-          mustHave: this.currentFeature.mustHave,
-          propertyValue: newValues.join(','),
-          typeId: this.currentEquipmentId
-        });
-
-        if (res.code === 200) {
-          this.$message.success('预定义选项已更新');
-
-          // ✅ 同步更新 selectedFeatureValues 中的对应项
-          if (this.editingPredefinedIndex >= 0) {
-            this.selectedFeatureValues[this.editingPredefinedIndex].propertyValue = newValues.join(',');
-          }
-
-          this.isEditingPredefined = false;
-          await this.refreshFeatureList();
-          this.selectFeature(this.currentFeature); // 重新选中当前项
-        } else {
-          this.$message.error(res.msg || '更新失败');
-        }
-      } catch (error) {
-        this.$message.error('更新预定义选项失败');
-      }
-    },
-
-
-    // 添加预定义值
-    addPredefinedValue() {
-      const val = this.predefinedInputTemp.trim();
-      if (!val) return;
-      const exists = this.getPredefinedValues(this.currentFeature).includes(val);
-      if (exists) {
-        this.$message.warning('该选项已存在');
-        return;
-      }
-      const current = this.currentFeature.propertyValue || '';
-      this.currentFeature.propertyValue = current ? `${current},${val}` : val;
-      this.predefinedInputTemp = '';
-    },
-
-
-    // 删除预定义值
-    removePredefinedValue(index) {
-      const list = this.getPredefinedValues(this.currentFeature);
-      list.splice(index, 1);
-      this.currentFeature.propertyValue = list.join(',');
-    },
-
-
-
-
-
-    handleConfigClose() {
-      this.configDialogVisible = false;
-      this.resetConfigData();
-    },
-
-    async getCascaderData() {
-      try {
-        const res = await getEquipmentCascaderAPI();
-        if (res.code === 200) {
-          this.cascaderOptions = res.data || [];
-        } else {
-          this.$message.error(res.msg || '获取装备分类数据失败');
-        }
-      } catch (error) {
-        this.$message.error('获取装备分类数据失败：' + (error.message || '未知错误'));
-      }
-    }
-  },
-
-  async created() {
-    await this.getDeviceTree();
-    await this.getDeviceList();
-  }
 }
 </script>
 
 <style lang="scss" scoped>
 .app-container {
-  padding: 20px;
-  background-color: #f5f7fa;
-  height: calc(100vh - 84px);
+    padding: 20px;
+    background-color: #f5f7fa;
+    height: calc(100vh - 84px);
 }
 .tree-column {
-  transition: all 0.3s ease;
-  display: flex;
-  flex-direction: row;
+    transition: all 0.3s ease;
+    display: flex;
+    flex-direction: row;
 }
 .card-container {
-  background-color: #fff;
-  border-radius: 4px;
-  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.05);
-  overflow: hidden;
-  flex-grow: 1;
-  width: 240px;
+    background-color: #fff;
+    border-radius: 4px;
+    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.05);
+    overflow: hidden;
+    flex-grow: 1;
+    width: 240px;
 }
 .card-header {
-  padding: 14px;
-  border-bottom: 1px solid #e4e7ed;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
+    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;
+    font-size: 15px;
+    color: #1f2d3d;
+    font-weight: 500;
 }
 .tree-container {
-  height: calc(100vh - 174px);
-  overflow: auto;
-  padding: 15px;
+    height: calc(100vh - 174px);
+    overflow: auto;
+    padding: 15px;
 }
 .el-col-1 {
-  width: 1.5% !important;
+    width: 1.5% !important;
 }
 .collapse-btn {
-  position: absolute;
-  right: 0;
-  top: 50%;
-  transform: translateY(-50%);
-  background: white;
-  color: #606266;
-  padding: 2px;
-  z-index: 10;
+    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;
+    background: white;
+    color: #409eff;
 }
 .tree-container::-webkit-scrollbar {
-  display: none;
+    display: none;
 }
 .pagination-container {
-  padding: 15px 20px;
-  display: flex;
-  justify-content: flex-end;
-  align-items: center;
+    padding: 15px 20px;
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
 }
 .path-change-tip {
-  font-size: 12px;
-  color: #909399;
-  background-color: #f4f4f5;
-  padding: 8px 12px;
-  border-radius: 4px;
-  margin-top: 5px;
+    font-size: 12px;
+    color: #909399;
+    background-color: #f4f4f5;
+    padding: 8px 12px;
+    border-radius: 4px;
+    margin-top: 5px;
 }
 .path-change-tip i {
-  color: #409eff;
-  margin-right: 5px;
+    color: #409eff;
+    margin-right: 5px;
 }
 :deep(.el-input.is-disabled .el-input__inner) {
-  background-color: #f5f7fa;
-  border-color: #e4e7ed;
-  color: #606266;
+    background-color: #f5f7fa;
+    border-color: #e4e7ed;
+    color: #606266;
 }
 
 /* 特征值相关样式 */
 .selected-feature-list {
-  padding: 8px;
-  background-color: #f9fafc;
-  border-radius: 4px;
-  min-height: 40px;
+    padding: 8px;
+    background-color: #f9fafc;
+    border-radius: 4px;
+    min-height: 40px;
 }
 .empty-tip {
-  color: #909399;
-  font-size: 12px;
-  padding: 8px;
+    color: #909399;
+    font-size: 12px;
+    padding: 8px;
 }
 
 /* 特征值配置弹窗样式 */
 .feature-config-dialog .el-dialog__body {
-  padding: 20px;
+    padding: 20px;
 }
 .feature-config-container {
-  display: flex;
-  height: 500px;
-  border: 1px solid #e4e7ed;
-  border-radius: 4px;
+    display: flex;
+    height: 500px;
+    border: 1px solid #e4e7ed;
+    border-radius: 4px;
 }
 .feature-selection-panel {
-  width: 300px;
-  border-right: 1px solid #e4e7ed;
-  display: flex;
-  flex-direction: column;
+    width: 300px;
+    border-right: 1px solid #e4e7ed;
+    display: flex;
+    flex-direction: column;
 }
 .panel-header {
-  padding: 12px 16px;
-  border-bottom: 1px solid #e4e7ed;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  background: #f5f7fa;
+    padding: 12px 16px;
+    border-bottom: 1px solid #e4e7ed;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    background: #f5f7fa;
 }
 .panel-title {
-  font-weight: 600;
-  color: #303133;
+    font-weight: 600;
+    color: #303133;
 }
 .feature-list {
-  flex: 1;
-  overflow-y: auto;
-  padding: 8px 0;
+    flex: 1;
+    overflow-y: auto;
+    padding: 8px 0;
 }
 .feature-item {
-  padding: 12px 16px;
-  cursor: pointer;
-  border-bottom: 1px solid #f0f0f0;
-  transition: all 0.3s;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
+    padding: 12px 16px;
+    cursor: pointer;
+    border-bottom: 1px solid #f0f0f0;
+    transition: all 0.3s;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
 }
 .feature-item:hover {
-  background-color: #f5f7fa;
+    background-color: #f5f7fa;
 }
 .feature-item.active {
-  background-color: #ecf5ff;
-  border-right: 3px solid #409eff;
+    background-color: #ecf5ff;
+    border-right: 3px solid #409eff;
 }
 .feature-item.has-value {
-  background-color: #f0f9ff;
+    background-color: #f0f9ff;
 }
 .feature-info {
-  flex: 1;
+    flex: 1;
 }
 .feature-name {
-  display: block;
-  font-size: 14px;
-  color: #303133;
-  margin-bottom: 4px;
+    display: block;
+    font-size: 14px;
+    color: #303133;
+    margin-bottom: 4px;
 }
 .feature-type {
-  font-size: 12px;
-  color: #909399;
+    font-size: 12px;
+    color: #909399;
 }
 .feature-required {
-  flex-shrink: 0;
+    flex-shrink: 0;
 }
 .empty-feature {
-  padding: 40px 20px;
-  text-align: center;
-  color: #909399;
+    padding: 40px 20px;
+    text-align: center;
+    color: #909399;
 }
 .empty-feature i {
-  font-size: 24px;
-  margin-bottom: 8px;
-  display: block;
+    font-size: 24px;
+    margin-bottom: 8px;
+    display: block;
 }
 .feature-value-panel {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  padding: 0 20px;
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    padding: 0 20px;
 }
 .current-feature-info {
-  padding: 16px 0;
-  border-bottom: 1px solid #e4e7ed;
+    padding: 16px 0;
+    border-bottom: 1px solid #e4e7ed;
 }
 .current-feature-info h4 {
-  margin: 0 0 8px 0;
-  color: #303133;
+    margin: 0 0 8px 0;
+    color: #303133;
 }
 .feature-meta {
-  display: flex;
-  gap: 20px;
-  font-size: 12px;
-  color: #909399;
+    display: flex;
+    gap: 20px;
+    font-size: 12px;
+    color: #909399;
 }
 .value-management {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  gap: 20px;
-  padding: 16px 0;
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    gap: 20px;
+    padding: 16px 0;
 }
 .section-title {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: 12px;
-  font-weight: 600;
-  color: #303133;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 12px;
+    font-weight: 600;
+    color: #303133;
 }
 .selected-values-list {
-  min-height: 80px;
-  max-height: 150px;
-  overflow-y: auto;
-  padding: 12px;
-  border: 1px solid #e4e7ed;
-  border-radius: 4px;
-  background: #fafafa;
+    min-height: 80px;
+    max-height: 150px;
+    overflow-y: auto;
+    padding: 12px;
+    border: 1px solid #e4e7ed;
+    border-radius: 4px;
+    background: #fafafa;
 }
 .value-tag {
-  margin: 4px;
-  cursor: pointer;
+    margin: 4px;
+    cursor: pointer;
 }
 .empty-values {
-  text-align: center;
-  color: #909399;
-  padding: 20px;
+    text-align: center;
+    color: #909399;
+    padding: 20px;
 }
 .empty-values i {
-  font-size: 20px;
-  margin-bottom: 8px;
-  display: block;
+    font-size: 20px;
+    margin-bottom: 8px;
+    display: block;
 }
 .add-value-section,
 .predefined-values {
-  border-top: 1px solid #e4e7ed;
-  padding-top: 16px;
+    border-top: 1px solid #e4e7ed;
+    padding-top: 16px;
 }
 .predefined-list {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 8px;
+    display: flex;
+    flex-wrap: wrap;
+    gap: 8px;
 }
 .predefined-tag {
-  cursor: pointer;
-  transition: all 0.3s;
+    cursor: pointer;
+    transition: all 0.3s;
 }
 .predefined-tag:hover {
-  transform: scale(1.05);
+    transform: scale(1.05);
 }
 
 /* 滚动条样式 */
 .feature-list::-webkit-scrollbar,
 .selected-values-list::-webkit-scrollbar {
-  width: 6px;
+    width: 6px;
 }
 .feature-list::-webkit-scrollbar-track,
 .selected-values-list::-webkit-scrollbar-track {
-  background: #f1f1f1;
+    background: #f1f1f1;
 }
 .feature-list::-webkit-scrollbar-thumb,
 .selected-values-list::-webkit-scrollbar-thumb {
-  background: #c1c1c1;
-  border-radius: 3px;
+    background: #c1c1c1;
+    border-radius: 3px;
 }
 .feature-list::-webkit-scrollbar-thumb:hover,
 .selected-values-list::-webkit-scrollbar-thumb:hover {
-  background: #a8a8a8;
+    background: #a8a8a8;
 }
 
 /* 新建特征项表单提示 */
 .form-tip {
-  font-size: 12px;
-  color: #909399;
-  margin-top: 4px;
+    font-size: 12px;
+    color: #909399;
+    margin-top: 4px;
 }
 
 /* 面板头部按钮组样式 */
 .panel-header .el-button-group {
-  margin-left: 10px;
+    margin-left: 10px;
 }
 .panel-header .el-button {
-  padding: 5px 8px;
+    padding: 5px 8px;
 }
 .feature-actions {
-  display: flex;
-  align-items: center;
-  gap: 8px;
+    display: flex;
+    align-items: center;
+    gap: 8px;
 }
 
 /* 确保删除按钮在hover时有反馈 */
 .feature-item .el-button--text {
-  opacity: 0.7;
-  transition: opacity 0.3s;
+    opacity: 0.7;
+    transition: opacity 0.3s;
 }
 .feature-item:hover .el-button--text {
-  opacity: 1;
+    opacity: 1;
 }
 
 /* 添加必填项提示样式 */
 .required-tip {
-  margin-top: 8px;
-  font-size: 12px;
-  color: #409eff;
-  display: flex;
-  align-items: center;
+    margin-top: 8px;
+    font-size: 12px;
+    color: #409eff;
+    display: flex;
+    align-items: center;
 }
 
 /* 增强校验失败时的输入框样式 */
 :deep(.el-form-item.is-error .el-input__inner) {
-  border-color: #f56c6c;
-  box-shadow: 0 0 0 2px rgba(245, 108, 108, 0.2);
+    border-color: #f56c6c;
+    box-shadow: 0 0 0 2px rgba(245, 108, 108, 0.2);
 }
 
 /* 预定义标签选中效果 */
 .predefined-tag.selected {
-  background-color: #409eff;
-  color: white;
+    background-color: #409eff;
+    color: white;
 }
 
 /* 核心修改9：添加分类修改入口的样式 */
 .category-display {
-  position: relative;
+    position: relative;
 }
 .edit-category-btn {
-  position: absolute;
-  right: 12px;
-  top: 50%;
-  transform: translateY(-50%);
-  color: #409eff;
-  cursor: pointer;
-  font-size: 12px;
-  transition: color 0.2s;
+    position: absolute;
+    right: 12px;
+    top: 50%;
+    transform: translateY(-50%);
+    color: #409eff;
+    cursor: pointer;
+    font-size: 12px;
+    transition: color 0.2s;
 }
 .edit-category-btn:hover {
-  color: #66b1ff;
+    color: #66b1ff;
 }
 
 .editing-tip {
-  margin-top: 8px;
-  font-size: 12px;
-  color: #409eff;
-  display: flex;
-  align-items: center;
+    margin-top: 8px;
+    font-size: 12px;
+    color: #409eff;
+    display: flex;
+    align-items: center;
 }
 
-
 /* 编辑按钮样式 */
 .section-title .el-button {
-  margin-left: 8px;
+    margin-left: 8px;
 }
 /* 预定义标签选中效果增强 */
 .predefined-tag.selected {
-  background-color: #409eff;
-  color: white;
-  transform: scale(1.05);
+    background-color: #409eff;
+    color: white;
+    transform: scale(1.05);
 }
 /* 编辑状态提示更醒目 */
 .editing-tip {
-  margin-top: 12px;
-  padding: 8px;
-  background-color: #f0f9ff;
-  border-radius: 4px;
+    margin-top: 12px;
+    padding: 8px;
+    background-color: #f0f9ff;
+    border-radius: 4px;
 }
 
 .content-box {
-  border-radius: 8px;
-  height: calc(100vh - 120px);
-  display: flex;
-  flex-direction: column;
-  overflow: hidden;
-
-  ::v-deep .el-card__body {
-    display: flex !important;
-    flex-direction: column !important;
-    height: 100% !important;
-    padding: 20px;
-  }
-
-  .el-row:first-child {
-    margin-bottom: 16px;
-    flex-shrink: 0;
-
-    .el-col {
-      display: flex;
-      justify-content: flex-end;
-      align-items: center;
-      gap: 12px;
-    }
-  }
-
-  .table-container {
-    flex: 1;
-    overflow: hidden;
-    margin-bottom: 0;
-    min-height: 0;
+    border-radius: 8px;
+    height: calc(100vh - 120px);
     display: flex;
     flex-direction: column;
-  }
+    overflow: hidden;
 
-  .pagination-wrapper {
-    flex-shrink: 0;
-    padding-top: 6px;
-    margin-top: auto;
-
-    ::v-deep  .pagination-container {
-      padding: 0px 20px !important;
-      margin-bottom: 30px;
-    }
-  }
-
-  ::v-deep .el-table {
-    // 启用斑马纹
-    &.el-table--striped .el-table__body {
-      tr.el-table__row--striped td {
-        background-color: #F6FBFA !important; // 浅紫色
-      }
+    ::v-deep .el-card__body {
+        display: flex !important;
+        flex-direction: column !important;
+        height: 100% !important;
+        padding: 20px;
     }
 
-    .el-table__header {
-      background: #E9F0EE;
+    .el-row:first-child {
+        margin-bottom: 16px;
+        flex-shrink: 0;
 
-      th {
-        background: #E9F0EE !important;
-        color: #606266;
-        font-weight: 600;
-        height: 50px;
-      }
+        .el-col {
+            display: flex;
+            justify-content: flex-end;
+            align-items: center;
+            gap: 12px;
+        }
     }
 
-    &.el-table--striped .el-table__body tr.el-table__row:hover>td.el-table__cell {
-      background-color: #CCF1E9 !important;
+    .table-container {
+        flex: 1;
+        overflow: hidden;
+        margin-bottom: 0;
+        min-height: 0;
+        display: flex;
+        flex-direction: column;
+    }
+
+    .pagination-wrapper {
+        flex-shrink: 0;
+        padding-top: 6px;
+        margin-top: auto;
+
+        ::v-deep .pagination-container {
+            padding: 0px 20px !important;
+            margin-bottom: 30px;
+        }
+    }
+
+    ::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-table__body tr.hover-row > td.el-table__cell {
+            background-color: #ccf1e9 !important;
+        }
     }
-  }
 }
 </style>
 
 <style>
 .six-level-cascader .el-cascader-menu {
-  max-height: 300px;
-  overflow-y: auto;
+    max-height: 300px;
+    overflow-y: auto;
 }
 .six-level-cascader .el-cascader-menu__item {
-  position: relative;
-  transition: all 0.2s;
+    position: relative;
+    transition: all 0.2s;
 }
 
-.six-level-cascader .el-cascader-menu[data-level="1"] .el-cascader-menu__item { padding-left: 20px; font-weight: 500; }
-.six-level-cascader .el-cascader-menu[data-level="2"] .el-cascader-menu__item { padding-left: 35px; font-weight: 400; }
-.six-level-cascader .el-cascader-menu[data-level="3"] .el-cascader-menu__item { padding-left: 50px; font-size: 13px; }
-.six-level-cascader .el-cascader-menu[data-level="4"] .el-cascader-menu__item { padding-left: 65px; font-size: 13px; color: #666; }
-.six-level-cascader .el-cascader-menu[data-level="5"] .el-cascader-menu__item { padding-left: 80px; font-size: 12px; color: #888; }
-.six-level-cascader .el-cascader-menu[data-level="6"] .el-cascader-menu__item { padding-left: 95px; font-size: 12px; color: #999; background-color: #f8f9fa; }
-.six-level-cascader .el-cascader-menu[data-level="7"] .el-cascader-menu__item { display: none; }
-.six-level-cascader .el-cascader-menu::-webkit-scrollbar { width: 6px; }
-.six-level-cascader .el-cascader-menu::-webkit-scrollbar-track { background: #f1f1f1; border-radius: 3px; }
-.six-level-cascader .el-cascader-menu::-webkit-scrollbar-thumb { background: #c1c1c1; border-radius: 3px; }
-.six-level-cascader .el-cascader-menu::-webkit-scrollbar-thumb:hover { background: #a8a8a8; }
+.six-level-cascader .el-cascader-menu[data-level='1'] .el-cascader-menu__item {
+    padding-left: 20px;
+    font-weight: 500;
+}
+.six-level-cascader .el-cascader-menu[data-level='2'] .el-cascader-menu__item {
+    padding-left: 35px;
+    font-weight: 400;
+}
+.six-level-cascader .el-cascader-menu[data-level='3'] .el-cascader-menu__item {
+    padding-left: 50px;
+    font-size: 13px;
+}
+.six-level-cascader .el-cascader-menu[data-level='4'] .el-cascader-menu__item {
+    padding-left: 65px;
+    font-size: 13px;
+    color: #666;
+}
+.six-level-cascader .el-cascader-menu[data-level='5'] .el-cascader-menu__item {
+    padding-left: 80px;
+    font-size: 12px;
+    color: #888;
+}
+.six-level-cascader .el-cascader-menu[data-level='6'] .el-cascader-menu__item {
+    padding-left: 95px;
+    font-size: 12px;
+    color: #999;
+    background-color: #f8f9fa;
+}
+.six-level-cascader .el-cascader-menu[data-level='7'] .el-cascader-menu__item {
+    display: none;
+}
+.six-level-cascader .el-cascader-menu::-webkit-scrollbar {
+    width: 6px;
+}
+.six-level-cascader .el-cascader-menu::-webkit-scrollbar-track {
+    background: #f1f1f1;
+    border-radius: 3px;
+}
+.six-level-cascader .el-cascader-menu::-webkit-scrollbar-thumb {
+    background: #c1c1c1;
+    border-radius: 3px;
+}
+.six-level-cascader .el-cascader-menu::-webkit-scrollbar-thumb:hover {
+    background: #a8a8a8;
+}
 </style>

From be225d401531c6a8688ed9b1f3bd98a0d6c09fd0 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Wed, 29 Oct 2025 18:05:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=A3=85=E5=A4=87=E5=BD=95=E5=85=A5?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=A4=A7=E5=B0=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/EquipmentEntryApply/EquipmentDetailList.vue    | 3 +++
 src/views/EquipmentEntryApply/equipmentInput/index.vue   | 8 ++++++--
 src/views/EquipmentEntryApproval/EquipmentDetailList.vue | 8 ++++++--
 src/views/EquipmentEntryApproval/EquipmentMainList.vue   | 6 +++---
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/views/EquipmentEntryApply/EquipmentDetailList.vue b/src/views/EquipmentEntryApply/EquipmentDetailList.vue
index fbdab932..4702a488 100644
--- a/src/views/EquipmentEntryApply/EquipmentDetailList.vue
+++ b/src/views/EquipmentEntryApply/EquipmentDetailList.vue
@@ -551,6 +551,9 @@ export default {
     &.el-table--striped .el-table__body tr.el-table__row:hover>td.el-table__cell {
       background-color: #CCF1E9 !important;
     }
+    .el-table__body tr.hover-row > td.el-table__cell {
+            background-color: #ccf1e9 !important;
+    }
 
   }
 }
diff --git a/src/views/EquipmentEntryApply/equipmentInput/index.vue b/src/views/EquipmentEntryApply/equipmentInput/index.vue
index 911d6f92..0cfdf49c 100644
--- a/src/views/EquipmentEntryApply/equipmentInput/index.vue
+++ b/src/views/EquipmentEntryApply/equipmentInput/index.vue
@@ -147,11 +147,11 @@
     </el-row>
       <el-row>
         <el-col :span="24" style="text-align: right;">
-          <el-button icon="el-icon-search" type="primary" @click="queryTableList">
+          <el-button icon="el-icon-search" type="primary" @click="queryTableList" size="mini">
           查询
         </el-button>
         <el-button icon="el-icon-refresh"
-          @click="resetTableList"
+          @click="resetTableList" size="mini"
         >
           重置
         </el-button>
@@ -165,6 +165,7 @@
         <el-col :span="24" style="text-align: right;">
           <el-button
           type="primary"
+          size="mini"
           @click="equipmentDeployment"
           v-show="!isAddVisible"
         >
@@ -744,6 +745,9 @@ export default {
     &.el-table--striped .el-table__body tr.el-table__row:hover>td.el-table__cell {
       background-color: #CCF1E9 !important;
     }
+    .el-table__body tr.hover-row > td.el-table__cell {
+            background-color: #ccf1e9 !important;
+    }
   }
 }
 </style>
diff --git a/src/views/EquipmentEntryApproval/EquipmentDetailList.vue b/src/views/EquipmentEntryApproval/EquipmentDetailList.vue
index 2e0f77eb..2db08d8c 100644
--- a/src/views/EquipmentEntryApproval/EquipmentDetailList.vue
+++ b/src/views/EquipmentEntryApproval/EquipmentDetailList.vue
@@ -131,10 +131,10 @@
 
 
         <el-col :span="18" style="text-align: right;">
-          <el-button class="primary-lease" type="primary" icon="el-icon-search" @click="getEquipmentApplyList">
+          <el-button class="primary-lease" size="mini" type="primary" icon="el-icon-search" @click="getEquipmentApplyList">
             查询
           </el-button>
-          <el-button class="primary-lease" icon="el-icon-refresh" @click="resetForm">
+          <el-button class="primary-lease" size="mini" icon="el-icon-refresh" @click="resetForm">
             重置
           </el-button>
         </el-col>
@@ -145,6 +145,7 @@
         <el-row>
           <el-col :span="24" style="text-align: right;">
             <el-button
+            size="mini"
             class="primary-lease"
             type="primary"
             @click="showDetails('0')"
@@ -645,6 +646,9 @@ export default {
     &.el-table--striped .el-table__body tr.el-table__row:hover>td.el-table__cell {
       background-color: #CCF1E9 !important;
     }
+    .el-table__body tr.hover-row > td.el-table__cell {
+            background-color: #ccf1e9 !important;
+    }
   }
 }
 </style>
diff --git a/src/views/EquipmentEntryApproval/EquipmentMainList.vue b/src/views/EquipmentEntryApproval/EquipmentMainList.vue
index a1ac7475..5b866902 100644
--- a/src/views/EquipmentEntryApproval/EquipmentMainList.vue
+++ b/src/views/EquipmentEntryApproval/EquipmentMainList.vue
@@ -37,9 +37,9 @@
           </el-form-item>
         </el-col>
         <el-col :span="12" style="text-align:right;">
-          <el-button icon="el-icon-search" class="primary-lease" type="primary" @click="getEquipmentApplyList">
+          <el-button icon="el-icon-search" size="mini" class="primary-lease" type="primary" @click="getEquipmentApplyList">
               查询</el-button>
-            <el-button icon="el-icon-refresh" class="primary-lease" @click="resetForm">
+            <el-button icon="el-icon-refresh" size="mini" class="primary-lease" @click="resetForm">
               重置</el-button>
         </el-col>
       </el-row>
@@ -48,7 +48,7 @@
       <el-card class="content-box">
         <el-row>
           <el-col :span="24" style="text-align: right;">
-            <el-button class="primary-lease" type="primary" @click="showDetails('1')">展开明细</el-button>
+            <el-button class="primary-lease" size="mini" type="primary" @click="showDetails('1')">展开明细</el-button>
           </el-col>
         </el-row>
       <el-table :data="tableData" border stripe height="100%">