diff --git a/ruoyi-admin/src/main/resources/static/js/Iot-ui/deviceMonitor.js b/ruoyi-admin/src/main/resources/static/js/Iot-ui/deviceMonitor.js index 43468ed..b9dc4a8 100644 --- a/ruoyi-admin/src/main/resources/static/js/Iot-ui/deviceMonitor.js +++ b/ruoyi-admin/src/main/resources/static/js/Iot-ui/deviceMonitor.js @@ -63,9 +63,23 @@ const createDeviceModule = function (sensor,params) { $("#sensor-card-group").append(html); break; + case "humiture": + html += `
${sensor.sensorName}
`; + + html += '
'; + for (let i=0; i${params[i].paramText+":"+(sensor[params[i].paramTitle] == null ? "-" : sensor[params[i].paramTitle])}
`; + } + html += ''; + html += '
'; + html+=`

${sensor['collectTime'] == null ? "-" : collectTime(sensor['collectTime'])}

`; + html += '
'; + + $("#sensor-card-group").append(html); + break; + case "image": html += '
'; - /*  ${sensor['sensorStatus'] == null ? "-" : sensorStatus(sensor['sensorStatus'])}*/ html += `
${sensor.sensorName}
` html += '
'; let imgurl = sensor.imgstr.replace("D:/ruoyi/uploadPath","/profile"); @@ -95,12 +109,55 @@ const createDeviceModule = function (sensor,params) { } html += '
'; html += '
'; - //html+=`

${sensor['sensorStatus'] == null ? "-" : sensorStatus(sensor['sensorStatus'])}

`; html+=`

${sensor['collectTime'] == null ? "-" : collectTime(sensor['collectTime'])}

`; html += '
'; $("#sensor-card-group").append(html); break; + + case "doormagnetic": + html += `
${sensor.sensorName}
`; + + html += '
'; + for (let i=0; i${params[i].paramText+":"+(sensor[params[i].paramTitle] == null ? "-" : sensor[params[i].paramTitle])}
`; + } + html += '
'; + html += '
'; + html+=`

${sensor['collectTime'] == null ? "-" : collectTime(sensor['collectTime'])}

`; + html += '
'; + + $("#sensor-card-group").append(html); + break; + + case "vibration": + html += `
${sensor.sensorName}
`; + + html += '
'; + for (let i=0; i${params[i].paramText+":"+(sensor[params[i].paramTitle] == null ? "-" : sensor[params[i].paramTitle])}
`; + } + html += ''; + html += '
'; + html+=`

${sensor['collectTime'] == null ? "-" : collectTime(sensor['collectTime'])}

`; + html += '
'; + + $("#sensor-card-group").append(html); + break; + + case "waterlogging": + html += `
${sensor.sensorName}
`; + + html += '
'; + for (let i=0; i${params[i].paramText+":"+(sensor[params[i].paramTitle] == null ? "-" : sensor[params[i].paramTitle])}
`; + } + html += ''; + html += '
'; + html+=`

${sensor['collectTime'] == null ? "-" : collectTime(sensor['collectTime'])}

`; + html += '
'; + + $("#sensor-card-group").append(html); break; case "platen": @@ -120,6 +177,18 @@ const createDeviceModule = function (sensor,params) { break; default: + html += `
${sensor.sensorName}
`; + + html += '
'; + for (let i=0; i${params[i].paramText+":"+(sensor[params[i].paramTitle] == null ? "-" : sensor[params[i].paramTitle])}
`; + } + html += ''; + html += '
'; + html+=`

${sensor['collectTime'] == null ? "-" : collectTime(sensor['collectTime'])}

`; + html += '
'; + + $("#sensor-card-group").append(html); break; } }