sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

测点：接口调整

Browse Source 
量测：接口返回数据调整
This commit is contained in:
高云鹏 2024-10-25 15:46:05 +08:00
parent c371c4c5c2
commit ea4f50f775
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/dasadmin/src/api/backend/node/request.ts
View File

@ -120,7 +120,7 @@ export const saveMappingListReq = (data: any) => {
export const bindDeviceMeasReq = (data: any) => {
return createAxios({
url: '/api/node/link/bindDeviceMeas',
url: '/api/node/link/bindDevices',
method: 'post',
data: data,
})

4
ui/dasadmin/src/views/backend/equipment/equipmentManagement/measurement.vue
View File

@ -155,8 +155,10 @@ const getCompleteData = () => {
return getRealValueList({ deviceId: props.deviceId, attributes: codeList }, data)
})
.then((realData: any) => {
console.log(realData);
const data = realData.list.map((item: any) => {
const realValItem = realData.realVal[props.deviceId]?.[item.attributeCode]
const realValItem = realData.realVal[props.deviceId]?.[item.attributeCode?.toLowerCase()]
return {
...item,
realTimeValue: realValItem ? (realValItem % 1 === 0 ? realValItem : realValItem.toFixed(3)) : '-',

13
ui/dasadmin/src/views/backend/node/univer.vue
View File

@ -334,13 +334,14 @@ const okEdit = (data: any) => {
const submitcorrectionDevice = () => {
const bindDevice = correctionDevice.value.map((item: any, index) => {
return {
equipmentId: item.id,
id: item.id,
iotAddr: item.iotAddr,
porder: index + 1,
name: item.name,
iotModelId: item.iotModelId,
}
})
bindDeviceMeasReq({ equipmentId: bindDevice, linkId: route.query.id }).then((res) => {
bindDeviceMeasReq({ equipmentList: bindDevice, linkId: route.query.id }).then((res) => {
ElMessage.success('关联成功！')
closecorrectionDevice()
resetExcel()
@ -379,10 +380,10 @@ const getBindDeviceTree = () => {
if (res.data) {
correctionDevice.value = res.data.map((item: any) => {
return {
id: item.equipmentId,
name: item.equipmentName,
id: item.id,
name: item.name,
iotAddr: item.iotAddr,
porder: item.porder,
iotModelId: item.iotModelId,
}
})
}