diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/DeviceSummaryController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/DeviceSummaryController.java index d0f87f34..b435feb1 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/DeviceSummaryController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/DeviceSummaryController.java @@ -48,6 +48,8 @@ public class DeviceSummaryController extends BasicController{ jsonObject.put("satNum",gnssStatus.getSatelliteinuse()>=12?"多于12":gnssStatus.getSatelliteinuse()); jsonObject.put("rxBytes",gnssStatus.getB562bytes()+gnssStatus.getD3xxbytes()); jsonObject.put("rssi",gnssStatus.getRssi()); + jsonObject.put("loc",NumberUtils.scale(gnssStatus.getLongitude(), 8) + +","+NumberUtils.scale(gnssStatus.getLatitude(), 8)); } return jsonObject; } diff --git a/sec-beidou/src/main/resources/templates/page/gnss_dev_summary.html b/sec-beidou/src/main/resources/templates/page/gnss_dev_summary.html index d76a2961..320375cc 100644 --- a/sec-beidou/src/main/resources/templates/page/gnss_dev_summary.html +++ b/sec-beidou/src/main/resources/templates/page/gnss_dev_summary.html @@ -65,6 +65,12 @@ +
+ +
+ +
+
@@ -100,7 +106,6 @@ url:"/device_summary/query", data: data.field, success: function (result) { - console.log(result); if(result.code == 0){ layer.alert(result.msg); } @@ -119,6 +124,7 @@ $('#rxBytes').val(result.rxBytes) $('#deviceType').val(result.deviceType) $('#rssi').val(result.rssi) + $('#loc').val(result.loc) form.render(); } },