diff --git a/weapp/package/AIOTOverview/AIOTOverview.js b/weapp/package/AIOTOverview/AIOTOverview.js index d057bf4..bd8d590 100644 --- a/weapp/package/AIOTOverview/AIOTOverview.js +++ b/weapp/package/AIOTOverview/AIOTOverview.js @@ -86,7 +86,7 @@ Page({ controlId=res.map(item=>{ return { ...item, - xjId:rslt.rows.find(q=>q.axyProjectId==item.thingId)?.id + xjId:rslt.rows.find(q=>q.axyProjectId==item.thingId)?.structureId } }) } diff --git a/weapp/package/AIOTOverview/electricityMonitoring/electricityMonitoring.js b/weapp/package/AIOTOverview/electricityMonitoring/electricityMonitoring.js index f7762b5..fba0115 100644 --- a/weapp/package/AIOTOverview/electricityMonitoring/electricityMonitoring.js +++ b/weapp/package/AIOTOverview/electricityMonitoring/electricityMonitoring.js @@ -70,7 +70,7 @@ Page({ if(res.rows.length&&rslt.rows.length){ const data=res.rows.map(item=>{ return { - value: rslt.rows.find(q => item.id === q.structureId)?.structureId, + value: item.id, text:item.name } }) @@ -85,7 +85,6 @@ Page({ }) } data.unshift({text: '全部', value: 'all' }) - // console.log('listt',listt) this.setData({ structList:data, list:listt, diff --git a/weapp/package/AIOTOverview/electricityMonitoring/electricityMonitoring.wxml b/weapp/package/AIOTOverview/electricityMonitoring/electricityMonitoring.wxml index 01e423b..a22215b 100644 --- a/weapp/package/AIOTOverview/electricityMonitoring/electricityMonitoring.wxml +++ b/weapp/package/AIOTOverview/electricityMonitoring/electricityMonitoring.wxml @@ -27,13 +27,13 @@ 运行状态 {{'离线'}} {{'离线'}} - {{'正常'}} + {{'正常'}} 电源状态 {{'离线'}} {{'离线'}} - {{'正常'}} + {{'正常'}} diff --git a/weapp/package/AIOTOverview/flowMonitoring/flowMonitoring.js b/weapp/package/AIOTOverview/flowMonitoring/flowMonitoring.js index 2edb79e..f03f516 100644 --- a/weapp/package/AIOTOverview/flowMonitoring/flowMonitoring.js +++ b/weapp/package/AIOTOverview/flowMonitoring/flowMonitoring.js @@ -41,10 +41,11 @@ Page({ const res = await Request.get(getProjectList()) const rslt = await Request.get(getRelationList()) if (res.rows.length && rslt.rows.length) { - const data = res.rows.map(item => { + + const data=res.rows.map(item=>{ return { - value: rslt.rows.find(q => item.id === q.structureId)?.id, - text: item.name + value: item.id, + text:item.name } }) data.unshift({ text: '全部', value: 'all' })