From 1df8b976c1519004e5dc6242c234b718582c0419 Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Thu, 2 Nov 2023 17:20:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B0=83=E7=94=A8ip=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=9C=B0=E5=9D=80=E5=8F=8A=E4=BC=A0=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vocalldemo/report.html | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

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{