fix: 页面字段/接口调整
This commit is contained in:
@@ -83,9 +83,9 @@ const ranges = ref([
|
||||
},
|
||||
]);
|
||||
//日期范围响应式变量
|
||||
const dateRange = ref<[string, string]>([
|
||||
dayjs().subtract(1, 'hour').startOf('hour').valueOf().toString(), // 上一小时开始
|
||||
dayjs().startOf('hour').add(1, 'hour').valueOf().toString(), // 当前小时结束
|
||||
const dateRange = ref<[Dayjs, Dayjs] | undefined>([
|
||||
dayjs().subtract(1, 'hour').startOf('hour'), // 上一小时开始
|
||||
dayjs().startOf('hour').add(1, 'hour'), // 当前小时结束
|
||||
]);
|
||||
//实时数据状态
|
||||
const isRealtime = ref(false);
|
||||
@@ -108,10 +108,7 @@ const handleDateChange = (
|
||||
return;
|
||||
}
|
||||
|
||||
dateRange.value = [
|
||||
dayjs(dateStrings[0]).valueOf().toString(),
|
||||
dayjs(dateStrings[1]).valueOf().toString(),
|
||||
];
|
||||
dateRange.value = [dayjs(dateStrings[0]), dayjs(dateStrings[1])];
|
||||
fetchChartData();
|
||||
};
|
||||
|
||||
@@ -226,8 +223,14 @@ const fetchChartData = async () => {
|
||||
tableLoading.value = true;
|
||||
rangeLoading.value = true;
|
||||
try {
|
||||
const [startTime, endTime] = dateRange.value;
|
||||
if (!startTime || !endTime) {
|
||||
let beginTime = 0;
|
||||
let endTime = 0;
|
||||
// 时间范围
|
||||
if (Array.isArray(dateRange.value) && dateRange.value.length > 0) {
|
||||
beginTime = dateRange.value[0].valueOf();
|
||||
endTime = dateRange.value[1].valueOf();
|
||||
}
|
||||
if (beginTime == 0 || endTime == 0) {
|
||||
console.warn('Invalid date range:', dateRange.value);
|
||||
return;
|
||||
}
|
||||
@@ -237,8 +240,8 @@ const fetchChartData = async () => {
|
||||
const params = {
|
||||
neType,
|
||||
neId: '001',
|
||||
startTime: String(startTime),
|
||||
endTime: String(endTime),
|
||||
beginTime: beginTime,
|
||||
endTime: endTime,
|
||||
sortField: 'timeGroup',
|
||||
sortOrder: 'asc',
|
||||
interval: 60 * 15,
|
||||
@@ -247,7 +250,7 @@ const fetchChartData = async () => {
|
||||
|
||||
try {
|
||||
const res = await listKPIData(params);
|
||||
if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) {
|
||||
if (res.code === RESULT_CODE_SUCCESS) {
|
||||
return res.data;
|
||||
}
|
||||
return [];
|
||||
@@ -651,8 +654,8 @@ const fetchSpecificKPI = async () => {
|
||||
for (const neType of ALL_NE_TYPES) {
|
||||
const res = await getKPITitle(neType.toUpperCase());
|
||||
|
||||
if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.data)) {
|
||||
const formattedKPIs = res.data.map(item => ({
|
||||
if (res.code === RESULT_CODE_SUCCESS) {
|
||||
const formattedKPIs = res.data.map((item: any) => ({
|
||||
title: item[`${language}Title`],
|
||||
dataIndex: item.kpiId,
|
||||
key: item.kpiId,
|
||||
|
||||
Reference in New Issue
Block a user