From 12a9040ee538f58b311c9cb4c27bd1aea8abcdf4 Mon Sep 17 00:00:00 2001 From: zhaohy <1695786511@qq.com> Date: Fri, 30 Aug 2024 10:31:40 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../view/alarmManagement/energyAlarm/status.vue | 49 +++++++++++----------- .../view/alarmManagement/equipmentAlarm/status.vue | 48 +++++++++++---------- .../view/alarmManagement/gatewayAlarm/status.vue | 1 - 3 files changed, 50 insertions(+), 48 deletions(-) diff --git a/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/status.vue b/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/status.vue index 238adb5..6ddc6cf 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/status.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/energyAlarm/status.vue @@ -140,30 +140,31 @@ .then((res) => { if (res.msg === 'success') { logList.value = res.data; - infoObject.value = { ...logList.value[0] }; - infoObject.value.state = infoObject.value.state.value; - let colorMap = { - 1: 'rgba(255, 188, 70, 1)', - 2: 'rgba(67, 136, 251, 1)', - 3: 'rgba(41, 196, 154, 1)', - 4: 'rgba(243, 97, 99, 1)', - 5: 'rgba(141, 150, 163, 1)', - }; - let bgColorMap = { - 1: 'rgba(255, 188, 70, 0.1)', - 2: 'rgba(67, 136, 251, 0.1)', - 3: 'rgba(41, 196, 154, 0.1)', - 4: 'rgba(243, 97, 99, 0.1)', - 5: 'rgba(141, 150, 163, 0.1)', - }; - logList.value.forEach((item) => { - item.stateName = item.state.label; - item.color = colorMap[item.state.value]; - item.bgColor = bgColorMap[item.state.value]; - item.src = 'state-' + item.state.value; - }); - console.log(logList.value); - config.value.dataSource = logList.value; + if (logList.value.length > 0) { + infoObject.value = { ...logList.value[0] }; + infoObject.value.state = infoObject.value.state.value; + let colorMap = { + 1: 'rgba(255, 188, 70, 1)', + 2: 'rgba(67, 136, 251, 1)', + 3: 'rgba(41, 196, 154, 1)', + 4: 'rgba(243, 97, 99, 1)', + 5: 'rgba(141, 150, 163, 1)', + }; + let bgColorMap = { + 1: 'rgba(255, 188, 70, 0.1)', + 2: 'rgba(67, 136, 251, 0.1)', + 3: 'rgba(41, 196, 154, 0.1)', + 4: 'rgba(243, 97, 99, 0.1)', + 5: 'rgba(141, 150, 163, 0.1)', + }; + logList.value.forEach((item) => { + item.stateName = item.state.label; + item.color = colorMap[item.state.value]; + item.bgColor = bgColorMap[item.state.value]; + item.src = 'state-' + item.state.value; + }); + config.value.dataSource = logList.value; + } } }); }; diff --git a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue index aadfdf8..17453ae 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/equipmentAlarm/status.vue @@ -147,29 +147,31 @@ .then((res) => { if (res.msg === 'success') { logList.value = res.data; - infoObject.value = { ...logList.value[0] }; - infoObject.value.state = infoObject.value.state.value; - let colorMap = { - 1: 'rgba(255, 188, 70, 1)', - 2: 'rgba(67, 136, 251, 1)', - 3: 'rgba(41, 196, 154, 1)', - 4: 'rgba(243, 97, 99, 1)', - 5: 'rgba(141, 150, 163, 1)', - }; - let bgColorMap = { - 1: 'rgba(255, 188, 70, 0.1)', - 2: 'rgba(67, 136, 251, 0.1)', - 3: 'rgba(41, 196, 154, 0.1)', - 4: 'rgba(243, 97, 99, 0.1)', - 5: 'rgba(141, 150, 163, 0.1)', - }; - logList.value.forEach((item) => { - item.stateName = item.state.label; - item.color = colorMap[item.state.value]; - item.bgColor = bgColorMap[item.state.value]; - item.src = 'state-' + item.state.value; - }); - config.value.dataSource = logList.value; + if (logList.value.length > 0) { + infoObject.value = { ...logList.value[0] }; + infoObject.value.state = infoObject.value.state.value; + let colorMap = { + 1: 'rgba(255, 188, 70, 1)', + 2: 'rgba(67, 136, 251, 1)', + 3: 'rgba(41, 196, 154, 1)', + 4: 'rgba(243, 97, 99, 1)', + 5: 'rgba(141, 150, 163, 1)', + }; + let bgColorMap = { + 1: 'rgba(255, 188, 70, 0.1)', + 2: 'rgba(67, 136, 251, 0.1)', + 3: 'rgba(41, 196, 154, 0.1)', + 4: 'rgba(243, 97, 99, 0.1)', + 5: 'rgba(141, 150, 163, 0.1)', + }; + logList.value.forEach((item) => { + item.stateName = item.state.label; + item.color = colorMap[item.state.value]; + item.bgColor = bgColorMap[item.state.value]; + item.src = 'state-' + item.state.value; + }); + config.value.dataSource = logList.value; + } } }); }; diff --git a/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/status.vue b/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/status.vue index 0cbeecd..f2e8401 100644 --- a/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/status.vue +++ b/hx-ai-intelligent/src/view/alarmManagement/gatewayAlarm/status.vue @@ -49,7 +49,6 @@ visible.value = false; }; const toggle = async (data) => { - console.log(data, 'xxxxxx'); let states = await getEnum({ params: { enumType: 'AlarmLogStateEnum' } }); stateOptions.value = states.data; let stateMap = {