From cd4f47dcb150ce23d1cb70bf2a73198c5d411178 Mon Sep 17 00:00:00 2001 From: jiangAB Date: Wed, 17 Dec 2025 14:49:06 +0800 Subject: [PATCH] update --- public/img/未连接.png | Bin 1164 -> 1682 bytes public/map/components/PortOverview.vue | 2 +- public/map/components/ShorePowerUsage.vue | 4 +++ public/map/components/cesiumMap.vue | 2 +- public/map/index.vue | 38 ++++++++++++++-------- 5 files changed, 30 insertions(+), 16 deletions(-) diff --git a/public/img/未连接.png b/public/img/未连接.png index 04a47de8ee3fc5e3a7258ff9568c8bfa0d8e04e7..5c8736b46ef71e337514bc2e1e07464cd0b3fc10 100644 GIT binary patch delta 1666 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 KMNUMnLSTZt&=B7M diff --git a/public/map/components/PortOverview.vue b/public/map/components/PortOverview.vue index 94c9ea2..6250084 100644 --- a/public/map/components/PortOverview.vue +++ b/public/map/components/PortOverview.vue @@ -457,7 +457,7 @@ const getStatusClass = (status: string | undefined) => { case '故障': return 'status-fault' case '超容': - return 'status-fault' + return 'status-maintenance' case '异常': return 'status-abnormal' case '维修中': diff --git a/public/map/components/ShorePowerUsage.vue b/public/map/components/ShorePowerUsage.vue index fd36189..e6e90c9 100644 --- a/public/map/components/ShorePowerUsage.vue +++ b/public/map/components/ShorePowerUsage.vue @@ -1152,6 +1152,10 @@ onBeforeUnmount(() => { gap: 10px; } +.card .card-content { + overflow: hidden !important; +} + .average { .overview-value { diff --git a/public/map/components/cesiumMap.vue b/public/map/components/cesiumMap.vue index 8201328..0c76e36 100644 --- a/public/map/components/cesiumMap.vue +++ b/public/map/components/cesiumMap.vue @@ -859,7 +859,7 @@ onMounted(async () => { let statusImage = null; if (item.shipStatus === '正常') { // statusImage = null; - } else if (item.shipStatus === '故障') { + } else if (item.shipStatus === '超容') { statusImage = '/img/故障.png'; } else { statusImage = '/img/未连接.png'; diff --git a/public/map/index.vue b/public/map/index.vue index 0702977..2f68908 100644 --- a/public/map/index.vue +++ b/public/map/index.vue @@ -532,25 +532,35 @@ const handleGetStorePower = async () => { } const getShipStatus = (ship: ShipRespVo) => { - // console.log(props.realtimeDeviceData) - if (ship.applyInfo.reason !== 0) { + if (ship.shorePowerAndShip.status === 9) { return '未使用' - } else if ([2, 5, 8].includes(ship.shorePowerAndShip.status)) { - return '故障' } else { - const Vobj = realtimeDeviceData.value.find(item => item.deviceId === ship.shorePower.voltageDeviceld) - const Cobj = realtimeDeviceData.value.find(item => item.deviceId === ship.shorePower.currentDeviceld) - let capacity = 0 - try { - capacity = Number(ship.shorePowerEquipment.capacity) - } catch (error) { - return '获取岸电容量失败' + const shorePower = realtimeDeviceData.value.find(item => item.deviceId === ship.shorePowerAndShip.shorePowerId) + if (!shorePower) { + return '未知' } - const power = (Vobj?.measureValue ?? 0) * (Cobj?.measureValue ?? 0); - if (power > capacity) { + // const shorePower = ShorePowerList.value.find(item => item.shorePowerId === ship.shorePowerAndShip.shorePowerId) + // return shorePower?.storePowerStatus || '故障' + if ([2, 5, 8].includes(shorePower.deviceStatus)) { + return '故障' + } else if (shorePower?.deviceStatus === 6) { return '超容' + } else { + const Vobj = realtimeDeviceData.value.find(item => item.deviceId === ship.shorePower.voltageDeviceId) + const Cobj = realtimeDeviceData.value.find(item => item.deviceId === ship.shorePower.currentDeviceId) + let capacity = 0 + try { + capacity = Number(ship.shorePowerEquipment.capacity) + console.log('capacity', capacity, Vobj.measureValue, Cobj?.measureValue) + } catch (error) { + return '获取岸电容量失败' + } + const power = (Vobj?.measureValue ?? 0) * (Cobj?.measureValue ?? 0); + if (power / 1000 > capacity) { + return '超容' + } + return '正常' } - return '正常' } }