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 @@ +