diff --git a/src/views/EquipmentLedger/components/equ-repair.vue b/src/views/EquipmentLedger/components/equ-repair.vue
index f44d7895..1d868f70 100644
--- a/src/views/EquipmentLedger/components/equ-repair.vue
+++ b/src/views/EquipmentLedger/components/equ-repair.vue
@@ -220,7 +220,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         name: '',
-        status: '2',
+        status: '5',
         companyId: '',
         proId: ''
       },
diff --git a/src/views/EquipmentLedger/components/equ-store.vue b/src/views/EquipmentLedger/components/equ-store.vue
index 2fde59d5..84c0ce08 100644
--- a/src/views/EquipmentLedger/components/equ-store.vue
+++ b/src/views/EquipmentLedger/components/equ-store.vue
@@ -16,7 +16,7 @@
             filterable
             style="width: 240px"
           >
-            <el-option v-for="item in propertyUnitList" :key="item.id" :label="item.label" :value="item.id" />
+            <el-option v-for="item in propertyUnitList" :key="item.id" :label="item.label" :value="item.id"/>
           </el-select>
         </el-form-item>
         <el-form-item label="使用项目：" prop="proCode">
@@ -27,26 +27,26 @@
             v-model="outForm.proCode"
             @change="onChangeProCode"
           >
-            <el-option :key="item.proCode" :label="item.proName" :value="item.proCode" v-for="item in useProjectList" />
+            <el-option :key="item.proCode" :label="item.proName" :value="item.proCode" v-for="item in useProjectList"/>
           </el-select>
         </el-form-item>
         <el-form-item label="项目类型：" prop="proType">
-          <el-input style="width: 240px" disabled v-model="proTypeName" />
+          <el-input style="width: 240px" disabled v-model="proTypeName"/>
         </el-form-item>
         <el-form-item label="电压等级：" prop="voltageLevel">
-          <el-input style="width: 240px" disabled v-model="voltageLevel" />
+          <el-input style="width: 240px" disabled v-model="voltageLevel"/>
         </el-form-item>
         <el-form-item label="项目所在省：" prop="proProvince">
-          <el-input style="width: 240px" disabled v-model="outForm.proProvince" />
+          <el-input style="width: 240px" disabled v-model="outForm.proProvince"/>
         </el-form-item>
         <el-form-item label="项目所在市：" prop="proCity">
-          <el-input style="width: 240px" disabled v-model="outForm.proCity" />
+          <el-input style="width: 240px" disabled v-model="outForm.proCity"/>
         </el-form-item>
         <el-form-item label="项目所在区/县：" prop="proCounty">
-          <el-input style="width: 240px" disabled v-model="outForm.proCounty" />
+          <el-input style="width: 240px" disabled v-model="outForm.proCounty"/>
         </el-form-item>
         <el-form-item label="详细地址：" prop="proLocation">
-          <el-input v-model="outForm.proLocation" placeholder="请输入详细地址" clearable style="width: 240px" />
+          <el-input v-model="outForm.proLocation" placeholder="请输入详细地址" clearable style="width: 240px"/>
         </el-form-item>
       </el-form>
     </div>
@@ -56,12 +56,12 @@
         <el-col :span="12"><span style="font-weight: 800">装备退库列表</span></el-col>
         <el-col :span="12" style="text-align: end">
           <el-button size="mini" type="primary" icon="el-icon-plus" @click="onHandleAddEquipment">添加装备</el-button>
-          <el-button size="mini" type="primary" @click="onHandleSubmit"> 确定退库 </el-button>
+          <el-button size="mini" type="primary" @click="onHandleSubmit"> 确定退库</el-button>
         </el-col>
       </el-row>
       <el-table :data="selectedEquipment" border stripe>
-        <el-table-column label="序号" type="index" align="center" width="55" />
-        <el-table-column prop="name" label="装备名称" align="center" />
+        <el-table-column label="序号" type="index" align="center" width="55"/>
+        <el-table-column prop="name" label="装备名称" align="center"/>
         <el-table-column prop="devCategory" label="装备类目" align="center">
           <template slot-scope="{ row }">
             <span>
@@ -70,8 +70,8 @@
             </span>
           </template>
         </el-table-column>
-        <el-table-column prop="specificationModel" label="规格型号" align="center" />
-        <el-table-column prop="code" label="装备编码" align="center" />
+        <el-table-column prop="specificationModel" label="规格型号" align="center"/>
+        <el-table-column prop="code" label="装备编码" align="center"/>
         <el-table-column label="入库数量" align="center">
           <template slot-scope="{ row }">
             <!-- <el-input-number
@@ -111,8 +111,8 @@
         <el-table-column label="是否维修" align="center">
           <template slot-scope="{ row }">
             <el-select v-model="row.changeStatus" placeholder="请选择是否维修">
-              <el-option label="是" value="5" />
-              <el-option label="否" value="1" />
+              <el-option label="否" value="1"/>
+              <el-option label="是" value="5"/>
             </el-select>
           </template>
         </el-table-column>
@@ -142,7 +142,7 @@
             <el-form-item>
               <el-button size="mini" type="primary" @click="onHandleAddEquipmentQuery">查询</el-button>
               <el-button size="mini" plain @click="onHandleAddEquipmentReset">重置</el-button>
-              <el-button size="mini" type="primary" @click="onHandleAddEquipmentConfirm"> 确定添加 </el-button>
+              <el-button size="mini" type="primary" @click="onHandleAddEquipmentConfirm"> 确定添加</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -155,23 +155,22 @@
         ref="equipmentTable"
         :row-key="(row) => row.devId"
       >
-        <el-table-column label="序号" type="index" align="center" width="55" />
-        <el-table-column width="55" align="center" type="selection" />
-        <el-table-column width="160" show-overflow-tooltip prop="propertyUnit" label="公司名称" align="center" />
-        <el-table-column width="160" show-overflow-tooltip prop="name" label="装备名称" align="center" />
-        <el-table-column width="160" show-overflow-tooltip prop="specificationModel" label="装备型号" align="center" />
-        <el-table-column width="160" show-overflow-tooltip prop="code" label="装备编号" align="center" />
-        <el-table-column width="160" show-overflow-tooltip prop="unit" label="计数单位" align="center" />
+        <el-table-column label="序号" type="index" align="center" width="55"/>
+        <el-table-column width="55" align="center" type="selection"/>
+        <el-table-column width="160" show-overflow-tooltip prop="propertyUnit" label="公司名称" align="center"/>
+        <el-table-column width="160" show-overflow-tooltip prop="name" label="装备名称" align="center"/>
+        <el-table-column width="160" show-overflow-tooltip prop="specificationModel" label="装备型号" align="center"/>
+        <el-table-column width="160" show-overflow-tooltip prop="code" label="装备编号" align="center"/>
+        <el-table-column width="160" show-overflow-tooltip prop="unit" label="计数单位" align="center"/>
         <el-table-column align="center" show-overflow-tooltip prop="status" label="状态">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.status == 1" size="mini">在库</el-tag>
-            <el-tag v-if="scope.row.status == 2 || scope.row.status == 3" size="mini"> 在用 </el-tag>
-            <el-tag v-if="scope.row.status == 5" size="mini"> 维修 </el-tag>
+            <el-tag v-if="scope.row.status == 2" size="mini">自用</el-tag>
+            <el-tag v-if="scope.row.status == 3" size="mini"> 共享</el-tag>
           </template>
         </el-table-column>
-        <el-table-column width="160" show-overflow-tooltip prop="propertyUnit" label="产权单位" align="center" />
-        <el-table-column width="160" show-overflow-tooltip prop="originalValue" label="资产原值(元)" align="center" />
-        <el-table-column width="160" show-overflow-tooltip prop="productDate" label="出厂日期" align="center" />
+        <el-table-column width="160" show-overflow-tooltip prop="propertyUnit" label="产权单位" align="center"/>
+        <el-table-column width="160" show-overflow-tooltip prop="originalValue" label="资产原值(元)" align="center"/>
+        <el-table-column width="160" show-overflow-tooltip prop="productDate" label="出厂日期" align="center"/>
         <el-table-column
           width="160"
           show-overflow-tooltip
@@ -179,7 +178,7 @@
           label="最大使用年限"
           align="center"
         />
-        <el-table-column width="160" show-overflow-tooltip prop="usingProject" label="使用项目" align="center" />
+        <el-table-column width="160" show-overflow-tooltip prop="usingProject" label="使用项目" align="center"/>
         <el-table-column
           width="160"
           show-overflow-tooltip
@@ -187,7 +186,7 @@
           label="下次检验日期"
           align="center"
         />
-        <el-table-column width="160" show-overflow-tooltip prop="manufacturer" label="生产厂商" align="center" />
+        <el-table-column width="160" show-overflow-tooltip prop="manufacturer" label="生产厂商" align="center"/>
         <template v-for="item in tableColumns">
           <!-- 特征项列 -->
           <el-table-column :key="`item-${item}`" align="center" show-overflow-tooltip :label="`特征项${item}`">
@@ -230,7 +229,7 @@ import {
   getMaxFeatureAPI,
   getUseProjectListAPI,
   getVoltageListAPI,
-  addProjectOutAPI,
+  addProjectOutAPI
 } from '@/api/EquipmentLedger/equ-out'
 import { getDeviceListAPI } from '@/api/EquipmentLedger/index.js'
 import { deptTreeSelect } from '@/api/system/user'
@@ -257,7 +256,7 @@ export default {
         proCity: '', // 项目所在市
         proCounty: '', // 项目所在区/县
         proLocation: '', // 详细地址
-        propertyUnitId: '', // 属性单位ID
+        propertyUnitId: '' // 属性单位ID
       },
       // 入库表单规则
       outFormRules: {
@@ -269,7 +268,7 @@ export default {
         proProvince: [{ required: true, message: '请选择项目所在省', trigger: 'change' }],
         proCity: [{ required: true, message: '请选择项目所在市', trigger: 'change' }],
         proCounty: [{ required: true, message: '请选择项目所在区/县', trigger: 'change' }],
-        proLocation: [{ required: true, message: '请选择详细地址', trigger: 'change' }],
+        proLocation: [{ required: true, message: '请选择详细地址', trigger: 'change' }]
       },
       equipmentList: [],
       propertyUnitList: [], // 产权单位
@@ -286,7 +285,7 @@ export default {
         devName: '',
         status: '2',
         companyId: '',
-        proId: '',
+        proId: ''
       },
       // 可选择的变更设备列表
       addEquipmentList: [],
@@ -295,7 +294,7 @@ export default {
       useProjectList: [], // 使用项目下拉选
       voltageList: [], // 电压等级下拉选
       proTypeName: '', // 项目类型名称
-      voltageLevel: '',
+      voltageLevel: ''
     }
   },
   created() {
@@ -394,7 +393,7 @@ export default {
         devName: '',
         status: '2',
         companyId: '',
-        proId: this.addEquipmentQueryParams.proId || '', // 保留项目ID
+        proId: this.addEquipmentQueryParams.proId || '' // 保留项目ID
       }
       this.getSelectEquipmentList()
     },
@@ -432,7 +431,7 @@ export default {
         return
       }
 
-      this.$refs.outFormRef.validate(async (valid) => {
+      this.$refs.outFormRef.validate(async(valid) => {
         if (valid) {
           if (this.selectedEquipment.length === 0) {
             this.$modal.msgError('请至少添加一个装备')
@@ -445,7 +444,7 @@ export default {
             return {
               devId: item.maId,
               useTime: item.useTime,
-              changeStatus: item.changeStatus,
+              changeStatus: item.changeStatus
             }
           })
 
@@ -457,7 +456,7 @@ export default {
           if (res.code === 200) {
             this.$modal.msgSuccess('状态变更成功')
             this.$router.push({
-              path: '/equipment/equipment-ledger',
+              path: '/equipment/equipment-ledger'
             })
           } else {
             this.$modal.msgError(res.msg)
@@ -514,7 +513,7 @@ export default {
       this.currentDialogSelected = selection.map((item) => ({
         ...item,
         useTime: '',
-        validationError: {},
+        validationError: {}
       }))
 
       // 更新选中ID集合
@@ -533,14 +532,14 @@ export default {
 
       // 过滤掉已添加的装备，避免重复
       const newItems = this.currentDialogSelected.filter(
-        (newItem) => !this.selectedEquipment.some((existing) => existing.devId === newItem.devId),
+        (newItem) => !this.selectedEquipment.some((existing) => existing.devId === newItem.devId)
       )
 
       if (newItems.length > 0) {
         this.selectedEquipment = [...this.selectedEquipment, ...newItems]
         this.$modal.msgSuccess('成功添加 ' + newItems.length + ' 个装备')
         this.selectedEquipment.forEach((item) => {
-          item.changeStatus = '1'
+          this.$set(item, 'changeStatus', '1');
         })
       } else {
         this.$modal.msgError('所选装备已添加')
@@ -593,8 +592,8 @@ export default {
     // 确定变更
     onHandleSubmit() {
       this.submitForm()
-    },
-  },
+    }
+  }
 }
 </script>
 
diff --git a/src/views/EquipmentLedger/index.vue b/src/views/EquipmentLedger/index.vue
index e7da46bc..5103b7d5 100644
--- a/src/views/EquipmentLedger/index.vue
+++ b/src/views/EquipmentLedger/index.vue
@@ -12,7 +12,7 @@
               @submit.native.prevent
               style="width: 100%"
             >
-              <el-form-item prop="name"  style="margin-bottom: unset">
+              <el-form-item prop="name" style="margin-bottom: unset">
                 <el-input
                   v-model="treeSearchKey"
                   placeholder="搜索"
@@ -420,11 +420,11 @@
                 <el-tag v-if="row.upDownStatus == 0" size="mini" type="danger">下架</el-tag>
               </template>
               <template v-slot="{ row }" v-else-if="item.prop == 'status'">
-                <el-tag v-if="row.status == 1" size="mini">在库</el-tag>
+                <el-tag v-if="row.status == 1" type="success" size="mini">在库</el-tag>
                 <el-tag v-if="row.status == 2" size="mini">自用</el-tag>
                 <el-tag v-if="row.status == 3" size="mini">共享</el-tag>
-                <el-tag v-if="row.status == 4" size="mini" type="info">退役</el-tag>
-                <el-tag v-if="row.status == 5" size="mini" type="danger">维修</el-tag>
+                <el-tag v-if="row.status == 4" size="mini" type="danger">退役</el-tag>
+                <el-tag v-if="row.status == 5" size="mini" type="warning" >维修</el-tag>
               </template>
               <template v-slot="{ row }" v-else-if="item.prop == 'appearanceImages'">
                 <span style="color: #00a288; cursor: pointer" @click="handleView(row, 1)">查看</span>
@@ -803,9 +803,9 @@ import {
   getDeviceDetailAPI,
   getManufacturerSelectApi
 } from '@/api/EquipmentLedger/index.js'
-import {firstLevel, secondAndThirdLevel} from '@/api/EquipmentEntryApply'
-import {getMaxFeatureAPI, getProvinceListAPI} from '@/api/EquipmentLedger/equ-out.js'
-import {deptTreeSelect} from '@/api/system/user'
+import { firstLevel, secondAndThirdLevel } from '@/api/EquipmentEntryApply'
+import { getMaxFeatureAPI, getProvinceListAPI } from '@/api/EquipmentLedger/equ-out.js'
+import { deptTreeSelect } from '@/api/system/user'
 
 export default {
   name: 'EquipmentLedger',
@@ -836,14 +836,14 @@ export default {
         featureItem: undefined, // 特征项
         featureValue: undefined, // 特征值
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 10
       },
       // 查询表单验证规则
       queryRules: {},
       // 树形结构配置
       defaultProps: {
         children: 'children',
-        label: 'name',
+        label: 'name'
       },
       treeData: [],
       defaultExpandedKeys: [], // 存储默认展开的节点 key
@@ -854,51 +854,51 @@ export default {
       serviceLifeList: [], // 使用年限
       manufacturerList: [], // 生产厂家
       columns: [
-        {key: 0, label: `所属省份`, prop: 'province', visible: true},
-        {key: 1, label: `产权单位`, prop: 'propertyUnit', visible: true},
-        {key: 2, label: `专业`, prop: 'major', visible: true},
-        {key: 3, label: `工序`, prop: 'process', visible: true},
-        {key: 4, label: `装备类目`, prop: 'devType', visible: true},
-        {key: 5, label: `装备名称`, prop: 'name', visible: true},
-        {key: 6, label: `规格型号`, prop: 'specificationModel', visible: true},
-        {key: 7, label: `装备编码`, prop: 'code', visible: true},
-        {key: 8, label: `装备状态`, prop: 'status', visible: true},
-        {key: 44, label: `上下架状态`, prop: 'upDownStatus', visible: true},
-        {key: 9, label: `使用年限`, prop: 'serviceLife', visible: true},
-        {key: 10, label: `使用项目`, prop: 'usingProject', visible: true},
-        {key: 11, label: `使用到期时间`, prop: 'expirationTime', visible: true},
-        {key: 12, label: `使用次数`, prop: 'usageCount', visible: true},
-        {key: 13, label: `维修次数`, prop: 'repairCount', visible: true},
-        {key: 14, label: `装备原始编码`, prop: 'originalCode', visible: true},
-        {key: 15, label: `计量单位`, prop: 'unit', visible: true},
-        {key: 16, label: `生产厂家`, prop: 'manufacturer', visible: true},
-        {key: 17, label: `出厂日期`, prop: 'productionDate', visible: true},
-        {key: 18, label: `采购日期`, prop: 'purchaseDate', visible: true},
-        {key: 19, label: `资产原值（元）`, prop: 'originalValue', visible: true},
-        {key: 20, label: `最大使用年限（年）`, prop: 'maxServiceLifeYears', visible: true},
-        {key: 21, label: `下次维保日期`, prop: 'nextMaintenanceDate', visible: true},
-        {key: 22, label: `装备外观`, prop: 'appearanceImages', visible: true},
-        {key: 23, label: `合格证`, prop: 'certificates', visible: true},
-        {key: 24, label: `定期检验报告`, prop: 'inspectionReports', visible: true},
-        {key: 25, label: `采购发票`, prop: 'purchaseInvoices', visible: true},
-        {key: 26, label: `特征项1`, prop: 'featureItem1', visible: true},
-        {key: 27, label: `特征值1`, prop: 'featureValue1', visible: true},
-        {key: 28, label: `特征项2`, prop: 'featureItem2', visible: true},
-        {key: 29, label: `特征值2`, prop: 'featureValue2', visible: true},
-        {key: 30, label: `特征项3`, prop: 'featureItem3', visible: true},
-        {key: 31, label: `特征值3`, prop: 'featureValue3', visible: true},
-        {key: 32, label: `特征项4`, prop: 'featureItem4', visible: true},
-        {key: 33, label: `特征值4`, prop: 'featureValue4', visible: true},
-        {key: 34, label: `特征项5`, prop: 'featureItem5', visible: true},
-        {key: 35, label: `特征值5`, prop: 'featureValue5', visible: true},
-        {key: 36, label: `特征项6`, prop: 'featureItem6', visible: true},
-        {key: 37, label: `特征值6`, prop: 'featureValue6', visible: true},
-        {key: 38, label: `特征项7`, prop: 'featureItem7', visible: true},
-        {key: 39, label: `特征值7`, prop: 'featureValue7', visible: true},
-        {key: 40, label: `特征项8`, prop: 'featureItem8', visible: true},
-        {key: 41, label: `特征值8`, prop: 'featureValue8', visible: true},
-        {key: 42, label: `特征项9`, prop: 'featureItem9', visible: true},
-        {key: 43, label: `特征值9`, prop: 'featureValue9', visible: true},
+        { key: 0, label: `所属省份`, prop: 'province', visible: true },
+        { key: 1, label: `产权单位`, prop: 'propertyUnit', visible: true },
+        { key: 2, label: `专业`, prop: 'major', visible: true },
+        { key: 3, label: `工序`, prop: 'process', visible: true },
+        { key: 4, label: `装备类目`, prop: 'devType', visible: true },
+        { key: 5, label: `装备名称`, prop: 'name', visible: true },
+        { key: 6, label: `规格型号`, prop: 'specificationModel', visible: true },
+        { key: 7, label: `装备编码`, prop: 'code', visible: true },
+        { key: 8, label: `装备状态`, prop: 'status', visible: true },
+        { key: 44, label: `上下架状态`, prop: 'upDownStatus', visible: true },
+        { key: 9, label: `使用年限`, prop: 'serviceLife', visible: true },
+        { key: 10, label: `使用项目`, prop: 'usingProject', visible: true },
+        { key: 11, label: `使用到期时间`, prop: 'expirationTime', visible: true },
+        { key: 12, label: `使用次数`, prop: 'usageCount', visible: true },
+        { key: 13, label: `维修次数`, prop: 'repairCount', visible: true },
+        { key: 14, label: `装备原始编码`, prop: 'originalCode', visible: true },
+        { key: 15, label: `计量单位`, prop: 'unit', visible: true },
+        { key: 16, label: `生产厂家`, prop: 'manufacturer', visible: true },
+        { key: 17, label: `出厂日期`, prop: 'productionDate', visible: true },
+        { key: 18, label: `采购日期`, prop: 'purchaseDate', visible: true },
+        { key: 19, label: `资产原值（元）`, prop: 'originalValue', visible: true },
+        { key: 20, label: `最大使用年限（年）`, prop: 'maxServiceLifeYears', visible: true },
+        { key: 21, label: `下次维保日期`, prop: 'nextMaintenanceDate', visible: true },
+        { key: 22, label: `装备外观`, prop: 'appearanceImages', visible: true },
+        { key: 23, label: `合格证`, prop: 'certificates', visible: true },
+        { key: 24, label: `定期检验报告`, prop: 'inspectionReports', visible: true },
+        { key: 25, label: `采购发票`, prop: 'purchaseInvoices', visible: true },
+        { key: 26, label: `特征项1`, prop: 'featureItem1', visible: true },
+        { key: 27, label: `特征值1`, prop: 'featureValue1', visible: true },
+        { key: 28, label: `特征项2`, prop: 'featureItem2', visible: true },
+        { key: 29, label: `特征值2`, prop: 'featureValue2', visible: true },
+        { key: 30, label: `特征项3`, prop: 'featureItem3', visible: true },
+        { key: 31, label: `特征值3`, prop: 'featureValue3', visible: true },
+        { key: 32, label: `特征项4`, prop: 'featureItem4', visible: true },
+        { key: 33, label: `特征值4`, prop: 'featureValue4', visible: true },
+        { key: 34, label: `特征项5`, prop: 'featureItem5', visible: true },
+        { key: 35, label: `特征值5`, prop: 'featureValue5', visible: true },
+        { key: 36, label: `特征项6`, prop: 'featureItem6', visible: true },
+        { key: 37, label: `特征值6`, prop: 'featureValue6', visible: true },
+        { key: 38, label: `特征项7`, prop: 'featureItem7', visible: true },
+        { key: 39, label: `特征值7`, prop: 'featureValue7', visible: true },
+        { key: 40, label: `特征项8`, prop: 'featureItem8', visible: true },
+        { key: 41, label: `特征值8`, prop: 'featureValue8', visible: true },
+        { key: 42, label: `特征项9`, prop: 'featureItem9', visible: true },
+        { key: 43, label: `特征值9`, prop: 'featureValue9', visible: true }
       ],
       tableData: [],
       tableColumns: 0,
@@ -942,18 +942,18 @@ export default {
         personPhone: '',
         nextCheckTime: '',
         brand: '',
-        propertyVoList: [],
+        propertyVoList: []
       },
       // 表单验证规则
       formRules: {
-        name: [{required: true, message: '请输入装备名称', trigger: 'blur'}],
-        code: [{required: true, message: '请输入装备编号', trigger: 'blur'}],
-        changeStatus: [{required: true, message: '请选择装备状态', trigger: 'change'}],
+        name: [{ required: true, message: '请输入装备名称', trigger: 'blur' }],
+        code: [{ required: true, message: '请输入装备编号', trigger: 'blur' }],
+        changeStatus: [{ required: true, message: '请选择装备状态', trigger: 'change' }]
       },
       maxFeatureCount: 5, // 最大特征项数量限制
       dialogVisible: false,
       dialogTitle: '',
-      dialogList: [],
+      dialogList: []
     }
   },
   methods: {
@@ -1017,7 +1017,7 @@ export default {
         this.processList = []
         this.queryParams.process = ''
       } else {
-        secondAndThirdLevel({firstLevelId: item}).then((res) => {
+        secondAndThirdLevel({ firstLevelId: item }).then((res) => {
           if (res.code === 200) {
             this.processList = this.convertToSubTree(res.data)
           }
@@ -1032,7 +1032,7 @@ export default {
       list.forEach((item) => {
         map[item.value] = {
           value: item.value.toString(),
-          label: item.label,
+          label: item.label
         }
       })
 
@@ -1132,7 +1132,7 @@ export default {
       try {
         let fileName = `装备台账_${new Date().getTime()}.xLsx`
         let url = '/material-mall/device/export'
-        const params = {...this.queryParams}
+        const params = { ...this.queryParams }
         console.log('🚀 ~ 导出 ~ params:', params)
         this.download(url, params, fileName)
       } catch (error) {
@@ -1140,20 +1140,19 @@ export default {
       }
     },
 
-
     /**
      * 获取左侧树形结构数据
      */
     async getDeviceTree() {
       try {
-        this.treeLoading = true;
-        const res = await getDeviceTreeAPI();
-        this.treeData = res.data ? [res.data] : [];
+        this.treeLoading = true
+        const res = await getDeviceTreeAPI()
+        this.treeData = res.data ? [res.data] : []
       } catch (error) {
-        this.$message.error('获取树形结构失败：' + (error.message || '未知错误'));
-        console.error(error);
+        this.$message.error('获取树形结构失败：' + (error.message || '未知错误'))
+        console.error(error)
       } finally {
-        this.treeLoading = false;
+        this.treeLoading = false
       }
     },
 
@@ -1161,13 +1160,13 @@ export default {
      * 收集第一级和第二级节点的ID，第三级默认不展开
      */
     collectFirstAndSecondLevelKeys(nodes) {
-      if (!nodes || !nodes.length) return;
+      if (!nodes || !nodes.length) return
 
       nodes.forEach(firstLevelNode => {
         // 展开第一级节点
         if (firstLevelNode.id) {
-          this.defaultExpandedKeys.push(firstLevelNode.id);
-          console.log(`展开第一级节点: ${firstLevelNode.name}, ID: ${firstLevelNode.id}`);
+          this.defaultExpandedKeys.push(firstLevelNode.id)
+          console.log(`展开第一级节点: ${firstLevelNode.name}, ID: ${firstLevelNode.id}`)
         }
 
         // 检查是否有子节点（第二级节点）
@@ -1175,16 +1174,15 @@ export default {
           // 遍历所有第二级节点
           firstLevelNode.children.forEach(secondLevelNode => {
             if (secondLevelNode.id) {
-              this.defaultExpandedKeys.push(secondLevelNode.id);
-              console.log(`展开第二级节点: ${secondLevelNode.name}, ID: ${secondLevelNode.id}`);
+              this.defaultExpandedKeys.push(secondLevelNode.id)
+              console.log(`展开第二级节点: ${secondLevelNode.name}, ID: ${secondLevelNode.id}`)
               // 第三级及更深层级默认不展开（保持折叠状态）
             }
-          });
+          })
         }
-      });
+      })
     },
 
-
     /**
      * 左侧树查询：匹配节点显示自身及下一级，但默认只显示到第二级
      */
@@ -1192,41 +1190,41 @@ export default {
       if (!this.treeSearchKey.trim) return
       try {
         // 1. 获取输入的查询关键词（去空格）
-        const searchKey = this.treeSearchKey ? this.treeSearchKey.trim() : '';
+        const searchKey = this.treeSearchKey ? this.treeSearchKey.trim() : ''
 
         // 如果没有搜索关键词，则重置为原始树（显示到第二级）
         if (!searchKey) {
-          await this.resetTreeSearch();
-          return;
+          await this.resetTreeSearch()
+          return
         }
 
         // 2. 重新获取原始树形数据
-        this.treeLoading = true;
-        const res = await getDeviceTreeAPI();
-        const originalTreeData = res.data ? [res.data] : [];
+        this.treeLoading = true
+        const res = await getDeviceTreeAPI()
+        const originalTreeData = res.data ? [res.data] : []
 
         // 3. 筛选逻辑：匹配节点显示自身及下一级
-        const filteredTreeData = this.filterTreeWithNextLevel(originalTreeData, searchKey);
+        const filteredTreeData = this.filterTreeWithNextLevel(originalTreeData, searchKey)
 
         // 4. 收集所有匹配节点的ID，用于默认展开
-        const expandedIds = [];
-        this.collectMatchedNodeIds(filteredTreeData, searchKey, expandedIds);
+        const expandedIds = []
+        this.collectMatchedNodeIds(filteredTreeData, searchKey, expandedIds)
 
         // 5. 更新树形数据和默认展开节点
-        this.treeData = filteredTreeData;
-        this.defaultExpandedKeys = expandedIds;
+        this.treeData = filteredTreeData
+        this.defaultExpandedKeys = expandedIds
 
         // 6. 无匹配结果时提示
         if (filteredTreeData.length === 0 || this.isTreeEmpty(filteredTreeData)) {
-         /*  this.$message.info('未找到匹配的类型分支'); */
+          /*  this.$message.info('未找到匹配的类型分支'); */
         } else {
           // this.$message.success(`找到 ${expandedIds.length} 个匹配项`);
         }
       } catch (error) {
         // this.$message.error('树形查询失败：' + (error.message || '未知错误'));
-        console.error(error);
+        console.error(error)
       } finally {
-        this.treeLoading = false;
+        this.treeLoading = false
       }
     },
 
@@ -1234,36 +1232,36 @@ export default {
      * 辅助方法：筛选节点并包含下一级
      */
     filterTreeWithNextLevel(treeData, key) {
-      if (!treeData || !treeData.length) return [];
+      if (!treeData || !treeData.length) return []
 
       return treeData
         .map(node => {
           // 深拷贝节点
-          const newNode = {...node};
+          const newNode = { ...node }
 
-          const isNodeMatch = key ? node.name.includes(key) : true;
+          const isNodeMatch = key ? node.name.includes(key) : true
 
           if (isNodeMatch) {
             // 匹配节点：保留所有直接子节点
             if (newNode.children && newNode.children.length) {
               // 保留第二级，但第三级及更深层级保持原样（默认不展开）
-              newNode.children = [...newNode.children];
+              newNode.children = [...newNode.children]
             }
-            return newNode;
+            return newNode
           } else {
             // 不匹配节点：检查子节点是否有匹配的
             if (newNode.children && newNode.children.length) {
-              const filteredChildren = this.filterTreeWithNextLevel(newNode.children, key);
+              const filteredChildren = this.filterTreeWithNextLevel(newNode.children, key)
 
               if (filteredChildren.length > 0) {
-                newNode.children = filteredChildren;
-                return newNode;
+                newNode.children = filteredChildren
+                return newNode
               }
             }
-            return null;
+            return null
           }
         })
-        .filter(node => node !== null);
+        .filter(node => node !== null)
     },
 
     /**
@@ -1273,42 +1271,41 @@ export default {
      * @param {Array} expandedIds - 存储展开节点ID的数组
      */
     collectMatchedNodeIds(treeData, key, expandedIds) {
-      if (!treeData || !treeData.length) return;
+      if (!treeData || !treeData.length) return
 
       treeData.forEach(node => {
         // 若当前节点匹配关键词，记录其ID（用于展开）
         if (key ? node.name.includes(key) : true) {
-          if (node.id) expandedIds.push(node.id);
+          if (node.id) expandedIds.push(node.id)
         }
 
         // 递归处理子级，确保深层子级的匹配节点也被收集
         if (node.children && node.children.length) {
-          this.collectMatchedNodeIds(node.children, key, expandedIds);
+          this.collectMatchedNodeIds(node.children, key, expandedIds)
         }
-      });
+      })
     },
 
     /**
      * 辅助方法：检查树是否为空（没有任何有效节点）
      */
     isTreeEmpty(treeData) {
-      if (!treeData || !treeData.length) return true;
+      if (!treeData || !treeData.length) return true
 
       // 递归检查所有节点
       for (const node of treeData) {
         if (node && node.id) {
-          return false; // 发现有效节点
+          return false // 发现有效节点
         }
         if (node.children && node.children.length) {
           if (!this.isTreeEmpty(node.children)) {
-            return false; // 子节点中有有效节点
+            return false // 子节点中有有效节点
           }
         }
       }
-      return true;
+      return true
     },
 
-
     /**
      * 左侧树重置：仅恢复树形原始状态（不联动右侧列表）
      */
@@ -1319,18 +1316,18 @@ export default {
       try {
         // 1. 清空左侧表单输入和查询参数
         if (this.$refs.queryFormLeft) {
-          this.$refs.queryFormLeft.resetFields();
+          this.$refs.queryFormLeft.resetFields()
         }
-        this.treeSearchKey = ''; // 手动清空装备名称查询值
-        this.queryParams.typeId = undefined; // 清空可能存在的节点ID缓存
+        this.treeSearchKey = '' // 手动清空装备名称查询值
+        this.queryParams.typeId = undefined // 清空可能存在的节点ID缓存
 
         // 2. 恢复原始树形数据，默认显示到第二级
-        this.treeLoading = true;
-        const res = await getDeviceTreeAPI();
-        this.treeData = res.data ? [res.data] : [];
+        this.treeLoading = true
+        const res = await getDeviceTreeAPI()
+        this.treeData = res.data ? [res.data] : []
 
         // 重置默认展开的节点ID数组
-        this.defaultExpandedKeys = [];
+        this.defaultExpandedKeys = []
 
         // 只展开第一级和第二级节点
         // this.collectFirstAndSecondLevelKeys(this.treeData);
@@ -1339,13 +1336,12 @@ export default {
         // this.$message.success('树形查询已重置');
       } catch (error) {
         // this.$message.error('树形重置失败：' + (error.message || '未知错误'));
-        console.error(error);
+        console.error(error)
       } finally {
-        this.treeLoading = false;
+        this.treeLoading = false
       }
     },
 
-
     /**
      * 获取右侧列表数据
      */
@@ -1382,7 +1378,7 @@ export default {
     async onHandlePreview(row) {
       // this.formData = row
       // this.previewDialogVisible = true
-      this.$router.push({path: '/equipment/details', query: {id: row.maId}})
+      this.$router.push({ path: '/equipment/details', query: { id: row.maId } })
     },
 
     /**
@@ -1435,7 +1431,7 @@ export default {
         personPhone: '',
         nextCheckTime: '',
         brand: '',
-        propertyVoList: [],
+        propertyVoList: []
       }
     },
 
@@ -1455,7 +1451,7 @@ export default {
 
       this.formData.propertyVoList.push({
         propertyName: '',
-        propertyValue: '',
+        propertyValue: ''
       })
     },
 
@@ -1468,7 +1464,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning',
         center: true,
-        showCancelButton: this.formData.propertyVoList.length > 1, // 至少保留一个特征项
+        showCancelButton: this.formData.propertyVoList.length > 1 // 至少保留一个特征项
       })
         .then(() => {
           this.formData.propertyVoList.splice(index, 1)
@@ -1482,7 +1478,7 @@ export default {
      * 提交编辑表单
      */
     async submitEditForm() {
-      this.$refs.editForm.validate(async (valid) => {
+      this.$refs.editForm.validate(async(valid) => {
         if (valid) {
           try {
             const res = await updateDeviceAPI(this.formData)
@@ -1508,8 +1504,8 @@ export default {
       this.$confirm('确定要删除该装备吗？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
-        type: 'warning',
-      }).then(async () => {
+        type: 'warning'
+      }).then(async() => {
         try {
           const res = await delDevice(row.maId)
           if (res.code === 200) {
@@ -1536,7 +1532,7 @@ export default {
       try {
         const res = await updateDeviceUpDownAPI({
           devIds: this.selectedRows.map((item) => item.maId).join(','),
-          status: 1,
+          status: 1
         })
         this.selectedRows = []
 
@@ -1564,7 +1560,7 @@ export default {
       try {
         const res = await updateDeviceUpDownAPI({
           devIds: this.selectedRows.map((item) => item.maId).join(','),
-          status: 0,
+          status: 0
         })
         this.selectedRows = []
 
@@ -1593,7 +1589,7 @@ export default {
     async getDeviceStatusCount() {
       try {
         const res = await getDeviceStatusCountAPI()
-        const {inStock, ownUse, share, underRepair} = res.data || {}
+        const { inStock, ownUse, share, underRepair } = res.data || {}
         this.inStock = inStock || 0
         this.ownUse = ownUse || 0
         this.share = share || 0
@@ -1635,7 +1631,7 @@ export default {
     handleFile(row) {
       // 打开文件预览
       window.open(row.fileUrl, '_blank')
-    },
+    }
   },
 
   async created() {
@@ -1648,14 +1644,12 @@ export default {
     // 最后加载列表数据
     await this.getDeviceList()
     this.initDefaultExpandedKeys()
-  },
-
+  }
 
 }
 </script>
 
 
-
 <style scoped lang="scss">
 .app-container {
   padding: 20px;
@@ -1964,13 +1958,13 @@ export default {
     }
   }
 
-  &.el-table--striped .el-table__body tr.el-table__row:hover>td.el-table__cell {
+  &.el-table--striped .el-table__body tr.el-table__row:hover > td.el-table__cell {
     background-color: #CCF1E9 !important;
   }
 }
 
 .el-col-1 {
-    width: 1.5% !important;
+  width: 1.5% !important;
 }
 </style>
 
diff --git a/src/views/EquipmentRoamRecord/index.vue b/src/views/EquipmentRoamRecord/index.vue
index 74f1da35..30a0af06 100644
--- a/src/views/EquipmentRoamRecord/index.vue
+++ b/src/views/EquipmentRoamRecord/index.vue
@@ -70,7 +70,7 @@
             <el-tag v-if="row.changeStatus == 5" size="mini" type="danger">维修</el-tag>
           </template>
         </el-table-column>
-        <el-table-column align="center" show-overflow-tooltip prop="status" label="流转后状态">
+<!--        <el-table-column align="center" show-overflow-tooltip prop="status" label="流转后状态">
           <template slot-scope="{ row }">
             <el-tag v-if="row.status == 1" size="mini">在库</el-tag>
             <el-tag v-if="row.status == 2" size="mini">自用</el-tag>
@@ -78,7 +78,7 @@
             <el-tag v-if="row.status == 4" size="mini" type="info">退役</el-tag>
             <el-tag v-if="row.status == 5" size="mini" type="danger">维修</el-tag>
           </template>
-        </el-table-column>
+        </el-table-column>-->
         <el-table-column align="center" show-overflow-tooltip prop="useUint" label="使用单位"/>
         <el-table-column align="center" show-overflow-tooltip prop="proName" label="使用项目"/>
         <el-table-column align="center" show-overflow-tooltip prop="proLocation" label="地址"/>
diff --git a/src/views/EquipmentRoamRecord/outboundRecord/index.vue b/src/views/EquipmentRoamRecord/outboundRecord/index.vue
index 1cd9e6a5..7d287817 100644
--- a/src/views/EquipmentRoamRecord/outboundRecord/index.vue
+++ b/src/views/EquipmentRoamRecord/outboundRecord/index.vue
@@ -1,7 +1,7 @@
 <template>
   <!-- 装备流转记录  -->
   <div class="app-container">
-    
+
       <el-form ref="queryForm" size="small" inline label-width="auto" :model="queryParams">
         <el-card class="search-box">
         <el-col :span="12">
@@ -32,7 +32,7 @@
         </el-col>
       </el-card>
       </el-form>
-    
+
 
     <el-card class="content-box">
       <el-row>
@@ -63,11 +63,10 @@
         </el-table-column>-->
         <el-table-column align="center" show-overflow-tooltip prop="changeStatus" label="流转后状态">
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.status == 1" size="mini">在库</el-tag>
-            <el-tag v-if="scope.row.status == 2 || scope.row.status == 3" size="mini">
-              在用
+            <el-tag v-if="scope.row.status == 2" size="mini">自用</el-tag>
+            <el-tag v-if="scope.row.status == 3" size="mini">
+              共享
             </el-tag>
-            <el-tag v-if="scope.row.status == 5" size="mini"> 维修</el-tag>
           </template>
         </el-table-column>
         <el-table-column align="center" show-overflow-tooltip prop="useUint" label="需求单位"/>
@@ -100,7 +99,7 @@
         <el-button size="mini" type="primary" @click="onHandlePrint">打印</el-button>
         <el-button size="mini" type="primary" @click="onHandleClose">关闭</el-button>
       </el-row>
-      
+
       <vue-easy-print ref="recordPrintRef" tableShow style="width: 100%">
         <h2 style="text-align: center;font-size: 28px;">出库记录单</h2>
         <el-row class="record-row">
@@ -369,11 +368,11 @@ export default {
   border-radius: 6px;
   overflow: hidden;
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
-  
+
   ::v-deep .el-table {
     border-radius: 6px;
     overflow: hidden;
-    
+
     // 启用斑马纹
     &.el-table--striped .el-table__body {
       tr.el-table__row--striped td {
@@ -397,11 +396,11 @@ export default {
     .el-table__body {
       tr {
         transition: all 0.2s ease;
-        
+
         &:hover {
           background-color: #f8f9fa;
         }
-        
+
         td {
           padding: 12px 8px;
           font-size: 13px;
@@ -413,12 +412,12 @@ export default {
     &.el-table--striped .el-table__body tr.el-table__row:hover>td.el-table__cell {
       background-color: #CCF1E9 !important;
     }
-    
+
     // 表格边框优化
     &::before {
       display: none;
     }
-    
+
     &::after {
       display: none;
     }
diff --git a/src/views/EquipmentServicing/index.vue b/src/views/EquipmentServicing/index.vue
index 7d5167c2..693473c2 100644
--- a/src/views/EquipmentServicing/index.vue
+++ b/src/views/EquipmentServicing/index.vue
@@ -10,119 +10,114 @@
       label-width="auto" size="small"
     >
       <el-card class="search-box">
-      <el-row :gutter="20" type="flex">
-        <el-col :span="6">
-          <el-form-item label="装备编码" prop="deviceCode">
-            <el-input
-              v-model.trim="searchParams.deviceCode"
-              placeholder="请输入装备编码"
-              clearable
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6" >
-          <el-form-item label="质检次数" prop="minNum">
-            <el-input
-              v-model="searchParams.minNum"
-              placeholder="质检次数"
-              inputmode="numeric"
-              size="small"
-              style="width: 100px"
-            /> -
-            <el-input
-              v-model.trim="searchParams.maxNum"
-              placeholder="质检次数"
-              inputmode="numeric"
-              size="small"
-              style="width: 100px"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="9">
-          <el-form-item label="质检日期" prop="leaseStatus">
-            <el-date-picker
-              v-model="qcTime"
-              type="daterange"
-              placeholder="最新质检日期"
-              range-separator="-"
-              value-format="yyyy-MM-dd"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="9">
-          <el-form-item label="更新日期" prop="createTime">
-            <el-date-picker
-              v-model="createTime"
-              type="daterange"
-              placeholder="更新日期"
-              range-separator="-"
-              value-format="yyyy-MM-dd"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="24" style="text-align: right;">
-          <el-button type="primary" icon="el-icon-search" size="mini" class="primary-lease" @click="onSearch">查询</el-button>
-          <el-button icon="el-icon-refresh" size="mini" class="primary-lease" @click="onReset">重置</el-button>
-        </el-col>
-      </el-row>
-      
+        <el-row :gutter="20" type="flex">
+          <el-col :span="5">
+            <el-form-item label="装备编码" prop="deviceCode">
+              <el-input
+                v-model.trim="searchParams.deviceCode"
+                placeholder="请输入装备编码"
+                clearable
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="质检日期" prop="leaseStatus">
+              <el-date-picker
+                v-model="qcTime"
+                type="daterange"
+                placeholder="维保日期"
+                range-separator="-"
+                value-format="yyyy-MM-dd"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="更新日期" prop="createTime">
+              <el-date-picker
+                v-model="createTime"
+                type="daterange"
+                placeholder="更新日期"
+                range-separator="-"
+                value-format="yyyy-MM-dd"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24" style="text-align: right;">
+            <el-button type="primary" icon="el-icon-search" size="mini" class="primary-lease" @click="onSearch">查询
+            </el-button>
+            <el-button icon="el-icon-refresh" size="mini" class="primary-lease" @click="onReset">重置</el-button>
+          </el-col>
+        </el-row>
+
       </el-card>
     </el-form>
     <el-card class="content-box">
       <div class="table-container">
-    <!-- 维保列表表格 -->
-    <el-table
-      :data="qualityLis"
-      border
-      stripe
-      show-overflow-tooltip
-    >
-      <el-table-column label="序号" type="index" align="center" width="80"/>
-      <el-table-column prop="deviceCode" label="装备编码" align="center"/>
-      <el-table-column prop="deviceName" label="装备名称" align="center"/>
-      <el-table-column prop="qcTime" label="最新质检日期" align="center"/>
-      <el-table-column prop="createBy" label="创建人" align="center" width="120"/>
-      <el-table-column prop="createTime" label="上传时间" align="center"/>
-      <el-table-column prop="updateTime" label="更新时间" align="center"/>
-      <el-table-column label="操作" align="center" width="280">
-        <template slot-scope="{ row }">
-          <el-button
-            size="mini"
-            type="primary"
-            class="primary-lease"
-            @click="handleOpenAddDialog(row)"
-          >
-            新建
-          </el-button>
-          <el-button
-            size="mini"
-            type="primary"
-            class="primary-lease"
-            @click="handleOpenDetailDialog(row)"
-          >
-            装备质检记录
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-  </div>
-    <div class="pagination-wrapper">
-    <!-- 分页组件 -->
-    <pagination
-      :total="total"
-      :page.sync="searchParams.pageNum"
-      :limit.sync="searchParams.pageSize"
-      @pagination="getLeaseListData"
-    />
-  </div>
-    
-  </el-card>
+        <!-- 维保列表表格 -->
+        <el-table
+          :data="qualityLis"
+          border
+          stripe
+          show-overflow-tooltip
+        >
+          <el-table-column label="序号" type="index" align="center" width="80"/>
+          <el-table-column prop="deviceName" label="装备名称" align="center"/>
+          <el-table-column prop="itemTypeModel" label="装备型号" align="center"/>
+          <el-table-column prop="deviceCode" label="装备编码" align="center"/>
+          <el-table-column prop="createBy" label="维保人" align="center" width="120"/>
+          <el-table-column prop="nextCheckTime" label="下次维保日期" align="center"/>
+          <el-table-column prop="phonenumber" label="维保人联系方式" align="center"/>
+          <el-table-column prop="updateTime" label="更新时间" align="center"/>
+          <el-table-column prop="alert" label="维保告警" align="center">
+            <template slot-scope="scope">
+              <el-tag v-if="scope.row.alert == '正常'" size="mini">正常</el-tag>
+              <el-tag v-if="scope.row.alert == '已超期'" type="danger" size="mini">
+                已超期
+              </el-tag>
+              <el-tag v-if="scope.row.alert == '一月内到期'" type="warning"  size="mini">
+                一月内维保到期
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" width="280">
+            <template slot-scope="{ row }">
+              <el-button
+                size="mini"
+                type="primary"
+                class="primary-lease"
+                @click="handleOpenAddDialog(row)"
+              >
+                新建
+              </el-button>
+              <el-button
+                size="mini"
+                type="primary"
+                class="primary-lease"
+                @click="handleOpenDetailDialog(row)"
+              >
+                装备质检记录
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="pagination-wrapper">
+        <!-- 分页组件 -->
+        <pagination
+          :total="total"
+          :page.sync="searchParams.pageNum"
+          :limit.sync="searchParams.pageSize"
+          @pagination="getLeaseListData"
+        />
+      </div>
+
+    </el-card>
     <!-- 新增/详情对话框 -->
     <el-dialog
       :title="dialogTitle"
@@ -189,20 +184,20 @@
                 <el-upload
                   :action="uploadUrl"
                   :headers="{ Authorization: getToken() }"
-                :file-list="fileList"
-                :on-success="handleUploadSuccess"
-                :on-error="handleUploadError"
-                :on-remove="handleRemove"
-                :before-upload="beforeUpload"
-                :limit="1"
-                :on-exceed="handleExceed"
-                accept=".jpg,.png,.pdf,.doc,.docx"
-                list-type="picture-card"
+                  :file-list="fileList"
+                  :on-success="handleUploadSuccess"
+                  :on-error="handleUploadError"
+                  :on-remove="handleRemove"
+                  :before-upload="beforeUpload"
+                  :limit="1"
+                  :on-exceed="handleExceed"
+                  accept=".jpg,.png,.pdf,.doc,.docx"
+                  list-type="picture-card"
                 >
-                <i class="el-icon-plus" style="font-size: 48px; color: #aaa;"></i>
-                <div slot="tip" class="el-upload__tip">
-                  支持格式：.jpg、.png、.pdf、.doc、.docx 单个文件大小不能超过10M
-                </div>
+                  <i class="el-icon-plus" style="font-size: 48px; color: #aaa;"></i>
+                  <div slot="tip" class="el-upload__tip">
+                    支持格式：.jpg、.png、.pdf、.doc、.docx 单个文件大小不能超过10M
+                  </div>
                 </el-upload>
               </el-form-item>
             </el-col>
@@ -272,7 +267,9 @@
             </el-col>
             <el-col :span="6">
               <el-form-item>
-                <el-button type="primary" icon="el-icon-search" class="primary-lease" @click="getLeaseListDataInDialog">查询</el-button>
+                <el-button type="primary" icon="el-icon-search" class="primary-lease" @click="getLeaseListDataInDialog">
+                  查询
+                </el-button>
                 <el-button icon="el-icon-refresh" class="primary-lease" @click="onResetInDialog">重置</el-button>
               </el-form-item>
             </el-col>
@@ -425,7 +422,7 @@ export default {
         qcUser: '',
         qcTime: '',
         nextCheckTime: '',
-        fileInfoList: [],  // 存储上传成功的文件信息
+        fileInfoList: []  // 存储上传成功的文件信息
       },
 
       // 文件上传相关
@@ -562,7 +559,7 @@ export default {
         qcUser: '',
         qcTime: '',
         nextCheckTime: '',
-        fileInfoList: [],
+        fileInfoList: []
       }
       this.fileList = []
       this.warningDays = row.maintenanceAlarmDay
@@ -921,7 +918,7 @@ export default {
     padding-top: 6px;
     margin-top: auto;
 
-    ::v-deep  .pagination-container {
+    ::v-deep .pagination-container {
       padding: 0px 20px !important;
       margin-bottom: 30px;
     }
@@ -946,20 +943,21 @@ export default {
       }
     }
 
-    &.el-table--striped .el-table__body tr.el-table__row:hover>td.el-table__cell {
+    &.el-table--striped .el-table__body tr.el-table__row:hover > td.el-table__cell {
       background-color: #CCF1E9 !important;
     }
   }
 }
+
 .dialog-table {
   border-radius: 6px;
   overflow: hidden;
   box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
-  
+
   ::v-deep .el-table {
     border-radius: 6px;
     overflow: hidden;
-    
+
     // 启用斑马纹
     &.el-table--striped .el-table__body {
       tr.el-table__row--striped td {
@@ -983,11 +981,11 @@ export default {
     .el-table__body {
       tr {
         transition: all 0.2s ease;
-        
+
         &:hover {
           background-color: #f8f9fa;
         }
-        
+
         td {
           padding: 12px 8px;
           font-size: 13px;
@@ -996,15 +994,15 @@ export default {
       }
     }
 
-    &.el-table--striped .el-table__body tr.el-table__row:hover>td.el-table__cell {
+    &.el-table--striped .el-table__body tr.el-table__row:hover > td.el-table__cell {
       background-color: #CCF1E9 !important;
     }
-    
+
     // 表格边框优化
     &::before {
       display: none;
     }
-    
+
     &::after {
       display: none;
     }
@@ -1012,27 +1010,27 @@ export default {
 }
 
 ::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--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;
+  }
+}
 </style>
 
diff --git a/src/views/EquipmentTypeConfig/index.vue b/src/views/EquipmentTypeConfig/index.vue
index 085faab6..1936be40 100644
--- a/src/views/EquipmentTypeConfig/index.vue
+++ b/src/views/EquipmentTypeConfig/index.vue
@@ -1,2348 +1,2412 @@
 <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>
+        <!-- 折叠/展开控制按钮 -->
+        <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" size="mini" @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-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" size="mini" @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"
-                                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-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-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="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="`编辑装备 - ${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="'新增装备'"
-            :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>
 
-        <!-- 配置特征项弹窗（含特征值展示与新增） -->
-        <!-- 配置特征项弹窗（含特征值展示与新增） -->
-        <!-- 配置特征项弹窗（仅替换此段） -->
-        <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="{
+          <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 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 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"
+              @click="selectFeature(feature)"
             >
-                <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="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>
-
-            <div slot="footer" class="dialog-footer">
-                <el-button @click="handleCreateFeatureClose">取消</el-button>
-                <el-button type="primary" @click="submitCreateFeature" :loading="createFeatureLoading">保存</el-button>
+              <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>
-        </el-dialog>
-    </div>
+            <div v-if="featureItemList.length === 0" class="empty-feature">
+              <i class="el-icon-info"></i>
+              <span>暂无特征项</span>
+            </div>
+          </div>
+        </div>
+
+        <!-- 右侧：特征值管理区 -->
+        <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 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-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="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>
 </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,
+      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: '',
-            },
+      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(),
+      // 核心修改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: '',
+      // 核心修改4：存储装备分类路径文本（用于展示）
+      categoryPathText: '',
 
-            // 配置特征项相关数据
-            configDialogVisible: false,
-            currentEquipmentId: '',
-            currentEquipmentName: '',
-            currentFeature: null,
-            featureItemList: [],
-            featureLoading: false,
-            submitLoading: false,
-            configForm: {
-                featureId: '',
-            },
-            addValueForm: {
-                propertyValue: '',
-            },
-            inputStatus: {
-                touched: false,
-            },
-            selectedFeatureValues: [],
+      // 配置特征项相关数据
+      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' }],
-            },
+      // 新建特征项相关数据
+      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: '',
+      // 存储当前装备的 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
+        }
+      }
     },
 
-    computed: {
-        // 计算属性：添加按钮是否禁用
-        isAddButtonDisabled() {
-            // 未选择特征项时禁用
-            if (!this.currentFeature) return true
-
-            // 处理必填项逻辑
-            if (this.currentFeature.mustHave === '1') {
-                // 必填项：值为空时禁用
-                return !this.addValueForm.propertyValue?.trim()
-            }
-
-            // 非必填项：始终可用（即使值为空）
-            return false
-        },
+    // 获取预定义值（针对下拉选择类型）
+    getPredefinedValues(feature) {
+      if (feature.propertyValue && feature.inputType !== 1) {
+        return feature.propertyValue
+          .split(',')
+          .map((v) => v.trim())
+          .filter((v) => v)
+      }
+      return []
     },
 
-    methods: {
-        // 新增：进入编辑模式
-        enterEditMode() {
-            this.isEditing = true
-            this.tempSelectedFeatures = [...this.selectedFeatureValues]
-        },
-        // 新增：退出编辑模式
-        exitEditMode() {
-            this.isEditing = false
-            this.selectedFeatureValues = [...this.tempSelectedFeatures]
-            this.tempSelectedFeatures = []
-            this.$message.success('编辑完成')
-        },
+    // 动态生成校验规则
+    getDynamicRules() {
+      const rules = {
+        propertyValue: []
+      }
 
-        // 新增：判断预定义值是否被选中
-        isPredefinedValueSelected(value) {
+      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) {
-                return Array.isArray(this.addValueForm.propertyValue) && this.addValueForm.propertyValue.includes(value)
-            } else if (this.currentFeature.inputType === 2) {
-                return this.addValueForm.propertyValue === value
+              // 多选：数组长度大于0
+              if (Array.isArray(value) && value.length > 0) {
+                callback()
+              } else {
+                callback(new Error('请至少选择一个特征值（必填项）'))
+              }
+            } else {
+              // 其他类型：字符串非空
+              if (value?.trim()) {
+                callback()
+              } else {
+                callback(new Error('请输入特征值（必填项）'))
+              }
             }
-            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)
+          }
+        })
+
+        // 预定义值校验（下拉+多选都需校验）
+        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 {
-                    this.addValueForm.propertyValue.push(value)
+                  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(',')
             }
-            // 编辑状态下，实时更新临时列表（模拟“添加前预览”）
-            if (this.isEditing) {
-                this.handleValueInputForEdit()
+            const maxLength = this.currentFeature.inputType === 2 ? 50 : 200
+            if (targetValue.length <= maxLength) {
+              callback()
+            } else {
+              callback(new Error(`特征值长度不能超过${maxLength}个字符`))
             }
-        },
-        // 新增：编辑状态下输入值处理
-        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,
+          },
+          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
+      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) {
-                this.tempSelectedFeatures[editIndex] = {
-                    ...this.tempSelectedFeatures[editIndex],
-                    propertyValue: targetValue,
-                }
+              // 更新原特征值的propertyValue
+              this.selectedFeatureValues[editIndex] = {
+                ...this.selectedFeatureValues[editIndex],
+                propertyValue: targetValue
+              }
+              this.$message.success('特征值修改成功')
             }
-        },
-
-        // 获取预定义值（针对下拉选择类型）
-        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 = []
-
-            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,
+          } else {
+            // 原有新增逻辑：重复校验+添加新特征值
+            const exists = this.selectedFeatureValues.some(
+              (item) => item.id === this.currentFeature.id && item.propertyValue === targetValue
             )
-        },
-
-        // 保存预定义选项修改
-        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
             }
-            const current = this.currentFeature.propertyValue || ''
-            this.currentFeature.propertyValue = current ? `${current},${val}` : val
-            this.predefinedInputTemp = ''
-        },
+            this.addFeatureToSelected(targetValue)
+          }
 
-        // 删除预定义值
-        removePredefinedValue(index) {
-            const list = this.getPredefinedValues(this.currentFeature)
-            list.splice(index, 1)
-            this.currentFeature.propertyValue = list.join(',')
-        },
+          // 重置表单（无论新增还是编辑，都清空选择器）
+          this.resetAddValueForm()
+        } else {
+          if (this.currentFeature && this.currentFeature.mustHave === '1') {
+            this.$message.warning('请输入必填的特征值')
+          }
+        }
+      })
+    },
 
-        handleConfigClose() {
-            this.configDialogVisible = false
-            this.resetConfigData()
-        },
+    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()
+      }
 
-        async getCascaderData() {
+      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 getEquipmentCascaderAPI()
-                if (res.code === 200) {
-                    this.cascaderOptions = res.data || []
-                } else {
-                    this.$message.error(res.msg || '获取装备分类数据失败')
-                }
+              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 || '未知错误'))
+              this.$message.error('删除失败: ' + (error.message || '未知错误'))
             }
-        },
+          })
+          .catch(() => {
+            this.$message.info('已取消删除')
+          })
+      } else {
+        targetList.splice(index, 1)
+        this.$message.info('特征值已移除')
+      }
     },
 
-    async created() {
-        await this.getDeviceTree()
-        await this.getDeviceList()
+    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
+      }
+      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);
+  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;
     display: flex;
     flex-direction: column;
-    overflow: hidden;
+  }
 
-    ::v-deep .el-card__body {
-        display: flex !important;
-        flex-direction: column !important;
-        height: 100% !important;
-        padding: 20px;
+  .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-row:first-child {
-        margin-bottom: 16px;
-        flex-shrink: 0;
+    .el-table__header {
+      background: #e9f0ee;
 
-        .el-col {
-            display: flex;
-            justify-content: flex-end;
-            align-items: center;
-            gap: 12px;
-        }
+      th {
+        background: #e9f0ee !important;
+        color: #606266;
+        font-weight: 600;
+        height: 50px;
+      }
     }
 
-    .table-container {
-        flex: 1;
-        overflow: hidden;
-        margin-bottom: 0;
-        min-height: 0;
-        display: flex;
-        flex-direction: column;
+    &.el-table--striped .el-table__body tr.el-table__row:hover > td.el-table__cell {
+      background-color: #ccf1e9 !important;
     }
 
-    .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;
-        }
+    .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;
+  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;
+  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;
+  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;
+  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;
+  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;
+  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;
+  display: none;
 }
+
 .six-level-cascader .el-cascader-menu::-webkit-scrollbar {
-    width: 6px;
+  width: 6px;
 }
+
 .six-level-cascader .el-cascader-menu::-webkit-scrollbar-track {
-    background: #f1f1f1;
-    border-radius: 3px;
+  background: #f1f1f1;
+  border-radius: 3px;
 }
+
 .six-level-cascader .el-cascader-menu::-webkit-scrollbar-thumb {
-    background: #c1c1c1;
-    border-radius: 3px;
+  background: #c1c1c1;
+  border-radius: 3px;
 }
+
 .six-level-cascader .el-cascader-menu::-webkit-scrollbar-thumb:hover {
-    background: #a8a8a8;
+  background: #a8a8a8;
 }
 </style>
diff --git a/src/views/iframe/MallIframe.vue b/src/views/iframe/MallIframe.vue
index a1509fbc..9a074163 100644
--- a/src/views/iframe/MallIframe.vue
+++ b/src/views/iframe/MallIframe.vue
@@ -14,8 +14,8 @@ export default {
     console.log('🚀 ~ mounted:', window.location)
     this.iframeSrc =
       process.env.NODE_ENV === 'production'
-        ? 'http://192.168.0.14:19190/iws/mall-view/equipList'
-        : 'http://localhost:8102/iws/mall-view/equipList'
+        ? ' http://127.0.0.1:8108/iws/mall-view/equipList'
+        : 'http://127.0.0.1:8108/iws/mall-view/equipList'
     console.log('🚀 ~ this.iframeSrc:', this.iframeSrc)
   },
 }