diff --git a/public/img/未连接.png b/public/img/未连接.png index 04a47de..5c8736b 100644 Binary files a/public/img/未连接.png and b/public/img/未连接.png differ 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 '正常' } }