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/fluxData/index.vue | 439 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 325 insertions(+), 114 deletions(-)
diff --git a/src/views/monitorData/fluxData/index.vue b/src/views/monitorData/fluxData/index.vue
index 8eda26d..973c8d9 100644
--- a/src/views/monitorData/fluxData/index.vue
+++ b/src/views/monitorData/fluxData/index.vue
@@ -8,12 +8,12 @@
v-model="state.tableData.listQuery.searchParams.time"
type="datetimerange"
format="YYYY-MM-DD HH:mm:ss"
- value-format="YYYY-MM-DD HH:mm:ss"
range-separator="~"
start-placeholder="开始时间"
end-placeholder="结束时间"
- @change = "chooseTime"
+
/>
+<!-- @change = "chooseTime"-->
</el-form-item>
<el-form-item label="区域：">
<el-select
@@ -22,7 +22,7 @@
style="max-width: 180px"
size="default"
>
- <el-option v-for="item in state.tableData.areaList" :key="item.label" :label="item.value" :value="item.label"></el-option>
+ <el-option v-for="item in state.tableData.areaList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="气体：">
@@ -32,7 +32,7 @@
style="max-width: 180px"
size="default"
>
- <el-option v-for="item in state.tableData.gasList" :key="item.label" :label="item.value" :value="item.label"></el-option>
+ <el-option v-for="item in state.tableData.gasList" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-button size="default" type="primary" class="ml10" @click="search()">
@@ -47,17 +47,25 @@
</el-icon>
重置
</el-button>
+ <vue3-json-excel
+ class="ml10"
+ :json-data="state.tableData.excelData"
+ :fields="fields"
+ name="通量数据.xls"
+ >
+ <el-button type="primary" :icon="Download" size="default">导出</el-button>
+ </vue3-json-excel>
</el-form>
</div>
- <div id="gasChart" style="height: 500px;width: auto"></div>
- <el-table :data="state.tableData.data" style="width: 100%">
+ <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="采集时间"/>
- <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
@@ -79,12 +87,17 @@
</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 {TableFluxState} from "/@/types/monitorData";
+import moment from "moment/moment";
+import { gasManageApi } from "/@/api/basicDataManage/gasManage";
+import { areaManageApi } from "/@/api/basicDataManage/areaManage";
+import { fluxDataApi } from "/@/api/monitorData/fluxData";
+import {Download} from "@element-plus/icons-vue";
+import {gasDataApi} from "/@/api/monitorData/gasData";
-const infoRef = ref();
const state = reactive<TableFluxState>({
tableData: {
data: [],
@@ -99,33 +112,41 @@
area: ''
}
},
- gasList: [
- {
- label: '1',
- value: '甲醛'
- },
- {
- label: '2',
- value: '甲烷'
- }
- ],
- areaList: [
- {
- label: '1',
- value: '1号区域'
- },
- {
- label: '2',
- value: '2号区域'
- }
- ],
- }
+ gasList: [],
+ areaList: [],
+ excelData: []
+ },
+});
+const fields = ref({
+ 'time':'dataReceivingTime',
+ '设备ID':'equipmentId',
+ '区域': 'areaId',
+ '风速':'windSpeed',
+ '风向':'windDirection',
+ '甲烷CH4':'gasName01',
+ 'gasValue01':'gasValue01',
+ '乙烷C2H6':'gasName02',
+ 'gasValue02':'gasValue02',
+ '丙烷C3H8':'gasName03',
+ 'gasValue03':'gasValue03',
+ '丁烷C4H10':'gasName04',
+ 'gasValue04':'gasValue04',
+ '硫化氢H2S':'gasName05',
+ 'gasValue05':'gasValue05',
+ '乙烯C2H4':'gasName06',
+ 'gasValue06':'gasValue06',
+ '异丁烷C4H10':'gasName07',
+ 'gasValue07':'gasValue07',
});
+const loading = ref(false);
+const picLoading = ref(false);
+const myChart = shallowRef(null)
+const fluxChart =ref("eChartfluxN" + 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]));
console.log(sTime, eTime)
// 2.时间戳间隔 再加上一天
const datadiff = eTime - sTime + 86400000;
@@ -140,7 +161,7 @@
type: 'error',
message: '查询时间范围7天内',
})
- state.tableData.listQuery.searchParams.time = [];
+ getNowTime();
return false;
} else {
console.log('七天内数据')
@@ -151,8 +172,8 @@
onMounted(
() => {
getNowTime();
- initCharts();
-
+ getArea();
+ getAllGas();
}
);
@@ -160,48 +181,141 @@
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`
- eTime = `${eTime} 23:59:59`
+ sTime = `${sTime} 00:00:00`
+ eTime = `${eTime} ` + moment().format('HH:mm:ss')
state.tableData.listQuery.searchParams.time = [sTime ,eTime];
- console.log("time",state.tableData.listQuery.searchParams.time)
}
-const initInfoData = () => {
- console.log("数据列表")
-};
-const onHandleSizeChange = (val: number) => {
- state.tableData.listQuery.pageSize = val;
- initInfoData();
-};
-// 分页改变
-const onHandleCurrentChange = (val: number) => {
- state.tableData.listQuery.pageIndex = val;
- initInfoData();
-};
-const del = (val: any) => {
- ElMessageBox.confirm(
- '确定删除此条数据？',
- '提示',
- {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
- type: 'warning',
+
+const dataZoomEnd = ref();
+const xData = ref([] as any);
+const yData = ref([]);
+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'),
+ 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 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))
+ const gasTlTime = [...new Set(gasTime)]
+ let areaData = state.tableData.areaList.map((item)=>{
+ return {
+ areaId: item.id,
+ name: item.name,
+ dotList: []
+ }
+ })
+ for(let i of gasTlTime){
+ const sameTimeData = resChart.data.data.filter(it=>it.time?.slice(11) == i)
+ for(let j of areaData){
+ const foundData = sameTimeData.find(k=>k.areaId == j.areaId)
+ if(foundData){
+ j.dotList.push(foundData.gasValue)
+ }else{
+ j.dotList.push(0)
+ }
+ }
+ }
+ yData.value = areaData.map((i)=>{
+ return {
+ name: i.name,
+ type: 'bar',
+ data: i.dotList,
+ label: labelOption,
+ emphasis:{
+ focus: 'series'
+ }
+ }
+ })
+ areaChart.value = yData.value.map((item: any) => {
+ return item.name
+ });
+
+ dataZoomEnd.value = gasTlTime.length > 25 ? 5 : 100;
+ console.log(yData,'y')
+
+ initCharts(gasTlTime,yData.value)
+ }else {
+ yData.value = [];
+ xData.value = [];
+ dataZoomEnd.value = 100;
+ initCharts([],[]);
}
- )
- .then(() => {
- ElMessage({
- type: 'success',
- message: '删除成功',
- })
- })
+
+ // 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'),
+ 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 == 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 search = () => {
- console.log("22",state.tableData.listQuery.searchParams)
-}
-const reset = () => {
- state.tableData.listQuery.searchParams.time = [];
- state.tableData.listQuery.searchParams.area = '';
- state.tableData.listQuery.searchParams.gas = '';
+const exportFluxData = async () => {
+ const pageParam = {
+ 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'),
+ ch4: state.tableData.listQuery.searchParams.gas == 1 ? 1 : 0,
+ c2h6: state.tableData.listQuery.searchParams.gas == 2 ? 1:0,
+ c3H8: state.tableData.listQuery.searchParams.gas == 3 ? 1:0,
+ c4h101: state.tableData.listQuery.searchParams.gas == 4 ? 1:0,
+ h2s: state.tableData.listQuery.searchParams.gas == 5 ? 1:0,
+ c2h4: state.tableData.listQuery.searchParams.gas == 6 ? 1:0,
+ c4h102: state.tableData.listQuery.searchParams.gas == 7 ? 1:0,
+
+// 发对应的编号，查询数据；null，不查询
+ areaId1: state.tableData.listQuery.searchParams.area == 1 ? '1':null,
+ areaId2: state.tableData.listQuery.searchParams.area == 2 ? '2':null,
+ areaId3: state.tableData.listQuery.searchParams.area == 3 ? '3':null,
+ areaId4: state.tableData.listQuery.searchParams.area == 4 ? '4':null,
+ areaId5: state.tableData.listQuery.searchParams.area == 5 ? '5':null,
+ areaId6: state.tableData.listQuery.searchParams.area == 6 ? '6':null,
+ }
+ let res = await fluxDataApi().exportFlux(pageParam);
+ if(res.data.code == 200) {
+ state.tableData.excelData = res.data.data
+ console.log('excelData',state.tableData.excelData)
+ }else {
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
+ }
}
const labelOption = {
@@ -211,8 +325,109 @@
position: 'insideBottom',
distance: 15,
};
-const initCharts = () => {
- const myChart = echarts.init(document.getElementById('gasChart'));
+const mapArray = (target: any) => {
+ let obj = {}as any;
+ let result = [];
+ let finalResult = []as any;
+ target.map((item: any) => {
+ let key = item.regionName;
+ 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 = {
+ pageIndex: 1,
+ pageSize: 999,
+ searchParams:{
+ name: ''
+ }
+ }
+ 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',
+ 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 = res.data.data[0].id;
+ await initInfoData();
+ }else{
+ ElMessage({
+ type: 'warning',
+ message: res.data.msg
+ });
+ }
+};
+
+const onHandleSizeChange = (val: number) => {
+ state.tableData.listQuery.pageSize = val;
+ initInfoData();
+};
+// 分页改变
+const onHandleCurrentChange = (val: number) => {
+ state.tableData.listQuery.pageIndex = val;
+ initInfoData();
+};
+const search = () => {
+ initInfoData();
+ console.log("22",state.tableData.listQuery.searchParams)
+}
+const reset = () => {
+ getNowTime();
+ state.tableData.listQuery.searchParams.area = '';
+ state.tableData.listQuery.searchParams.gas = state.tableData.gasList[0].id;
+ state.tableData.listQuery.pageIndex = 1;
+ initInfoData();
+}
+
+
+const initCharts = (time: Array<string>,data: Array<any>) => {
+ if (myChart.value != null && myChart.value != "" && myChart.value != undefined) {
+ myChart.value.dispose();
+ }
+ console.log(yData.value.length,'xxxx')
+
+ myChart.value = echarts.init(document.getElementById(fluxChart.value));
// 指定图表的配置项和数据
const option = {
tooltip: {
@@ -222,7 +437,7 @@
}
},
legend: {
- data: ['区域1', '区域2', '区域3', '区域4']
+ data: areaChart.value
},
toolbox: {
show: true,
@@ -237,11 +452,25 @@
saveAsImage: { show: true }
}
},
+ graphic: {
+ type: 'text', // 类型：文本
+ left: 'center',
+ top: 'middle',
+ silent: true, // 不响应事件
+ invisible: yData.value.length > 0, // 有数据就隐藏
+ style: {
+ fill: '#9d9d9d',
+ fontWeight: 'bold',
+ text: '暂无数据',
+ fontFamily: 'Microsoft YaHei',
+ fontSize: '22px'
+ }
+ },
xAxis: [
{
type: 'category',
axisTick: { show: false },
- data: ['2012', '2013', '2014', '2015', '2016']
+ data: time
}
],
yAxis: [
@@ -249,48 +478,30 @@
type: 'value'
}
],
- series: [
+ series: data,
+
+ 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.value.setOption(option,true);
+ //自适应宽度
+ window.addEventListener('resize', function () {
+ myChart.value.resize();
+ })
}
</script>
<style scoped lang="scss">
@@ -312,4 +523,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