Обновление PROD состояния кодовой базой dev контура #7 #25

Merged
APervov merged 8 commits from dev into main 2026-07-06 16:47:23 +00:00
5 changed files with 11 additions and 10 deletions
Showing only changes of commit cf1dea2767 - Show all commits

View File

@@ -1,7 +1,7 @@
export type CurrentItem = { export type CurrentItem = {
edge: string; edge: string;
tag: string; tag: string;
value: number; value: number | null;
createdAt: string; createdAt: string;
updatedAt: string; updatedAt: string;
time: string; time: string;

View File

@@ -5,7 +5,7 @@ import { CalendarDays, CalendarClock, Check, ChevronDown, Clock3, DatabaseZap, S
import type { CurrentItem } from '../../../entities/current/types'; import type { CurrentItem } from '../../../entities/current/types';
import { HistoryChart } from '../../../features/history-chart/HistoryChart'; import { HistoryChart } from '../../../features/history-chart/HistoryChart';
import { RANGE_PRESETS, createRange, type DateRangeState } from '../../../features/history/dateRange'; import { RANGE_PRESETS, createRange, type DateRangeState } from '../../../features/history/dateRange';
import { toIsoFromInput } from '../../../utils/format'; import { formatNumber, toIsoFromInput } from '../../../utils/format';
import type { HistoryGranularity } from '../../../utils/historyGranularity'; import type { HistoryGranularity } from '../../../utils/historyGranularity';
type ArchiveViewProps = { type ArchiveViewProps = {
@@ -191,7 +191,7 @@ export function ArchiveView({
{label !== item.tag ? <small>{item.tag}</small> : null} {label !== item.tag ? <small>{item.tag}</small> : null}
</span> </span>
<span className="tag-select-item__side"> <span className="tag-select-item__side">
<strong>{item.value.toLocaleString('ru-RU', { maximumFractionDigits: item.precision ?? 3 })}</strong> <strong>{formatNumber(item.value)}</strong>
{selected ? <Check size={15} /> : null} {selected ? <Check size={15} /> : null}
</span> </span>
</button> </button>

View File

@@ -29,8 +29,8 @@ export function ElectricalNode({ liveValues, node, ownerEdgeId }: ElectricalNode
? getLiveValue(liveValues, node.edgeId || ownerEdgeId, node.tagId) ? getLiveValue(liveValues, node.edgeId || ownerEdgeId, node.tagId)
: getLiveValue(liveValues, bindingEdgeId, bindings?.stateTagId); : getLiveValue(liveValues, bindingEdgeId, bindings?.stateTagId);
const alarmValue = node.kind === 'decoration' ? getLiveValue(liveValues, bindingEdgeId, bindings?.alarmTagId) : undefined; const alarmValue = node.kind === 'decoration' ? getLiveValue(liveValues, bindingEdgeId, bindings?.alarmTagId) : undefined;
const alarmActive = Boolean(alarmValue && Number(alarmValue.value) !== 0); const alarmActive = Boolean(alarmValue && alarmValue.value !== null && alarmValue.value !== 0);
const stateActive = Boolean(mainValue && Number(mainValue.value) !== 0); const stateActive = Boolean(mainValue && mainValue.value !== null && mainValue.value !== 0);
const title = getNodeTitle(node, mainValue); const title = getNodeTitle(node, mainValue);
const style: CSSProperties = { const style: CSSProperties = {
left: node.position.x, left: node.position.x,

View File

@@ -1,7 +1,7 @@
/** Форматирует числовое значение показателя для карточек и мини-плиток. */ /** Форматирует числовое значение показателя для карточек и мини-плиток. */
export function formatNumber(value: number): string { export function formatNumber(value: number | null): string {
if (!Number.isFinite(value)) { if (value === null || !Number.isFinite(value)) {
return '-'; return '';
} }
return new Intl.NumberFormat('ru-RU', { return new Intl.NumberFormat('ru-RU', {

View File

@@ -16,8 +16,9 @@ function isConfiguredLimit(value: number | null): value is number {
export function getMetricStatus(item: CurrentItem, now = Date.now()): MetricStatusInfo { export function getMetricStatus(item: CurrentItem, now = Date.now()): MetricStatusInfo {
const measuredAt = new Date(item.time).getTime(); const measuredAt = new Date(item.time).getTime();
const ageSeconds = Number.isFinite(measuredAt) ? Math.max(0, Math.round((now - measuredAt) / 1000)) : Number.POSITIVE_INFINITY; const ageSeconds = Number.isFinite(measuredAt) ? Math.max(0, Math.round((now - measuredAt) / 1000)) : Number.POSITIVE_INFINITY;
const belowMin = isConfiguredLimit(item.min) && item.value < item.min; const value = item.value;
const aboveMax = isConfiguredLimit(item.max) && item.value > item.max; const belowMin = isConfiguredLimit(value) && isConfiguredLimit(item.min) && value < item.min;
const aboveMax = isConfiguredLimit(value) && isConfiguredLimit(item.max) && value > item.max;
if (belowMin || aboveMax) { if (belowMin || aboveMax) {
return { status: 'critical', label: 'за пределами уставки', ageSeconds }; return { status: 'critical', label: 'за пределами уставки', ageSeconds };