From 022a757742c70b3106d817461464e821b537e794 Mon Sep 17 00:00:00 2001
From: wujingjing <gersonwu@qq.com>
Date: 星期二, 05 十一月 2024 13:20:40 +0800
Subject: [PATCH] process loading bug；报告
---
src/components/chat/chatComponents/summaryCom/components/recordSet/RecordSetDialog.vue | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/components/chat/chatComponents/summaryCom/components/recordSet/RecordSetDialog.vue b/src/components/chat/chatComponents/summaryCom/components/recordSet/RecordSetDialog.vue
index 00b5148..17e3a83 100644
--- a/src/components/chat/chatComponents/summaryCom/components/recordSet/RecordSetDialog.vue
+++ b/src/components/chat/chatComponents/summaryCom/components/recordSet/RecordSetDialog.vue
@@ -1,7 +1,7 @@
<template>
<el-dialog :destroy-on-close="true" v-model="isShow" draggable :close-on-click-modal="false" :title="chartValues?.title">
<RecordSet chartHeight="30rem" ref="recordSetRef" :data="chartValues">
- <TimeRange class="flex-0 m-1" @change="timeRangeChange" />
+ <TimeRange ref="timeRangeRef" v-model="queryRange" class="flex-0 m-1" @change="timeRangeChange" />
<List class="flex-0 m-1" v-model="stepTime" :data="listData" @change="selectStepChange" />
</RecordSet>
</el-dialog>
@@ -24,6 +24,7 @@
});
const recordSetRef = useCompRef(RecordSet);
+const timeRangeRef = useCompRef(TimeRange);
const listData = {
list: [
@@ -40,31 +41,35 @@
const queryRange = ref<string[]>(null);
const timeRangeChange = (val) => {
- queryRange.value = val;
- setChartData(queryRange.value);
+ setChartData();
};
const selectStepChange = (val) => {
- setChartData(queryRange.value);
+ setChartData();
};
const stepTime = ref('5 minutes');
const chartValues = ref(null);
-const setChartData = async (timeRange: string[]) => {
+const setChartData = async () => {
const res = await queryScadaTimeValues({
// 璁惧绫诲瀷
ptype: props.otype,
// 璁惧鍚嶇О
pname: props.oname,
otype: props.indexName,
- start_time: timeRange[0],
- end_time: timeRange[1],
+ start_time: timeRangeRef.value.formatDateValue[0],
+ end_time: timeRangeRef.value.formatDateValue[1],
step_time: stepTime.value,
});
chartValues.value = res.values;
chartValues.value.chart = 'single_line';
nextTick(() => {
setTimeout(() => {
- recordSetRef.value.drawChart();
+ if(recordSetRef.value.isMultiCompare){
+ recordSetRef.value.handleData();
+ recordSetRef.value.handleMultiCompare();
+ }else{
+ recordSetRef.value.drawChart();
+ }
}, 0);
});
};
@@ -76,7 +81,10 @@
return;
}
queryRange.value = getRecentDateRange(1).map((item) => formatDate(item));
- setChartData(queryRange.value);
+ nextTick(()=>{
+ setChartData();
+
+ })
}
);
</script>
--
Gitblit v1.9.3