-
停機 (UDT/SDT)
-
--
-
--
+
+
-
工程 (EGT)
-
--
-
--
+
EGT
+
--
+
工程
-
@@ -717,25 +751,44 @@
if (result.success) {
const d = result.data;
const total = d.total_count || 0;
- const cats = d.by_status_category || {};
+ const status = d.by_status || {};
- const productive = cats.PRODUCTIVE || 0;
- const standby = cats.STANDBY || 0;
- const down = (cats.DOWN || 0);
- const eng = cats.ENGINEERING || 0;
- const other = (cats.NOT_SCHEDULED || 0) + (cats.INACTIVE || 0) + (cats.OTHER || 0) + (cats.UNKNOWN || 0);
+ // Get individual status counts
+ const prd = status.PRD || 0;
+ const sby = status.SBY || 0;
+ const udt = status.UDT || 0;
+ const sdt = status.SDT || 0;
+ const egt = status.EGT || 0;
+ const nst = status.NST || 0;
+ // Calculate percentage denominator (includes NST)
+ const totalStatus = prd + sby + udt + sdt + egt + nst;
+
+ // Update OU% and Availability%
+ document.getElementById('ouPct').textContent = d.ou_pct ? `${d.ou_pct}%` : '--';
+ document.getElementById('availabilityPct').textContent = d.availability_pct ? `${d.availability_pct}%` : '--';
+
+ // Update status cards with count and percentage
+ document.getElementById('prdCount').textContent = prd;
+ document.getElementById('prdPct').textContent = totalStatus ? `生產 (${((prd/totalStatus)*100).toFixed(1)}%)` : '生產';
+
+ document.getElementById('sbyCount').textContent = sby;
+ document.getElementById('sbyPct').textContent = totalStatus ? `待機 (${((sby/totalStatus)*100).toFixed(1)}%)` : '待機';
+
+ document.getElementById('udtCount').textContent = udt;
+ document.getElementById('udtPct').textContent = totalStatus ? `非計畫停機 (${((udt/totalStatus)*100).toFixed(1)}%)` : '非計畫停機';
+
+ document.getElementById('sdtCount').textContent = sdt;
+ document.getElementById('sdtPct').textContent = totalStatus ? `計畫停機 (${((sdt/totalStatus)*100).toFixed(1)}%)` : '計畫停機';
+
+ document.getElementById('egtCount').textContent = egt;
+ document.getElementById('egtPct').textContent = totalStatus ? `工程 (${((egt/totalStatus)*100).toFixed(1)}%)` : '工程';
+
+ document.getElementById('nstCount').textContent = nst;
+ document.getElementById('nstPct').textContent = totalStatus ? `未排程 (${((nst/totalStatus)*100).toFixed(1)}%)` : '未排程';
+
+ // Update total count
document.getElementById('totalCount').textContent = total;
- document.getElementById('productiveCount').textContent = productive;
- document.getElementById('productivePct').textContent = total ? `${((productive/total)*100).toFixed(1)}%` : '--';
- document.getElementById('standbyCount').textContent = standby;
- document.getElementById('standbyPct').textContent = total ? `${((standby/total)*100).toFixed(1)}%` : '--';
- document.getElementById('downCount').textContent = down;
- document.getElementById('downPct').textContent = total ? `${((down/total)*100).toFixed(1)}%` : '--';
- document.getElementById('engCount').textContent = eng;
- document.getElementById('engPct').textContent = total ? `${((eng/total)*100).toFixed(1)}%` : '--';
- document.getElementById('otherCount').textContent = other;
- document.getElementById('otherPct').textContent = total ? `${((other/total)*100).toFixed(1)}%` : '--';
}
} catch (e) {
console.error('載入摘要失敗:', e);
@@ -1020,12 +1073,14 @@
const dot = document.getElementById('cacheDot');
const status = document.getElementById('cacheStatus');
+ const resCache = data.resource_cache || {};
const eqCache = data.equipment_status_cache || {};
- if (eqCache.enabled && eqCache.loaded) {
+ // 使用 resource_cache 的數量（過濾後的設備數）
+ if (resCache.enabled && resCache.loaded) {
dot.className = 'cache-dot';
- status.textContent = `快取正常 (${eqCache.count} 筆)`;
- } else if (eqCache.enabled) {
+ status.textContent = `快取正常 (${resCache.count} 筆)`;
+ } else if (resCache.enabled) {
dot.className = 'cache-dot loading';
status.textContent = '快取載入中...';
} else {
@@ -1033,6 +1088,7 @@
status.textContent = '快取未啟用';
}
+ // 使用 equipment_status_cache 的更新時間（即時狀態更新時間）
if (eqCache.updated_at) {
document.getElementById('lastUpdate').textContent =
`更新: ${new Date(eqCache.updated_at).toLocaleString('zh-TW')}`;