Merge branch 'develop' of https://gitlab.steamware.net/steamware/mapo-core into develop
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
<div class="row bg-dark text-light px-2">
|
||||
<div class="col-5 text-left">
|
||||
<div class="col-6 text-left">
|
||||
<b>MP-TAB2 @(DateTime.Today.Year)</b> | <span class="small">v.@version</span>
|
||||
</div>
|
||||
<div class="col-7 text-end">
|
||||
<div class="col-6 text-end">
|
||||
<span class="small">@($"{DateTime.Now:HH:mm:ss}")</span> | <a class="text-light" href="https://www.egalware.com/" target="_blank"><img class="img-fluid" width="16" src="images/LogoEgw.png" /> Egalware </a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,3 +1,34 @@
|
||||
@infosIob.IP
|
||||
@infosIob.iType
|
||||
@infosIob.name
|
||||
<div class="card">
|
||||
<div class="card-header text-center">
|
||||
<div>
|
||||
<i class="fa-solid fa-microchip" style="font-size: 5rem;"></i>
|
||||
</div>
|
||||
<div>
|
||||
<span>IOB Details</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<ul class="list-group">
|
||||
<li class="list-group-item d-flex justify-content-between">
|
||||
<div>Machine Code: </div>
|
||||
<div class="fw-bold">@idxMacch</div>
|
||||
</li>
|
||||
<li class="list-group-item d-flex justify-content-between">
|
||||
<div>IOB Type: </div>
|
||||
<div class="fw-bold"><i class="fa-brands fa-windows"></i> @infosIob.iType</div>
|
||||
</li>
|
||||
<li class="list-group-item d-flex justify-content-between">
|
||||
<div>IOB Name: </div>
|
||||
<div class="fw-bold">@infosIob.name</div>
|
||||
</li>
|
||||
<li class="list-group-item d-flex justify-content-between">
|
||||
<div>IOB Address: </div>
|
||||
<div class="fw-bold">@infosIob.IP</div>
|
||||
</li>
|
||||
<li class="list-group-item d-flex justify-content-between">
|
||||
<div>CNC Absolute counter: </div>
|
||||
<div class="fw-bold">@infosIob.CNC_Counter</div>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
@@ -15,7 +15,7 @@ namespace MP.Data.Objects
|
||||
#region Public Fields
|
||||
|
||||
public bool CNC_Counter { get; set; }=false;
|
||||
public string IP { get; set; } ="";
|
||||
public string IP { get; set; } ="::1";
|
||||
public IobType iType { get; set; } = IobType.ND;
|
||||
public string name { get; set; } ="ND";
|
||||
public string typeCss { get; set; } = "fa fa-question-circle-o";
|
||||
|
||||
Reference in New Issue
Block a user