From 337905dff2d88f6473e826c88cd16ba5f212f6ce Mon Sep 17 00:00:00 2001
From: zhouwenxuan <1175765986@qq.com>
Date: 星期三, 06 九月 2023 16:02:50 +0800
Subject: [PATCH] 实时监测数据
---
src/api/monitorData/gasData/index.ts | 25 ++
src/views/monitorData/gasData/index.vue | 119 +++++++++----
src/views/monitorData/fluxData/index.vue | 192 ++++++++++++++------
src/types/monitorData.d.ts | 10
src/views/monitorData/weatherData/index.vue | 119 ++++++++++--
src/api/monitorData/weatherData/index.ts | 25 ++
src/api/monitorData/fluxData/index.ts | 25 ++
7 files changed, 388 insertions(+), 127 deletions(-)
diff --git a/src/api/monitorData/fluxData/index.ts b/src/api/monitorData/fluxData/index.ts
new file mode 100644
index 0000000..6dfee1d
--- /dev/null
+++ b/src/api/monitorData/fluxData/index.ts
@@ -0,0 +1,25 @@
+import request from '/@/utils/request';
+
+export function fluxDataApi() {
+ return {
+
+ //通量监测数据-折线图
+ getFluxLineChart: (data: object) => {
+ return request({
+ url: import.meta.env.VITE_API_URL + `/gasMonitorData/gasFlux/lineChart`,
+ method: 'post',
+ data: data
+ });
+ },
+
+ //通量监测数据-分页
+ getFluxLinePage: (data: object) => {
+ return request({
+ url: import.meta.env.VITE_API_URL + `/gasMonitorData/gasFlux/page`,
+ method: 'post',
+ data: data
+ });
+ },
+
+ };
+}
diff --git a/src/api/monitorData/gasData/index.ts b/src/api/monitorData/gasData/index.ts
new file mode 100644
index 0000000..40d5468
--- /dev/null
+++ b/src/api/monitorData/gasData/index.ts
@@ -0,0 +1,25 @@
+import request from '/@/utils/request';
+
+export function gasDataApi() {
+ return {
+
+ //气体监测数据-折线图
+ getGasLineChart: (data: object) => {
+ return request({
+ url: import.meta.env.VITE_API_URL + `/gasMonitorData/gas/lineChart`,
+ method: 'post',
+ data: data
+ });
+ },
+
+ //气体监测数据-分页
+ getGasLinePage: (data: object) => {
+ return request({
+ url: import.meta.env.VITE_API_URL + `/gasMonitorData/gas/page`,
+ method: 'post',
+ data: data
+ });
+ },
+
+ };
+}
diff --git a/src/api/monitorData/weatherData/index.ts b/src/api/monitorData/weatherData/index.ts
new file mode 100644
index 0000000..fd2dbe1
--- /dev/null
+++ b/src/api/monitorData/weatherData/index.ts
@@ -0,0 +1,25 @@
+import request from '/@/utils/request';
+
+export function weatherDataApi() {
+ return {
+
+ //气象监测数据-折线图
+ getWeatherLineChart: (data: object) => {
+ return request({
+ url: import.meta.env.VITE_API_URL + `/gasMonitorData/gasAtmosphere/lineChart`,
+ method: 'post',
+ data: data
+ });
+ },
+
+ //气象监测数据-分页
+ getWeatherLinePage: (data: object) => {
+ return request({
+ url: import.meta.env.VITE_API_URL + `/gasMonitorData/gasAtmosphere/page`,
+ method: 'post',
+ data: data
+ });
+ },
+
+ };
+}
diff --git a/src/types/monitorData.d.ts b/src/types/monitorData.d.ts
index a0219f5..aef6fa0 100644
--- a/src/types/monitorData.d.ts
+++ b/src/types/monitorData.d.ts
@@ -23,8 +23,8 @@
time: string;
windSpeed: string;
windDirection: string;
- gasName: string;
- gasPPM: string;
+ name: string;
+ gasValue: string;
}
export interface TableGasState {
tableData: {
@@ -48,11 +48,11 @@
export interface TableFluxRow {
id: string;
time: string;
- area: string;
+ regionName: string;
windSpeed: string;
windDirection: string;
- gasName: string;
- gasPPM: string;
+ name: string;
+ gasValue: string;
}
export interface TableFluxState {
tableData: {
diff --git a/src/views/monitorData/fluxData/index.vue b/src/views/monitorData/fluxData/index.vue
index f36da95..d50c5d2 100644
--- a/src/views/monitorData/fluxData/index.vue
+++ b/src/views/monitorData/fluxData/index.vue
@@ -52,11 +52,11 @@
<el-table :data="state.tableData.data" style="width: 100%">
<el-table-column type="index" label="序号" width="80" />
<el-table-column align="center" prop="time" label="采集时间"/>
- <el-table-column align="center" prop="area" label="区域名称"/>
+ <el-table-column align="center" prop="regionName" 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="name" label="气体名称"/>
+ <el-table-column align="center" prop="gasValue" label="气体浓度"/>
</el-table>
<br />
<el-pagination
@@ -84,7 +84,8 @@
import {TableFluxState} from "/@/types/monitorData";
import moment from "moment/moment";
import { gasManageApi } from "/@/api/basicDataManage/gasManage";
-import {areaManageApi} from "/@/api/basicDataManage/areaManage";
+import { areaManageApi } from "/@/api/basicDataManage/areaManage";
+import { fluxDataApi } from "/@/api/monitorData/fluxData";
const state = reactive<TableFluxState>({
tableData: {
@@ -107,8 +108,8 @@
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]));
console.log(sTime, eTime)
// 2.时间戳间隔 再加上一天
const datadiff = eTime - sTime + 86400000;
@@ -123,7 +124,7 @@
type: 'error',
message: '查询时间范围7天内',
})
- state.tableData.listQuery.searchParams.time = [];
+ getNowTime();
return false;
} else {
console.log('七天内数据')
@@ -136,8 +137,6 @@
getNowTime();
getArea();
getAllGas();
- initCharts();
-
}
);
@@ -145,17 +144,111 @@
let isDate = new Date()
let sTime = `${isDate.getFullYear()}-${isDate.getMonth() + 1}-${isDate.getDate()}`
let eTime = `${isDate.getFullYear()}-${isDate.getMonth() + 1}-${isDate.getDate()}`
- sTime = `${sTime} 00:00:30`
+ sTime = `${sTime} 00:00:00`
eTime = `${eTime} ` + moment().format('HH:mm:ss')
state.tableData.listQuery.searchParams.time = [sTime ,eTime];
}
-const initInfoData = () => {
- const param = {
+
+const dataZoomEnd = ref();
+const xData = ref([] as any);
+const yData = ref([]);
+const areaChart = ref([]as any);
+const initInfoData = async () => {
+ //折线图
+ 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'),
+ gasName: state.tableData.listQuery.searchParams.gas,
+ areaId: state.tableData.listQuery.searchParams.area
}
- console.log("数据列表")
+ let resChart = await fluxDataApi().getFluxLineChart(chartParam);
+ if(resChart.data.code == 100) {
+ yData.value = mapArray(resChart.data.data);
+ areaChart.value = yData.value.map((item: any) => {
+ return item.name
+ });
+ dataZoomEnd.value = xData.value.length > 25 ? 2 : 100;
+ initCharts();
+ }else {
+ ElMessage({
+ type: 'warning',
+ message: resChart.data.msg
+ });
+ }
+
+ //表格
+ 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'),
+ gasName: state.tableData.listQuery.searchParams.gas,
+ areaId: state.tableData.listQuery.searchParams.area
+ }
+ }
+ let res = await fluxDataApi().getFluxLinePage(pageParam);
+ if(res.data.code == 100) {
+ state.tableData.data = res.data.data;
+ state.tableData.total = res.data.total;
+ state.tableData.listQuery.pageIndex = res.data.pageIndex;
+ state.tableData.listQuery.pageSize = res.data.pageSize;
+ }else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
+ }
};
+
+const labelOption = {
+ rotate: 90,
+ align: 'left',
+ verticalAlign: 'middle',
+ position: 'insideBottom',
+ distance: 15,
+};
+const mapArray = (target: any) => {
+ let obj = {}as any;
+ let result = [];
+ let finalResult = []as any;
+ target.map((item: any) => {
+ let key = item.regionName;
+ //如果有这个key，就push一个对象
+ if (obj[key]) {
+ obj[key].push(item);
+ } else {
+ obj[key] = [item];
+ }
+ });
+ //根据obj中有几个对象，挨个push进去，组成最后的数组
+ for (const key in obj) {
+ const element = obj[key];
+ result.push(element);
+ }
+ xData.value = result[0].map((item:any) => {
+ return item.time;
+ })
+ result.forEach(item => {
+ let obj = {
+ name: '',
+ data: [],
+ type: 'bar',
+ label: labelOption,
+ emphasis:{
+ focus: 'series'
+ }
+ };
+ const data = item.map((i:any) => {
+ return i.gasValue
+ });
+ obj.name = item[0].regionName;
+ obj.data = data;
+ finalResult.push(obj);
+ })
+ return finalResult;
+}
+
const getArea = async () => {
const param = {
@@ -168,6 +261,7 @@
let res = await areaManageApi().getAreaPage(param);
if(res.data.code == 100) {
state.tableData.areaList = res.data.data;
+ // state.tableData.listQuery.searchParams.area = res.data.data[0].id;
}else {
ElMessage({
type: 'warning',
@@ -179,6 +273,8 @@
let res = await gasManageApi().getGas({});
if(res.data.code == 100) {
state.tableData.gasList = res.data.data;
+ state.tableData.listQuery.searchParams.gas = res.data.data[0].id;
+ await initInfoData();
}else{
ElMessage({
type: 'warning',
@@ -201,20 +297,14 @@
console.log("22",state.tableData.listQuery.searchParams)
}
const reset = () => {
- state.tableData.listQuery.searchParams.time = [];
+ getNowTime();
state.tableData.listQuery.searchParams.area = '';
- state.tableData.listQuery.searchParams.gas = '';
+ state.tableData.listQuery.searchParams.gas = state.tableData.gasList[0].id;
state.tableData.listQuery.pageIndex = 1;
initInfoData();
}
-const labelOption = {
- rotate: 90,
- align: 'left',
- verticalAlign: 'middle',
- position: 'insideBottom',
- distance: 15,
-};
+
const initCharts = () => {
const myChart = echarts.init(document.getElementById('gasChart'));
// 指定图表的配置项和数据
@@ -226,7 +316,7 @@
}
},
legend: {
- data: ['区域1', '区域2', '区域3', '区域4']
+ data: areaChart.value
},
toolbox: {
show: true,
@@ -245,7 +335,7 @@
{
type: 'category',
axisTick: { show: false },
- data: ['2012', '2013', '2014', '2015', '2016']
+ data: xData.value
}
],
yAxis: [
@@ -253,48 +343,30 @@
type: 'value'
}
],
- series: [
+ series: yData.value,
+
+ dataZoom: [
{
- name: '区域1',
- type: 'bar',
- barGap: 0,
- label: labelOption,
- emphasis: {
- focus: 'series'
- },
- data: [320, 332, 301, 334, 390]
+ type: 'slider',
+ show: dataZoomEnd.value == 100 ? false : true,
+ realtime: true,
+ start: 0,
+ end: dataZoomEnd.value
},
{
- name: '区域2',
- type: 'bar',
- label: labelOption,
- emphasis: {
- focus: 'series'
- },
- data: [220, 182, 191, 234, 290]
+ type: 'inside',
+ realtime: true,
+ start: 0,
+ end: dataZoomEnd.value
},
- {
- name: '区域3',
- type: 'bar',
- label: labelOption,
- emphasis: {
- focus: 'series'
- },
- data: [150, 232, 201, 154, 190]
- },
- {
- name: '区域4',
- type: 'bar',
- label: labelOption,
- emphasis: {
- focus: 'series'
- },
- data: [98, 77, 101, 99, 40]
- }
]
};
// 使用刚指定的配置项和数据显示图表。
- myChart.setOption(option);
+ myChart.setOption(option,true);
+ //自适应宽度
+ window.addEventListener('resize', function () {
+ myChart.resize();
+ })
}
</script>
<style scoped lang="scss">
diff --git a/src/views/monitorData/gasData/index.vue b/src/views/monitorData/gasData/index.vue
index c1804a3..dd84cc0 100644
--- a/src/views/monitorData/gasData/index.vue
+++ b/src/views/monitorData/gasData/index.vue
@@ -39,13 +39,13 @@
</el-form>
</div>
<div id="gasChart" style="height: 500px;width: auto"></div>
- <el-table :data="state.tableData.data" style="width: 100%">
+ <el-table :data="state.tableData.data" style="width: 100%;margin-top: 20px">
<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="name" label="气体名称"/>
+ <el-table-column align="center" prop="gasValue" label="气体浓度"/>
</el-table>
<br />
<el-pagination
@@ -73,6 +73,7 @@
import {TableGasState} from "/@/types/monitorData";
import { gasManageApi } from "/@/api/basicDataManage/gasManage";
import moment from "moment";
+import {gasDataApi} from "/@/api/monitorData/gasData";
const state = reactive<TableGasState>({
tableData: {
@@ -94,7 +95,6 @@
});
const chooseTime = (val: any) => {
- console.log("val",val)
let sTime = Date.parse(new Date(val[0]));
let eTime = Date.parse(new Date(val[1]));
const datadiff = eTime - sTime + 86400000;
@@ -107,22 +107,19 @@
type: 'error',
message: '查询时间范围7天内',
})
- state.tableData.listQuery.searchParams.time = [];
+ getNowTime();
return false;
- } else {
}
}
}
const dataZoomEnd = ref();
-const xData = ref(['10:18:26', '10:18:56', '10:19:24', '10:19:54', '10:20:26', '10:20:56', '10:21:24']);
-
+const xData = ref([]);
+const yData = ref([]);
+const markLines = ref(0);
onMounted(
() => {
getNowTime();
getAllGas();
- dataZoomEnd.value = xData.value.length > 25 ? 30 : 100; //x轴数量大于25，滑动框显示前30%标签，否则显示100%
- console.log("dataZoomEnd",dataZoomEnd.value)
- initCharts();
}
);
const getNowTime = () => {
@@ -133,18 +130,61 @@
eTime = `${eTime} ` + moment().format('HH:mm:ss')
state.tableData.listQuery.searchParams.time = [sTime,eTime];
}
-const initInfoData = () => {
- const param = {
+const initInfoData = async () => {
+ //折线图
+ 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'),
+ gasName: state.tableData.listQuery.searchParams.gas
}
- console.log("数据列表",param)
+ let resChart = await gasDataApi().getGasLineChart(chartParam);
+ if(resChart.data.code == 100) {
+ xData.value = resChart.data.data.map((item: any) => {
+ return item.time;
+ })
+ yData.value = resChart.data.data.map((item: any) => {
+ return item.gasValue;
+ })
+ dataZoomEnd.value = xData.value.length > 25 ? 30 : 100;
+ markLines.value = 110;
+ initCharts();
+ }else {
+ ElMessage({
+ type: 'warning',
+ message: resChart.data.msg
+ });
+ }
+
+ //表格
+ 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'),
+ gasName: state.tableData.listQuery.searchParams.gas
+ }
+ }
+ let res = await gasDataApi().getGasLinePage(pageParam);
+ if(res.data.code == 100) {
+ state.tableData.data = res.data.data;
+ state.tableData.total = res.data.total;
+ state.tableData.listQuery.pageIndex = res.data.pageIndex;
+ state.tableData.listQuery.pageSize = res.data.pageSize;
+ }else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
+ }
};
const getAllGas = async () => {
let res = await gasManageApi().getGas({});
if(res.data.code == 100) {
state.tableData.gasList = res.data.data;
+ state.tableData.listQuery.searchParams.gas = state.tableData.gasList[0].id;
+ initInfoData();
}else {
ElMessage({
type: 'warning',
@@ -167,13 +207,11 @@
console.log("vla",state.tableData.listQuery.searchParams)
}
const reset = () => {
- state.tableData.listQuery.searchParams.time = [];
- state.tableData.listQuery.searchParams.gas = '';
+ getNowTime();
+ state.tableData.listQuery.searchParams.gas = state.tableData.gasList[0].id;
state.tableData.listQuery.pageIndex = 1;
initInfoData();
}
-
-
const initCharts = () => {
const myChart = echarts.init(document.getElementById('gasChart'));
@@ -188,19 +226,17 @@
xAxis: {
show: true,
type: 'category',
- // axisLabel: {
- // interval: 0,
- // rotate: 45
- // },
data: xData.value
},
yAxis: {
show: true,
- type: 'value'
+ type: 'value',
+ max: Math.max(markLines.value,...yData.value),
+ min: Math.min(markLines.value,...yData.value)
},
series: [
{
- data: [150, 230, 224, 218, 135, 147, 260],
+ data: yData.value,
type: 'line',
markLine: {//图表标线
symbol: "none",
@@ -209,29 +245,38 @@
position: 'end', // 表现内容展示的位置
color: 'red' // 展示内容颜色
},
- yAxis: '200',
+ yAxis: markLines.value,
lineStyle: {
color: "red",
width: 1, // 0 的时候可以隐藏线
type: "solid" // 实线，不写默认虚线
}
},],//type: 'average', 平均值, min最小值, max 最大值, median中位数
-
},
}
],
- // dataZoom: [
- // {
- // type: 'slider',
- // show: dataZoomEnd.value == 100 ? false : true,
- // realtime: true,
- // start: 0,
- // end: dataZoomEnd.value
- // },
- // ]
+ 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.setOption(option,true);
+ //自适应宽度
+ window.addEventListener('resize', function () {
+ myChart.resize();
+ })
}
</script>
<style scoped lang="scss">
diff --git a/src/views/monitorData/weatherData/index.vue b/src/views/monitorData/weatherData/index.vue
index eda444c..4a90727 100644
--- a/src/views/monitorData/weatherData/index.vue
+++ b/src/views/monitorData/weatherData/index.vue
@@ -39,13 +39,10 @@
</el-form>
</div>
<div id="gasChart" style="height: 500px;width: auto"></div>
- <el-table :data="state.tableData.data" style="width: 100%">
+ <el-table :data="state.tableData.data" style="width: 100%;margin-top: 20px">
<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
@@ -72,8 +69,8 @@
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 +81,42 @@
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 weatherName = ref('温度');
+const dataZoomEnd = ref();
+const xData = ref([]);
+const yData = ref([]);
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 +127,7 @@
type: 'error',
message: '查询时间范围7天内',
})
- state.tableData.listQuery.searchParams.time = [];
+ getNowTime();
return false;
} else {
console.log('七天内数据')
@@ -137,8 +138,9 @@
onMounted(
() => {
getNowTime();
+ initInfoData();
initCharts();
- initInfoData()
+
}
);
const getNowTime = () => {
@@ -149,13 +151,59 @@
eTime = `${eTime} ` + moment().format('HH:mm:ss')
state.tableData.listQuery.searchParams.time = [sTime ,eTime];
}
-const initInfoData = () => {
- const param = {
+const initInfoData = async () => {
+ //折线图
+ 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) {
+ 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;
+ initCharts();
+ }else {
+ ElMessage({
+ type: 'warning',
+ message: resChart.data.msg
+ });
+ }
+
+ //表格
+ 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;
+ state.tableData.listQuery.pageIndex = res.data.pageIndex;
+ state.tableData.listQuery.pageSize = res.data.pageSize;
+ }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();
@@ -168,11 +216,13 @@
const search = () => {
console.log("vla",state.tableData.listQuery.searchParams)
+ changeWeather(state.tableData.listQuery.searchParams.weatherType);
initInfoData();
}
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();
}
@@ -190,7 +240,7 @@
xAxis: {
show: true,
type: 'category',
- data: ['10:18:26', '10:18:28', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
+ data: xData.value
},
yAxis: {
show: true,
@@ -198,13 +248,32 @@
},
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.setOption(option,true);
+ //自适应宽度
+ window.addEventListener('resize', function () {
+ myChart.resize();
+ })
}
</script>
<style scoped lang="scss">
--
Gitblit v1.9.2