feat: 完善仓库建筑绑定、质检预警规则与大屏展示

这个提交包含在:
wikiboss
2026-10-28 17:30:49 +08:00
父节点 d4ff221fa3
当前提交 ffff286274
共有 18 个文件被更改,包括 614 次插入 和 318 次删除

查看文件

@@ -17,8 +17,11 @@ import {
getAerialModeConfig,
getNextAerialMode,
CENTER_HOTSPOT_COORDS,
generateDepotAlerts
} from './grain_monitor_core.js';
CENTER_EXTRA_POSITIONS,
resolveHotspotCoord,
generateDepotAlerts,
syncAlertMarqueeSpeed
} from './grain_monitor_core.js?v=20261028_chart3';
// 全局状态
const STATE = {
@@ -96,28 +99,7 @@ async function fetchGranaryData() {
if (!res.ok) continue;
const json = await res.json();
if (json && json.data && Array.isArray(json.data.list) && json.data.list.length > 0) {
let list = json.data.list;
// 业务规范对齐:若线上外部API尚未同步最新规划 (缺少44号仓),自动执行“新增的是43,后面的仓库递增”
if (!list.some(item => item.name && item.name.includes('44号'))) {
list = list.map(item => {
if (item.name === '43号仓房' || (item.id === 46 && item.name.includes('43'))) {
return {
...item,
name: '44号仓房',
num: 44,
content: item.content ? { ...item.content, code: '44', warehouseType: '高大平房仓' } : item.content
};
}
return item;
});
if (!list.some(item => item.id === 51 || item.name === '43号仓房')) {
const default43 = DEFAULT_GRANARY_DATA?.data?.list?.find(i => i.id === 51);
if (default43) {
list.push(default43);
}
}
}
const list = json.data.list;
STATE.list = normalizeGranaryList({ ...json, data: { ...json.data, list } });
if (json.data && json.data.coords) {
STATE.customCoords = json.data.coords;
@@ -172,6 +154,9 @@ function renderDepotAlerts() {
const marqueeTrack = document.getElementById('alert-marquee-track');
if (!marqueeTrack) return;
const alerts = generateDepotAlerts(STATE.list, STATE.envData);
const signature = alerts.map(a => `${a.id}|${a.text}`).join('\n');
if (marqueeTrack.dataset.alertSignature === signature && marqueeTrack.childElementCount > 0) return;
marqueeTrack.dataset.alertSignature = signature;
marqueeTrack.innerHTML = '';
const displayAlerts = alerts.length > 0 ? (alerts.length === 1 ? alerts : alerts.concat(alerts)) : [];
displayAlerts.forEach(alert => {
@@ -192,6 +177,7 @@ function renderDepotAlerts() {
}
marqueeTrack.appendChild(pill);
});
requestAnimationFrame(() => syncAlertMarqueeSpeed(marqueeTrack));
}
// 4. 渲染顶部 KPIs
@@ -204,6 +190,16 @@ function renderKPIs() {
document.getElementById('kpi-utilization').textContent = `${s.utilizationRate}%`;
document.getElementById('kpi-warehouse-count').textContent = `${s.warehouseCount} 栋`;
document.getElementById('kpi-oil-count').textContent = `${s.oilTankCount} 座`;
const filterLabels = {
all: `全部 (${STATE.list.length})`,
warehouse: `平房仓群 (${s.warehouseCount})`,
oilTank: `储油罐区 (${s.oilTankCount})`
};
document.querySelectorAll('.filter-btn[data-filter]').forEach(button => {
button.textContent = filterLabels[button.dataset.filter];
});
const totalCount = document.getElementById('depot-total-count');
if (totalCount) totalCount.textContent = `${STATE.list.length} 座/栋`;
}
// 5. 渲染 3D 鸟瞰图全景热点图钉 (20 个仓房/油罐全量覆盖,像素级对准与错层防重叠)
@@ -211,12 +207,10 @@ function renderHotspots() {
const container = document.getElementById('aerial-hotspots');
if (!container) return;
const hotspotCoords = STATE.customCoords ? { ...CENTER_HOTSPOT_COORDS, ...STATE.customCoords } : CENTER_HOTSPOT_COORDS;
container.innerHTML = '';
STATE.list.forEach(item => {
const rawCoord = hotspotCoords[item.id] || hotspotCoords[item.num] || hotspotCoords[item.name];
const rawCoord = resolveHotspotCoord(item, STATE.customCoords, CENTER_HOTSPOT_COORDS);
if (!rawCoord) return;
const coord = {
@@ -241,7 +235,7 @@ function renderHotspots() {
pin.style.left = `${coord.x}%`;
pin.style.top = `${coord.y}%`;
const shortName = item.name.replace('号仓房', '号仓').replace('号油罐', '号罐');
const shortName = `${item.num}号${isOil ? '罐' : '仓'}`;
let stemHtml = '';
if (hasStem) {
@@ -259,8 +253,8 @@ function renderHotspots() {
pin.innerHTML = `
<div class="bubble-inner">
<span class="bubble-name">${shortName}</span>
<span class="bubble-tag">${item.grainName}</span>
<span class="bubble-name"></span>
<span class="bubble-tag"></span>
</div>
<div class="bubble-arrow"></div>
${stemHtml}
@@ -271,8 +265,25 @@ function renderHotspots() {
selectGranary(item.id, true);
};
pin.querySelector('.bubble-name').textContent = shortName;
pin.querySelector('.bubble-tag').textContent = item.grainName;
container.appendChild(pin);
});
// 未建台账的位置只显示待编号,不参与库存统计或质量预测。
if (STATE.filterType !== 'oilTank') {
Object.entries(CENTER_EXTRA_POSITIONS).forEach(([position, coord]) => {
if (STATE.list.some(item => item.screenPosition === position)) return;
const pin = document.createElement('div');
pin.className = 'hotspot-pin wheat pending-warehouse';
pin.style.left = `${coord.x}%`;
pin.style.top = `${coord.y}%`;
pin.style.cursor = 'default';
pin.title = '请在后台粮仓管理添加仓库,选择对应的大屏建筑位置并填写仓号';
pin.innerHTML = '<div class="bubble-inner"><span class="bubble-name">待编号</span></div><div class="bubble-arrow"></div>';
container.appendChild(pin);
});
}
}
// 6. 渲染底部仓房/油罐快捷导航条 (纯净 20 仓罐双排点阵)
@@ -293,8 +304,10 @@ function renderMiniGrid() {
const typeClass = isOil ? 'oil' : (item.grainName === '稻谷' ? 'paddy' : 'wheat');
const isActive = item.id === STATE.activeId;
btn.className = `mini-btn ${typeClass} ${isActive ? 'active' : ''}`;
const shortName = item.name.replace('号仓房', '号仓').replace('号油罐', '号罐');
btn.innerHTML = `<span class="btn-name">${shortName}</span><span class="btn-grain">${item.grainName}</span>`;
const shortName = `${item.num}号${isOil ? '罐' : '仓'}`;
btn.innerHTML = '<span class="btn-name"></span><span class="btn-grain"></span>';
btn.querySelector('.btn-name').textContent = shortName;
btn.querySelector('.btn-grain').textContent = item.grainName;
btn.title = `${item.name} (${item.grainName}) - 实存 ${item.storageNum} 吨`;
btn.onclick = () => selectGranary(item.id, true);
container.appendChild(btn);
@@ -633,7 +646,7 @@ async function initOrUpdateForecastCharts(granaryItem) {
setupForecastEnvControls();
const currentReport = getGranaryQualityReport(grainName, currentItem.rawContent || currentItem.content || {});
const currentReport = getGranaryQualityReport(grainName, currentItem.rawContent || currentItem.content || {}, currentItem.qualityTest);
// 1. 0 毫秒即时秒出基础图表 (杜绝任何白屏与残亮点)
const baselineList = [
@@ -673,6 +686,7 @@ async function initOrUpdateForecastCharts(granaryItem) {
const initialFuture30 = initialSeries.metrics.map(m => ({
key: m.key,
name: m.name,
unit: m.unit,
predictedValue: m.values[3] !== undefined ? m.values[3] : m.values[m.values.length - 1]
}));
const initialCompareOption = buildForecastCompareChartOption(grainType, currentReport?.items || [], initialFuture30);
@@ -698,7 +712,7 @@ async function initOrUpdateForecastCharts(granaryItem) {
const series = generateForecastSeries(grainType, currentReport, forecastList, STATE.forecastEnv);
if (trendTitleEl) {
trendTitleEl.textContent = `${currentItem.name} (${grainName}) 质量指标多周期演变推演 (当前实测与未来 7~60天)`;
trendTitleEl.textContent = `${currentItem.name} (${grainName}) 多周期趋势`;
}
const trendOption = buildForecastTrendChartOption(series);
if (trendOption) {
@@ -708,11 +722,12 @@ async function initOrUpdateForecastCharts(granaryItem) {
const future30Targets = series.metrics.map(m => ({
key: m.key,
name: m.name,
unit: m.unit,
predictedValue: m.values[3] !== undefined ? m.values[3] : m.values[m.values.length - 1]
}));
if (compareTitleEl) {
compareTitleEl.textContent = `${currentItem.name} 现状实测 vs 未来30天预测终值偏离评估`;
compareTitleEl.textContent = `${currentItem.name} 未来30天 · 变化对比`;
}
const compareOption = buildForecastCompareChartOption(grainType, currentReport?.items || [], future30Targets);
if (compareOption) {