From 060f4de17583c476cd0fac966d4c64389f2cde05 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Mon, 23 Jun 2025 12:19:36 +0500 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=B7=D0=B0=D0=B3=D0=BE=D0=BB=D0=BE=D0=B2=D0=BA?= =?UTF-8?q?=D0=BE=D0=B2=20=D0=B2=20=D1=80=D0=B0=D0=B7=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D0=B0=D1=85=20=D1=81=20=D1=83=D0=B7=D0=BB=D0=B0=D0=BC=D0=B8=20?= =?UTF-8?q?=D0=B8=20=D1=82=D0=BE=D1=87=D0=BA=D0=B0=D0=BC=D0=B8=20=D0=B4?= =?UTF-8?q?=D0=BE=D1=81=D1=82=D1=83=D0=BF=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FRONT/DEV/src/components/UI/Dropdown/DeviceCard.tsx | 2 +- FRONT/DEV/src/components/UI/tables/TableScanner.tsx | 2 +- .../modules/appModules/usersScanner/modules/ListUsers.tsx | 2 +- .../modules/appModules/usersScanner/modules/TableUsers.tsx | 2 +- .../modules/appModules/usersScanner/userScanner.tsx | 4 ++-- .../modules/appModules/wifiScanner/WifiScanner.tsx | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/FRONT/DEV/src/components/UI/Dropdown/DeviceCard.tsx b/FRONT/DEV/src/components/UI/Dropdown/DeviceCard.tsx index cfed6c4..0345346 100644 --- a/FRONT/DEV/src/components/UI/Dropdown/DeviceCard.tsx +++ b/FRONT/DEV/src/components/UI/Dropdown/DeviceCard.tsx @@ -100,7 +100,7 @@ const DeviceCard: React.FC = ({ device, status }) => { - {device.hostname || 'Неизвестно'} + {device.hostname || device.ip} diff --git a/FRONT/DEV/src/components/UI/tables/TableScanner.tsx b/FRONT/DEV/src/components/UI/tables/TableScanner.tsx index e1b8c6f..320f625 100644 --- a/FRONT/DEV/src/components/UI/tables/TableScanner.tsx +++ b/FRONT/DEV/src/components/UI/tables/TableScanner.tsx @@ -87,7 +87,7 @@ const TableScanner = ({devices}:TableScannerProps) => { {devices.map((item, i) => ( - {item.hostname || 'Неизвестен'} + {item.hostname || item.ip} {item.vendor} {item.ip} {item.open_ports.join(', ') || '-'} diff --git a/FRONT/DEV/src/components/workSpace/modules/appModules/usersScanner/modules/ListUsers.tsx b/FRONT/DEV/src/components/workSpace/modules/appModules/usersScanner/modules/ListUsers.tsx index 1075a09..5c0099e 100644 --- a/FRONT/DEV/src/components/workSpace/modules/appModules/usersScanner/modules/ListUsers.tsx +++ b/FRONT/DEV/src/components/workSpace/modules/appModules/usersScanner/modules/ListUsers.tsx @@ -31,7 +31,7 @@ const ListUsers = ({loading, handleScan, devices, scanInitiated}: ListUsersProps return ( <> - {devices.length > 0 ? 'Обновить список' : 'Сканировать сеть'} + {devices.length > 0 ? 'Обновить список' : 'Сканировать узлы подсети'} {devices.length > 0 ? ( diff --git a/FRONT/DEV/src/components/workSpace/modules/appModules/usersScanner/modules/TableUsers.tsx b/FRONT/DEV/src/components/workSpace/modules/appModules/usersScanner/modules/TableUsers.tsx index ebe71a9..cd2e9c4 100644 --- a/FRONT/DEV/src/components/workSpace/modules/appModules/usersScanner/modules/TableUsers.tsx +++ b/FRONT/DEV/src/components/workSpace/modules/appModules/usersScanner/modules/TableUsers.tsx @@ -30,7 +30,7 @@ const ListUsers = ({loading, handleScan, devices, scanInitiated}: ListUsersProps return ( <> - {devices.length > 0 ? 'Обновить список' : 'Сканировать сеть'} + {devices.length > 0 ? 'Обновить список' : 'Сканировать узлы подсети'} {devices.length > 0 ? ( diff --git a/FRONT/DEV/src/components/workSpace/modules/appModules/usersScanner/userScanner.tsx b/FRONT/DEV/src/components/workSpace/modules/appModules/usersScanner/userScanner.tsx index cb816ca..dd3f035 100644 --- a/FRONT/DEV/src/components/workSpace/modules/appModules/usersScanner/userScanner.tsx +++ b/FRONT/DEV/src/components/workSpace/modules/appModules/usersScanner/userScanner.tsx @@ -163,7 +163,7 @@ export default function UserScanner() { return ( - {(!scanInitiated || loading) && (Сканирование пользователей в сети)} + {(!scanInitiated || loading) && (Сканирование узлов в подсети)} @@ -177,7 +177,7 @@ export default function UserScanner() { {loading ? ( - Сканирование сети + Сканирование узлов в подсети ) : selectedView.value == 1 ? ( diff --git a/FRONT/DEV/src/components/workSpace/modules/appModules/wifiScanner/WifiScanner.tsx b/FRONT/DEV/src/components/workSpace/modules/appModules/wifiScanner/WifiScanner.tsx index b24e367..9cabdd7 100644 --- a/FRONT/DEV/src/components/workSpace/modules/appModules/wifiScanner/WifiScanner.tsx +++ b/FRONT/DEV/src/components/workSpace/modules/appModules/wifiScanner/WifiScanner.tsx @@ -161,7 +161,7 @@ export function WifiScanner() { return ( - Сканирование Wi-Fi сети + Сканирование точек доступа Wi-Fi @@ -186,11 +186,11 @@ export function WifiScanner() { {loading ? ( - Сканирование сети + Сканирование точек доступа ) : ( 0 }> - {wifiNetworks.length > 0 ? 'Обновить список' : 'Сканировать сеть'} + {wifiNetworks.length > 0 ? 'Обновить список' : 'Сканировать точки доступа'} )}