From fb1980d73a6dfd8356c83a4360fe7fe1be88e97c Mon Sep 17 00:00:00 2001 From: fks-yangshouda Date: Tue, 9 Jul 2024 10:10:17 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=AE=BE=E5=A4=87=E7=9B=91=E6=8E=A7=20?= =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E4=B8=8B=E8=BD=BD=20=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=94=B9=E4=B8=BA=E4=B8=89=E5=A4=A9=202.?= =?UTF-8?q?=E8=83=BD=E8=80=97=E7=9B=91=E6=8E=A7=20-=20=E5=9B=BE=E8=A1=A8?= =?UTF-8?q?=E5=89=8D=E5=8F=B0=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hx-ai-intelligent/src/icon/huanjingjiance.svg | 2 +- hx-ai-intelligent/src/icon/jiankongzhongxin.svg | 2 +- hx-ai-intelligent/src/icon/xiazai.svg | 1 + hx-ai-intelligent/src/router/monitor.ts | 19 + .../src/view/monitor/deviceMonitor/graph/index.vue | 377 ++++++++++--------- .../src/view/monitor/deviceMonitor/index.vue | 96 ++--- .../src/view/monitor/deviceMonitor/tree/index.vue | 399 +++++++++++---------- .../monitor/energyMonitor/graphGraph/index.vue | 206 +++++++++++ .../src/view/monitor/energyMonitor/index.vue | 88 +++++ .../src/view/monitor/energyMonitor/table/index.vue | 166 +++++++++ .../src/view/monitor/energyMonitor/tree/index.vue | 330 +++++++++++++++++ 11 files changed, 1264 insertions(+), 422 deletions(-) create mode 100644 hx-ai-intelligent/src/icon/xiazai.svg create mode 100644 hx-ai-intelligent/src/view/monitor/energyMonitor/graphGraph/index.vue create mode 100644 hx-ai-intelligent/src/view/monitor/energyMonitor/index.vue create mode 100644 hx-ai-intelligent/src/view/monitor/energyMonitor/table/index.vue create mode 100644 hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue diff --git a/hx-ai-intelligent/src/icon/huanjingjiance.svg b/hx-ai-intelligent/src/icon/huanjingjiance.svg index 503b264..622b99b 100644 --- a/hx-ai-intelligent/src/icon/huanjingjiance.svg +++ b/hx-ai-intelligent/src/icon/huanjingjiance.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/hx-ai-intelligent/src/icon/jiankongzhongxin.svg b/hx-ai-intelligent/src/icon/jiankongzhongxin.svg index b9cb5fa..83d7a07 100644 --- a/hx-ai-intelligent/src/icon/jiankongzhongxin.svg +++ b/hx-ai-intelligent/src/icon/jiankongzhongxin.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/hx-ai-intelligent/src/icon/xiazai.svg b/hx-ai-intelligent/src/icon/xiazai.svg new file mode 100644 index 0000000..dca8632 --- /dev/null +++ b/hx-ai-intelligent/src/icon/xiazai.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/hx-ai-intelligent/src/router/monitor.ts b/hx-ai-intelligent/src/router/monitor.ts index 79d2806..65d21c1 100644 --- a/hx-ai-intelligent/src/router/monitor.ts +++ b/hx-ai-intelligent/src/router/monitor.ts @@ -43,6 +43,25 @@ const equipment = { }, ], }, + { + path: 'energyMonitor', + name: 'EnergyMonitor', + meta: { title: '能耗监测', hideChildren: true, icon: 'huanjingjiance' }, + component: Base, + redirect: { name: 'EnergyMonitorIndex' }, + children: [ + { + path: 'index', + name: 'EnergyMonitorIndex', + component: () => import('/@/view/monitor/energyMonitor/index.vue'), + meta: { + title: '能耗监测', + keepAlive: true, + // backApi: [], + }, + }, + ], + }, // { // path: 'group', // name: 'Group', diff --git a/hx-ai-intelligent/src/view/monitor/deviceMonitor/graph/index.vue b/hx-ai-intelligent/src/view/monitor/deviceMonitor/graph/index.vue index f2562fe..9e7a29d 100644 --- a/hx-ai-intelligent/src/view/monitor/deviceMonitor/graph/index.vue +++ b/hx-ai-intelligent/src/view/monitor/deviceMonitor/graph/index.vue @@ -1,210 +1,199 @@ - - + diff --git a/hx-ai-intelligent/src/view/monitor/deviceMonitor/index.vue b/hx-ai-intelligent/src/view/monitor/deviceMonitor/index.vue index b3a735b..d5ab9d1 100644 --- a/hx-ai-intelligent/src/view/monitor/deviceMonitor/index.vue +++ b/hx-ai-intelligent/src/view/monitor/deviceMonitor/index.vue @@ -1,76 +1,80 @@ diff --git a/hx-ai-intelligent/src/view/monitor/deviceMonitor/tree/index.vue b/hx-ai-intelligent/src/view/monitor/deviceMonitor/tree/index.vue index a5b4740..d4badb6 100644 --- a/hx-ai-intelligent/src/view/monitor/deviceMonitor/tree/index.vue +++ b/hx-ai-intelligent/src/view/monitor/deviceMonitor/tree/index.vue @@ -1,3 +1,4 @@ +