From fc70a46bf84cda4fbe53332f4abd84cf1227fe95 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期二, 11 十一月 2025 10:14:25 +0800
Subject: [PATCH] 新增气象极值
---
src/views/monitorData/gasData/index.vue | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/views/monitorData/gasData/index.vue b/src/views/monitorData/gasData/index.vue
index 2495ad5..de0ccc5 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="采集时间"/>
@@ -131,7 +132,7 @@
}
});
const fields = ref({
- 'time':'dataReceivingTime',
+ 'time':'time',
'设备ID':'equipmentId',
'位置':'position',
'经度':'lng',
@@ -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,13 +211,14 @@
}
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;
})
if(resChart.data.data && resChart.data.data.length > 0){
const gasNewValue = resChart.data.data[0].gasCategoryConfigurationRespDTO
- if(resChart.data.data && gasNewValue && gasNewValue != null ){
+ if(resChart.data.data && gasNewValue && gasNewValue.id != null ){
resChart.data.data.forEach(item => {
item.gasValue = ((Number(item.gasValue) - Number(gasNewValue.concentration)) * Number(gasNewValue.multiplication)).toFixed(2)
})
@@ -255,7 +259,7 @@
state.tableData.data = res.data.data;
if(res.data.data && res.data.data.length > 0){
const gasNewValue = state.tableData.data[0].gasCategoryConfigurationRespDTO
- if(res.data.data && gasNewValue && gasNewValue != null ){
+ if(res.data.data && gasNewValue && gasNewValue.id != null ){
state.tableData.data.forEach(item => {
item.gasValue = ((Number(item.gasValue) - Number(gasNewValue.concentration)) * Number(gasNewValue.multiplication)).toFixed(2)
})
--
Gitblit v1.9.2