[WORK] Вкладка «Матрица и порты» (25 хостов × 47 аксессуаров), комплектация и ограничения из даташитов; не дублировать кабели в BOM
This commit is contained in:
1 parent
daffbe41dd
commit
b234740dcc
6 files changed
+431
No files matched your search
@@ -58,6 +58,8 @@ class Data:
|
||||
self.mounts = load_yaml("mounts.yaml")
|
||||
self.iface = load_yaml("interfaces_verified.yaml")
|
||||
self.iface_auto = load_yaml("interfaces.yaml")
|
||||
self.pkg = load_yaml("package.yaml")
|
||||
self.limits = load_yaml("limitations.yaml")
|
||||
self.dante = load_yaml("dante.yaml")
|
||||
self.devices = {norm(d["name"]): {"name": d["name"], "role": d.get("role", "unknown")}
|
||||
for d in self.cat.get("devices") or []}
|
||||
@@ -316,6 +318,54 @@ class Data:
|
||||
return {"host": host, "host_ports": {"in": h_in, "out": h_out, "source": h_src},
|
||||
"links": links}
|
||||
|
||||
# ── матрица: хосты × аксессуары + порты ──
|
||||
def matrix(self):
|
||||
hosts = [h for h in self.hosts()]
|
||||
accs = {}
|
||||
for hk in [h["key"] for h in hosts]:
|
||||
for e in self.edges.get(hk, []):
|
||||
if not e.get("supported") or not e.get("usable", True):
|
||||
continue
|
||||
accs[norm(e["to"])] = e["to"]
|
||||
acc_list = sorted(accs.values())
|
||||
rows = []
|
||||
for h in hosts:
|
||||
hk = h["key"]
|
||||
cells = {}
|
||||
for e in self.edges.get(hk, []):
|
||||
if not e.get("supported") or not e.get("usable", True):
|
||||
continue
|
||||
k = norm(e["to"])
|
||||
q = e.get("max_qty")
|
||||
cells[k] = q if q else 1
|
||||
ins, outs, src = self.device_ports(h["name"])
|
||||
rows.append({"host": h["name"], "cells": cells,
|
||||
"ports": {"in": ins, "out": outs, "source": src}})
|
||||
return {"hosts": [r["host"] for r in rows],
|
||||
"rows": rows,
|
||||
"accessories": acc_list}
|
||||
|
||||
# ── порты всех устройств ──
|
||||
def ports_table(self):
|
||||
out = []
|
||||
for k, v in sorted(self.devices.items(), key=lambda x: x[1]["name"]):
|
||||
name = v["name"]
|
||||
ins, outs, src = self.device_ports(name)
|
||||
pkg = []
|
||||
for x in (self.pkg.get("devices") or []):
|
||||
if norm(x["device"]) == k:
|
||||
pkg = x.get("items") or []
|
||||
break
|
||||
lim = []
|
||||
for x in (self.limits.get("devices") or []):
|
||||
if norm(x["device"]) == k:
|
||||
lim = x.get("limits") or []
|
||||
break
|
||||
out.append({"device": name, "role": v["role"],
|
||||
"in": ins, "out": outs, "source": src,
|
||||
"package": pkg, "limits": lim})
|
||||
return out
|
||||
|
||||
# ── проверка ёмкости хоста ──
|
||||
def capacity(self, host_key, items):
|
||||
"""items: [[model, qty], ...]. Проверяет порты VCH, лимиты, питание."""
|
||||
@@ -577,6 +627,10 @@ class H(BaseHTTPRequestHandler):
|
||||
if p == "/api/positions":
|
||||
return self._out(D.positions(q.get("host", [""])[0],
|
||||
[x for x in q.get("need", []) if x]))
|
||||
if p == "/api/matrix":
|
||||
return self._out(D.matrix())
|
||||
if p == "/api/ports":
|
||||
return self._out(D.ports_table())
|
||||
if p == "/api/links":
|
||||
items = [x for x in q.get("item", []) if x]
|
||||
return self._out(D.link_plan(q.get("host", [""])[0], items))
|
||||
|
||||
@@ -72,6 +72,10 @@ svg{width:100%;height:460px;background:#0a0e13;border:1px solid var(--line);bord
|
||||
</header>
|
||||
<main>
|
||||
<div class="crumb" id="crumb"><div class="c on">ВКС</div></div>
|
||||
<div style="display:flex;gap:8px;margin-bottom:14px">
|
||||
<div class="mtab on" data-m="work" id="mtab-work">Конструктор</div>
|
||||
<div class="mtab" data-m="matrix" id="mtab-matrix">Матрица и порты</div>
|
||||
</div>
|
||||
|
||||
<section id="pick">
|
||||
<div class="card"><h3>Направление</h3><div class="dir" id="dirs"></div>
|
||||
@@ -79,6 +83,25 @@ svg{width:100%;height:460px;background:#0a0e13;border:1px solid var(--line);bord
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section id="matrix" class="hidden">
|
||||
<div class="card">
|
||||
<h3>Матрица совместимости — хосты × аксессуары</h3>
|
||||
<div style="display:flex;gap:10px;margin-bottom:10px;flex-wrap:wrap">
|
||||
<input id="mq" placeholder="фильтр по модели…" style="max-width:240px" oninput="renderMatrix()">
|
||||
<label style="display:flex;gap:6px;align-items:center;margin:0;font-size:12px">
|
||||
<input type="checkbox" id="monly" onchange="renderMatrix()" style="width:auto"> только с портами из даташита
|
||||
</label>
|
||||
<span class="muted" id="mstat"></span>
|
||||
</div>
|
||||
<div id="matrixbox" style="overflow:auto;max-height:70vh"></div>
|
||||
</div>
|
||||
<div class="card" style="margin-top:14px">
|
||||
<h3>Порты, комплектация и ограничения</h3>
|
||||
<input id="pq" placeholder="поиск устройства…" style="max-width:280px;margin-bottom:10px" oninput="renderPorts()">
|
||||
<div id="portsbox" style="overflow:auto;max-height:60vh"></div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<section id="work" class="hidden">
|
||||
<div class="lay">
|
||||
<!-- комната -->
|
||||
@@ -275,6 +298,60 @@ function drawLinks(lp, hostname){
|
||||
});
|
||||
svg.innerHTML=s;
|
||||
}
|
||||
let MATRIX=null, PORTS=null;
|
||||
document.getElementById('mtab-matrix').onclick=async()=>{
|
||||
document.querySelectorAll('.mtab').forEach(x=>x.classList.toggle('on',x.id==='mtab-matrix'));
|
||||
$('#matrix').classList.remove('hidden'); $('#work').classList.add('hidden'); $('#pick').classList.add('hidden');
|
||||
if(!MATRIX){ MATRIX=await J('/api/matrix'); PORTS=await J('/api/ports'); }
|
||||
renderMatrix(); renderPorts();
|
||||
};
|
||||
document.getElementById('mtab-work').onclick=()=>{
|
||||
document.querySelectorAll('.mtab').forEach(x=>x.classList.toggle('on',x.id==='mtab-work'));
|
||||
$('#matrix').classList.add('hidden');
|
||||
if($('#pick').classList.contains('hidden')) $('#work').classList.remove('hidden');
|
||||
else $('#pick').classList.remove('hidden');
|
||||
};
|
||||
function renderMatrix(){
|
||||
if(!MATRIX)return;
|
||||
const q=($('#mq')?.value||'').toLowerCase(), only=$('#monly')?.checked;
|
||||
const accs=MATRIX.accessories.filter(a=>a.toLowerCase().includes(q));
|
||||
let rows=MATRIX.rows.filter(r=>r.host.toLowerCase().includes(q));
|
||||
if(only) rows=rows.filter(r=>r.ports.source==='verified');
|
||||
$('#mstat').textContent=`хостов ${rows.length} · аксессуаров ${accs.length} · связей ${rows.reduce((a,r)=>a+Object.keys(r.cells).length,0)}`;
|
||||
let html='<table style="font-size:11.5px;border-collapse:separate;border-spacing:0">';
|
||||
html+='<tr><th style="position:sticky;left:0;background:#161b22;z-index:2">Хост</th>';
|
||||
html+='<th style="position:sticky;top:0;background:#161b22">порты in</th><th style="position:sticky;top:0;background:#161b22">порты out</th>';
|
||||
accs.forEach(a=>{html+=`<th style="writing-mode:vertical-rl;transform:rotate(180deg);height:110px;background:#161b22">${esc(a).slice(0,26)}</th>`});
|
||||
html+='</tr>';
|
||||
rows.forEach(r=>{
|
||||
html+=`<tr><td style="position:sticky;left:0;background:#161b22;font-weight:600;white-space:nowrap">${esc(r.host)}</td>`;
|
||||
html+=`<td class="muted">${(r.ports.in||['—']).join(',')}</td>`;
|
||||
html+=`<td class="muted">${(r.ports.out||['—']).join(',')}</td>`;
|
||||
accs.forEach(a=>{
|
||||
const v=r.cells[a.toLowerCase().replace(/[^a-z0-9]/g,'')];
|
||||
html+=`<td style="text-align:center;color:${v?'#3fb950':'#30363d'}">${v?(v>1?v:'✓'):'·'}</td>`;
|
||||
});
|
||||
html+='</tr>';
|
||||
});
|
||||
html+='</table>';
|
||||
$('#matrixbox').innerHTML=html;
|
||||
}
|
||||
function renderPorts(){
|
||||
if(!PORTS)return;
|
||||
const q=($('#pq')?.value||'').toLowerCase();
|
||||
const list=PORTS.filter(p=>p.device.toLowerCase().includes(q));
|
||||
let html='<table><tr><th>Устройство</th><th>роль</th><th>входы</th><th>выходы</th><th>источник</th><th>комплектация</th><th>ограничения</th></tr>';
|
||||
list.forEach(p=>{
|
||||
html+=`<tr><td><b>${esc(p.device)}</b></td><td class="muted">${p.role}</td>
|
||||
<td>${(p.in||['—']).map(x=>`<span class="tag">${esc(x)}</span>`).join('')}</td>
|
||||
<td>${(p.out||['—']).filter(x=>x!=='—').map(x=>`<span class="tag">${esc(x)}</span>`).join('')||'<span class="muted">—</span>'}</td>
|
||||
<td class="muted">${p.source==='verified'?'даташит':p.source==='auto'?'извлечено':'по роли'}</td>
|
||||
<td class="muted">${(p.package||[]).slice(0,3).map(x=>esc(x).slice(0,40)).join('; ')||'—'}</td>
|
||||
<td class="muted">${(p.limits||[]).slice(0,2).map(x=>esc(x).slice(0,60)).join('; ')||'—'}</td></tr>`;
|
||||
});
|
||||
html+='</table>';
|
||||
$('#portsbox').innerHTML=html;
|
||||
}
|
||||
function esc(s){return String(s).replace(/[<>&]/g,c=>({'<':'<','>':'>','&':'&'}[c]))}
|
||||
boot();
|
||||
</script>
|
||||
|
||||
Reference in new issue
Block a user