-
${esc(row.name)}${esc(row.flask_url_browser || row.flask_url || "")}
-
+
+
${esc(row.name)}
+
${esc(row.flask_url_browser || row.flask_url || "")}
+
+
${review}
-
+
${inner}
@@ -273,16 +280,17 @@
const data = await r.json();
tradeMeta = data.meta?.meta || data.meta || {};
const el = document.getElementById("trade-meta");
- if (tradeMeta.key_gate_rule_text) {
- el.textContent = tradeMeta.key_gate_rule_text;
- } else if (tradeMeta.trend_pullback_preview_ttl) {
- el.textContent =
- `预览有效期 ${tradeMeta.trend_pullback_preview_ttl}s · 补仓档 ${tradeMeta.trend_pullback_dca_legs} · 余额偏差≤${tradeMeta.trend_preview_max_drift_pct}%`;
- } else {
- el.textContent = "";
+ let txt = "";
+ if (tradeMeta.key_gate_rule_text) txt = tradeMeta.key_gate_rule_text;
+ else if (tradeMeta.trend_pullback_preview_ttl) {
+ txt = `预览 ${tradeMeta.trend_pullback_preview_ttl}s · 补仓 ${tradeMeta.trend_pullback_dca_legs} 档 · 余额偏差 ≤${tradeMeta.trend_preview_max_drift_pct}%`;
}
+ el.textContent = txt;
+ el.style.display = txt ? "block" : "none";
} catch (e) {
- document.getElementById("trade-meta").textContent = "";
+ const el = document.getElementById("trade-meta");
+ el.textContent = "";
+ el.style.display = "none";
}
}
@@ -312,9 +320,9 @@
.map((r) => `
| ${r.i} | ${r.price} | ${r.contracts} |
`)
.join("");
box.innerHTML = `
-
预览 #${esc(p.id || trendPreviewId)} 剩余 ${p.expires_in_sec ?? "?"}s
-
${esc(p.symbol)} ${esc(p.direction)} ${p.leverage}x · 快照 ${fmt(p.snapshot_available_usdt, 2)} U
-
+
预览 #${esc(p.id || trendPreviewId)} · ${p.expires_in_sec ?? "?"}s
+
${esc(p.symbol)} ${esc(p.direction)} · ${p.leverage}x · 快照 ${fmt(p.snapshot_available_usdt, 2)} U
+
`;
@@ -355,8 +363,8 @@
const parts = [];
if (m.hub_bridge_token_set) parts.push("中控已配置 HUB_BRIDGE_TOKEN");
else parts.push("中控未设 HUB_BRIDGE_TOKEN（实例需 APP_AUTH_DISABLED 或同令牌）");
- if (m.public_origin) parts.push("复盘外链: " + m.public_origin);
- else parts.push("未设 HUB_PUBLIC_ORIGIN（复盘 127.0.0.1 仅服务器本机可开）");
+ if (m.public_origin) parts.push("浏览器外链基址: " + m.public_origin);
+ else parts.push("未设 HUB_PUBLIC_ORIGIN（复盘链接仅本机可开）");
if ((m.env_disabled_ids || []).length)
parts.push("环境强制关闭 id: " + m.env_disabled_ids.join(", "));
el.textContent = parts.join(" · ");
@@ -366,11 +374,11 @@
function loadSettingsUI() {
loadSettingsMetaLine();
loadSettings().then((data) => {
- const tbody = document.getElementById("settings-tbody");
- tbody.innerHTML = (data.exchanges || [])
- .map((ex, idx) => renderSettingsRow(ex, idx))
+ const list = document.getElementById("settings-list");
+ list.innerHTML = (data.exchanges || [])
+ .map((ex, idx) => renderSettingsCard(ex, idx))
.join("");
- tbody.querySelectorAll(".btn-del-ex").forEach((btn) => {
+ list.querySelectorAll(".btn-del-ex").forEach((btn) => {
btn.onclick = () => {
const i = Number(btn.dataset.idx);
data.exchanges.splice(i, 1);
@@ -381,46 +389,53 @@
});
}
- function renderSettingsRow(ex, idx) {
+ function renderSettingsCard(ex, idx) {
const caps = ex.capabilities || [];
const envOff = ex.env_disabled
- ? '
环境变量强制关'
+ ? '
环境变量强制关'
: "";
- return `
- | ${envOff} |
- |
- |
- |
- |
-
-
-
-
- |
- |
- |
-
`;
+ return `
`;
}
function collectSettingsFromUI() {
- const rows = [...document.querySelectorAll("#settings-tbody tr")];
+ const rows = [...document.querySelectorAll("#settings-list .settings-card")];
return {
version: 1,
- exchanges: rows.map((tr) => {
+ exchanges: rows.map((card) => {
const caps = [];
- if (tr.querySelector(".cap-order").checked) caps.push("order");
- if (tr.querySelector(".cap-key").checked) caps.push("key");
- if (tr.querySelector(".cap-trend").checked) caps.push("trend");
- const id = tr.querySelector(".ex-id").value.trim();
- const stableKey = (tr.dataset.key || id).trim();
+ if (card.querySelector(".cap-order").checked) caps.push("order");
+ if (card.querySelector(".cap-key").checked) caps.push("key");
+ if (card.querySelector(".cap-trend").checked) caps.push("trend");
+ const id = card.querySelector(".ex-id").value.trim();
+ const stableKey = (card.dataset.key || id).trim();
return {
id: id,
key: stableKey,
- name: tr.querySelector(".ex-name").value.trim(),
- flask_url: tr.querySelector(".ex-flask").value.trim(),
- agent_url: tr.querySelector(".ex-agent").value.trim(),
- review_url: tr.querySelector(".ex-review").value.trim(),
- enabled: tr.querySelector(".ex-enabled").checked,
+ name: card.querySelector(".ex-name").value.trim(),
+ flask_url: card.querySelector(".ex-flask").value.trim(),
+ agent_url: card.querySelector(".ex-agent").value.trim(),
+ review_url: card.querySelector(".ex-review").value.trim(),
+ enabled: card.querySelector(".ex-enabled").checked,
capabilities: caps,
};
}),
@@ -471,18 +486,20 @@
};
document.getElementById("order-sltp-mode").onchange = function () {
const pct = this.value === "pct";
- document.getElementById("order-sl").style.display = pct ? "none" : "";
- document.getElementById("order-tp").style.display = pct ? "none" : "";
- document.getElementById("order-sl-pct").style.display = pct ? "" : "none";
- document.getElementById("order-tp-pct").style.display = pct ? "" : "none";
+ const slField = document.getElementById("order-sl").closest(".field");
+ const tpField = document.getElementById("order-tp").closest(".field");
+ if (slField) slField.style.display = pct ? "none" : "";
+ if (tpField) tpField.style.display = pct ? "none" : "";
+ document.getElementById("wrap-sl-pct").style.display = pct ? "" : "none";
+ document.getElementById("wrap-tp-pct").style.display = pct ? "" : "none";
};
document.getElementById("key-sl-tp-mode").onchange = function () {
const manual = this.value === "trend_manual";
- document.getElementById("key-manual-tp").style.display = manual ? "" : "none";
+ document.getElementById("wrap-key-manual-tp").style.display = manual ? "" : "none";
};
document.getElementById("trend-direction").onchange = function () {
- const inp = document.getElementById("trend-add-upper");
- inp.placeholder = this.value === "short" ? "补仓下沿价" : "补仓上沿价";
+ const lbl = document.getElementById("trend-add-label");
+ if (lbl) lbl.textContent = this.value === "short" ? "补仓下沿价" : "补仓上沿价";
};
document.getElementById("btn-settings-save").onclick = saveSettings;
document.getElementById("btn-settings-reload").onclick = loadSettingsUI;
diff --git a/manual_trading_hub/static/index.html b/manual_trading_hub/static/index.html
index 82f50dd..45abc63 100644
--- a/manual_trading_hub/static/index.html
+++ b/manual_trading_hub/static/index.html
@@ -7,156 +7,237 @@
-
+
+
-
-
监控区
-
- 持仓/余额来自子代理；关键位、机器人单来自各实例 Flask（须 PM2 跑着 crypto_*）。
- 「交易复盘」在新标签打开 /records。其它电脑访问中控时，请在 hub 的 .env 设置
- HUB_PUBLIC_ORIGIN=http://Ubuntu内网IP，否则会跳到 127.0.0.1。
-
-
-
-
下单区
-
-
-
-
-
-
-
-
-
-
+
+
+
下单区
+
+
+
+
+
+
+
+
+
+
+
-
-
人工下单
-
-
-
添加关键位
-
-
-
-
系统设置
-
- 配置各交易所 Flask 地址与子代理地址，点击「保存设置」写入本目录
- hub_settings.json（重启 hub 后仍生效）。OKX 默认关闭；环境变量
- HUB_DISABLED_IDS=1 会强制关闭对应 id（勾选框灰掉）。实例须配置与中控一致的
- HUB_BRIDGE_TOKEN，或本机调试时 APP_AUTH_DISABLED=true。
-
-
-
-
-
-
-
-
-
-
-
-
- | 启用 | 显示名 | Flask URL | Agent URL | 复盘链接 |
- 能力 | id | |
-
-
-
-
+
+ 配置说明
+
+ 保存后写入 hub_settings.json。Flask / Agent 填本机地址即可；复盘链接可留空（由 Flask 地址自动生成）。
+ HUB_DISABLED_IDS 可强制关闭账户；HUB_BRIDGE_TOKEN 与实例一致，或实例 APP_AUTH_DISABLED=true。
+
+
+
+
+
+
+
+