From bdd99a4f6edb84d8eebe6afc38c2c2f86fb4a52c Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期一, 16 六月 2025 14:13:57 +0800
Subject: [PATCH] 修改查询条件
---
src/views/monitorData/gasData/index.vue | 8 ++++++--
src/views/monitorData/fluxData/index.vue | 8 ++++++--
src/views/monitorData/weatherData/index.vue | 10 +++++++---
3 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/src/views/monitorData/fluxData/index.vue b/src/views/monitorData/fluxData/index.vue
index 97ef4ff..973c8d9 100644
--- a/src/views/monitorData/fluxData/index.vue
+++ b/src/views/monitorData/fluxData/index.vue
@@ -11,8 +11,9 @@
range-separator="~"
start-placeholder="开始时间"
end-placeholder="结束时间"
- @change = "chooseTime"
+
/>
+<!-- @change = "chooseTime"-->
</el-form-item>
<el-form-item label="区域：">
<el-select
@@ -56,7 +57,7 @@
</vue3-json-excel>
</el-form>
</div>
- <div :id="fluxChart" style="height: 500px;width: auto"></div>
+ <div :id="fluxChart" style="height: 500px;width: auto" v-loading="picLoading"></div>
<el-table :data="state.tableData.data" style="width: 100%" v-loading="loading">
<el-table-column type="index" label="序号" width="80" />
<el-table-column align="center" prop="time" label="采集时间"/>
@@ -139,6 +140,7 @@
});
const loading = ref(false);
+const picLoading = ref(false);
const myChart = shallowRef(null)
const fluxChart =ref("eChartfluxN" + Date .now() + Math .random())
const chooseTime = (val:any) => {
@@ -190,6 +192,7 @@
const areaChart = ref([]as any);
const initInfoData = async () => {
await exportFluxData()
+ picLoading.value = true;
//柱状图
const chartParam = {
startTime: moment(state.tableData.listQuery.searchParams.time[0]).format('YYYY-MM-DD HH:mm:ss'),
@@ -199,6 +202,7 @@
}
let resChart = await fluxDataApi().getFluxLineChart(chartParam);
if(resChart.data.code == 100) {
+ picLoading.value = false;
if(resChart.data.data) {
// yData.value = mapArray(resChart.data.data);
const gasTime = resChart.data.data.map(i=>i.time?.slice(11))
diff --git a/src/views/monitorData/gasData/index.vue b/src/views/monitorData/gasData/index.vue
index eae143f..98f3874 100644
--- a/src/views/monitorData/gasData/index.vue
+++ b/src/views/monitorData/gasData/index.vue
@@ -11,8 +11,9 @@
range-separator="~"
start-placeholder="开始时间"
end-placeholder="结束时间"
- @change = "chooseTime"
+
/>
+ <!-- @change = "chooseTime"-->
</el-form-item>
<el-form-item label="气体：">
<el-select
@@ -57,7 +58,7 @@
</vue3-json-excel>
</el-form>
</div>
- <div :id="gasChart" style="height: 500px;width: auto"></div>
+ <div :id="gasChart" style="height: 500px;width: auto" v-loading="picLoading"></div>
<el-table :data="state.tableData.data" style="width: 100%;margin-top: 20px" v-loading="loading">
<el-table-column type="index" label="序号" width="80" />
<el-table-column align="center" prop="time" label="采集时间"/>
@@ -178,6 +179,7 @@
}
}
const loading = ref(false);
+const picLoading = ref(false);
const dataZoomEnd = ref();
const xData = ref([]);
const yData = ref([]);
@@ -199,6 +201,7 @@
}
const initInfoData = async () => {
await exportGasData();
+ picLoading.value = true;
//折线图
const chartParam = {
startTime: moment(state.tableData.listQuery.searchParams.time[0]).format('YYYY-MM-DD HH:mm:ss'),
@@ -208,6 +211,7 @@
}
let resChart = await gasDataApi().getGasLineChart(chartParam);
if(resChart.data.code == 100) {
+ picLoading.value = false;
if (resChart.data.data) {
xData.value = resChart.data.data.map((item: any) => {
return item.time;
diff --git a/src/views/monitorData/weatherData/index.vue b/src/views/monitorData/weatherData/index.vue
index 50f988b..ca25d9f 100644
--- a/src/views/monitorData/weatherData/index.vue
+++ b/src/views/monitorData/weatherData/index.vue
@@ -11,8 +11,9 @@
range-separator="~"
start-placeholder="开始时间"
end-placeholder="结束时间"
- @change = "chooseTime"
+
/>
+<!-- @change = "chooseTime"-->
</el-form-item>
<el-form-item label="气象类型：">
<el-select
@@ -38,7 +39,7 @@
</el-button>
</el-form>
</div>
- <div :id="weatherChart" style="height: 500px;width: auto"></div>
+ <div :id="weatherChart" style="height: 500px;width: auto" v-loading="picLoading"></div>
<el-table :data="state.tableData.data" style="width: 100%;margin-top: 20px" v-loading="loading">
<el-table-column type="index" label="序号" width="80" />
<el-table-column align="center" prop="time" label="采集时间"/>
@@ -109,6 +110,7 @@
}
});
const loading = ref(false);
+const picLoading = ref(false);
const weatherName = ref('温度');
const dataZoomEnd = ref();
const xData = ref([]);
@@ -154,6 +156,7 @@
state.tableData.listQuery.searchParams.time = [sTime ,eTime];
}
const initInfoData = async () => {
+ picLoading.value = true;
//折线图
const chartParam = {
startTime: moment(state.tableData.listQuery.searchParams.time[0]).format('YYYY-MM-DD HH:mm:ss'),
@@ -170,6 +173,7 @@
return item.value;
})
dataZoomEnd.value = xData.value.length > 25 ? 5 : 100;
+ picLoading.value = false
}else {
xData.value = [];
yData.value = [];
@@ -184,7 +188,7 @@
});
}
- loading.value = true;
+ loading.value = true
//表格
const pageParam = {
pageIndex: state.tableData.listQuery.pageIndex,
--
Gitblit v1.9.2