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 d1a11b4..4ee61e7 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,12 +63,12 @@ const createDeviceModule = function (sensor,params) { break; case "image": - html += '
'; + html += '
'; /*  ${sensor['sensorStatus'] == null ? "-" : sensorStatus(sensor['sensorStatus'])}*/ html += `
${sensor.sensorName}
` html += '
'; let imgurl = sensor.imgstr.replace("D:/ruoyi/uploadPath","/profile"); - html += '' + html += '' html += '
' html += '
'; html += `

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

`; @@ -124,7 +124,17 @@ const createDeviceModule = function (sensor,params) { } const imgOnclick = function (com) { - /*$("#imgWindow").append(com)*/ + Dialog({ + title: '图像详情', + width: 600, + imageContent: { + src: com.src, + height: 480 + }, + showButton: false, + showTitle: true, + maskClose: true + }); } const collectTime = function (time){ diff --git a/ruoyi-admin/src/main/resources/templates/section/substation.html b/ruoyi-admin/src/main/resources/templates/section/substation.html index bccf0cc..d90a2ba 100644 --- a/ruoyi-admin/src/main/resources/templates/section/substation.html +++ b/ruoyi-admin/src/main/resources/templates/section/substation.html @@ -307,7 +307,7 @@ width: ['10%', '10%', '10%', '30%', '10%', '10%', '10%'], }) - //获取告警信息 + //获取告警单元模块信息 const alarmInfo = function () { $.ajax({ url: "/iot/wisdomScenario/getAlarmInfo?monitorUnitId=" + getParams("id"), @@ -316,7 +316,7 @@ success: (res) => { console.log("告警信息:" + res); - alertList.loadData(res.map(value => [value.alarmModuleId.substring(0, 2) + "...", value.alarmModuleText, value.sensorLocation, `${"无线检测 相对检测值为:" + value.minValue + "-" + value.maxValue + ",其值为:" + value.alarmValue}`, "超限", value.collectTime, `${value.disposeFlag == 1 ? '' : ''}`]), Object.keys(alertListColumns)) + alertList.loadData(res.map(value => [value.alarmModuleId.substring(0, 2) + "...", value.alarmModuleText, value.sensorLocation, `${"无线检测 相对检测值为:" + value.minValue + "-" + value.maxValue + ",其值为:" + value.alarmValue}`, "超限", value.collectTime, `${value.disposeFlag == 1 ? '' : ''}`]), Object.keys(alertListColumns)) }, error: () => { @@ -341,6 +341,37 @@ }) } + const disposeInfo = function (res) { + $.getJSON('/iot/wisdomScenario/getAlarmByUid?alarmuid=' + res, function (result) { + let html = `
+

+ +

+

+ +

+

+ + +

+

+ + +

+
` + + Dialog({ + title: "处理详情", + width: 600, + content: html, + ok: { + callback: function () { + } + } + }); + }) + } + const alarmDisposeInfo = function (res) { let html = `

@@ -384,7 +415,6 @@ } }); } - +