diff --git a/vocalldemo/report.html b/vocalldemo/report.html index 1f48d4a..a0feb5e 100644 --- a/vocalldemo/report.html +++ b/vocalldemo/report.html @@ -165,18 +165,20 @@ document.getElementById('alarmBtn').onclick = function () { reportIot(); } + //报警信息上报 function reportIot() { let ip = $('#ip').val(); if(ip == '') { - layer.msg('未成功获取本机IP,请联系运维人员'); + layer.msg('未成功获取本机IP,请联系运维人员'); return; } + let val = $('#volTxt').val() !== '' ? ',' + $('#volTxt').val() : '' let data = { -     "alarmTypeIdentity": "700007", -     "description": $('#volTxt').val(), -     "deviceSn": ip, -     "platformCode": "DIANXIN", + "alarmTypeIdentity":"700007", + "description": ip + val, + "deviceSn":'ZJBJLXDIANXIN001', + "platformCode":"DIANXIN", } var loadingIndex = layer.load(0, {shade: false}); $.ajax({ @@ -199,8 +201,9 @@ getIp(); function getIp() { $.ajax({ - url: baseUrl + "/appData/escalation", type: "post", contentType: "application/json;charset=UTF-8", dataType: "json", data: {},timeout: 6000, success: function (res) { - let _data = JSON.parse(res.data); + url: baseUrl + "/alarmInformation/getIp", type: "get", contentType: "application/json;charset=UTF-8", dataType: "json", data: {},timeout: 6000, success: function (res) { + console.log('res ===>',res) + // let _data = JSON.parse(res.data); if (res.code === 200) { $('#ip').val(res.data); }else{