diff --git a/src/views/Exhibition/CHIC/index.vue b/src/views/Exhibition/CHIC/index.vue index 77c1411..49d0935 100644 --- a/src/views/Exhibition/CHIC/index.vue +++ b/src/views/Exhibition/CHIC/index.vue @@ -166,13 +166,13 @@ async function getTopDeviceData() { caijian.value = setData(res.data.裁剪设备) labelList.value = []; labelList.value.push(...fengren.value.value.map((item,i) => { - return { label: item[2],index:i,name:'fengren'} + return { label: item[2],index:i,name:'fengren',status:item[5]} })) labelList.value.push(...banfang.value.value.map((item,i) => { - return { label: item[2],index:i,name:'banfang'} + return { label: item[2],index:i,name:'banfang',status:item[5]} })) labelList.value.push(...caijian.value.value.map((item,i) => { - return { label: item[2],index:i,name:'caijian'} + return { label: item[2],index:i,name:'caijian',status:item[5]} })) } } @@ -187,20 +187,23 @@ async function getCismaListData() { } - +//socket function getWebsocket(val) { try { let data = JSON.parse(val) if (data.type == 'WorkingState') { - let { RackNumber, WorkingState } = data + let { RackNumber, WorkingState } = data.msg let index = labelList.value.findIndex((item, index) => { return item['label'] == RackNumber }) + console.log(data); + if (index !== -1) { let name = labelList.value[index].name let i = labelList.value[index].index + labelList.value[index].status = WorkingState if (name == 'fengren') { fengren.value.value[i][5] = WorkingState } else if (name == 'banfang') { @@ -208,6 +211,12 @@ function getWebsocket(val) { } else if (name == 'caijian') { caijian.value.value[i][5] = WorkingState } + console.log(caijian.value.value[i]); + + devnum.on = labelList.value.filter((item) => item.status == '2').length + devnum.wait = labelList.value.filter((item) => item.status == '1'||item.status == '3').length + devnum.off = labelList.value.filter((item) => item.status == '0').length + } } @@ -223,9 +232,9 @@ function errWebsocket(val) { onMounted(() => { getTopDeviceData() getCismaListData() - // timer = setInterval(()=>{ - // getTopDeviceData() - // },5000) + timer = setInterval(()=>{ + getTopDeviceData() + },60000) connectWebsocket(null, null, getWebsocket, errWebsocket) document.getElementById('app').style.backgroundColor = '#0E0E0E' })