diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index d338a92..0c4df2b 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -73,7 +73,7 @@ spring: redis: port: 6379 password: admin123 - host: 121.36.58.109 + host: 127.0.0.1 jedis: pool: max-active: 8 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 e2144f7..d949a7a 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 @@ -47,11 +47,11 @@ const createDeviceModule = function (sensor,params) { let html = '
'; switch (sensor.datatype) { case "temperature": - html += `
${sensor.sensorName}
`; + html += `
${sensor.sensorName}
`; html += '
'; for (let i=0; i${params[i].paramText+":"+(sensor[params[i].paramTitle] == null ? "-" : sensor[params[i].paramTitle])}
`; + html += `
${params[i].paramText+":"+(sensor[params[i].paramTitle] == null ? "-" : sensor[params[i].paramTitle])}
`; } html += '
'; html += '
'; @@ -64,16 +64,16 @@ const createDeviceModule = function (sensor,params) { case "image": html += '
'; - html += `
${sensor.sensorName}  ${sensor['sensorStatus'] == null ? "-" : sensorStatus(sensor['sensorStatus'])}
` + html += `
${sensor.sensorName}  ${sensor['sensorStatus'] == null ? "-" : sensorStatus(sensor['sensorStatus'])}
` html += '
'; let imgurl = sensor.imgstr.replace("D:/ruoyi/uploadPath","/profile"); html += '' html += '
' html += '
'; - html += `

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

`; + html += `

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

`; for (let i=0; i${params[i].paramText+":"+(sensor[params[i].paramTitle] == null ? "-" : sensor[params[i].paramTitle])}

`; + html += `

${params[i].paramText+":"+(sensor[params[i].paramTitle] == null ? "-" : sensor[params[i].paramTitle])}

`; } } html += '
'; @@ -85,11 +85,11 @@ const createDeviceModule = function (sensor,params) { break; case "smoke": - html += `
${sensor.sensorName}
`; + html += `
${sensor.sensorName}
`; html += '
'; for (let i=0; i${params[i].paramText+":"+(sensor[params[i].paramTitle] == null ? "-" : sensor[params[i].paramTitle])}
`; + html += `
${params[i].paramText+":"+(sensor[params[i].paramTitle] == null ? "-" : sensor[params[i].paramTitle])}
`; } html += '
'; html += '
'; @@ -102,11 +102,11 @@ const createDeviceModule = function (sensor,params) { break; case "platen": - html += `
${sensor.sensorName}
`; + html += `
${sensor.sensorName}
`; html += '
'; for (let i=0; i${params[i].paramText+":"+(sensor[params[i].paramTitle] == null ? "-" : sensor[params[i].paramTitle])}
`; + html += `
${params[i].paramText+":"+(sensor[params[i].paramTitle] == null ? "-" : sensor[params[i].paramTitle])}
`; } html += '
'; html += '
'; @@ -136,16 +136,16 @@ const sensorStatus = function (status) { let result = "-"; switch (status) { case 0: - result = `在线`; + result = `在线`; break; case 1: - result = `离线`; + result = `离线`; break; case 2: - result = `告警`; + result = `告警`; break; default: - result = `异常`; + result = `异常`; break; } return result; diff --git a/ruoyi-admin/src/main/resources/templates/section/transformer-detail.html b/ruoyi-admin/src/main/resources/templates/section/transformer-detail.html index 846cc88..11ebfb4 100644 --- a/ruoyi-admin/src/main/resources/templates/section/transformer-detail.html +++ b/ruoyi-admin/src/main/resources/templates/section/transformer-detail.html @@ -364,7 +364,7 @@ left: 16.2%; border: 0px solid red; color: #00f9ff; - padding: 1em 0.5em 1em 1.5em; + padding: 1em 0.5em 1em 2.5em; align-items: flex-start; justify-content: space-around; flex-wrap: nowrap; @@ -372,6 +372,7 @@ align-content: stretch; overflow-x: hidden; overflow-y: auto; + font-size:1.5rem; } div::-webkit-scrollbar {