diff --git a/ops/work/web/app.py b/ops/work/web/app.py index e007474..86d7a0a 100644 --- a/ops/work/web/app.py +++ b/ops/work/web/app.py @@ -145,6 +145,139 @@ class Data: outs = list(dflt["out"]) or ["—"] return ins, outs + # ── ПОЗИЦИОННЫЙ конструктор: места установки ── + POSITIONS = [ + {"id": "rack", "name": "Стойка / шкаф", + "hint": "кодек, DSP, коммутатор", + "roles": ["sharing_or_hub", "power"]}, + {"id": "table", "name": "Стол", + "hint": "настольные микрофоны, панели, докстанции", + "roles": ["audio", "touch", "remote"]}, + {"id": "ceiling", "name": "Потолок", + "hint": "потолочные микрофоны и громкоговорители", + "roles": ["audio", "speaker", "sensor"]}, + {"id": "wall", "name": "Стена / экран", + "hint": "камеры, дисплеи", + "roles": ["camera", "display"]}, + {"id": "perimeter", "name": "Периметр", + "hint": "кронштейны и крепления", + "roles": ["mount", "headset"]}, + ] + + # позиция по имени устройства (важнее роли: VCM38 — потолочный, хотя роль audio) + POSITION_RULES = [ + (r"^VCM|^CM50|^CS10-D|^CLS120|^MSpeaker|^CS10\b", "ceiling"), + (r"^CM20|^CS10|^CP50|^CPE|^CP965|^CP\d|^CTP|^MTouch|^VCR|^MB-Remote|^PA\d", "table"), + (r"^UVC|^MB-CAM|^MB-12X|^SmartVision|MeetingDisplay|^ETV|^VCC", "wall"), + (r"^MCore|^VCH|^WPP|^AP0|^AVBridge|^AVHub|^BYOD|^YPS|^PVB|^PVT|MeetingEye|^A\d|^MeetingBoard|^MB-FS|^Roomcast", "rack"), + (r"[Mm]ount|Bracket|Stand|^MB-Tray|^MB-Wall|^MD-", "perimeter"), + ] + + def pos_of(self, name): + for pat, pos in self.POSITION_RULES: + if re.match(pat, str(name)): + return pos + return None + + def positions(self, host_key, need=None): + """Позиции комнаты: в каждой только совместимые с хостом устройства.""" + need_n = {norm(x) for x in (need or [])} + hk = norm(host_key) + if hk not in self.devices: + return {"error": "хост не найден"} + host_role = self.devices[hk]["role"] + # у бара камера обычно встроенная — позицию камеры скрываем, если нет совместимых + out = [] + for pos in self.POSITIONS: + items = [] + for e in self.edges.get(hk, []): + t = e["to"] + r = self.devices.get(norm(t), {}).get("role") + if r not in pos["roles"]: + continue + # уточнение по позиции устройства + real_pos = self.pos_of(t) + if real_pos and real_pos != pos["id"]: + continue + if not e.get("supported") or not e.get("usable", True): + continue + a = self.attrs.get(norm(t), {}) + f = {norm(x) for x in self.feats.get(norm(t), set())} + if need_n and not need_n <= f: + continue + items.append({ + "model": t, "role": r, + "max_qty": e.get("max_qty"), + "condition": (e.get("condition") or "").strip()[:160], + "power_w": a.get("power.consumption_w"), + "pickup_m": a.get("audio.pickup_m"), + "zoom": a.get("camera.zoom_optical") or a.get("camera.zoom_hybrid"), + "ports_vch": a.get("ports.vch"), + }) + if pos["id"] == "perimeter": + for m in self.mounts_map.get(hk, []): + items.append({"model": m, "role": "mount", "max_qty": 1, + "condition": "лист Mounts & Bracket", + "power_w": None, "pickup_m": None, "zoom": None, + "ports_vch": None}) + uniq = {} + for i in items: + uniq.setdefault(i["model"], i) + items = sorted(uniq.values(), key=lambda x: x["model"]) + out.append({"id": pos["id"], "name": pos["name"], "hint": pos["hint"], + "items": items}) + return {"host": self.devices[hk]["name"], "host_role": host_role, + "positions": out} + + # ── проверка ёмкости хоста ── + def capacity(self, host_key, items): + """items: [[model, qty], ...]. Проверяет порты VCH, лимиты, питание.""" + hk = norm(host_key) + if hk not in self.devices: + return {"error": "хост не найден"} + host = self.devices[hk]["name"] + ha = self.attrs.get(hk, {}) + vch_ports = ha.get("ports.vch") + issues, notes = [], [] + total_w, missing_w = 0.0, [] + vch_users = 0 + qtys = {} + for row in items: + model, qty = row[0], int(row[1]) + qtys[model] = qtys.get(model, 0) + qty + # лимиты из матрицы + limits = {} + for e in self.edges.get(hk, []): + if e.get("supported"): + limits[norm(e["to"])] = (e.get("max_qty"), e["to"]) + for model, q in qtys.items(): + lim, name = limits.get(norm(model), (None, model)) + if lim and q > lim: + issues.append("%s: %d шт при лимите %d" % (name, q, lim)) + a = self.attrs.get(norm(model), {}) + w = a.get("power.consumption_w") + if w: + total_w += w * q + else: + missing_w.append(model) + if a.get("audio.pickup_m") or a.get("ports.vch"): + vch_users += q + if vch_ports is not None and vch_users > 0: + notes.append("портов VCH у хоста: %s · устройств на VCH: %d" + % (int(vch_ports), vch_users)) + if vch_users > vch_ports: + issues.append( + "VCH: %d устройств на %s порт(а) — требуется цепочка/расширитель; " + "ёмкость цепочки в данных отсутствует — ПРОВЕРИТЬ У ВЕНДОРА" + % (vch_users, int(vch_ports))) + notes.append("суммарное потребление: %.1f Вт (по данным)" % total_w) + if missing_w: + notes.append("нет данных о потреблении: %s" % ", ".join(sorted(set(missing_w))[:8])) + return {"host": host, "vch_ports": vch_ports, "vch_users": vch_users, + "total_power_w": round(total_w, 1), + "missing_power": sorted(set(missing_w)), + "issues": issues, "notes": notes} + # ── варианты для ручной сборки (только совместимые!) ── FEATURE_ROLE = { "aec": "audio", "anc": "audio", "dante": "audio", "aes67": "audio", @@ -354,6 +487,19 @@ class H(BaseHTTPRequestHandler): if k not in D.devices: return self._out({"error": "not found"}, 404) return self._out(D.device_row(k)) + 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/capacity": + items = [] + for raw in q.get("item", []): + if ":" in raw: + m, n = raw.rsplit(":", 1) + try: + items.append([m, int(n)]) + except ValueError: + pass + return self._out(D.capacity(q.get("host", [""])[0], items)) if p == "/api/vendors": return self._out(VENDORS) if p == "/api/options": diff --git a/ops/work/web/index.html b/ops/work/web/index.html index c79e2ed..918e4e1 100644 --- a/ops/work/web/index.html +++ b/ops/work/web/index.html @@ -7,67 +7,59 @@ :root{--bg:#0d1117;--panel:#161b22;--panel2:#1c232c;--line:#30363d;--txt:#e6edf3;--dim:#8b949e;--acc:#2f81f7;--ok:#3fb950;--bad:#f85149;--warn:#d29922;--purple:#a371f7} *{box-sizing:border-box} body{margin:0;font:14px/1.5 -apple-system,Segoe UI,Roboto,sans-serif;background:var(--bg);color:var(--txt)} -header{display:flex;align-items:center;gap:18px;padding:12px 22px;border-bottom:1px solid var(--line);background:var(--panel)} -header h1{font-size:16px;margin:0;font-weight:600} +header{display:flex;align-items:center;gap:16px;padding:11px 20px;border-bottom:1px solid var(--line);background:var(--panel)} +header h1{font-size:15px;margin:0;font-weight:600} .cs{font-size:12px;color:var(--dim)}.cs b{color:var(--txt)} -.mode{margin-left:auto;font-size:12px;color:var(--dim);border:1px solid var(--line);padding:4px 10px;border-radius:20px} -main{max-width:1580px;margin:0 auto;padding:20px} -.crumb{display:flex;align-items:center;gap:8px;margin-bottom:16px;font-size:13px;flex-wrap:wrap} -.crumb .c{padding:6px 13px;border:1px solid var(--line);border-radius:8px;background:var(--panel);cursor:pointer;color:var(--dim)} +.mode{margin-left:auto;font-size:11.5px;color:var(--dim);border:1px solid var(--line);padding:4px 10px;border-radius:20px} +main{max-width:1620px;margin:0 auto;padding:18px} +.crumb{display:flex;align-items:center;gap:7px;margin-bottom:14px;font-size:12.5px;flex-wrap:wrap} +.crumb .c{padding:5px 12px;border:1px solid var(--line);border-radius:8px;background:var(--panel);color:var(--dim)} .crumb .c.on{border-color:var(--acc);color:var(--txt);background:#132239} -.crumb .c.soon{opacity:.45;cursor:not-allowed} .crumb .sep{color:var(--line)} -.modes{display:flex;gap:8px;margin-bottom:16px} -.mtab{padding:10px 18px;border:1px solid var(--line);border-radius:10px;background:var(--panel);cursor:pointer;font-size:13.5px;color:var(--dim)} -.mtab.on{border-color:var(--acc);background:#132239;color:var(--txt)} -.card{background:var(--panel);border:1px solid var(--line);border-radius:11px;padding:16px} -.card h3{margin:0 0 12px;font-size:12px;text-transform:uppercase;letter-spacing:.6px;color:var(--dim);font-weight:600} -.cols{display:grid;grid-template-columns:1fr 1fr;gap:16px} -.lay{display:grid;grid-template-columns:340px 1fr 1fr;gap:16px;align-items:start} -@media(max-width:1200px){.lay{grid-template-columns:1fr}} -.dir{display:grid;grid-template-columns:repeat(3,1fr);gap:12px} -.dir .d,.vendors .d{border:1px solid var(--line);border-radius:10px;padding:15px;cursor:pointer;background:var(--panel2)} -.dir .d:hover,.vendors .d:hover{border-color:var(--acc)} -.dir .d.on,.vendors .d.on{border-color:var(--acc);background:#132239} -.dir .d.soon,.vendors .d.soon{opacity:.45;cursor:not-allowed} -.dir .d b,.vendors .d b{display:block;font-size:15px;margin-bottom:3px} -.dir .d span,.vendors .d span{font-size:12px;color:var(--dim)} -.vendors{display:grid;grid-template-columns:repeat(auto-fill,minmax(150px,1fr));gap:10px} -.chips{display:flex;flex-wrap:wrap;gap:6px;margin-top:4px} -.chip{border:1px solid var(--line);background:var(--panel2);color:var(--dim);padding:4px 11px;border-radius:20px;font-size:12px;cursor:pointer;user-select:none} -.chip:hover{border-color:var(--acc);color:var(--txt)} -.chip.on{background:#1f6feb22;border-color:var(--acc);color:#79c0ff} -.chip.on::before{content:"✓ ";font-weight:700} -.grp{margin-bottom:13px;border-bottom:1px solid var(--line);padding-bottom:10px} -.grp h4{margin:0 0 6px;font-size:12px;color:var(--txt);font-weight:600;display:flex;justify-content:space-between} -.grp h4 span{color:var(--dim);font-weight:400;font-size:11px} -label{display:block;font-size:12px;color:var(--dim);margin:9px 0 4px} -select,input{width:100%;background:#0d1117;border:1px solid var(--line);color:var(--txt);padding:8px 10px;border-radius:7px;font-size:13px} +.dir{display:grid;grid-template-columns:repeat(3,1fr);gap:10px} +.dir .d{border:1px solid var(--line);border-radius:10px;padding:14px;background:var(--panel2);cursor:pointer} +.dir .d:hover{border-color:var(--acc)} +.dir .d.soon{opacity:.45;cursor:not-allowed} +.dir .d b{display:block;font-size:14px;margin-bottom:3px} +.dir .d span{font-size:11.5px;color:var(--dim)} +.vendors{display:grid;grid-template-columns:repeat(auto-fill,minmax(140px,1fr));gap:9px;margin-top:10px} +.vendors .d{border:1px solid var(--line);border-radius:10px;padding:12px;background:var(--panel2);cursor:pointer} +.vendors .d.soon{opacity:.45;cursor:not-allowed} +.card{background:var(--panel);border:1px solid var(--line);border-radius:11px;padding:14px} +.card h3{margin:0 0 10px;font-size:11.5px;text-transform:uppercase;letter-spacing:.6px;color:var(--dim);font-weight:600} +.lay{display:grid;grid-template-columns:300px 1fr 350px;gap:14px;align-items:start} +@media(max-width:1250px){.lay{grid-template-columns:1fr}} +label{display:block;font-size:11.5px;color:var(--dim);margin:8px 0 3px} +select,input{width:100%;background:#0d1117;border:1px solid var(--line);color:var(--txt);padding:7px 9px;border-radius:6px;font-size:12.5px} input[type=range]{padding:0;accent-color:var(--acc)} -.btn{background:var(--acc);border:0;color:#fff;padding:10px 18px;border-radius:8px;font-size:13.5px;font-weight:600;cursor:pointer} -.btn.sm{padding:6px 11px;font-size:12.5px} +.btn{background:var(--acc);border:0;color:#fff;padding:9px 16px;border-radius:7px;font-size:13px;font-weight:600;cursor:pointer} +.btn.sm{padding:5px 10px;font-size:12px} .btn.ghost{background:transparent;border:1px solid var(--line);color:var(--txt)} -table{width:100%;border-collapse:collapse;font-size:13px} -th,td{text-align:left;padding:7px 9px;border-bottom:1px solid var(--line)} -th{color:var(--dim);font-weight:500;font-size:11.5px;text-transform:uppercase} -tr:hover td{background:#1c232c} -.tag{display:inline-block;background:#1f6feb22;color:#79c0ff;border:1px solid #1f6feb44;padding:2px 8px;border-radius:20px;font-size:11px;margin:2px 3px 2px 0} -.muted{color:var(--dim);font-size:12px} -.box{border-left:3px solid var(--warn);background:#2d2208;padding:9px 13px;border-radius:7px;margin:9px 0;font-size:12.5px} +.pos{margin-bottom:14px;border:1px solid var(--line);border-radius:9px;overflow:hidden} +.pos>h4{margin:0;padding:8px 12px;background:var(--panel2);font-size:12.5px;display:flex;justify-content:space-between;align-items:center;cursor:pointer} +.pos>h4 small{color:var(--dim);font-weight:400} +.pos>.body{padding:10px 12px} +.pitem{display:flex;align-items:center;gap:8px;padding:5px 0;border-bottom:1px solid #232b36} +.pitem:last-child{border-bottom:0} +.pitem .nm{flex:1;font-size:12.5px} +.pitem .sp{font-size:11px;color:var(--dim)} +table{width:100%;border-collapse:collapse;font-size:12.5px} +th,td{text-align:left;padding:6px 8px;border-bottom:1px solid var(--line)} +th{color:var(--dim);font-weight:500;font-size:11px;text-transform:uppercase} +.tag{display:inline-block;background:#1f6feb22;color:#79c0ff;border:1px solid #1f6feb44;padding:1px 7px;border-radius:20px;font-size:10.5px;margin:1px 3px 1px 0} +.muted{color:var(--dim);font-size:11.5px} +.box{border-left:3px solid var(--warn);background:#2d2208;padding:8px 11px;border-radius:6px;margin:8px 0;font-size:12px} .box.ok{border-color:var(--ok);background:#0d2417} .box.bad{border-color:var(--bad);background:#2d1214} -svg{width:100%;height:520px;background:#0a0e13;border:1px solid var(--line);border-radius:11px} -.hidden{display:none} .qty{display:inline-flex;align-items:center;gap:5px} -.qty button{width:25px;height:25px;border-radius:6px;border:1px solid var(--line);background:var(--panel2);color:var(--txt);cursor:pointer} -.qty button:disabled{opacity:.3;cursor:not-allowed} -.lim{font-size:11px;color:var(--dim)} -.addrow{display:flex;gap:6px} -.legend{display:flex;gap:14px;flex-wrap:wrap;margin-top:9px;font-size:12px;color:var(--dim)} -.legend i{display:inline-block;width:20px;height:3px;margin-right:5px;vertical-align:middle} -.steps{display:flex;gap:8px;margin-bottom:14px;flex-wrap:wrap} -.step{padding:7px 13px;border:1px solid var(--line);border-radius:9px;background:var(--panel);font-size:12.5px;color:var(--dim);cursor:pointer} -.step.on{border-color:var(--acc);color:var(--txt);background:#132239} +.qty button{width:23px;height:23px;border-radius:5px;border:1px solid var(--line);background:var(--panel2);color:var(--txt);cursor:pointer} +.qty button:disabled{opacity:.3} +svg{width:100%;height:460px;background:#0a0e13;border:1px solid var(--line);border-radius:10px} +.hidden{display:none} +.kv{display:grid;grid-template-columns:1fr auto;gap:3px 10px;font-size:12px} +.kv div:nth-child(odd){color:var(--dim)} +.legend{display:flex;gap:12px;flex-wrap:wrap;margin-top:8px;font-size:11px;color:var(--dim)} +.legend i{display:inline-block;width:18px;height:3px;margin-right:4px;vertical-align:middle} @@ -76,297 +68,184 @@ svg{width:100%;height:520px;background:#0a0e13;border:1px solid var(--line);bord
устройств —
связей —
хостов —
-
атрибутов —
сборка · без цен
-
-
- +
ВКС
- -
-

Направление

-
-