From 5e85476e99ff5046858bf56f1d5cb12e2b81467b Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 22 Feb 2021 18:12:04 +0800
Subject: [PATCH] 分析研判问题调整

---
 public/map/popup/js/equipment-history.js |  107 +++++++++++++++++++++++++++--------------------------
 public/map/popup/js/equipment-details.js |    2 
 2 files changed, 56 insertions(+), 53 deletions(-)

diff --git a/public/map/popup/js/equipment-details.js b/public/map/popup/js/equipment-details.js
index 43685fa..ed902dc 100644
--- a/public/map/popup/js/equipment-details.js
+++ b/public/map/popup/js/equipment-details.js
@@ -23,7 +23,7 @@
 
     $('.equipment-details-box table td input').click(function () {
 
-        var url = '../../popup/html/equipment-history.html?deviceNumber=' + $(this).attr('deviceNumber');
+        var url = 'popup/html/equipment-history.html?deviceNumber=' + $(this).attr('deviceNumber');
         window.parent.layui.use('layer', function () {
             var layer = window.parent.layui.layer;
             layer.close(layer.index)
diff --git a/public/map/popup/js/equipment-history.js b/public/map/popup/js/equipment-history.js
index aefaa8f..23e37f7 100644
--- a/public/map/popup/js/equipment-history.js
+++ b/public/map/popup/js/equipment-history.js
@@ -1,66 +1,69 @@
 $(function () {
-    var code = GetQueryString("deviceNumber");
-    console.log(code, 1212121);
+  var code = GetQueryString("deviceNumber");
+  console.log(code, 1212121);
 
-    $.ajax({
-        url: 'http://36.134.81.48:18001/api/blade-jfpts/jingdan/jingdan/selectdInfo?deviceNumber=' + code,
-        type: 'POST',
-        dataType: 'JSON',
-        success: function (data) {
-            console.log(data);
-            var result = data.data;
-            var num = null;
-            for (var t, e, time, y, h, str = '', i = 0; i < result.length; i++) {
-                num = Number(i) + 1;
+  $.ajax({
+    url: 'http://36.134.81.48:18001/api/blade-jfpts/jingdan/jingdan/selectdInfo?deviceNumber=' + code,
+    type: 'POST',
+    dataType: 'JSON',
+    success: function (data) {
+      console.log(data);
+      var result = data.data;
+      var num = null;
+      for (var t, e, time, y, h, str = '', i = 0; i < result.length; i++) {
+        num = Number(i) + 1;
 
-                t = result[i].handleTime.substr(0, 10);
-                e = result[i].handleTime.substr(11);
-                time = t + '&nbsp;' + e;
-                y = result[i].handleTime.substr(5, 5);
-                h = result[i].handleTime.substr(11, 5);
+        var types = result[i].type == "0" ? "待处理" :  result[i].type == "1" ? "处理中": result[i].type == "2" ? "已处理": "待处理";
 
-                str += '<tr>';
-                str += '<td>' + num + '</td>';
-                str += '<td>' + result[i].galarmPeople + '</td>';
-                str += '<td>' + result[i].phoneNumber + '</td>';
-                str += '<td>' + result[i].place + '</td>';
-                str += '<td>' + result[i].content + '</td>';
-                str += '<td>' + time + '</td>';
-                str += '<td>' + result[i].type + '</td>';
-                str += '<td>' + result[i].handName + '</td>';
-                str += '</tr>';
+        t = result[i].handleTime.substr(0, 10);
+        e = result[i].handleTime.substr(11);
+        time = t + '&nbsp;' + e;
+        y = result[i].handleTime.substr(5, 5);
+        h = result[i].handleTime.substr(11, 5);
+
+        str += '<tr>';
+        str += '<td>' + num + '</td>';
+        str += '<td>' + result[i].galarmPeople + '</td>';
+        str += '<td>' + result[i].phoneNumber + '</td>';
+        str += '<td>' + result[i].place + '</td>';
+        str += '<td>' + result[i].content + '</td>';
+        str += '<td>' + time + '</td>';
+
+        str += '<td>' +  types + '</td>';
+        str += '<td>' + result[i].handName + '</td>';
+        str += '</tr>';
 
 
-                $('.equipment-history-box tbody').append(str);
-                str = '';
-            }
+        $('.equipment-history-box tbody').append(str);
+        str = '';
+      }
 
 
 
 
-            // $('.equipment-details-box tbody tr:eq(0) td:eq(1)').text(result.deviceName);
-            // $('.equipment-details-box tbody tr:eq(1) td:eq(1)').text(result.deviceNumber);
-            // $('.equipment-details-box tbody tr:eq(2) td:eq(1)').text(result.deviceType);
-            // $('.equipment-details-box tbody tr:eq(3) td:eq(1)').text(result.ownership);
-            // $('.equipment-details-box tbody tr:eq(4) td:eq(1)').text(result.devicestate);
-            // $('.equipment-details-box tbody tr:eq(5) td:eq(1)').text(result.stime);
-            // $('.equipment-details-box tbody tr:eq(6) input').attr('id', result.id);
-        }
-    })
-
-
-
-
-
-
-
-
-    function GetQueryString(name) {
-        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
-        var r = window.location.search.substr(1).match(reg);
-        if (r != null) return unescape(r[2]);
-        return null;
+      // $('.equipment-details-box tbody tr:eq(0) td:eq(1)').text(result.deviceName);
+      // $('.equipment-details-box tbody tr:eq(1) td:eq(1)').text(result.deviceNumber);
+      // $('.equipment-details-box tbody tr:eq(2) td:eq(1)').text(result.deviceType);
+      // $('.equipment-details-box tbody tr:eq(3) td:eq(1)').text(result.ownership);
+      // $('.equipment-details-box tbody tr:eq(4) td:eq(1)').text(result.devicestate);
+      // $('.equipment-details-box tbody tr:eq(5) td:eq(1)').text(result.stime);
+      // $('.equipment-details-box tbody tr:eq(6) input').attr('id', result.id);
     }
+  })
+
+
+
+
+
+
+
+
+  function GetQueryString(name) {
+    var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
+    var r = window.location.search.substr(1).match(reg);
+    if (r != null) return unescape(r[2]);
+    return null;
+  }
 
 })
 

--
Gitblit v1.9.3