From 69d3d249ed9ee14d4ddf5ad8654dd437c605e9be Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Thu, 12 Dec 2024 10:58:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E5=A4=87=E8=AF=A6=E6=83=85=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/equip/detail.vue               | 30 +++++++++++++++++++-----
 src/views/user/goodsManagement/index.vue |  2 +-
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/views/equip/detail.vue b/src/views/equip/detail.vue
index 38a845d..5a8e119 100644
--- a/src/views/equip/detail.vue
+++ b/src/views/equip/detail.vue
@@ -172,6 +172,13 @@
                         {{ pageData[v.key] }}
                     </div>
                 </div>
+                <div class="item" v-for="(v, i) in propertyNames" :key="i">
+                    <div class="label">{{ v.propertyName }}：</div>
+                    <div
+                    >
+                        {{ v.propertyValue }}
+                    </div>
+                </div>
             </div>
         </div>
         <div class="appearance">
@@ -611,12 +618,12 @@ const equipDetailKeyList = reactive([
         fn: '',
         arg: '',
     },
-    {
-        label: '整机重量(KG)',
-        key: 'deviceWeight',
-        fn: '',
-        arg: '',
-    },
+    // {
+    //     label: '整机重量(KG)',
+    //     key: 'deviceWeight',
+    //     fn: '',
+    //     arg: '',
+    // },
     // {
     //     label: '装备型号',
     //     key: 'modelName',
@@ -655,6 +662,10 @@ const equipDetailKeyList = reactive([
     // },
 ])
 
+const propertyNames = ref([])
+
+
+
 //
 const dialogPhone = ref(false)
 
@@ -853,6 +864,13 @@ const getData = async () => {
 
     console.log('res详情数据', res)
     pageData.value = res.data
+    if(res.data.devInfoProperties.length > 0 && res.data.devInfoProperties !=null) {
+         propertyNames.value = [];
+         propertyNames.value = res.data.devInfoProperties
+        // res.data.devInfoProperties.forEach((item:any) => {
+        //     propertyNames.value.push({label：any:item.propertyName,keya:any:item.propertyValue})
+        // })
+    }
     goodsImgList.value = res.data.mainFileList
 }
 
diff --git a/src/views/user/goodsManagement/index.vue b/src/views/user/goodsManagement/index.vue
index 5a4f311..3fd63a1 100644
--- a/src/views/user/goodsManagement/index.vue
+++ b/src/views/user/goodsManagement/index.vue
@@ -1452,7 +1452,7 @@ const options = ref<any>([])
                     </el-form-item>
                  </el-col>
                 <el-col :span="12" >
-                    <el-form-item label="属性值：" :rules="getProertyValueRules(item)" :prop="item.propertyValue">
+                    <el-form-item label="属性值：" >
                     <el-input   
                       v-model="item.propertyValue"
                       placeholder="请输入"