From 366c6fcd324cee766ae6d6783418a39613e7dcdd Mon Sep 17 00:00:00 2001
From: astankovmi <admin@astankovmi.ru>
Date: Tue, 23 Jun 2026 16:26:44 +0300
Subject: [PATCH] upd

---
 .../Components/Pages/DatabaseType.razor       |  29 +++++++++++++-----
 Strela/Models/DeviceItem.cs                   |   6 ++--
 Strela/Services/DataBase.db                   | Bin 28672 -> 28672 bytes
 Strela/Services/DataBase.db-shm               | Bin 32768 -> 0 bytes
 Strela/Services/DataBase.db-wal               | Bin 28872 -> 0 bytes
 5 files changed, 24 insertions(+), 11 deletions(-)
 delete mode 100644 Strela/Services/DataBase.db-shm
 delete mode 100644 Strela/Services/DataBase.db-wal

diff --git a/Ministreliy/Components/Pages/DatabaseType.razor b/Ministreliy/Components/Pages/DatabaseType.razor
index 0a3829d..633a739 100644
--- a/Ministreliy/Components/Pages/DatabaseType.razor
+++ b/Ministreliy/Components/Pages/DatabaseType.razor
@@ -8,6 +8,16 @@
 
 <PageTitle>База данных</PageTitle>
 
+<ul class="nav nav-tabs">
+    <li class="nav-item">
+        <a class="nav-link" aria-current="page" href="database">Сводные данные</a>
+    </li>
+    <li class="nav-item">
+        <a class="nav-link active" href="database/type">Типы устройств</a>
+    </li>
+
+</ul>
+
 <div class="modal fade modal1" id="addtype" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="addtypeLabel" aria-hidden="true">
     <div class="modal-dialog">
         <div class="modal-content">
@@ -40,7 +50,7 @@
 }
 else
 {
-    <ul class="nav nav-tabs">
+    @* <ul class="nav nav-tabs">
         <li class="nav-item" role="presentation">
             <a class="nav-link" aria-current="page" href="database">Сводные данные</a>
         </li>
@@ -55,7 +65,14 @@ else
                href="database/addtype">Добавить Тип</a>
         </li>
 
-    </ul>
+    </ul> *@
+    <br>
+    <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#addtype">
+        Добавить тип
+    </button>
+    <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#deltype">
+        Удалить тип
+    </button>
 
     <div class="card-body p-0">
         <div class="tab-content" id="myTabContent">
@@ -83,9 +100,7 @@ else
     </div>
 
 
-    <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#deltype">
-        Удалить тип
-    </button>
+    
 
 
 
@@ -114,9 +129,7 @@ else
         </div>
     </div>
 }
-    <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#addtype">
-        Добавить тип
-    </button>
+    
 
 @code {
     //HttpClient http = new();
diff --git a/Strela/Models/DeviceItem.cs b/Strela/Models/DeviceItem.cs
index b3bb57a..560833a 100644
--- a/Strela/Models/DeviceItem.cs
+++ b/Strela/Models/DeviceItem.cs
@@ -13,10 +13,10 @@
         public int ConnectedToSwitchId { get; set; }
         public int ConnectedToPortOnSwitch { get; set; }
 
-        //public DeviceItem(int type, string ip, string mac, string location)
-        //{
+        public DeviceItem(string ip, string mac, string location)
+        {
             
-        //}
+        }
     }
     
         //Unknown = 0,
diff --git a/Strela/Services/DataBase.db b/Strela/Services/DataBase.db
index cf8f06ad0c8725f4128ce7c5b6f290e59586ad1e..57f0d38454f8c4a66683f30aedc94e352a7fe275 100644
GIT binary patch
delta 86
zcmZp8z}WDBaRZ}(C<6lnBmYNc{xAF&p>QGp)Xjnl_572k%A07gu`n|TCl;r$voSM>
gmZzo^1J#R50tJ8w$mEeOPAf`HD^A(`QJy~l07c~(j{pDw

delta 86
zcmZp8z}WDBaRZ}(DF0IiCjMIt{9pKQ0pUshjr<Gwr*0NhsOO(NRo+B{lZBZ<(m63V
lwJ4E+fk99;n3EYOkXW1oL_h(4#o+SHlH?5M%^&6Y0|0&d80Y{1

diff --git a/Strela/Services/DataBase.db-shm b/Strela/Services/DataBase.db-shm
deleted file mode 100644
index 93acae6947975548093e41a27845786beae74298..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32768
zcmeI)y9ok85CG6U|6-uwrY4u!gN2<KS%F<xfi(zX3t|a}`MG<@VPatD@dkz+mSJFC
z0TUmakYk#%2w|1qoU`p|e^}S^b9Jn)_gxvwdU1K)mhs2_G^&j}v-ybkclQiZ^)0(5
z1pxvC2oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBly
zK!5-N0t5&UAV7cs0RjXF5FkK+009C7dLmGyiz~x03ga+oZ@%<oEo%@UK!5-N0t5&U
zAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C7
H{#xJ#ZjL3m

diff --git a/Strela/Services/DataBase.db-wal b/Strela/Services/DataBase.db-wal
deleted file mode 100644
index 17e971c2cd2e6c902642a72a98914a49e6e535c4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 28872
zcmeI)&x;aa9LMoT#~-O{&qheep2FSe5=AVz9g3p<fJ*EKON8K<A<fWe35y{V9XmzG
z4jv6J-TDv0qJz+3nUe$touUxhTYYEE!?G7qn-0Do6`U`F&-i-g^x->Cwi$V<PJTJ6
z)Uxu%yT;4Lr~Z@U*S4A;PxUv>ODQOy=(zrUCsDp*Z>N${G_-5zp&n>gclBG{(yye*
zKmY**5I_I{1Q0*~0R#|00D*ri5RV#a<?5CE-AgyFAB-3(bJKPzxmuxi-?n05L#1=3
z^VoFcA`<D#g$Jfn&_*mI_0fUU53S{5h7=0bqP*il`Mqk%F-z5=?U?a^9OkWxW!Eh^
zcTX<x`)laL3-|MBFBb^u-Z&TNkqZb20|5jOKmY**5I_I{1Q0*~0Y3z0$pxa4Bc$qP
zu{vEY@ZtTpa!WnC?d1Yt-5uuwUEQN!z>lS84g?TD009ILKmY**5I_I{1k^OSKt%cl
z4oh#qjJd$Cv)OyM&JEZ1^$U;-aAP8X00IagfB*srAb<b@2q55(z<<mIR@<A8Iu|+*
zlX@Wg3+z5e;7YH6_hNqme^#Ga5I_I{1Q0*~0R#|0009IRU0~k1fOsxVxW7O<bEXn{
z-E))LRl!j%FiHi;1s46T<o_dp00IagfB*srAb<b@2>2y1ms~(D_Q>CT2j%Oexj^&H
v#RIXQ$DVu75d`!PZ+`)D0l(Irc@RJV0R#|0009ILKmY**5by+i%mw}cC9)}_