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 f6e8062..b599c83 100644 --- a/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue +++ b/hx-ai-intelligent/src/view/monitor/energyMonitor/tree/index.vue @@ -40,18 +40,22 @@
- + 查询 @@ -89,15 +93,15 @@ // 能耗类型list const options1 = ref([]); - // 采集频率list + // 日期类型list const options2 = ref([]); const mode = ref('1'); // 能耗类型 const selectedValue = ref(); - // 采集频率 - const frequencyValue = ref(); + // 日期类型 + const dateTypeValue = ref(); // 时间 - const dateRange = ref<[Dayjs, Dayjs] | undefined>(); + const dateValue = ref<[Dayjs, Dayjs] | undefined>(); // 页面初始化参数 const getOptionsList = async () => { @@ -115,20 +119,12 @@ } options2.value = [ { - value: '1', - label: '5分钟', - }, - { - value: '2', - label: '10分钟', + value: 'month', + label: '月', }, { - value: '3', - label: '30分钟', - }, - { - value: '4', - label: '1小时', + value: 'year', + label: '年', }, ]; }; @@ -691,9 +687,9 @@ } }; - const onChange = (val: RangeValue) => { - dateRange.value = val; - }; + // const onChange = (val: RangeValue) => { + // dateRange.value = val; + // }; const onCalendarChange = (val: RangeValue) => { dates.value = val; @@ -716,8 +712,8 @@ options2, mode, selectedValue, - frequencyValue, - dateRange, + dateTypeValue, + dateValue, getOptionsList, getSelect, getSelect11, @@ -725,7 +721,7 @@ disabledDate, onCalendarChange, onOpenChange, - onChange, + // onChange, hackValue, treeLoading, changeEnergyType, diff --git a/hx-ai-intelligent/src/view/monitor/environmentMonitor/aggregateData/index.vue b/hx-ai-intelligent/src/view/monitor/environmentMonitor/aggregateData/index.vue index 1536c37..1831fc5 100644 --- a/hx-ai-intelligent/src/view/monitor/environmentMonitor/aggregateData/index.vue +++ b/hx-ai-intelligent/src/view/monitor/environmentMonitor/aggregateData/index.vue @@ -1,3 +1,4 @@ +