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/weatherData/index.vue | 162 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 131 insertions(+), 31 deletions(-)
diff --git a/src/views/monitorData/weatherData/index.vue b/src/views/monitorData/weatherData/index.vue
index eda444c..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,14 +39,11 @@
</el-button>
</el-form>
</div>
- <div id="gasChart" style="height: 500px;width: auto"></div>
- <el-table :data="state.tableData.data" style="width: 100%">
+ <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="采集时间"/>
- <el-table-column align="center" prop="windSpeed" label="风速"/>
- <el-table-column align="center" prop="windDirection" label="风向"/>
- <el-table-column align="center" prop="gasName" label="气体名称"/>
- <el-table-column align="center" prop="gasPPM" label="气体浓度"/>
+ <el-table-column align="center" prop="value" :label='weatherName' />
</el-table>
<br />
<el-pagination
@@ -67,13 +65,13 @@
</template>
<script setup lang="ts">
-import {reactive, ref,onMounted} from "vue";
+import {reactive, ref, onMounted, shallowRef} from "vue";
import * as echarts from "echarts";
import { ElMessage, ElMessageBox } from 'element-plus'
import {TableWeatherState} from "/@/types/monitorData";
import moment from "moment/moment";
+import {weatherDataApi } from "/@/api/monitorData/weatherData";
-const infoRef = ref();
const state = reactive<TableWeatherState>({
tableData: {
data: [],
@@ -84,38 +82,46 @@
pageSize: 10,
searchParams:{
time: [],
- weatherType: ''
+ weatherType: 'temp'
}
},
weatherTypeList: [
{
- label: '1',
+ label: 'temp',
value: '温度'
},
{
- label: '2',
+ label: 'humidity',
value: '湿度'
},
{
- label: '3',
+ label: 'windDirection',
value: '风向'
},
{
- label: '4',
+ label: 'windSpeed',
value: '风速'
},
{
- label: '5',
+ label: 'pressure',
value: '压力'
}
]
}
});
+const loading = ref(false);
+const picLoading = ref(false);
+const weatherName = ref('温度');
+const dataZoomEnd = ref();
+const xData = ref([]);
+const yData = ref([]);
+const myChart = shallowRef(null)
+const weatherChart = ref("eChartweatherN" + Date .now() + Math .random())
const chooseTime = (val: any) => {
console.log("val",val)
- let sTime = Date.parse(new Date(val[0].replace(/-/g, "/")));
- let eTime = Date.parse(new Date(val[1].replace(/-/g, "/")));
+ let sTime = Date.parse(new Date(val[0]));
+ let eTime = Date.parse(new Date(val[1]));
const datadiff = eTime - sTime + 86400000;
const time = 7 * 24 * 60 * 60 * 1000;
if (sTime > eTime) {
@@ -126,7 +132,7 @@
type: 'error',
message: '查询时间范围7天内',
})
- state.tableData.listQuery.searchParams.time = [];
+ getNowTime();
return false;
} else {
console.log('七天内数据')
@@ -137,8 +143,8 @@
onMounted(
() => {
getNowTime();
+ initInfoData();
initCharts();
- initInfoData()
}
);
const getNowTime = () => {
@@ -149,13 +155,70 @@
eTime = `${eTime} ` + moment().format('HH:mm:ss')
state.tableData.listQuery.searchParams.time = [sTime ,eTime];
}
-const initInfoData = () => {
- const param = {
+const initInfoData = async () => {
+ picLoading.value = true;
+ //折线图
+ const chartParam = {
startTime: moment(state.tableData.listQuery.searchParams.time[0]).format('YYYY-MM-DD HH:mm:ss'),
- endTime: moment(state.tableData.listQuery.searchParams.time[1]).format('YYYY-MM-DD HH:mm:ss')
+ endTime: moment(state.tableData.listQuery.searchParams.time[1]).format('YYYY-MM-DD HH:mm:ss'),
+ atmosphere: state.tableData.listQuery.searchParams.weatherType
}
- console.log("数据列表")
+ let resChart = await weatherDataApi().getWeatherLineChart(chartParam);
+ if(resChart.data.code == 100) {
+ if(resChart.data.data) {
+ xData.value = resChart.data.data.map((item: any) => {
+ return item.time;
+ })
+ yData.value = resChart.data.data.map((item: any) => {
+ return item.value;
+ })
+ dataZoomEnd.value = xData.value.length > 25 ? 5 : 100;
+ picLoading.value = false
+ }else {
+ xData.value = [];
+ yData.value = [];
+ dataZoomEnd.value = 100;
+ }
+
+ initCharts();
+ }else {
+ ElMessage({
+ type: 'warning',
+ message: resChart.data.msg
+ });
+ }
+
+ loading.value = true
+ //表格
+ const pageParam = {
+ pageIndex: state.tableData.listQuery.pageIndex,
+ pageSize: state.tableData.listQuery.pageSize,
+ searchParams: {
+ startTime: moment(state.tableData.listQuery.searchParams.time[0]).format('YYYY-MM-DD HH:mm:ss'),
+ endTime: moment(state.tableData.listQuery.searchParams.time[1]).format('YYYY-MM-DD HH:mm:ss'),
+ atmosphere: state.tableData.listQuery.searchParams.weatherType
+ }
+ }
+ let res = await weatherDataApi().getWeatherLinePage(pageParam);
+ if(res.data.code == 100) {
+ state.tableData.data = res.data.data;
+ state.tableData.total = res.data.total == null ? 0 :res.data.total;
+ state.tableData.listQuery.pageIndex = res.data.pageIndex;
+ state.tableData.listQuery.pageSize = res.data.pageSize;
+ loading.value = false;
+ }else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
+ }
};
+
+const changeWeather = (val: any) => {
+ console.log("vall",val)
+ let chooseObj = state.tableData.weatherTypeList.find(item => item.label === val);
+ weatherName.value = chooseObj.value;
+}
const onHandleSizeChange = (val: number) => {
state.tableData.listQuery.pageSize = val;
initInfoData();
@@ -167,18 +230,22 @@
};
const search = () => {
- console.log("vla",state.tableData.listQuery.searchParams)
initInfoData();
+ changeWeather(state.tableData.listQuery.searchParams.weatherType);
}
const reset = () => {
- state.tableData.listQuery.searchParams.time = [];
- state.tableData.listQuery.searchParams.weatherType = '';
+ getNowTime();
+ state.tableData.listQuery.searchParams.weatherType = state.tableData.weatherTypeList[0].label;
+ weatherName.value = "温度";
state.tableData.listQuery.pageIndex = 1;
initInfoData();
}
const initCharts = () => {
- const myChart = echarts.init(document.getElementById('gasChart'));
+ if (myChart.value != null && myChart.value != "" && myChart.value != undefined) {
+ myChart.value.dispose();
+ }
+ myChart.value = echarts.init(document.getElementById(weatherChart.value));
// 指定图表的配置项和数据
const option = {
tooltip: {
@@ -190,21 +257,54 @@
xAxis: {
show: true,
type: 'category',
- data: ['10:18:26', '10:18:28', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
+ data: xData.value
},
yAxis: {
show: true,
type: 'value'
},
+ graphic: {
+ type: 'text', // 类型：文本
+ left: 'center',
+ top: 'middle',
+ silent: true, // 不响应事件
+ invisible: yData.value.length > 0, // 有数据就隐藏
+ style: {
+ fill: '#9d9d9d',
+ fontWeight: 'bold',
+ text: '暂无数据',
+ fontFamily: 'Microsoft YaHei',
+ fontSize: '25px'
+ }
+ },
series: [
{
- data: [150, 230, 224, 218, 135, 147, 260],
+ data: yData.value,
type: 'line',
}
+ ],
+ dataZoom: [
+ {
+ type: 'slider',
+ show: dataZoomEnd.value == 100 ? false : true,
+ realtime: true,
+ start: 0,
+ end: dataZoomEnd.value
+ },
+ {
+ type: 'inside',
+ realtime: true,
+ start: 0,
+ end: dataZoomEnd.value
+ },
]
};
// 使用刚指定的配置项和数据显示图表。
- myChart.setOption(option);
+ myChart.value.setOption(option,true);
+ //自适应宽度
+ window.addEventListener('resize', function () {
+ myChart.value.resize();
+ })
}
</script>
<style scoped lang="scss">
@@ -226,4 +326,4 @@
box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.2);
padding: 3px
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.9.2