1.监控中心 - 环境监测 环境指数分析添加查询部分
2.修改 监控中心 - 能耗监测左侧树组件
This commit is contained in:
@@ -40,18 +40,22 @@
|
|||||||
<div class="fixed-bottom">
|
<div class="fixed-bottom">
|
||||||
<a-divider />
|
<a-divider />
|
||||||
<a-select
|
<a-select
|
||||||
v-model:value="frequencyValue"
|
v-model:value="dateTypeValue"
|
||||||
placeholder="请选择采集频率"
|
placeholder="请选择日期类型"
|
||||||
style="width: 100%; margin-bottom: 10px"
|
style="width: 100%; margin-bottom: 10px"
|
||||||
:options="options2" />
|
:options="options2" />
|
||||||
<a-range-picker
|
<a-date-picker
|
||||||
|
style="width: 100%; margin-bottom: 10px"
|
||||||
|
v-model:value="dateValue"
|
||||||
|
:picker="dateTypeValue" />
|
||||||
|
<!-- <a-range-picker
|
||||||
:value="hackValue || dateRange"
|
:value="hackValue || dateRange"
|
||||||
:disabled-date="disabledDate"
|
:disabled-date="disabledDate"
|
||||||
@change="onChange"
|
@change="onChange"
|
||||||
@openChange="onOpenChange"
|
@openChange="onOpenChange"
|
||||||
@calendarChange="onCalendarChange"
|
@calendarChange="onCalendarChange"
|
||||||
style="width: 100%; margin-bottom: 10px"
|
style="width: 100%; margin-bottom: 10px"
|
||||||
:placeholder="['请选择日期', '请选择日期']" />
|
:placeholder="['请选择日期', '请选择日期']" /> -->
|
||||||
<a-button type="primary" style="width: 100%; margin-bottom: 10px" @click="getSelect">
|
<a-button type="primary" style="width: 100%; margin-bottom: 10px" @click="getSelect">
|
||||||
查询
|
查询
|
||||||
</a-button>
|
</a-button>
|
||||||
@@ -89,15 +93,15 @@
|
|||||||
|
|
||||||
// 能耗类型list
|
// 能耗类型list
|
||||||
const options1 = ref<SelectProps['options']>([]);
|
const options1 = ref<SelectProps['options']>([]);
|
||||||
// 采集频率list
|
// 日期类型list
|
||||||
const options2 = ref<SelectProps['options']>([]);
|
const options2 = ref<SelectProps['options']>([]);
|
||||||
const mode = ref<String>('1');
|
const mode = ref<String>('1');
|
||||||
// 能耗类型
|
// 能耗类型
|
||||||
const selectedValue = ref<string | number | null | undefined>();
|
const selectedValue = ref<string | number | null | undefined>();
|
||||||
// 采集频率
|
// 日期类型
|
||||||
const frequencyValue = ref<string | undefined>();
|
const dateTypeValue = ref<string | undefined>();
|
||||||
// 时间
|
// 时间
|
||||||
const dateRange = ref<[Dayjs, Dayjs] | undefined>();
|
const dateValue = ref<[Dayjs, Dayjs] | undefined>();
|
||||||
|
|
||||||
// 页面初始化参数
|
// 页面初始化参数
|
||||||
const getOptionsList = async () => {
|
const getOptionsList = async () => {
|
||||||
@@ -115,20 +119,12 @@
|
|||||||
}
|
}
|
||||||
options2.value = [
|
options2.value = [
|
||||||
{
|
{
|
||||||
value: '1',
|
value: 'month',
|
||||||
label: '5分钟',
|
label: '月',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
value: '2',
|
value: 'year',
|
||||||
label: '10分钟',
|
label: '年',
|
||||||
},
|
|
||||||
{
|
|
||||||
value: '3',
|
|
||||||
label: '30分钟',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
value: '4',
|
|
||||||
label: '1小时',
|
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
@@ -691,9 +687,9 @@
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
const onChange = (val: RangeValue) => {
|
// const onChange = (val: RangeValue) => {
|
||||||
dateRange.value = val;
|
// dateRange.value = val;
|
||||||
};
|
// };
|
||||||
|
|
||||||
const onCalendarChange = (val: RangeValue) => {
|
const onCalendarChange = (val: RangeValue) => {
|
||||||
dates.value = val;
|
dates.value = val;
|
||||||
@@ -716,8 +712,8 @@
|
|||||||
options2,
|
options2,
|
||||||
mode,
|
mode,
|
||||||
selectedValue,
|
selectedValue,
|
||||||
frequencyValue,
|
dateTypeValue,
|
||||||
dateRange,
|
dateValue,
|
||||||
getOptionsList,
|
getOptionsList,
|
||||||
getSelect,
|
getSelect,
|
||||||
getSelect11,
|
getSelect11,
|
||||||
@@ -725,7 +721,7 @@
|
|||||||
disabledDate,
|
disabledDate,
|
||||||
onCalendarChange,
|
onCalendarChange,
|
||||||
onOpenChange,
|
onOpenChange,
|
||||||
onChange,
|
// onChange,
|
||||||
hackValue,
|
hackValue,
|
||||||
treeLoading,
|
treeLoading,
|
||||||
changeEnergyType,
|
changeEnergyType,
|
||||||
|
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user