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] }} +
+
{{ v.propertyName }}:
+
+ {{ v.propertyValue }} +
+
@@ -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([]) - +