Commit e5d27aac authored by 李志鸣's avatar 李志鸣

fea(led):车间、工位级LED屏幕新增服务器时间校准功能

parent d36fc393
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
// 实时时间 // 实时时间
judgeTimeNow () { judgeTimeNow () {
this.$fetch('led-controller/currentTime-get').then(res => { this.$fetch('led-controller/currentTime-get').then(res => {
let resolveCurrentTime = new Date(_.cloneDeep(res)) let resolveCurrentTime = _.cloneDeep(res)
this.timeNow = Moment(resolveCurrentTime).format('YYYY-MM-DD HH:mm:ss') this.timeNow = Moment(resolveCurrentTime).format('YYYY-MM-DD HH:mm:ss')
this.timer = setInterval(() => { this.timer = setInterval(() => {
let resolveStamp = new Date(this.timeNow).getTime() + 1000 let resolveStamp = new Date(this.timeNow).getTime() + 1000
......
...@@ -101,10 +101,14 @@ ...@@ -101,10 +101,14 @@
methods: { methods: {
// 实时时间 // 实时时间
judgeTimeNow () { judgeTimeNow () {
this.timeNow = Moment().format('YYYY-MM-DD HH:mm:ss') this.$fetch('led-controller/currentTime-get').then(res => {
let resolveCurrentTime = _.cloneDeep(res)
this.timeNow = Moment(resolveCurrentTime).format('YYYY-MM-DD HH:mm:ss')
this.timer = setInterval(() => { this.timer = setInterval(() => {
this.timeNow = Moment().format('YYYY-MM-DD HH:mm:ss') let resolveStamp = new Date(this.timeNow).getTime() + 1000
this.timeNow = Moment(resolveStamp).format('YYYY-MM-DD HH:mm:ss')
}, 1000) }, 1000)
})
}, },
//获取工位实时信息 //获取工位实时信息
getData () { getData () {
...@@ -121,7 +125,11 @@ ...@@ -121,7 +125,11 @@
// 实时时间 // 实时时间
this.judgeTimeNow() this.judgeTimeNow()
this.dataTimer = setInterval(() => { this.dataTimer = setInterval(() => {
//获取工位实时信息
this.getData() this.getData()
// 实时时间
this.judgeTimeNow()
clearInterval(this.timer)
}, 60000) }, 60000)
this.width = document.body.offsetWidth this.width = document.body.offsetWidth
this.height = document.body.offsetHeight this.height = document.body.offsetHeight
......
...@@ -100,10 +100,14 @@ ...@@ -100,10 +100,14 @@
methods: { methods: {
// 实时时间 // 实时时间
judgeTimeNow () { judgeTimeNow () {
this.timeNow = Moment().format('YYYY-MM-DD HH:mm:ss') this.$fetch('led-controller/currentTime-get').then(res => {
let resolveCurrentTime = _.cloneDeep(res)
this.timeNow = Moment(resolveCurrentTime).format('YYYY-MM-DD HH:mm:ss')
this.timer = setInterval(() => { this.timer = setInterval(() => {
this.timeNow = Moment().format('YYYY-MM-DD HH:mm:ss') let resolveStamp = new Date(this.timeNow).getTime() + 1000
this.timeNow = Moment(resolveStamp).format('YYYY-MM-DD HH:mm:ss')
}, 1000) }, 1000)
})
}, },
//获取工位实时信息 //获取工位实时信息
getData () { getData () {
...@@ -120,7 +124,11 @@ ...@@ -120,7 +124,11 @@
// 实时时间 // 实时时间
this.judgeTimeNow() this.judgeTimeNow()
this.dataTimer = setInterval(() => { this.dataTimer = setInterval(() => {
//获取工位实时信息
this.getData() this.getData()
// 实时时间
this.judgeTimeNow()
clearInterval(this.timer)
}, 60000) }, 60000)
this.width = document.body.offsetWidth this.width = document.body.offsetWidth
this.height = document.body.offsetHeight this.height = document.body.offsetHeight
......
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
// 实时时间 // 实时时间
judgeTimeNow () { judgeTimeNow () {
this.$fetch('led-controller/currentTime-get').then(res => { this.$fetch('led-controller/currentTime-get').then(res => {
let resolveCurrentTime = new Date(_.cloneDeep(res)) let resolveCurrentTime = _.cloneDeep(res)
this.timeNow = Moment(resolveCurrentTime).format('YYYY-MM-DD HH:mm:ss') this.timeNow = Moment(resolveCurrentTime).format('YYYY-MM-DD HH:mm:ss')
this.timer = setInterval(() => { this.timer = setInterval(() => {
let resolveStamp = new Date(this.timeNow).getTime() + 1000 let resolveStamp = new Date(this.timeNow).getTime() + 1000
......
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
// 实时时间 // 实时时间
judgeTimeNow () { judgeTimeNow () {
this.$fetch('led-controller/currentTime-get').then(res => { this.$fetch('led-controller/currentTime-get').then(res => {
let resolveCurrentTime = new Date(_.cloneDeep(res)) let resolveCurrentTime = _.cloneDeep(res)
this.timeNow = Moment(resolveCurrentTime).format('YYYY-MM-DD HH:mm:ss') this.timeNow = Moment(resolveCurrentTime).format('YYYY-MM-DD HH:mm:ss')
this.timer = setInterval(() => { this.timer = setInterval(() => {
let resolveStamp = new Date(this.timeNow).getTime() + 1000 let resolveStamp = new Date(this.timeNow).getTime() + 1000
......
...@@ -100,10 +100,14 @@ ...@@ -100,10 +100,14 @@
methods: { methods: {
// 实时时间 // 实时时间
judgeTimeNow () { judgeTimeNow () {
this.timeNow = Moment().format('YYYY-MM-DD HH:mm:ss') this.$fetch('led-controller/currentTime-get').then(res => {
let resolveCurrentTime = _.cloneDeep(res)
this.timeNow = Moment(resolveCurrentTime).format('YYYY-MM-DD HH:mm:ss')
this.timer = setInterval(() => { this.timer = setInterval(() => {
this.timeNow = Moment().format('YYYY-MM-DD HH:mm:ss') let resolveStamp = new Date(this.timeNow).getTime() + 1000
this.timeNow = Moment(resolveStamp).format('YYYY-MM-DD HH:mm:ss')
}, 1000) }, 1000)
})
}, },
//获取工位实时信息 //获取工位实时信息
getData () { getData () {
...@@ -120,7 +124,11 @@ ...@@ -120,7 +124,11 @@
// 实时时间 // 实时时间
this.judgeTimeNow() this.judgeTimeNow()
this.dataTimer = setInterval(() => { this.dataTimer = setInterval(() => {
//获取工位实时信息
this.getData() this.getData()
// 实时时间
this.judgeTimeNow()
clearInterval(this.timer)
}, 60000) }, 60000)
this.width = document.body.offsetWidth this.width = document.body.offsetWidth
this.height = document.body.offsetHeight this.height = document.body.offsetHeight
......
...@@ -108,10 +108,14 @@ ...@@ -108,10 +108,14 @@
}, },
// 实时时间 // 实时时间
judgeTimeNow () { judgeTimeNow () {
this.timeNow = Moment().format('YYYY-MM-DD HH:mm:ss') this.$fetch('led-controller/currentTime-get').then(res => {
let resolveCurrentTime = _.cloneDeep(res)
this.timeNow = Moment(resolveCurrentTime).format('YYYY-MM-DD HH:mm:ss')
this.timer = setInterval(() => { this.timer = setInterval(() => {
this.timeNow = Moment().format('YYYY-MM-DD HH:mm:ss') let resolveStamp = new Date(this.timeNow).getTime() + 1000
this.timeNow = Moment(resolveStamp).format('YYYY-MM-DD HH:mm:ss')
}, 1000) }, 1000)
})
} }
}, },
mounted () { mounted () {
...@@ -121,7 +125,11 @@ ...@@ -121,7 +125,11 @@
// 实时时间 // 实时时间
this.judgeTimeNow() this.judgeTimeNow()
this.dataTimer = setInterval(() => { this.dataTimer = setInterval(() => {
//获取工位实时信息
this.getData() this.getData()
// 实时时间
this.judgeTimeNow()
clearInterval(this.timer)
}, 60000) }, 60000)
this.width = document.body.offsetWidth this.width = document.body.offsetWidth
this.height = document.body.offsetHeight this.height = document.body.offsetHeight
......
...@@ -50,10 +50,14 @@ ...@@ -50,10 +50,14 @@
methods: { methods: {
// 计算实时时间 // 计算实时时间
getTimeNow () { getTimeNow () {
this.timeNow = Moment().format('YYYY-MM-DD HH:mm:ss') this.$fetch('led-controller/currentTime-get').then(res => {
let resolveCurrentTime = _.cloneDeep(res)
this.timeNow = Moment(resolveCurrentTime).format('YYYY-MM-DD HH:mm:ss')
this.nowTimer = setInterval(() => { this.nowTimer = setInterval(() => {
this.timeNow = Moment().format('YYYY-MM-DD HH:mm:ss') let resolveStamp = new Date(this.timeNow).getTime() + 1000
this.timeNow = Moment(resolveStamp).format('YYYY-MM-DD HH:mm:ss')
}, 1000) }, 1000)
})
}, },
// 获取VOC实时数据 // 获取VOC实时数据
getVOCRealData () { getVOCRealData () {
...@@ -75,6 +79,9 @@ ...@@ -75,6 +79,9 @@
this.dataTimer = setInterval(() => { this.dataTimer = setInterval(() => {
// 获取VOC实时数据 // 获取VOC实时数据
this.getVOCRealData() this.getVOCRealData()
// 计算实时时间
this.getTimeNow()
clearInterval(this.nowTimer)
}, 60000) }, 60000)
}, 0) }, 0)
}, },
......
...@@ -64,6 +64,8 @@ ...@@ -64,6 +64,8 @@
timeNow: null, timeNow: null,
// Data轮询定时器 // Data轮询定时器
dataTimer: null, dataTimer: null,
// 时间定时器
timer: null,
// 当日进车数据 // 当日进车数据
todayDataIN: null, todayDataIN: null,
// 当日出车数据 // 当日出车数据
...@@ -140,10 +142,14 @@ ...@@ -140,10 +142,14 @@
}, },
methods: { methods: {
judgeTimeNow () { judgeTimeNow () {
this.timeNow = Moment().format('YYYY-MM-DD HH-MM-SS') this.$fetch('led-controller/currentTime-get').then(res => {
let resolveCurrentTime = _.cloneDeep(res)
this.timeNow = Moment(resolveCurrentTime).format('YYYY-MM-DD HH:mm:ss')
this.timer = setInterval(() => { this.timer = setInterval(() => {
this.timeNow = Moment().format('YYYY-MM-DD HH:mm:ss') let resolveStamp = new Date(this.timeNow).getTime() + 1000
this.timeNow = Moment(resolveStamp).format('YYYY-MM-DD HH:mm:ss')
}, 1000) }, 1000)
})
}, },
getData () { getData () {
this.$fetch('area-controller/statistics-get', {}).then(res => { this.$fetch('area-controller/statistics-get', {}).then(res => {
...@@ -227,11 +233,18 @@ ...@@ -227,11 +233,18 @@
// 每一分钟请求一次数据 // 每一分钟请求一次数据
this.dataTimer = setInterval(() => { this.dataTimer = setInterval(() => {
this.getData() this.getData()
// 实时时间
this.judgeTimeNow()
clearInterval(this.timer)
}, 60000) }, 60000)
this.width = document.body.offsetWidth this.width = document.body.offsetWidth
this.height = document.body.offsetHeight this.height = document.body.offsetHeight
// this.zoom = `scale(${this.width / 1710})` // this.zoom = `scale(${this.width / 1710})`
}, 0) }, 0)
},
beforeDestroy () {
clearInterval(this.timer)
clearInterval(this.dataTimer)
} }
} }
</script> </script>
......
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