Skip to content

Z
zhongtong-avi-web
Commit e5d27aac authored by 李志鸣's avatar 李志鸣
Browse files
Options

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

parent d36fc393
Hide whitespace changes
Inline Side-by-side
Showing with 79 additions and 27 deletions
src/views/Led/Station/stationFive.vue
View file @ e5d27aac
......@@ -136,7 +136,7 @@
// 实时时间
judgeTimeNow () {
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.timer = setInterval(() => {
let resolveStamp = new Date(this.timeNow).getTime() + 1000
......
src/views/Led/Station/stationFour.vue
View file @ e5d27aac
......@@ -101,10 +101,14 @@
methods: {
// 实时时间
judgeTimeNow () {
this.timeNow = Moment().format('YYYY-MM-DD HH:mm:ss')
this.timer = setInterval(() => {
this.timeNow = Moment().format('YYYY-MM-DD HH:mm:ss')
}, 1000)
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(() => {
let resolveStamp = new Date(this.timeNow).getTime() + 1000
this.timeNow = Moment(resolveStamp).format('YYYY-MM-DD HH:mm:ss')
}, 1000)
})
},
//获取工位实时信息
getData () {
......@@ -121,7 +125,11 @@
// 实时时间
this.judgeTimeNow()
this.dataTimer = setInterval(() => {
//获取工位实时信息
this.getData()
// 实时时间
this.judgeTimeNow()
clearInterval(this.timer)
}, 60000)
this.width = document.body.offsetWidth
this.height = document.body.offsetHeight
......
src/views/Led/Station/stationOne.vue
View file @ e5d27aac
......@@ -100,10 +100,14 @@
methods: {
// 实时时间
judgeTimeNow () {
this.timeNow = Moment().format('YYYY-MM-DD HH:mm:ss')
this.timer = setInterval(() => {
this.timeNow = Moment().format('YYYY-MM-DD HH:mm:ss')
}, 1000)
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(() => {
let resolveStamp = new Date(this.timeNow).getTime() + 1000
this.timeNow = Moment(resolveStamp).format('YYYY-MM-DD HH:mm:ss')
}, 1000)
})
},
//获取工位实时信息
getData () {
......@@ -120,7 +124,11 @@
// 实时时间
this.judgeTimeNow()
this.dataTimer = setInterval(() => {
//获取工位实时信息
this.getData()
// 实时时间
this.judgeTimeNow()
clearInterval(this.timer)
}, 60000)
this.width = document.body.offsetWidth
this.height = document.body.offsetHeight
......
src/views/Led/Station/stationSeven.vue
View file @ e5d27aac
......@@ -136,7 +136,7 @@
// 实时时间
judgeTimeNow () {
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.timer = setInterval(() => {
let resolveStamp = new Date(this.timeNow).getTime() + 1000
......
src/views/Led/Station/stationSix.vue
View file @ e5d27aac
......@@ -136,7 +136,7 @@
// 实时时间
judgeTimeNow () {
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.timer = setInterval(() => {
let resolveStamp = new Date(this.timeNow).getTime() + 1000
......
src/views/Led/Station/stationThree.vue
View file @ e5d27aac
......@@ -100,10 +100,14 @@
methods: {
// 实时时间
judgeTimeNow () {
this.timeNow = Moment().format('YYYY-MM-DD HH:mm:ss')
this.timer = setInterval(() => {
this.timeNow = Moment().format('YYYY-MM-DD HH:mm:ss')
}, 1000)
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(() => {
let resolveStamp = new Date(this.timeNow).getTime() + 1000
this.timeNow = Moment(resolveStamp).format('YYYY-MM-DD HH:mm:ss')
}, 1000)
})
},
//获取工位实时信息
getData () {
......@@ -120,7 +124,11 @@
// 实时时间
this.judgeTimeNow()
this.dataTimer = setInterval(() => {
//获取工位实时信息
this.getData()
// 实时时间
this.judgeTimeNow()
clearInterval(this.timer)
}, 60000)
this.width = document.body.offsetWidth
this.height = document.body.offsetHeight
......
src/views/Led/Station/stationTwo.vue
View file @ e5d27aac
......@@ -108,10 +108,14 @@
},
// 实时时间
judgeTimeNow () {
this.timeNow = Moment().format('YYYY-MM-DD HH:mm:ss')
this.timer = setInterval(() => {
this.timeNow = Moment().format('YYYY-MM-DD HH:mm:ss')
}, 1000)
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(() => {
let resolveStamp = new Date(this.timeNow).getTime() + 1000
this.timeNow = Moment(resolveStamp).format('YYYY-MM-DD HH:mm:ss')
}, 1000)
})
}
},
mounted () {
......@@ -121,7 +125,11 @@
// 实时时间
this.judgeTimeNow()
this.dataTimer = setInterval(() => {
//获取工位实时信息
this.getData()
// 实时时间
this.judgeTimeNow()
clearInterval(this.timer)
}, 60000)
this.width = document.body.offsetWidth
this.height = document.body.offsetHeight
......
src/views/Led/Station/voc.vue
View file @ e5d27aac
......@@ -50,10 +50,14 @@
methods: {
// 计算实时时间
getTimeNow () {
this.timeNow = Moment().format('YYYY-MM-DD HH:mm:ss')
this.nowTimer = setInterval(() => {
this.timeNow = Moment().format('YYYY-MM-DD HH:mm:ss')
}, 1000)
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(() => {
let resolveStamp = new Date(this.timeNow).getTime() + 1000
this.timeNow = Moment(resolveStamp).format('YYYY-MM-DD HH:mm:ss')
}, 1000)
})
},
// 获取VOC实时数据
getVOCRealData () {
......@@ -75,6 +79,9 @@
this.dataTimer = setInterval(() => {
// 获取VOC实时数据
this.getVOCRealData()
// 计算实时时间
this.getTimeNow()
clearInterval(this.nowTimer)
}, 60000)
}, 0)
},
......
src/views/Led/WorkShop/paintingWorkShop.vue
View file @ e5d27aac
......@@ -64,6 +64,8 @@
timeNow: null,
// Data轮询定时器
dataTimer: null,
// 时间定时器
timer: null,
// 当日进车数据
todayDataIN: null,
// 当日出车数据
......@@ -140,10 +142,14 @@
},
methods: {
judgeTimeNow () {
this.timeNow = Moment().format('YYYY-MM-DD HH-MM-SS')
this.timer = setInterval(() => {
this.timeNow = Moment().format('YYYY-MM-DD HH:mm:ss')
}, 1000)
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(() => {
let resolveStamp = new Date(this.timeNow).getTime() + 1000
this.timeNow = Moment(resolveStamp).format('YYYY-MM-DD HH:mm:ss')
}, 1000)
})
},
getData () {
this.$fetch('area-controller/statistics-get', {}).then(res => {
......@@ -227,11 +233,18 @@
// 每一分钟请求一次数据
this.dataTimer = setInterval(() => {
this.getData()
// 实时时间
this.judgeTimeNow()
clearInterval(this.timer)
}, 60000)
this.width = document.body.offsetWidth
this.height = document.body.offsetHeight
// this.zoom = `scale(${this.width / 1710})`
}, 0)
},
beforeDestroy () {
clearInterval(this.timer)
clearInterval(this.dataTimer)
}
}
</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