@kamuira/stock-analyzer 1.2.6 → 1.3.1

package/index.html

@@ -204,6 +204,7 @@
         <div class="search-box">
             <input type="text" id="codeInput" placeholder="A股: 名称/代码/拼音 | 台股: 4位代码如2330" autocomplete="off">
             <button id="analyzeBtn" onclick="doAnalyze()">分析</button>
+            <button id="rankBtn" onclick="doRank()" style="background:#5a3dbf">📊 批量评分排名</button>
         </div>
 
         <div class="shortcuts">
@@ -229,9 +230,24 @@
             <button onclick="quickAnalyze('sh600111')">北方稀土</button>
             <button onclick="quickAnalyze('sh601318')">中国平安</button>
             <button onclick="quickAnalyze('sh601066')">中信建投</button>
+            <button onclick="quickAnalyze('sz000510')">新金路</button>
+            <button onclick="quickAnalyze('sh601021')">春秋航空</button>
+            <button onclick="quickAnalyze('sz000657')">中钨高新</button>
+            <button onclick="quickAnalyze('sh600027')">华电国际</button>
+            <button onclick="quickAnalyze('sh603659')">璞泰来</button>
         </div>
         <div class="shortcuts" id="customShortcuts"></div>
 
+        <div id="rankPanel" style="max-width:680px;margin:0 auto 24px;background:#141e28;border:1px solid #1f2d3a;border-radius:10px;padding:14px 16px">
+            <div style="font-size:13px;color:#b39dff;margin-bottom:8px;font-weight:bold">📊 排名股票池(默认清单已自动包含,在此填要额外加入的)</div>
+            <textarea id="rankListInput" rows="2" placeholder="额外加入的代码或名称,逗号/空格/换行分隔。例: 中钨高新, sz000510, 2330。留空则只排默认清单" style="width:100%;padding:10px 12px;border:1px solid #2a3a4a;border-radius:8px;background:#1a2a3a;color:#fff;font-size:13px;outline:none;resize:vertical;font-family:inherit"></textarea>
+            <div style="display:flex;gap:10px;align-items:center;margin-top:8px;flex-wrap:wrap">
+                <button onclick="doRank()" style="padding:8px 18px;border:none;border-radius:8px;background:#5a3dbf;color:#fff;font-size:13px;cursor:pointer">保存并排名</button>
+                <button onclick="resetRankList()" style="padding:8px 14px;border:1px solid #2a3a4a;border-radius:8px;background:transparent;color:#aaa;font-size:12px;cursor:pointer">清空额外</button>
+                <span id="rankPoolHint" style="font-size:12px;color:#666"></span>
+            </div>
+        </div>
+
         <div class="loading" id="loading">
             <div class="spinner"></div>
             <p id="loadingText">正在获取数据并分析中...</p>
@@ -285,6 +301,219 @@
             doAnalyze(false); // 所有快捷按钮都显示回测
         }
 
+        // 批量排名默认股票池:内置自选股 + 用户新增的 5 只(德明利已在列)
+        const DEFAULT_RANK_LIST = [
+            'sz002049','sh603893','sz300750','sz300274','sh603698','sh601138',
+            'sh600011','sh601600','sz002138','sh603986','sz002716','sh603256',
+            'sz001309','sh601899','sz000426','sz002428','sh600259','sh600362',
+            'sh600206','sh600111','sh601318','sh601066',
+            'sz000510','sh601021','sz000657','sh600027','sh603659'
+        ];
+
+        const rankBtn = document.getElementById('rankBtn');
+        const rankListInput = document.getElementById('rankListInput');
+        const rankPoolHint = document.getElementById('rankPoolHint');
+
+        // 把输入框文本拆成代码/名称数组(逗号、空格、换行、中文逗号/顿号都当分隔符)
+        function parseRankInput(text) {
+            return (text || '').split(/[\s,，、;；]+/).map(s => s.trim()).filter(Boolean);
+        }
+
+        // 初始化:有自定义就回填,否则留空(走默认)
+        function loadRankList() {
+            const saved = localStorage.getItem('rankListCustom');
+            if (saved) rankListInput.value = parseRankInput(saved).join(', ');
+            updateRankHint();
+        }
+        function updateRankHint() {
+            const extra = parseRankInput(rankListInput.value);
+            const total = DEFAULT_RANK_LIST.length + extra.length; // 实际去重后可能略少
+            rankPoolHint.textContent = extra.length
+                ? `默认 ${DEFAULT_RANK_LIST.length} 只 + 额外 ${extra.length} 只 ≈ ${total} 只(含回测,约需 ${Math.max(5, Math.round(total * 0.4))}-${total * 2} 秒)`
+                : `仅默认 ${DEFAULT_RANK_LIST.length} 只(含回测,约需 ${Math.max(5, Math.round(DEFAULT_RANK_LIST.length * 0.4))}-${DEFAULT_RANK_LIST.length * 2} 秒)`;
+        }
+        function resetRankList() {
+            rankListInput.value = '';
+            localStorage.removeItem('rankListCustom');
+            updateRankHint();
+        }
+        rankListInput.addEventListener('input', updateRankHint);
+        loadRankList();
+
+        // 保存上一次排名的渲染结果(仅前端内存,非接口缓存),用于点进个股后快速返回
+        let lastRankHTML = '';
+
+        function backToRank() {
+            if (!lastRankHTML) return;
+            errorDiv.classList.remove('active');
+            resultDiv.innerHTML = lastRankHTML;
+            resultDiv.classList.add('active');
+            window.scrollTo(0, 0);
+        }
+
+        async function doRank() {
+            const extra = parseRankInput(rankListInput.value);
+            // 默认清单始终包含;额外的拼在后面(服务端按解析后的代码去重)
+            const list = [...DEFAULT_RANK_LIST, ...extra];
+            // 额外清单存本机(留空则清除)
+            if (extra.length) localStorage.setItem('rankListCustom', extra.join(','));
+            else localStorage.removeItem('rankListCustom');
+
+            btn.disabled = true;
+            rankBtn.disabled = true;
+            errorDiv.classList.remove('active');
+            resultDiv.classList.remove('active');
+            loading.classList.add('active');
+            loadingText.textContent = `正在批量评分 + 回测 ${list.length} 只股票(含历史回测,约需 ${Math.max(5, Math.round(list.length * 0.4))}-${list.length * 2} 秒)...`;
+            try {
+                const res = await fetch(`/api/rank?codes=${encodeURIComponent(list.join(','))}`);
+                const data = await res.json();
+                if (data.error) { showError(data.error); return; }
+                renderRank(data);
+            } catch (e) {
+                showError('网络请求失败: ' + e.message);
+            } finally {
+                btn.disabled = false;
+                rankBtn.disabled = false;
+                loading.classList.remove('active');
+                loadingText.textContent = '正在获取数据并分析中...';
+            }
+        }
+
+        function renderRank(data) {
+            const { results, marketEnv } = data;
+            const ok = results.filter(r => !r.error);
+            const bad = results.filter(r => r.error);
+
+            // 综合筛选:回测攻守兼备(盈利因子≥1.5 且 最大回撤≤25% 且 复利>0)
+            const isQualified = b => b && b.profitFactor >= 1.5 && b.maxDrawdown <= 25 && b.compoundReturn > 0;
+            const starCount = ok.filter(r => isQualified(r.backtest)).length;
+
+            const signalColor = (s, score) =>
+                score >= 10 ? '#ff4444' : score >= 5 ? '#ff7043' : score >= 1 ? '#ff9800'
+                : score >= -4 ? '#888' : score >= -9 ? '#26c281' : '#00cc66';
+            const rrColor = rr => rr >= 2 ? '#4caf50' : rr >= 1 ? '#ff9800' : '#f44336';
+
+            let html = `<div style="background:#1a2530;border:1px solid #2a3a4a;border-radius:10px;padding:18px 20px;margin-bottom:18px">
+                <div style="font-size:17px;font-weight:bold;color:#b39dff;margin-bottom:6px">四维综合排名（均衡型）</div>
+                <div style="font-size:12px;color:#888;line-height:1.7">
+                    综合分 = <b style="color:#aaa">技术面 / 估值 / 基本面 / 消息面</b> 四维等权平均（各 0~100，越高越好），按综合分从高到低排序，共 ${ok.length} 只有效${bad.length ? `（${bad.length} 只数据不足/失败）` : ''}。
+                    大盘环境：${(marketEnv && marketEnv.signals ? marketEnv.signals.join(' | ') : '-')}<br>
+                    · <b style="color:#aaa">技术</b>=评分标准化(择时) · <b style="color:#aaa">估值</b>=PE/PB历史分位 · <b style="color:#aaa">基本面</b>=ROE/增速/负债 · <b style="color:#aaa">消息</b>=公告关键词(利好+/利空−)<br>
+                    <span style="color:#ffd54f">⭐ = 回测攻守兼备（盈利因子≥1.5 且 最大回撤≤25% 且 复利&gt;0），本次 ${starCount} 只，已高亮。</span><br>
+                    <span style="color:#ff8a80">估值/基本面/消息面均为当前值、不参与回测；消息面是公告关键词初筛(较粗)；综合分高仅代表"现在更值得细看"，不保证未来 ≠ 推荐买入。请自行判断。</span>
+                </div>
+            </div>`;
+
+            const cmpColor = c => c == null ? '#666' : c > 0 ? '#4caf50' : '#f44336';
+            const dimColor = s => s == null ? '#666' : s >= 65 ? '#4caf50' : s >= 45 ? '#ff9800' : '#f44336';
+            const dimCell = (score, label, sub) => score == null
+                ? `<td style="padding:8px 6px;text-align:center;color:#555">—</td>`
+                : `<td style="padding:8px 6px;text-align:center"><div style="font-size:15px;font-weight:bold;color:${dimColor(score)}">${score}</div><div style="font-size:10px;color:#888">${label || ''}${sub ? ' ' + sub : ''}</div></td>`;
+
+            // ✅ 买入候选:同时满足全部硬性条件,再按综合分取前三
+            const isBuyCandidate = r => {
+                const f = r.fundamental || {}, v = r.valuation || {}, nw = r.news || {};
+                return r.composite >= 55
+                    && f.score != null && f.score >= 45   // 基本面不偏弱
+                    && v.score != null && v.score >= 40   // 估值不高估
+                    && (nw.score == null || nw.score >= 40) // 消息面无明显利空
+                    && r.totalScore >= 1                  // 当前技术面=买入侧(谨慎买入及以上)
+                    && isQualified(r.backtest);           // 回测攻守兼备 ⭐
+            };
+            const candidates = ok.filter(isBuyCandidate).slice(0, 3);
+            const medals = ['🥇', '🥈', '🥉'];
+            const condLine = '条件:综合≥55 · 基本面≥45 · 估值≥40 · 消息面无明显利空 · 当前技术=买入侧 · 回测⭐';
+            html += `<div style="margin-bottom:22px">
+                <div style="font-size:14px;font-weight:bold;color:#4caf50;margin-bottom:4px">✅ 买入候选(同时满足全部条件,按综合分取前三)</div>
+                <div style="font-size:11px;color:#777;margin-bottom:10px">${condLine}</div>`;
+            if (!candidates.length) {
+                html += `<div style="background:#1a2530;border:1px solid #3a2d2d;border-radius:10px;padding:16px;font-size:13px;color:#ff9800">
+                    本次没有股票同时满足全部买入条件 —— 说明当前股票池里没有"质地好+不贵+技术转强+回测靠谱"俱全的标的,宁可空仓等待,也别凑合买。
+                </div>`;
+            } else {
+                html += `<div style="display:grid;grid-template-columns:repeat(auto-fit,minmax(200px,1fr));gap:12px">`;
+                candidates.forEach((r, i) => {
+                    const v = r.valuation || {}, f = r.fundamental || {}, dims = r.dims || {};
+                    const sc = signalColor(r.signal, r.totalScore);
+                    const bar = (t, s) => `<div style="display:flex;justify-content:space-between;font-size:11px;margin:3px 0"><span style="color:#888">${t}</span><span style="color:${dimColor(s)};font-weight:bold">${s != null ? s : '—'}</span></div>`;
+                    html += `<div onclick="quickAnalyze('${r.code}')" style="cursor:pointer;background:linear-gradient(135deg,#1a2e1f,#1a2530);border:1px solid ${i === 0 ? '#4caf50' : '#2d4a2d'};border-radius:12px;padding:16px">
+                        <div style="display:flex;align-items:center;gap:8px;margin-bottom:6px">
+                            <span style="font-size:22px">${medals[i]}</span>
+                            <div><div style="font-size:16px;font-weight:bold;color:#fff">⭐ ${r.name}</div><div style="font-size:11px;color:#666">${r.code}</div></div>
+                        </div>
+                        <div style="text-align:center;margin:6px 0 8px"><span style="font-size:30px;font-weight:bold;color:${dimColor(r.composite)}">${r.composite}</span><span style="font-size:12px;color:#888"> /100 综合</span></div>
+                        ${bar('技术', dims.technical)}
+                        ${bar('估值' + (v.label ? '(' + v.label + ')' : ''), v.score)}
+                        ${bar('基本面' + (f.label ? '(' + f.label + ')' : ''), f.score)}
+                        ${bar('消息' + ((r.news && r.news.label) ? '(' + r.news.label + ')' : ''), r.news ? r.news.score : null)}
+                        <div style="margin-top:8px;text-align:center"><span style="padding:2px 10px;border-radius:10px;font-size:12px;background:${sc}22;color:${sc}">${r.signal}</span>${r.backtest ? `<span style="margin-left:6px;font-size:11px;color:${cmpColor(r.backtest.compoundReturn)}">回测${r.backtest.compoundReturn > 0 ? '+' : ''}${r.backtest.compoundReturn}%</span>` : ''}</div>
+                    </div>`;
+                });
+                html += `</div>`;
+                if (candidates.length < 3) html += `<div style="font-size:12px;color:#777;margin-top:8px">本次仅 ${candidates.length} 只满足全部买入条件,不硬凑三只。</div>`;
+            }
+            html += `<div style="font-size:11px;color:#ff8a80;margin-top:8px">注:这是按规则筛出的"候选",仍不含消息面;买前自行查公告、定仓位、设止损。</div></div>`;
+
+            html += `<div style="overflow-x:auto"><table style="width:100%;border-collapse:collapse;font-size:13px">
+                <thead><tr style="color:#888;text-align:left;border-bottom:1px solid #2a3a4a">
+                    <th style="padding:10px 6px">#</th>
+                    <th style="padding:10px 6px">名称</th>
+                    <th style="padding:10px 6px;text-align:right">现价</th>
+                    <th style="padding:10px 6px;text-align:right">涨跌</th>
+                    <th style="padding:10px 6px;text-align:center" title="技术/估值/基本面 三维等权平均">综合分</th>
+                    <th style="padding:10px 6px;text-align:center" title="技术面评分标准化(择时)">技术</th>
+                    <th style="padding:10px 6px;text-align:center" title="PE/PB 历史分位,越便宜越高">估值</th>
+                    <th style="padding:10px 6px;text-align:center" title="ROE/营收利润增速/负债,越优质越高">基本面</th>
+                    <th style="padding:10px 6px;text-align:center" title="公告关键词:利好+/利空−,50为中性">消息</th>
+                    <th style="padding:10px 6px">技术信号</th>
+                    <th style="padding:10px 6px;text-align:right" title="回测满仓复利净收益(扣费)">复利回测</th>
+                </tr></thead><tbody>`;
+
+            ok.forEach((r, i) => {
+                const dir = r.changePct > 0 ? 'up' : r.changePct < 0 ? 'down' : 'flat';
+                const sc = signalColor(r.signal, r.totalScore);
+                const b = r.backtest;
+                const qualified = isQualified(b);
+                const rowBg = qualified ? 'background:rgba(255,213,79,0.08);' : '';
+                const v = r.valuation || {}, f = r.fundamental || {};
+                const vSub = v.pePercentile != null ? `PE${v.pePercentile}%位` : '';
+                const fSub = f.roe != null ? `ROE${f.roe.toFixed(0)}%` : '';
+                const btCell = b
+                    ? `<td style="padding:8px 6px;text-align:right;font-weight:bold;color:${cmpColor(b.compoundReturn)}">${b.compoundReturn > 0 ? '+' : ''}${b.compoundReturn}%</td>`
+                    : `<td style="padding:8px 6px;text-align:center;color:#666;font-size:12px">无信号</td>`;
+                html += `<tr style="border-bottom:1px solid #1a2530;cursor:pointer;${rowBg}" onclick="quickAnalyze('${r.code}')" title="${qualified ? '回测攻守兼备 · ' : ''}点击查看完整分析">
+                    <td style="padding:8px 6px;color:${i < 3 ? '#ffd54f' : '#666'};font-weight:${i < 3 ? 'bold' : 'normal'}">${i + 1}</td>
+                    <td style="padding:8px 6px">${qualified ? '<span title="回测攻守兼备">⭐</span> ' : ''}<span style="color:#fff;font-weight:bold">${r.name}</span> <span style="color:#666;font-size:11px">${r.code}</span></td>
+                    <td style="padding:8px 6px;text-align:right;color:#ddd">${(r.price != null ? r.price.toFixed(2) : '-')}</td>
+                    <td style="padding:8px 6px;text-align:right" class="${dir}">${r.changePct > 0 ? '+' : ''}${r.changePct}%</td>
+                    <td style="padding:8px 6px;text-align:center"><span style="font-size:18px;font-weight:bold;color:${dimColor(r.composite)}">${r.composite}</span></td>
+                    ${dimCell(r.dims ? r.dims.technical : null, '', '')}
+                    ${dimCell(v.score, v.label, vSub)}
+                    ${dimCell(f.score, f.label, fSub)}
+                    ${dimCell(r.news ? r.news.score : null, r.news ? r.news.label : null, r.news && r.news.hitCount ? r.news.hitCount + '条' : '')}
+                    <td style="padding:8px 6px"><span style="padding:2px 8px;border-radius:10px;font-size:12px;background:${sc}22;color:${sc}">${r.signal}</span></td>
+                    ${btCell}
+                </tr>`;
+            });
+            html += `</tbody></table></div>`;
+
+            if (bad.length) {
+                html += `<div style="margin-top:14px;font-size:12px;color:#666">
+                    未能分析：${bad.map(b => `${b.name}(${b.code}) ${b.error}`).join('；')}
+                </div>`;
+            }
+
+            html += `<div class="disclaimer">
+                免责声明：以上为技术面评分排名，不构成投资建议。投资有风险，入市需谨慎。<br>
+                点击任意一行可查看该股完整分析与回测。
+            </div>`;
+
+            lastRankHTML = html; // 存起来,点进个股后可一键返回,无需重算
+            resultDiv.innerHTML = html;
+            resultDiv.classList.add('active');
+        }
+
         async function doAnalyze(skipBacktest = false) {
             let code = input.value.trim();
             if (!code) return;
@@ -338,33 +567,59 @@
 
             let html = '';
 
+            // 若是从排名点进来的,显示一键返回(直接复用已渲染结果,不重新计算)
+            if (lastRankHTML) {
+                html += `<button onclick="backToRank()" style="margin-bottom:14px;padding:8px 16px;border:1px solid #5a3dbf;border-radius:8px;background:transparent;color:#b39dff;font-size:13px;cursor:pointer">← 返回排名</button>`;
+            }
+
             // 回测结果卡片
             if (backtestData && !backtestData.error) {
                 const bt = backtestData;
-                const long = bt.long || {total:0,winRate:0,avgReturn:0,totalReturn:0,avgWin:0,avgLoss:0,avgHoldDays:0};
+                const long = bt.long || {total:0,winRate:0,avgReturn:0,totalReturn:0,compoundReturn:0,maxDrawdown:0,profitFactor:0,avgWin:0,avgLoss:0,avgHoldDays:0};
                 const gradeColor = bt.grade === '优秀' ? '#4caf50' : bt.grade === '良好' ? '#2196f3' : bt.grade === '一般' ? '#ff9800' : '#f44336';
                 const winRateColor = long.winRate >= 55 ? '#4caf50' : long.winRate >= 50 ? '#ff9800' : '#f44336';
                 const avgReturnColor = long.avgReturn > 1.5 ? '#4caf50' : long.avgReturn > 0 ? '#ff9800' : '#f44336';
+                const ddColor = long.maxDrawdown <= 10 ? '#4caf50' : long.maxDrawdown <= 25 ? '#ff9800' : '#f44336';
+                const pfColor = long.profitFactor >= 1.5 ? '#4caf50' : long.profitFactor >= 1 ? '#ff9800' : '#f44336';
+                const compoundColor = long.compoundReturn > 0 ? '#4caf50' : '#f44336';
                 const safeName = (bt.name||'').replace(/['"<>&]/g, '');
+                const costNote = bt.costs ? `已扣费(单次往返约${bt.costs.roundTripPct}%)` : '已扣费';
                 html += `<div style="background:#1a2530;border:1px solid ${gradeColor};margin-bottom:20px;padding:20px;border-radius:10px">
                     <h3 style="color:${gradeColor};margin-bottom:12px;font-size:15px">回测验证: ${safeName} (${bt.code}) — 评级: ${bt.grade}</h3>
-                    <div style="font-size:12px;color:#888;margin-bottom:10px">数据: ${bt.dataRange || '-'} | 引擎: ${bt.engine || '-'} | 做多交易 ${long.total} 笔 | 平均持仓 ${long.avgHoldDays || 0} 天</div>
-                    ${long.total > 0 ? `<div style="display:grid;grid-template-columns:repeat(3,1fr);gap:10px;margin-bottom:12px">
+                    <div style="font-size:12px;color:#888;margin-bottom:10px">数据: ${bt.dataRange || '-'} | 引擎: ${bt.engine || '-'} | 做多交易 ${long.total} 笔 | 平均持仓 ${long.avgHoldDays || 0} 天 | 收益口径: ${costNote}</div>
+                    ${long.total > 0 ? `<div style="display:grid;grid-template-columns:repeat(3,1fr);gap:10px;margin-bottom:10px">
                         <div style="text-align:center;padding:8px;background:#141e28;border-radius:6px">
                             <div style="font-size:11px;color:#888">做多胜率</div>
                             <div style="font-size:18px;font-weight:bold;color:${winRateColor}">${long.winRate}%</div>
                             <div style="font-size:11px;color:#888">${long.wins||0}胜 / ${long.losses||0}负</div>
                         </div>
                         <div style="text-align:center;padding:8px;background:#141e28;border-radius:6px">
-                            <div style="font-size:11px;color:#888">单笔均收益</div>
+                            <div style="font-size:11px;color:#888">单笔均净收益</div>
                             <div style="font-size:18px;font-weight:bold;color:${avgReturnColor}">${long.avgReturn}%</div>
-                            <div style="font-size:11px;color:#888">累计 ${long.totalReturn}%</div>
+                            <div style="font-size:11px;color:#888">毛 ${long.grossAvgReturn != null ? long.grossAvgReturn : '-'}%</div>
                         </div>
                         <div style="text-align:center;padding:8px;background:#141e28;border-radius:6px">
                             <div style="font-size:11px;color:#888">盈亏比</div>
                             <div style="font-size:18px;font-weight:bold;color:#fff">${long.avgWin || 0} : ${Math.abs(long.avgLoss || 0)}</div>
                             <div style="font-size:11px;color:#888">均盈 : 均亏</div>
                         </div>
+                    </div>
+                    <div style="display:grid;grid-template-columns:repeat(3,1fr);gap:10px;margin-bottom:12px">
+                        <div style="text-align:center;padding:8px;background:#141e28;border-radius:6px">
+                            <div style="font-size:11px;color:#888">复利累计收益</div>
+                            <div style="font-size:18px;font-weight:bold;color:${compoundColor}">${long.compoundReturn != null ? long.compoundReturn : '-'}%</div>
+                            <div style="font-size:11px;color:#888">满仓滚动</div>
+                        </div>
+                        <div style="text-align:center;padding:8px;background:#141e28;border-radius:6px">
+                            <div style="font-size:11px;color:#888">最大回撤</div>
+                            <div style="font-size:18px;font-weight:bold;color:${ddColor}">${long.maxDrawdown != null ? long.maxDrawdown : '-'}%</div>
+                            <div style="font-size:11px;color:#888">净值峰值→谷底</div>
+                        </div>
+                        <div style="text-align:center;padding:8px;background:#141e28;border-radius:6px">
+                            <div style="font-size:11px;color:#888">盈利因子</div>
+                            <div style="font-size:18px;font-weight:bold;color:${pfColor}">${long.profitFactor != null ? long.profitFactor : '-'}</div>
+                            <div style="font-size:11px;color:#888">净盈 / 净亏</div>
+                        </div>
                     </div>` : `<div style="padding:12px;text-align:center;color:#888;font-size:13px;background:#141e28;border-radius:6px;margin-bottom:12px">回测周期内无做多入场信号</div>`}
                     <button onclick="saveToShortcuts('${bt.code}','${safeName}','${long.winRate}','${bt.grade}')" style="padding:8px 16px;border:1px solid ${gradeColor};border-radius:6px;background:transparent;color:${gradeColor};cursor:pointer;font-size:13px">+ 加入快捷列表</button>
                     <span style="font-size:11px;color:#666;margin-left:10px">加入后可在顶部快速访问</span>
@@ -406,6 +661,32 @@
                 <div class="score-labels"><span>强烈卖出</span><span>观望</span><span>强烈买入</span></div>
             </div>`;
 
+            // 三维综合(技术/估值/基本面)
+            if (data.composite != null) {
+                const dimColor = s => s == null ? '#666' : s >= 65 ? '#4caf50' : s >= 45 ? '#ff9800' : '#f44336';
+                const val = data.valuation || {}, fund = data.fundamental || {};
+                const dims = data.dims || {};
+                const dimBox = (title, score, label, hint) => `
+                    <div style="flex:1;min-width:120px;background:#141e28;border-radius:10px;padding:14px;text-align:center;border-top:3px solid ${dimColor(score)}">
+                        <div style="font-size:12px;color:#888;margin-bottom:4px">${title}</div>
+                        <div style="font-size:24px;font-weight:bold;color:${dimColor(score)}">${score != null ? score : '—'}</div>
+                        <div style="font-size:11px;color:#aaa">${label || (score == null ? '无数据' : '')}</div>
+                        <div style="font-size:10px;color:#666;margin-top:2px">${hint || ''}</div>
+                    </div>`;
+                html += `<div style="background:#1a2530;border:1px solid #2a3a4a;border-radius:12px;padding:18px;margin-bottom:20px">
+                    <div style="display:flex;justify-content:space-between;align-items:center;margin-bottom:12px;flex-wrap:wrap;gap:8px">
+                        <span style="font-size:15px;font-weight:bold;color:#b39dff">三维综合分 ${data.composite}<span style="font-size:12px;color:#888;font-weight:normal"> / 100(技术·估值·基本面 等权)</span></span>
+                        <span style="font-size:11px;color:#666">估值/基本面为当前值,不参与回测</span>
+                    </div>
+                    <div style="display:flex;gap:12px;flex-wrap:wrap">
+                        ${dimBox('技术面', dims.technical, '', '评分标准化·择时')}
+                        ${dimBox('估值', val.score, val.label, val.pePercentile != null ? `PE ${val.pePercentile}% 分位` : '')}
+                        ${dimBox('基本面', fund.score, fund.label, fund.roe != null ? `ROE ${fund.roe.toFixed(1)}%` : '')}
+                        ${dimBox('消息面', (data.news || {}).score, (data.news || {}).label, (data.news && data.news.hitCount) ? `命中 ${data.news.hitCount} 条` : '公告关键词')}
+                    </div>
+                </div>`;
+            }
+
             // 操作建议大卡片（最显眼）
             const posAdvice = (rr && rr.positionAdvice) || '';
             const holdAdvice = summary.totalScore >= 10 ? '建议持仓5-10天，趋势跟踪' : summary.totalScore >= 5 ? '建议持仓3-5天，短线波段' : summary.totalScore >= 1 ? '建议持仓1-3天，快进快出' : '不建议开仓';
@@ -524,9 +805,31 @@
                 </div>`;
             }
 
+            // 估值 / 基本面 明细(与技术指标并列的可折叠模块)
+            const extraSections = [
+                { title: '估值分析', d: data.valuation },
+                { title: '基本面', d: data.fundamental },
+                { title: '消息面(公告关键词)', d: data.news },
+            ];
+            for (const sec of extraSections) {
+                if (!sec.d || !sec.d.signals) continue;
+                const score = sec.d.score;
+                const scoreText = score == null ? '<span class="section-score zero">无数据</span>'
+                    : `<span class="section-score ${score >= 65 ? 'positive' : score >= 45 ? 'zero' : 'negative'}">${score}/100 ${sec.d.label || ''}</span>`;
+                html += `<div class="section">
+                    <div class="section-header" onclick="this.nextElementSibling.style.display = this.nextElementSibling.style.display === 'none' ? 'block' : 'none'">
+                        <span class="section-title">${sec.title}</span>
+                        ${scoreText}
+                    </div>
+                    <div class="section-body">
+                        ${sec.d.signals.map(s => `<div class="signal-item">${s}</div>`).join('')}
+                    </div>
+                </div>`;
+            }
+
             // 免责声明
             html += `<div class="disclaimer">
-                免责声明：以上分析仅基于技术面指标，不构成投资建议。投资有风险，入市需谨慎。<br>
+                免责声明：以上分析基于技术面 + 估值 + 基本面，不含消息面，不构成投资建议。投资有风险，入市需谨慎。<br>
                 数据来源：新浪财经(实时) / 腾讯财经(历史K线) | 分析时间: ${rt.time}
             </div>`;
 

package/news.js

@@ -0,0 +1,109 @@
+/**
+ * 消息面模块 — 数据来自东方财富公告接口(np-anotice-stock)
+ *
+ * 用关键词对最近的公告标题做利好/利空初筛(减持/问询=利空,预增/回购/中标=利好),
+ * 按时间衰减加权,聚合成 0~100 分(50=中性)。利空权重高于利好(风险更重要)。
+ *
+ * 特点:
+ *   - 关键词法,免费、快(每只 1 次 HTTP,可并发);带 20 分钟内存缓存
+ *   - 仅"当前快照",不参与回测(免费源无历史时点情绪)
+ *   - LLM 精判留给单股详情页按需触发,不在批量里跑
+ *
+ * 注:公告比新闻更干净——高信号事件(减持/问询/预增/中标)都在公告里。
+ */
+const { getJSON, toSecuCode } = require('./http-util');
+
+// 利好 / 利空关键词(命中即计分;中性/行政事项不匹配)
+const POSITIVE = ['预增', '预盈', '扭亏', '增持', '回购', '中标', '订单', '合同', '战略合作',
+  '收购', '获批', '分红', '派息', '业绩快报', '量产'];
+const NEGATIVE = ['减持', '问询函', '关注函', '立案', '处罚', '违规', '诉讼', '仲裁', '商誉减值',
+  '计提', '预减', '预亏', '亏损', '退市', '风险警示', '*ST', 'ST', '质押', '冻结', '终止',
+  '下修', '监管', '警示函', '更正', '延期'];
+
+/**
+ * 上下文护栏:命中的关键词在某些语境下不算利好/利空,返回 true 表示应忽略。
+ * 例:"回购"出现在股权激励/限制性股票/期权语境里,是行政事项而非真实回购利好。
+ */
+function isFalsePositive(kw, title) {
+  if (kw === '回购' && /激励|限制性|期权/.test(title)) return true;
+  if (kw === '增持' && /激励|限制性|期权/.test(title)) return true;
+  return false;
+}
+
+/** 'sz001309' → '001309';非 A 股返回 null */
+function toNum(code) {
+  return toSecuCode(code) ? code.replace(/^(sh|sz)/i, '') : null;
+}
+
+async function fetchNews(code) {
+  const num = toNum(code);
+  if (!num) return null; // 非 A 股
+  const url = 'https://np-anotice-stock.eastmoney.com/api/security/ann'
+    + `?sr=-1&page_size=30&page_index=1&ann_type=A&client_source=web&stock_list=${num}`;
+  const j = await getJSON(url, { Referer: 'https://data.eastmoney.com/' });
+  const list = j && j.data && j.data.list;
+  if (!list) return null;
+  return list
+    .map(a => ({ date: (a.notice_date || '').slice(0, 10), title: a.title || '' }))
+    .filter(a => a.title);
+}
+
+// ===== 20 分钟内存缓存(公告不会分秒变,排名常重跑) =====
+const _cache = new Map();
+const TTL = 20 * 60 * 1000;
+async function fetchNewsCached(code) {
+  const hit = _cache.get(code);
+  if (hit && Date.now() - hit.ts < TTL) return hit.data;
+  // 批量排名时多接口并发,公告接口偶发失败 → 失败后短暂等待重试一次
+  let data = null;
+  for (let attempt = 0; attempt < 2 && !data; attempt++) {
+    if (attempt > 0) await new Promise(r => setTimeout(r, 350));
+    try { data = await fetchNews(code); } catch (e) { data = null; }
+  }
+  if (data) _cache.set(code, { ts: Date.now(), data }); // 只缓存成功结果
+  return data;
+}
+
+/** 距今天数(粗略,按日期字符串) */
+function daysAgo(dateStr) {
+  const d = new Date(dateStr + 'T00:00:00');
+  if (Number.isNaN(d.getTime())) return 999;
+  return Math.floor((Date.now() - d.getTime()) / 86400000);
+}
+function recencyWeight(days) {
+  if (days <= 7) return 1.0;
+  if (days <= 30) return 0.6;
+  if (days <= 90) return 0.3;
+  return 0; // 超过 90 天不计入
+}
+
+/** 消息面打分,返回 0~100 + 命中的利好/利空信号 */
+function scoreNews(items) {
+  if (!items) return { score: null, signals: ['无消息数据(非A股或接口失败)'] };
+  if (!items.length) return { score: 50, signals: ['近期无公告'] };
+
+  let score = 50;
+  const hits = [];
+  for (const it of items) {
+    const w = recencyWeight(daysAgo(it.date));
+    if (w === 0) continue;
+    const neg = NEGATIVE.find(k => it.title.includes(k));
+    const pos = POSITIVE.find(k => it.title.includes(k) && !isFalsePositive(k, it.title));
+    if (neg) { score -= 12 * w; hits.push({ date: it.date, title: it.title, tag: '利空', kw: neg }); }
+    else if (pos) { score += 7 * w; hits.push({ date: it.date, title: it.title, tag: '利好', kw: pos }); }
+  }
+  score = Math.max(0, Math.min(100, Math.round(score)));
+
+  const signals = [];
+  if (!hits.length) {
+    signals.push('近期公告以常规事项为主,无明显利好/利空');
+  } else {
+    // 利空优先展示
+    hits.sort((a, b) => (a.tag === '利空' ? -1 : 1) - (b.tag === '利空' ? -1 : 1));
+    for (const h of hits.slice(0, 6)) signals.push(`[${h.tag}] ${h.date} ${h.title}`);
+  }
+  const label = score >= 60 ? '偏多' : score >= 40 ? '中性' : '偏空';
+  return { score, signals, label, hitCount: hits.length };
+}
+
+module.exports = { fetchNews, fetchNewsCached, scoreNews };

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@kamuira/stock-analyzer",
-  "version": "1.2.6",
+  "version": "1.3.1",
   "preferGlobal": true,
-  "description": "A股/台股综合技术分析工具 - 支持实时分析、回测验证、买卖建议",
+  "description": "A股/台股综合分析工具 - 技术面+估值+基本面+消息面四维评分、批量排名、含成本回测、买卖建议",
   "main": "server.js",
   "bin": {
     "stock-analyze": "bin/analyze.js",
@@ -24,7 +24,10 @@
     "RSI",
     "KDJ",
     "ADX",
-    "backtest"
+    "backtest",
+    "valuation",
+    "fundamental-analysis",
+    "stock-ranking"
   ],
   "author": "guiwzh",
   "license": "MIT",
@@ -44,6 +47,10 @@
     "dev.js",
     "indicators.js",
     "scoring.js",
+    "valuation.js",
+    "fundamentals.js",
+    "news.js",
+    "http-util.js",
     "index.html",
     "README.md"
   ],