diff --git a/src/views/remote-manage/chart/chart-line.vue b/src/views/remote-manage/chart/chart-line.vue index d57adb6..20ff8af 100644 --- a/src/views/remote-manage/chart/chart-line.vue +++ b/src/views/remote-manage/chart/chart-line.vue @@ -39,7 +39,7 @@ function updateChartData(data: any) { } else { currentNode = data[0]; } - for (let i = data.length - 1; i >= 0; i--) { + for (let i = (data.length - 1); i >= 0; i--) { const item = data[i] if (xData.indexOf(dateFormater("HH:mm:ss", item.Time)) == -1) { xData.shift(); @@ -48,7 +48,7 @@ function updateChartData(data: any) { serie.data.shift(); serie.data.push(item[serie.name]); if (item[serie.name + '_except']) { - emit("exceptionEvent", remoteWsStore.exceptionMsg[serie.name + '_except']); + emit("exceptionEvent", remoteWsStore.exceptionMsg[serie.name + '_except'], item.Time); } }) chart.setOption({ diff --git a/src/views/remote-manage/remote-control.vue b/src/views/remote-manage/remote-control.vue index e225fb2..10cc7bc 100644 --- a/src/views/remote-manage/remote-control.vue +++ b/src/views/remote-manage/remote-control.vue @@ -400,12 +400,12 @@ function updateMedicineTable(aiMedicine: any, doctorMedicine: any) { } } -function vitalExcepEvent(data: any) { - logUpdate(data) +function vitalExcepEvent(data: any, time: any) { + logUpdate(data, time) } -function logUpdate(msg: string) { - unusual.value.push(dateFormater('HH:mm:ss') + msg); +function logUpdate(msg: string, time: any) { + unusual.value.push(dateFormater('HH:mm:ss', time) + msg); setTimeout(() => { unusualMsgRef.value.scrollTo({ top: unusualMsgRef.value.scrollHeight,