Переделана навигация к датчикам, добавлена работа поиска тултипов на модели, добавлен функционал перехода из дашборда и истории тревог к датчику с тревогой на 3д модели

frontend/components/alerts/AlertsList.tsx

@@ -1,4 +1,6 @@
 import React, { useState, useMemo } from 'react'
+import { useRouter } from 'next/navigation'
+import useNavigationStore from '../../app/store/navigationStore'
 import * as statusColors from '../../lib/statusColors'
 
 interface AlertItem {
@@ -12,6 +14,8 @@ interface AlertItem {
   detector_name?: string
   location?: string
   object?: string
+  serial_number?: string
+  floor?: number
 }
 
 interface AlertsListProps {
@@ -21,6 +25,8 @@ interface AlertsListProps {
 }
 
 const AlertsList: React.FC<AlertsListProps> = ({ alerts, onAcknowledgeToggle, initialSearchTerm = '' }) => {
+  const router = useRouter()
+  const { navigateToSensor } = useNavigationStore()
   const [searchTerm, setSearchTerm] = useState(initialSearchTerm)
 
   const filteredAlerts = useMemo(() => {
@@ -46,6 +52,26 @@ const AlertsList: React.FC<AlertsListProps> = ({ alerts, onAcknowledgeToggle, in
     }
   }
   
+  const handleGoTo3D = async (alert: AlertItem, viewType: 'building' | 'floor') => {
+    // Используем доступные идентификаторы датчика
+    const sensorId = alert.serial_number || alert.detector_name || alert.detector_id
+    
+    if (!sensorId) {
+      console.warn('[AlertsList] Alert missing sensor identifier:', alert)
+      return
+    }
+    
+    const sensorSerialNumber = await navigateToSensor(
+      sensorId,
+      alert.floor || null,
+      viewType
+    )
+    
+    if (sensorSerialNumber) {
+      router.push(`/navigation?focusSensorId=${encodeURIComponent(sensorSerialNumber)}`)
+    }
+  }
+  
   return (
     <div className="space-y-6">
       {/* Поиск */}
@@ -81,6 +107,7 @@ const AlertsList: React.FC<AlertsListProps> = ({ alerts, onAcknowledgeToggle, in
                 <th style={interSemiboldStyle} className="text-left text-white text-sm py-3">Приоритет</th>
                 <th style={interSemiboldStyle} className="text-left text-white text-sm py-3">Подтверждено</th>
                 <th style={interSemiboldStyle} className="text-left text-white text-sm py-3">Время</th>
+                <th style={interSemiboldStyle} className="text-center text-white text-sm py-3">3D Вид</th>
               </tr>
             </thead>
             <tbody>
@@ -141,11 +168,33 @@ const AlertsList: React.FC<AlertsListProps> = ({ alerts, onAcknowledgeToggle, in
                   <td style={interRegularStyle} className="py-4 text-sm text-gray-300">
                     {new Date(item.timestamp).toLocaleString('ru-RU')}
                   </td>
+                  <td className="py-4">
+                    <div className="flex items-center justify-center gap-2">
+                      <button
+                        onClick={() => handleGoTo3D(item, 'building')}
+                        className="p-1.5 rounded hover:bg-blue-600/20 transition-colors group"
+                        title="Показать на общей модели"
+                      >
+                        <img src="/icons/Building3D.png" alt="Здание" className="w-5 h-5 opacity-70 group-hover:opacity-100" />
+                      </button>
+                      <button
+                        onClick={() => handleGoTo3D(item, 'floor')}
+                        className="p-1.5 rounded hover:bg-blue-600/20 transition-colors group"
+                        title="Показать на этаже"
+                      >
+                        <img 
+                          src="/icons/Floor3D.png" 
+                          alt="Этаж" 
+                          className="w-5 h-5 opacity-70 group-hover:opacity-100" 
+                        />
+                      </button>
+                    </div>
+                  </td>
                 </tr>
               ))}
               {filteredAlerts.length === 0 && (
                 <tr>
-                  <td colSpan={7} className="py-8 text-center text-gray-400">
+                  <td colSpan={8} className="py-8 text-center text-gray-400">
                     Записей не найдено
                   </td>
                 </tr>

frontend/components/alerts/AlertsList.tsx — копия

@@ -0,0 +1,161 @@
+import React, { useState, useMemo } from 'react'
+import * as statusColors from '../../lib/statusColors'
+
+interface AlertItem {
+  id: number
+  type: string
+  message: string
+  timestamp: string
+  acknowledged: boolean
+  priority: string
+  detector_id?: string
+  detector_name?: string
+  location?: string
+  object?: string
+}
+
+interface AlertsListProps {
+  alerts: AlertItem[]
+  onAcknowledgeToggle: (alertId: number) => void
+  initialSearchTerm?: string
+}
+
+const AlertsList: React.FC<AlertsListProps> = ({ alerts, onAcknowledgeToggle, initialSearchTerm = '' }) => {
+  const [searchTerm, setSearchTerm] = useState(initialSearchTerm)
+
+  const filteredAlerts = useMemo(() => {
+    return alerts.filter(alert => { 
+      const matchesSearch = searchTerm === '' || alert.detector_id?.toString() === searchTerm
+      return matchesSearch 
+    })
+  }, [alerts, searchTerm])
+
+  const interSemiboldStyle = { fontFamily: 'Inter, sans-serif', fontWeight: 600 }
+  const interRegularStyle = { fontFamily: 'Inter, sans-serif', fontWeight: 400 }
+
+  const getStatusColor = (type: string) => {
+    switch (type) {
+      case 'critical':
+        return statusColors.STATUS_COLOR_CRITICAL
+      case 'warning':
+        return statusColors.STATUS_COLOR_WARNING
+      case 'info':
+        return statusColors.STATUS_COLOR_NORMAL
+      default:
+        return statusColors.STATUS_COLOR_UNKNOWN
+    }
+  }
+  
+  return (
+    <div className="space-y-6">
+      {/* Поиск */}
+      <div className="flex items-center justify-end gap-4 mb-6">
+        <div className="relative">
+          <input
+            type="text"
+            placeholder="Поиск по ID детектора..."
+            value={searchTerm}
+            onChange={(e) => setSearchTerm(e.target.value)}
+            className="bg-[#161824] text-white placeholder-gray-400 px-4 py-2 rounded-lg border border-gray-600 focus:border-blue-500 focus:outline-none w-64"
+          />
+          <svg className="absolute right-3 top-2.5 w-5 h-5 text-gray-400" fill="none" stroke="currentColor" viewBox="0 0 24 24">
+            <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M21 21l-6-6m2-5a7 7 0 11-14 0 7 7 0 0114 0z" />
+          </svg>
+        </div>
+      </div>
+
+      {/* Таблица алертов */}
+      <div className="bg-[#161824] rounded-[20px] p-6">
+        <div className="mb-4 flex items-center justify-between">
+          <h2 style={interSemiboldStyle} className="text-xl text-white">История тревог</h2>
+          <span style={interRegularStyle} className="text-sm text-gray-400">Всего: {filteredAlerts.length}</span>
+        </div>
+        <div className="overflow-x-auto">
+          <table className="w-full">
+            <thead>
+              <tr className="border-b border-gray-700">
+                <th style={interSemiboldStyle} className="text-left text-white text-sm py-3">Детектор</th>
+                <th style={interSemiboldStyle} className="text-left text-white text-sm py-3">Статус</th>
+                <th style={interSemiboldStyle} className="text-left text-white text-sm py-3">Сообщение</th>
+                <th style={interSemiboldStyle} className="text-left text-white text-sm py-3">Местоположение</th>
+                <th style={interSemiboldStyle} className="text-left text-white text-sm py-3">Приоритет</th>
+                <th style={interSemiboldStyle} className="text-left text-white text-sm py-3">Подтверждено</th>
+                <th style={interSemiboldStyle} className="text-left text-white text-sm py-3">Время</th>
+              </tr>
+            </thead>
+            <tbody>
+              {filteredAlerts.map((item) => (
+                <tr key={item.id} className="border-b border-gray-700 hover:bg-gray-800/50 transition-colors">
+                  <td style={interRegularStyle} className="py-4 text-sm text-white">
+                    <div>{item.detector_name || 'Детектор'}</div>
+                    {item.detector_id ? (
+                      <div className="text-gray-400">ID: {item.detector_id}</div>
+                    ) : null}
+                  </td>
+                  <td className="py-4">
+                    <div className="flex items-center gap-2">
+                      <div 
+                        className="w-3 h-3 rounded-full"
+                        style={{ backgroundColor: getStatusColor(item.type) }}
+                      ></div>
+                      <span style={interRegularStyle} className="text-sm text-gray-300">
+                        {item.type === 'critical' ? 'Критический' : item.type === 'warning' ? 'Предупреждение' : 'Информация'}
+                      </span>
+                    </div>
+                  </td>
+                  <td style={interRegularStyle} className="py-4 text-sm text-white">
+                    {item.message}
+                  </td>
+                  <td style={interRegularStyle} className="py-4 text-sm text-white">
+                    {item.location || '-'}
+                  </td>
+                  <td className="py-4">
+                    <span 
+                      className="inline-flex items-center px-2.5 py-0.5 rounded-full text-xs font-medium text-white"
+                      style={{
+                        backgroundColor:
+                          item.priority === 'high'
+                            ? statusColors.STATUS_COLOR_CRITICAL
+                            : item.priority === 'medium'
+                              ? statusColors.STATUS_COLOR_WARNING
+                              : statusColors.STATUS_COLOR_NORMAL,
+                      }}
+                    >
+                      {item.priority === 'high' ? 'Высокий' : item.priority === 'medium' ? 'Средний' : 'Низкий'}
+                    </span>
+                  </td>
+                  <td className="py-4">
+                    <span style={interRegularStyle} className={`inline-flex items-center px-2.5 py-0.5 rounded-full text-xs ${
+                      item.acknowledged ? 'bg-green-600/20 text-green-300 ring-1 ring-green-600/40' : 'bg-red-600/20 text-red-300 ring-1 ring-red-600/40'
+                    }`}>
+                      {item.acknowledged ? 'Да' : 'Нет'}
+                    </span>
+                    <button
+                      onClick={() => onAcknowledgeToggle(item.id)}
+                      style={interRegularStyle}
+                      className="ml-2 inline-flex items-center px-2 py-1 rounded text-xs bg-[#2a2e3e] text-white hover:bg-[#353a4d]"
+                    >
+                      {item.acknowledged ? 'Снять' : 'Подтвердить'}
+                    </button>
+                  </td>
+                  <td style={interRegularStyle} className="py-4 text-sm text-gray-300">
+                    {new Date(item.timestamp).toLocaleString('ru-RU')}
+                  </td>
+                </tr>
+              ))}
+              {filteredAlerts.length === 0 && (
+                <tr>
+                  <td colSpan={7} className="py-8 text-center text-gray-400">
+                    Записей не найдено
+                  </td>
+                </tr>
+              )}
+            </tbody>
+          </table>
+        </div>
+      </div>
+    </div>
+  )
+}
+
+export default AlertsList

frontend/components/alerts/DetectorList.tsx

@@ -38,10 +38,37 @@ interface DetectorListProps {
   onDetectorSelect: (detectorId: number, selected: boolean) => void
   initialSearchTerm?: string
 }
+
+// Функция для генерации умного диапазона страниц
+function getPaginationRange(currentPage: number, totalPages: number): (number | string)[] {
+  if (totalPages <= 7) {
+    // Если страниц мало - показываем все
+    return Array.from({ length: totalPages }, (_, i) => i + 1)
+  }
+
+  // Всегда показываем первые 3 и последние 3
+  const start = [1, 2, 3]
+  const end = [totalPages - 2, totalPages - 1, totalPages]
+  
+  if (currentPage <= 4) {
+    // Начало: 1 2 3 4 5 ... 11 12 13
+    return [1, 2, 3, 4, 5, '...', ...end]
+  }
+  
+  if (currentPage >= totalPages - 3) {
+    // Конец: 1 2 3 ... 9 10 11 12 13
+    return [...start, '...', totalPages - 4, totalPages - 3, totalPages - 2, totalPages - 1, totalPages]
+  }
+  
+  // Середина: 1 2 3 ... 6 7 8 ... 11 12 13
+  return [...start, '...', currentPage - 1, currentPage, currentPage + 1, '...', ...end]
+}
  
 const DetectorList: React.FC<DetectorListProps> = ({ objectId, selectedDetectors, onDetectorSelect, initialSearchTerm = '' }) => {
   const [detectors, setDetectors] = useState<Detector[]>([])
   const [searchTerm, setSearchTerm] = useState<string>(initialSearchTerm)
+  const [currentPage, setCurrentPage] = useState(1)
+  const itemsPerPage = 20
 
   useEffect(() => {
     const loadDetectors = async () => {
@@ -76,6 +103,24 @@ const DetectorList: React.FC<DetectorListProps> = ({ objectId, selectedDetectors
     
     return matchesSearch
   })
+
+  // Сброс на первую страницу при изменении поиска
+  useEffect(() => {
+    setCurrentPage(1)
+  }, [searchTerm])
+
+  // Пагинация
+  const totalPages = Math.ceil(filteredDetectors.length / itemsPerPage)
+  const startIndex = (currentPage - 1) * itemsPerPage
+  const endIndex = startIndex + itemsPerPage
+  const currentDetectors = filteredDetectors.slice(startIndex, endIndex)
+  const paginationRange = getPaginationRange(currentPage, totalPages)
+
+  const handlePageChange = (page: number) => {
+    setCurrentPage(page)
+    // Скролл наверх таблицы
+    window.scrollTo({ top: 0, behavior: 'smooth' })
+  }
  
   return (
     <div className="space-y-6">
@@ -109,16 +154,16 @@ const DetectorList: React.FC<DetectorListProps> = ({ objectId, selectedDetectors
                 <th className="text-left text-white font-medium py-3 w-12">
                   <input
                     type="checkbox"
-                    checked={selectedDetectors.length === filteredDetectors.length && filteredDetectors.length > 0}
+                    checked={selectedDetectors.length === currentDetectors.length && currentDetectors.length > 0}
                     onChange={(e) => {
                       if (e.target.checked) {
-                        filteredDetectors.forEach(detector => {
+                        currentDetectors.forEach(detector => {
                           if (!selectedDetectors.includes(detector.detector_id)) {
                             onDetectorSelect(detector.detector_id, true)
                           }
                         })
                       } else {
-                        filteredDetectors.forEach(detector => {
+                        currentDetectors.forEach(detector => {
                           if (selectedDetectors.includes(detector.detector_id)) {
                             onDetectorSelect(detector.detector_id, false)
                           }
@@ -135,7 +180,7 @@ const DetectorList: React.FC<DetectorListProps> = ({ objectId, selectedDetectors
               </tr>
             </thead>
             <tbody>
-              {filteredDetectors.map((detector) => {
+              {currentDetectors.map((detector) => {
                 const isSelected = selectedDetectors.includes(detector.detector_id)
                 
                 return (
@@ -183,9 +228,76 @@ const DetectorList: React.FC<DetectorListProps> = ({ objectId, selectedDetectors
             </tbody>
           </table>
         </div>
+
+        {/* Пагинация */}
+        {totalPages > 1 && (
+          <div className="mt-6 flex flex-col items-center gap-4">
+            {/* Кнопки пагинации */}
+            <div className="flex items-center gap-2">
+              {/* Кнопка "Предыдущая" */}
+              <button
+                onClick={() => handlePageChange(currentPage - 1)}
+                disabled={currentPage === 1}
+                className={`px-4 py-2 rounded-lg text-sm font-medium transition-colors ${
+                  currentPage === 1
+                    ? 'text-gray-600 cursor-not-allowed'
+                    : 'text-gray-300 hover:text-white hover:bg-[#1E293B]'
+                }`}
+              >
+                ← Предыдущая
+              </button>
+
+              {/* Номера страниц */}
+              {paginationRange.map((page, index) => {
+                if (page === '...') {
+                  return (
+                    <span key={`ellipsis-${index}`} className="px-3 py-2 text-gray-500">
+                      ...
+                    </span>
+                  )
+                }
+
+                const pageNumber = page as number
+                const isActive = pageNumber === currentPage
+
+                return (
+                  <button
+                    key={pageNumber}
+                    onClick={() => handlePageChange(pageNumber)}
+                    className={`min-w-[40px] px-3 py-2 rounded-lg text-sm font-medium transition-colors ${
+                      isActive
+                        ? 'bg-blue-500 text-white'
+                        : 'text-gray-300 hover:text-white hover:bg-[#1E293B]'
+                    }`}
+                  >
+                    {pageNumber}
+                  </button>
+                )
+              })}
+
+              {/* Кнопка "Следующая" */}
+              <button
+                onClick={() => handlePageChange(currentPage + 1)}
+                disabled={currentPage === totalPages}
+                className={`px-4 py-2 rounded-lg text-sm font-medium transition-colors ${
+                  currentPage === totalPages
+                    ? 'text-gray-600 cursor-not-allowed'
+                    : 'text-gray-300 hover:text-white hover:bg-[#1E293B]'
+                }`}
+              >
+                Следующая →
+              </button>
+            </div>
+
+            {/* Счётчик */}
+            <div className="text-sm text-gray-400">
+              Показано {startIndex + 1}-{Math.min(endIndex, filteredDetectors.length)} из {filteredDetectors.length} датчиков
+            </div>
+          </div>
+        )}
       </div>
       
-      {/* Статы детекторров*/}
+      {/* Статы детекторов */}
       <div className="mt-6 grid grid-cols-4 gap-4">
         <div className="bg-[#161824] p-4 rounded-lg">
           <div className="text-2xl font-bold text-white">{filteredDetectors.length}</div>