|
|
|
@ -234,10 +234,10 @@ const connectToMQTT = () => {
|
|
|
|
let points = item.points
|
|
|
|
let points = item.points
|
|
|
|
if(points && points.length > 0){
|
|
|
|
if(points && points.length > 0){
|
|
|
|
let speed = points.find(l => l.name == 'SpindlesSpeed') // 转速
|
|
|
|
let speed = points.find(l => l.name == 'SpindlesSpeed') // 转速
|
|
|
|
devic.process = speed ? speed.value : ''
|
|
|
|
devic.process = speed ? speed.value : '70'
|
|
|
|
if(item.status == 1){
|
|
|
|
if(item.status == 1){
|
|
|
|
let status =points.find((point: any) => {point.name == 'Status'}) // 状态
|
|
|
|
let status =points.find((point: any) => point.name == 'Status') // 状态
|
|
|
|
if(status && status.value == 'statrt'){
|
|
|
|
if(status && status['value'] == 'statrt'){
|
|
|
|
devic.status = 0
|
|
|
|
devic.status = 0
|
|
|
|
}else{
|
|
|
|
}else{
|
|
|
|
devic.status = 1
|
|
|
|
devic.status = 1
|
|
|
|
@ -324,9 +324,18 @@ function deviceEach(item: any, status: number) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (deviceAllList.value.findIndex(ele => ele.code === item.code) !== -1 && codes.value.indexOf(item.code) !== -1) {
|
|
|
|
if (deviceAllList.value.findIndex(ele => ele.code === item.code) !== -1 && codes.value.indexOf(item.code) !== -1) {
|
|
|
|
|
|
|
|
|
|
|
|
let device = deviceAllList.value.find(ele => ele.code === item.code)
|
|
|
|
let device = deviceAllList.value.find(ele => ele.code === item.code)
|
|
|
|
if(device && device.pics){
|
|
|
|
if(device && device.pics){
|
|
|
|
device.pics += getRandom(1, 5);
|
|
|
|
device.status = item.status
|
|
|
|
|
|
|
|
if(item.status == 3){
|
|
|
|
|
|
|
|
device.status = 3
|
|
|
|
|
|
|
|
device.pics = 0
|
|
|
|
|
|
|
|
device.process = '0'
|
|
|
|
|
|
|
|
}else{
|
|
|
|
|
|
|
|
device.pics = Number(localStorage.getItem(`pics_${device.code}`)) + getRandom(1, 5);
|
|
|
|
|
|
|
|
localStorage.setItem(`pics_${device.code}`, device.pics.toString());
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// console.log("deviceAllList2 ==>", deviceAllList.value)
|
|
|
|
// console.log("deviceAllList2 ==>", deviceAllList.value)
|
|
|
|
return
|
|
|
|
return
|
|
|
|
@ -364,6 +373,11 @@ function deviceEach(item: any, status: number) {
|
|
|
|
timerId: undefined,
|
|
|
|
timerId: undefined,
|
|
|
|
rate: ''
|
|
|
|
rate: ''
|
|
|
|
});
|
|
|
|
});
|
|
|
|
|
|
|
|
deviceAllList.value.forEach(item => {
|
|
|
|
|
|
|
|
if (item.code && item.pics) {
|
|
|
|
|
|
|
|
localStorage.setItem(`pics_${item.code}`, item.pics.toString());
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
});
|
|
|
|
if(item.status == 3){
|
|
|
|
if(item.status == 3){
|
|
|
|
newDevice.status = 3
|
|
|
|
newDevice.status = 3
|
|
|
|
newDevice.pics = 0
|
|
|
|
newDevice.pics = 0
|
|
|
|
|