Commit b94f2938bb4e5ebe914f817d9acd36004bbbd702
1 parent
58baba1f
1.
Showing
1 changed file
with
1 additions
and
1 deletions
src/main/resources/static/real_control_v2/js/alarm/alarm.js
| ... | ... | @@ -11,7 +11,7 @@ var gb_alarm = (function () { |
| 11 | 11 | |
| 12 | 12 | var pop = function (data) { |
| 13 | 13 | //时间格式化 |
| 14 | - data.timeStr = moment(data.ts).format('HH时mm分ss秒'); | |
| 14 | + data.timeStr = moment(data.alarmTimeBegin).format('/'); | |
| 15 | 15 | if (data.alarmType === 'adas') { |
| 16 | 16 | data.content = '[' + code2des[6400 + data.type] + ']'; |
| 17 | 17 | } else if (data.alarmType === 'dsm') { | ... | ... |