Commit 6f53b121 authored by liyuanhong's avatar liyuanhong

修改了M5900 GPs 和 OBD页面,事件自动减8小时,以适应平台

parent 9095ed51
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<button id="sessionRefresh" type="button" class="btn btn-primary" onclick="getAllUsers(this)">刷新</button><label style="font-size:10px;width:100px;">刷新后,可在控制台查看在线用户详细信息</label> <button id="sessionRefresh" type="button" class="btn btn-primary" onclick="getAllUsers(this)">刷新</button><label style="font-size:10px;width:100px;">刷新后,可在控制台查看在线用户详细信息</label>
</div> </div>
<div style="width:100%;_padding-bottom:10px;border-bottom: 1px solid #eee;"> <div style="width:100%;_padding-bottom:10px;border-bottom: 1px solid #eee;">
<h4>点击登录按钮发送报文:</h4> <!-- <h4>点击登录按钮发送报文:</h4>-->
<div style="display: block; width: 100%; border-width: 1px; border-style: solid; border-color: darkgray; border-radius: 10px; padding: 2px; margin-top: 5px;"> <div style="display: block; width: 100%; border-width: 1px; border-style: solid; border-color: darkgray; border-radius: 10px; padding: 2px; margin-top: 5px;">
<h5><b>登录报文数据:</b> <h5><b>登录报文数据:</b>
<span style="border-width:1px;border-style:solid;border-color:darkgray;border-radius:10px;padding:1px 10px;"> <span style="border-width:1px;border-style:solid;border-color:darkgray;border-radius:10px;padding:1px 10px;">
......
...@@ -115,6 +115,9 @@ ...@@ -115,6 +115,9 @@
var msgCount = $("#msgCount").val(); var msgCount = $("#msgCount").val();
var UTCTime = $("#UTCTime").val(); var UTCTime = $("#UTCTime").val();
var timestampTemp = DateToTimestamp(UTCTime)
UTCTime = formatDate(parseInt(timestampTemp) - 8 * 3600 * 1000)
var latitude = $("#latitude").val(); var latitude = $("#latitude").val();
var longitude = $("#longitude").val(); var longitude = $("#longitude").val();
var speed = $("#speed").val(); var speed = $("#speed").val();
...@@ -137,7 +140,7 @@ ...@@ -137,7 +140,7 @@
var GPSTotalMileage = $("#GPSTotalMileage").val(); var GPSTotalMileage = $("#GPSTotalMileage").val();
var totalOil = $("#totalOil").val(); var totalOil = $("#totalOil").val();
var totalTime = $("#totalTime").val(); var totalTime = $("#totalTime").val();
var GPSTimestamp = $("#GPSTimestamp").val(); var GPSTimestamp = parseInt($("#GPSTimestamp").val()) - 8 * 3600 * 1000;
var data = {}; var data = {};
data["WATER_CODE"] = WATER_CODE; data["WATER_CODE"] = WATER_CODE;
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<button id="sessionRefresh" type="button" class="btn btn-primary" onclick="getAllUsers(this)">刷新</button><label style="font-size:10px;width:100px;">刷新后,可在控制台查看在线用户详细信息</label> <button id="sessionRefresh" type="button" class="btn btn-primary" onclick="getAllUsers(this)">刷新</button><label style="font-size:10px;width:100px;">刷新后,可在控制台查看在线用户详细信息</label>
</div> </div>
<div style="width:100%;_padding-bottom:10px;border-bottom: 1px solid #eee;"> <div style="width:100%;_padding-bottom:10px;border-bottom: 1px solid #eee;">
<h4>点击登录按钮发送报文:</h4> <!-- <h4>点击登录按钮发送报文:</h4>-->
<div style="display: block; width: 100%; border-width: 1px; border-style: solid; border-color: darkgray; border-radius: 10px; padding: 2px; margin-top: 5px;"> <div style="display: block; width: 100%; border-width: 1px; border-style: solid; border-color: darkgray; border-radius: 10px; padding: 2px; margin-top: 5px;">
<h5><b>登录报文数据:</b> <h5><b>登录报文数据:</b>
<span style="border-width:1px;border-style:solid;border-color:darkgray;border-radius:10px;padding:1px 10px;"> <span style="border-width:1px;border-style:solid;border-color:darkgray;border-radius:10px;padding:1px 10px;">
......
...@@ -100,6 +100,9 @@ $("#sendMsgBtn").click(function(){ ...@@ -100,6 +100,9 @@ $("#sendMsgBtn").click(function(){
var msgCount = $("#msgCount").val(); var msgCount = $("#msgCount").val();
var infoTime = $("#infoTime").val(); var infoTime = $("#infoTime").val();
var timestampTemp = DateToTimestamp(infoTime)
infoTime = formatDate(parseInt(timestampTemp) - 8 * 3600 * 1000)
var dataFlowCode = $("#dataFlowCode").val(); var dataFlowCode = $("#dataFlowCode").val();
var protocolType = $("#protocolType").val(); var protocolType = $("#protocolType").val();
var fireStatus = $("#fireStatus").val(); var fireStatus = $("#fireStatus").val();
......
...@@ -426,6 +426,8 @@ $("#sendMsgBtn").click(function(){ ...@@ -426,6 +426,8 @@ $("#sendMsgBtn").click(function(){
//获取GPS数据 //获取GPS数据
function getGPSData(){ function getGPSData(){
var UTCTime = $("#UTCTime").val(); var UTCTime = $("#UTCTime").val();
var timestampTemp = DateToTimestamp(UTCTime)
UTCTime = formatDate(parseInt(timestampTemp) - 8 * 3600 * 1000)
var latitude = $("#latitude").val(); var latitude = $("#latitude").val();
var longitude = $("#longitude").val(); var longitude = $("#longitude").val();
var speed = $("#speed").val(); var speed = $("#speed").val();
...@@ -447,7 +449,7 @@ function getGPSData(){ ...@@ -447,7 +449,7 @@ function getGPSData(){
var GPSTotalMileage = $("#GPSTotalMileage").val(); var GPSTotalMileage = $("#GPSTotalMileage").val();
var totalOil = $("#totalOil").val(); var totalOil = $("#totalOil").val();
var totalTime = $("#totalTime").val(); var totalTime = $("#totalTime").val();
var GPSTimestamp = $("#GPSTimestamp").val(); var GPSTimestamp = parseInt($("#GPSTimestamp").val()) - 8 * 3600 * 1000;
var data = {}; var data = {};
data["UTCTime"] = UTCTime; data["UTCTime"] = UTCTime;
......
...@@ -33,6 +33,9 @@ $("#sendMsgBtn").click(function(){ ...@@ -33,6 +33,9 @@ $("#sendMsgBtn").click(function(){
var sampleNums = parseInt($("#sampleNums").val()); var sampleNums = parseInt($("#sampleNums").val());
var curTime = $("#curTime").val(); var curTime = $("#curTime").val();
var timestampTemp = DateToTimestamp(curTime)
curTime = formatDate(parseInt(timestampTemp) - 8 * 3600 * 1000)
var durTime = parseInt($("#durTime").val()); var durTime = parseInt($("#durTime").val());
var sampleVals = $("#sampleVals").val(); var sampleVals = $("#sampleVals").val();
var sampleValsArr = sampleVals.split(" ") var sampleValsArr = sampleVals.split(" ")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment