Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
N
new-socketemulator
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
李远洪
new-socketemulator
Commits
6f53b121
Commit
6f53b121
authored
Apr 30, 2020
by
liyuanhong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改了M5900 GPs 和 OBD页面,事件自动减8小时,以适应平台
parent
9095ed51
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
4 deletions
+15
-4
templates/messageTools/message/M_simulater_page.html
templates/messageTools/message/M_simulater_page.html
+1
-1
templates/protocolTools/report/GPS_protocol_page.html
templates/protocolTools/report/GPS_protocol_page.html
+4
-1
templates/protocolTools/report/M_carSimulater_page.html
templates/protocolTools/report/M_carSimulater_page.html
+1
-1
templates/protocolTools/report/OBD_CAN_protocol_page.html
templates/protocolTools/report/OBD_CAN_protocol_page.html
+3
-0
templates/protocolTools/report/event_protocol_page.html
templates/protocolTools/report/event_protocol_page.html
+3
-1
templates/protocolTools/report/voltageData_protocol_page.html
...lates/protocolTools/report/voltageData_protocol_page.html
+3
-0
No files found.
templates/messageTools/message/M_simulater_page.html
View file @
6f53b121
...
...
@@ -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>
</div>
<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;"
>
<h5><b>
登录报文数据:
</b>
<span
style=
"border-width:1px;border-style:solid;border-color:darkgray;border-radius:10px;padding:1px 10px;"
>
...
...
templates/protocolTools/report/GPS_protocol_page.html
View file @
6f53b121
...
...
@@ -115,6 +115,9 @@
var
msgCount
=
$
(
"
#msgCount
"
).
val
();
var
UTCTime
=
$
(
"
#UTCTime
"
).
val
();
var
timestampTemp
=
DateToTimestamp
(
UTCTime
)
UTCTime
=
formatDate
(
parseInt
(
timestampTemp
)
-
8
*
3600
*
1000
)
var
latitude
=
$
(
"
#latitude
"
).
val
();
var
longitude
=
$
(
"
#longitude
"
).
val
();
var
speed
=
$
(
"
#speed
"
).
val
();
...
...
@@ -137,7 +140,7 @@
var
GPSTotalMileage
=
$
(
"
#GPSTotalMileage
"
).
val
();
var
totalOil
=
$
(
"
#totalOil
"
).
val
();
var
totalTime
=
$
(
"
#totalTime
"
).
val
();
var
GPSTimestamp
=
$
(
"
#GPSTimestamp
"
).
val
()
;
var
GPSTimestamp
=
parseInt
(
$
(
"
#GPSTimestamp
"
).
val
())
-
8
*
3600
*
1000
;
var
data
=
{};
data
[
"
WATER_CODE
"
]
=
WATER_CODE
;
...
...
templates/protocolTools/report/M_carSimulater_page.html
View file @
6f53b121
...
...
@@ -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>
</div>
<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;"
>
<h5><b>
登录报文数据:
</b>
<span
style=
"border-width:1px;border-style:solid;border-color:darkgray;border-radius:10px;padding:1px 10px;"
>
...
...
templates/protocolTools/report/OBD_CAN_protocol_page.html
View file @
6f53b121
...
...
@@ -100,6 +100,9 @@ $("#sendMsgBtn").click(function(){
var
msgCount
=
$
(
"
#msgCount
"
).
val
();
var
infoTime
=
$
(
"
#infoTime
"
).
val
();
var
timestampTemp
=
DateToTimestamp
(
infoTime
)
infoTime
=
formatDate
(
parseInt
(
timestampTemp
)
-
8
*
3600
*
1000
)
var
dataFlowCode
=
$
(
"
#dataFlowCode
"
).
val
();
var
protocolType
=
$
(
"
#protocolType
"
).
val
();
var
fireStatus
=
$
(
"
#fireStatus
"
).
val
();
...
...
templates/protocolTools/report/event_protocol_page.html
View file @
6f53b121
...
...
@@ -426,6 +426,8 @@ $("#sendMsgBtn").click(function(){
//获取GPS数据
function
getGPSData
(){
var
UTCTime
=
$
(
"
#UTCTime
"
).
val
();
var
timestampTemp
=
DateToTimestamp
(
UTCTime
)
UTCTime
=
formatDate
(
parseInt
(
timestampTemp
)
-
8
*
3600
*
1000
)
var
latitude
=
$
(
"
#latitude
"
).
val
();
var
longitude
=
$
(
"
#longitude
"
).
val
();
var
speed
=
$
(
"
#speed
"
).
val
();
...
...
@@ -447,7 +449,7 @@ function getGPSData(){
var
GPSTotalMileage
=
$
(
"
#GPSTotalMileage
"
).
val
();
var
totalOil
=
$
(
"
#totalOil
"
).
val
();
var
totalTime
=
$
(
"
#totalTime
"
).
val
();
var
GPSTimestamp
=
$
(
"
#GPSTimestamp
"
).
val
()
;
var
GPSTimestamp
=
parseInt
(
$
(
"
#GPSTimestamp
"
).
val
())
-
8
*
3600
*
1000
;
var
data
=
{};
data
[
"
UTCTime
"
]
=
UTCTime
;
...
...
templates/protocolTools/report/voltageData_protocol_page.html
View file @
6f53b121
...
...
@@ -33,6 +33,9 @@ $("#sendMsgBtn").click(function(){
var
sampleNums
=
parseInt
(
$
(
"
#sampleNums
"
).
val
());
var
curTime
=
$
(
"
#curTime
"
).
val
();
var
timestampTemp
=
DateToTimestamp
(
curTime
)
curTime
=
formatDate
(
parseInt
(
timestampTemp
)
-
8
*
3600
*
1000
)
var
durTime
=
parseInt
(
$
(
"
#durTime
"
).
val
());
var
sampleVals
=
$
(
"
#sampleVals
"
).
val
();
var
sampleValsArr
=
sampleVals
.
split
(
"
"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment