From 188f0c0e2ae02bf2e9560036fd2ff7cd03494be8 Mon Sep 17 00:00:00 2001 From: jieun Date: Wed, 18 Nov 2026 17:58:22 +0900 Subject: [PATCH] =?UTF-8?q?2=EC=B0=A8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/check-console.cjs | 16 ++++++++++++++- src/assets/operations-layout.css | 21 ++++++++++++++++++++ src/components/BatteryGauge.vue | 30 ++++++++++++++++++++++++++++ src/data/consoleDemo.js | 4 ++-- src/pages/Dashboard.vue | 34 +++++++++++++++----------------- 5 files changed, 84 insertions(+), 21 deletions(-) create mode 100644 src/components/BatteryGauge.vue diff --git a/scripts/check-console.cjs b/scripts/check-console.cjs index bf13f47..2c24b8c 100644 --- a/scripts/check-console.cjs +++ b/scripts/check-console.cjs @@ -17,7 +17,7 @@ function load(file, name) { assert.deepStrictEqual(compiled.errors, [], name + ' template must compile'); const source = parsed.script.content.replace(/^import .*;$/mg, '').replace('export default', 'module.exports ='); const context = {module:{exports:{}}, process:{env:{}}, window:{location:{protocol:'http:',hostname:'localhost'}}, - Icon:components.Icon, SensorTrend:components.SensorTrend, createDemo:demo, Date, Number, URL, AbortController, + Icon:components.Icon, SensorTrend:components.SensorTrend, BatteryGauge:components.BatteryGauge, createDemo:demo, Date, Number, URL, AbortController, setTimeout, clearTimeout, setInterval, clearInterval}; vm.runInNewContext(source, context); const options = context.module.exports; @@ -28,6 +28,20 @@ function load(file, name) { } components.Icon = load('src/components/ConsoleIcon.vue', 'Icon'); components.SensorTrend = load('src/components/SensorTrend.vue', 'Trend'); +components.BatteryGauge = load('src/components/BatteryGauge.vue', 'BatteryGauge'); +const Gauge = Vue.extend(components.BatteryGauge); +const gauge = new Gauge({propsData:{value:86}}); +assert.equal(gauge.numeric,86); +assert.equal(gauge.valid,true); +for (const value of [0,100,'42.5']) { + gauge.value=value; assert.equal(gauge.valid,true); assert(gauge._render().tag); +} +for (const value of [null,undefined,'',' ']) { + gauge.value=value; assert.equal(gauge.missing,true); assert.equal(gauge.valid,false); +} +for (const value of [-1,101,Infinity,NaN,'invalid',false,{}]) { + gauge.value=value; assert.equal(gauge.missing,false); assert.equal(gauge.valid,false); +} const options = load('src/pages/Dashboard.vue', 'Dashboard'); const route = Vue.observable({query:{view:'overview'}}); Vue.prototype.$route = route; diff --git a/src/assets/operations-layout.css b/src/assets/operations-layout.css index 3e7c5d6..51734d8 100644 --- a/src/assets/operations-layout.css +++ b/src/assets/operations-layout.css @@ -1,4 +1,11 @@ /* Operations console: readable type, compact chrome, clear status hierarchy. */ +/* Only these three paired rows stretch; stacked cards retain natural height. */ +@media(min-width:981px){ + .console-app .overview-grid.equal-height-overview{align-items:stretch} +} +@media(min-width:681px){ + .console-app .detail-grid.equal-height-device{align-items:stretch} +} .topbar-start{display:flex;align-items:center;gap:16px;min-width:0} .sidebar-toggle{flex-shrink:0} .monitor-toggle{border:0;background:none;display:flex;align-items:center;justify-content:space-between;width:100%;cursor:pointer} @@ -116,3 +123,17 @@ th:first-child,td:first-child{padding-left:24px} @media(max-width:680px){.brand.brand-logo{display:none}.monitor-toggle{display:flex;padding:9px 16px;margin:0;font-size:12px}.sidebar-collapsed .sidebar{display:none}.sidebar-collapsed .main-shell{margin-left:0}.sidebar nav{flex-wrap:wrap}.sidebar nav[style*=none]{display:none}.sidebar-toggle{width:30px;height:30px}.topbar-start{gap:9px}.breadcrumb{gap:7px}} .logout-button{margin-left:auto;display:flex;align-items:center;gap:5px;padding:8px 3px;border:0;background:none;color:#a7b6c8;font-size:11px}.logout-button:hover{color:#79dcc2}.sidebar-collapsed .account{flex-direction:column}.sidebar-collapsed .logout-button{margin-left:0}.sidebar-collapsed .logout-button span{display:none}@media(max-width:680px){.sidebar-bottom{display:block}.sidebar-bottom .account{border:0;padding:0 15px 8px;justify-content:flex-end}.sidebar-bottom .account-avatar,.sidebar-bottom .account>div{display:none}.sidebar-bottom .logout-button{margin-left:0;font-size:12px}} + +/* Compact operational content; login styles are unaffected. */ +.console-app main{padding-bottom:24px}.console-app .page-heading{margin-bottom:22px}.console-app .overview-grid,.console-app .detail-grid{align-items:start}.console-app .metric-card{min-height:0;padding-top:20px;padding-bottom:20px}.console-app .metric-number{margin-top:10px}.console-app .section-heading{margin-top:20px;margin-bottom:14px}.console-app .device-select-label{font-size:14px;color:#a7b6c8}.console-app .attention-panel .empty-state,.console-app .energy-results .empty-state{min-height:0;padding:18px 24px 24px}.console-app .table-scroll .empty-state{min-height:110px}.console-app .diagnosis-feature{padding:12px 24px 24px}.console-app .sensor-tiles{padding:15px 20px 24px}.console-app .energy-results .panel-heading{padding-bottom:8px}.console-app .history-panel .panel-heading{padding-bottom:16px}.console-app .brand.brand-logo{margin-bottom:22px}@media(max-width:680px){.console-app .metric-card{padding:16px}.console-app .section-heading{gap:8px}.console-app .page-heading{margin-bottom:18px}} + +/* Center only the requested card bodies below their unchanged headers. */ +.console-app .center-empty-attention,.console-app .centered-sensors,.console-app .centered-diagnosis{display:flex;flex-direction:column} +.console-app .center-empty-attention>.panel-heading,.console-app .centered-sensors>.panel-heading,.console-app .centered-diagnosis>.panel-heading{flex:none} +.console-app .attention-panel.center-empty-attention>.attention-empty-body{flex:1;display:grid;place-items:center;text-align:center;padding:21px 24px} +.console-app .attention-empty-group{display:flex;flex-direction:column;align-items:center;justify-content:center;gap:10px;text-align:center} +.console-app .centered-sensors>.sensor-tiles{flex:1;align-content:center;align-items:center;width:100%;padding-block:19.5px} +.console-app .centered-diagnosis>.diagnosis-feature{flex:1;align-items:center;justify-content:center;text-align:center;padding-block:18px} + +/* Battery history card only: retain trend data and share space with current gauge. */ +.console-app .battery-trend-layout{display:grid;grid-template-columns:minmax(0,7fr) minmax(0,3fr);align-items:center}.console-app .battery-trend-layout>.trend-wrap{min-width:0}.console-app .battery-gauge-region{min-width:0;padding:4px 24px 17px;display:flex;align-items:center;justify-content:center}@media(max-width:680px){.console-app .battery-gauge-region{padding:0 12px 12px}}@media(max-width:480px){.console-app .battery-trend-layout{grid-template-columns:minmax(0,1fr)}.console-app .battery-gauge-region{padding:0 16px 20px}.console-app .battery-gauge-region .battery-gauge{max-width:170px}} diff --git a/src/components/BatteryGauge.vue b/src/components/BatteryGauge.vue new file mode 100644 index 0000000..22fb0ba --- /dev/null +++ b/src/components/BatteryGauge.vue @@ -0,0 +1,30 @@ + + + diff --git a/src/data/consoleDemo.js b/src/data/consoleDemo.js index 8567632..faccd66 100644 --- a/src/data/consoleDemo.js +++ b/src/data/consoleDemo.js @@ -1,7 +1,7 @@ // UI preview fixtures only. Never sent to the device API. export function createDemo() { const now = Date.now(); - const names = ['캠퍼스 정문']; + const names = ['SMART-HELMET-01']; return names.map((name, i) => { const samples = Array.from({length: 48}, (_, n) => ({ ts: new Date(now - (47-n)*30*60000 - (i===4 ? 7200000 : 0)).toISOString(), @@ -11,7 +11,7 @@ export function createDemo() { uv_state: n%12<3 ? 1 : 0, fan_state: n%8<4 ? 1 : 0, lock: 1, helmet: i===2 ? 0 : 1, chg_ing: i%2, chg_done: 0 })); - return { key: 'PM-'+String(i+1).padStart(3,'0'), name, last: samples[samples.length-1].ts, samples, + return { key: 'PM-'+String(i+1).padStart(3,'0'), name, location: '운영지점 01', last: samples[samples.length-1].ts, samples, diagnosis: i===1 ? '오염 의심' : i===3 ? '파손 의심' : '정상', mode: i===3 ? '저전력' : '일반' }; }); } diff --git a/src/pages/Dashboard.vue b/src/pages/Dashboard.vue index f145f6d..5b930ee 100644 --- a/src/pages/Dashboard.vue +++ b/src/pages/Dashboard.vue @@ -2,57 +2,54 @@
-
{{ today }}M
+
{{ today }}
-
HELMET OPERATIONS

{{ currentNav.label }}

{{ descriptions[view] }}

{{ lastRefresh ? '갱신 '+clock(lastRefresh) : '갱신 대기' }}
+

{{ currentNav.label }}

{{ lastRefresh ? '갱신 '+clock(lastRefresh) : '갱신 대기' }}
{{ notice }}
-

장치 운영 현황 {{ devices.length }}

{{ demo ? '전체 장치의 연결 상태와 최신 데이터를 확인하세요.' : '현재 서버 연결 목록 기준 · 등록 장치 목록은 연동 예정' }}

+

장치 목록 {{ devices.length }}

현재 연결 목록 · 등록 장치 목록 미연동

-
장치 정보수신 상태온도 / 습도배터리위생관리안전모 진단최종 수신상세 보기
{{ isRecent(d)?'수신 정상':'미수신' }}{{ value(sample(d).temp) }}° / {{ value(sample(d).humi) }}%
{{ value(sample(d).batt_pct) }}%
UV {{ state(sample(d).uv_state) }}FAN {{ state(sample(d).fan_state) }}
{{ d.diagnosis || '미연동' }}{{ relative(d.last) }}
{{ search||statusFilter!=='all' ? '조건에 맞는 장치가 없습니다' : '연결된 장치가 없습니다' }}{{ search ? '검색어나 상태 필터를 바꿔보세요.' : '서버 연결 상태를 확인하세요.' }}
+
장치 정보수신 상태온도 / 습도배터리위생관리안전모 진단최종 수신상세 보기
{{ isRecent(d)?'수신 정상':'미수신' }}{{ value(sample(d).temp) }}° / {{ value(sample(d).humi) }}%
{{ value(sample(d).batt_pct) }}%
UV {{ state(sample(d).uv_state) }}FAN {{ state(sample(d).fan_state) }}
{{ d.diagnosis || '미연동' }}{{ relative(d.last) }}
{{ search||statusFilter!=='all' ? '조건에 맞는 장치가 없습니다' : '연결된 장치가 없습니다' }}
-
METAQLAB / 공유 PM 통합 관제 플랫폼CONTROL CENTER · v0.3
@@ -62,11 +59,12 @@