From 3f10e79964115107e750a2c7bbfc5247fdb7ff32 Mon Sep 17 00:00:00 2001
From: Jay <csj123456>
Date: 星期二, 12 十一月 2024 10:58:11 +0800
Subject: [PATCH] 计划数据导出功能问题解决，新增查询loading功能
---
src/views/data/point/DaPointChart.vue | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/views/data/point/DaPointChart.vue b/src/views/data/point/DaPointChart.vue
index 6b4d88f..19a6b23 100644
--- a/src/views/data/point/DaPointChart.vue
+++ b/src/views/data/point/DaPointChart.vue
@@ -24,8 +24,8 @@
<el-date-picker
size="mini"
v-model="dataForm.endTime"
- format="YYYY-MM-DD HH:mm:ss"
- value-format="YYYY-MM-DD HH:mm:ss"
+ format="YYYY-MM-DD HH:mm:00"
+ value-format="YYYY-MM-DD HH:mm:00"
type="datetime"
:clearable="false"
placeholder="选择日期时间"/>
@@ -45,7 +45,7 @@
</el-button>
</el-form-item>
</el-form>
- <div ref="chartDom" class="result-chart"></div>
+ <div ref="chartDom" class="result-chart" v-loading="loading"></div>
</el-dialog>
</template>
@@ -53,7 +53,7 @@
import {ref} from 'vue';
import * as echarts from 'echarts';
import * as DaPoint from '@/api/data/da/point/daPointChart'
- import {getYMDHMS} from "@/utils/dateUtil"
+ import {getYMDHM0} from "@/utils/dateUtil"
import download from "@/utils/download";
const message = useMessage() // 消息弹窗
const visible = ref(false);
@@ -69,10 +69,10 @@
pointNo: "",
pointName: "",
pointTypeName: "",
- startTime: getYMDHMS(new Date() - 60 * 60 * 1000),
+ startTime: getYMDHM0(new Date() - 60 * 60 * 1000),
endTime: "",
});
-
+ const loading = ref(true) // 列表的加载中
/** 打开弹窗 */
const open = async (row: object) => {
visible.value = true
@@ -86,12 +86,14 @@
async function getDataList() {
visible.value = true;
+ loading.value = true
if (dataForm.value.id) {
try {
chartParams.codes=[dataForm.value.pointNo];
chartParams.startDate = dataForm.value.startTime;
chartParams.endDate = dataForm.value.endTime;
const data = await DaPoint.getPointDaChart(chartParams)
+ loading.value = false
let seriesData = []
data.series.forEach(item => {
seriesData.push({
--
Gitblit v1.9.3