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 9b858e9..a3c572f 100644 --- a/hx-ai-intelligent/src/view/monitor/deviceMonitor/tree/index.vue +++ b/hx-ai-intelligent/src/view/monitor/deviceMonitor/tree/index.vue @@ -11,18 +11,16 @@ :tree-data="treeData1" @change="changeDeviceType" /> - - - + + +
@@ -56,18 +54,18 @@ + + diff --git a/hx-ai-intelligent/src/view/monitor/energyMonitor/index.vue b/hx-ai-intelligent/src/view/monitor/energyMonitor/index.vue index aa1e1c8..705aa07 100644 --- a/hx-ai-intelligent/src/view/monitor/energyMonitor/index.vue +++ b/hx-ai-intelligent/src/view/monitor/energyMonitor/index.vue @@ -1,88 +1,19 @@ - - - diff --git a/hx-ai-intelligent/src/view/monitor/energyMonitor/page.vue b/hx-ai-intelligent/src/view/monitor/energyMonitor/page.vue new file mode 100644 index 0000000..d4aa62b --- /dev/null +++ b/hx-ai-intelligent/src/view/monitor/energyMonitor/page.vue @@ -0,0 +1,88 @@ + + + + + + diff --git a/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue b/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue index 15f1af3..ffb8614 100644 --- a/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue +++ b/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue @@ -4,38 +4,38 @@
数据点位
- - + :options="options1" + @change="changeEnergyType" /> - 设备 + 设备 节点 - - - + + + + +
@@ -52,193 +52,482 @@ @calendarChange="onCalendarChange" style="width: 100%; margin-bottom: 10px" :placeholder="['请选择日期', '请选择日期']" /> - 查询 + + 查询 + +