|
|
@@ -160,17 +160,25 @@
|
|
|
})
|
|
|
},
|
|
|
timestampToTime (val) {
|
|
|
- var date = new Date(val) // 时间戳为10位需*1000,时间戳为13位的话不需乘1000
|
|
|
- var Y = date.getFullYear() + '-'
|
|
|
- var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-'
|
|
|
- var D = date.getDate() + ' '
|
|
|
- var h = date.getHours() + ':'
|
|
|
- var m = date.getMinutes() + ':'
|
|
|
- var s = date.getSeconds()
|
|
|
+ if (val === '' || val === 0) {
|
|
|
+ return val
|
|
|
+ }
|
|
|
+ let date = new Date(val) // 时间戳为10位需*1000,时间戳为13位的话不需乘1000
|
|
|
+ let offset_GMT = new Date().getTimezoneOffset()
|
|
|
+ if (offset_GMT !== -480) {
|
|
|
+ date = new Date(val + offset_GMT * 60 * 1000 + 8 * 60 * 60 * 1000)
|
|
|
+ }
|
|
|
+ let Y = date.getFullYear() + '-'
|
|
|
+ let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1) + '-'
|
|
|
+ let D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + ' '
|
|
|
+ let h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':'
|
|
|
+ console.log(h, 'h')
|
|
|
+ let m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':'
|
|
|
+ let s = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds())
|
|
|
return Y + M + D + h + m + s
|
|
|
},
|
|
|
jstimehandle (val) {
|
|
|
- if (val === '') {
|
|
|
+ if (val === '' || val === 0) {
|
|
|
return '----'
|
|
|
} else if (val === '0001-01-01T08:00:00+08:00') {
|
|
|
return '----'
|