Browse Source

feat:统计分析-雨量统计

master
waibao2 6 days ago
parent
commit
6e159d87bf
  1. 9
      src/views/report/swjsldzb/index.vue
  2. 512
      src/views/statistic/rain/area_rain.vue
  3. 4
      src/views/statistic/rain/jslmonth.vue
  4. 4
      src/views/statistic/rain/jsltzz.vue
  5. 4
      src/views/statistic/rain/lssdyl.vue
  6. 558
      src/views/statistic/rain/lxwy.vue
  7. 193
      src/views/statistic/rain/lxyy.vue
  8. 24
      src/views/statistic/rain/rain_main.vue
  9. 8
      src/views/statistic/rain/sdjsl.vue
  10. 4
      src/views/statistic/rain/sdjyjz.vue

9
src/views/report/swjsldzb/index.vue

@ -64,15 +64,15 @@ @@ -64,15 +64,15 @@
const mainTypes = ref([
{
name: '分钟',
label: '分钟',
value: '0'
},
{
name: '小时',
label: '小时',
value: '1'
},
{
name: '天',
label: '天',
value: '2'
}
])
@ -83,6 +83,7 @@ @@ -83,6 +83,7 @@
endTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
stnmId: '',
type: "",
sType:"0",
dataType: 0,
});
@ -129,8 +130,6 @@ @@ -129,8 +130,6 @@
}
});
}
console.log(legendData, xAxisData, seriesData, '======')
}
} catch (error) {
tableData.value = [];

512
src/views/statistic/rain/area_rain.vue

@ -2,125 +2,55 @@ @@ -2,125 +2,55 @@
<div class="app-container app-container-bg">
<el-card class="first-card" ref='firstCard' shadow="always">
<el-form :model="queryParams" ref="queryForm" :inline="true" @submit.native.prevent>
<el-form-item label="站点">
<el-cascader v-model="defaultOption" placeholder="请选择站点" :options="selectOptions" style="width: 250px;" filterable clearable></el-cascader>
</el-form-item>
<el-form-item label="开始时间">
<el-date-picker v-model="queryParams.startTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss" placeholder="选择开始时间" :disabled-date="disabledStartDate">
<el-date-picker v-model="queryParams.startTime" type="date" value-format="YYYY-MM-DD" format="YYYY-MM-DD" placeholder="选择开始时间" :disabled-date="disabledStartDate" @change="(val)=>changeTime(val,'start')">
</el-date-picker>
</el-form-item>
<el-form-item label="结束时间">
<el-date-picker v-model="queryParams.endTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择结束时间" :disabled-date="disabledEndDate">
<el-date-picker v-model="queryParams.endTime" type="date" value-format="YYYY-MM-DD" format="YYYY-MM-DD" placeholder="选择结束时间" :disabled-date="disabledEndDate" @change="(val)=>changeTime(val,'end')">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-checkbox v-model="queryParams.xindao" @change='handleQuery' :true-label="1" :false-label="0">遥测数据</el-checkbox>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">查询</el-button>
<el-switch class="ml20" v-model="staticType" size="large" inline-prompt style="--el-switch-on-color: #13ce66; --el-switch-off-color: #1890FF" active-text="逐日显示" inactive-text="逐时显示" />
</el-form-item>
<br />
<el-form-item label="对比站点">
<el-cascader v-model="defaultOption2" placeholder="请选择对比站" :options="selectOptions2" :props="{multiple: true, }" :show-all-levels="false" collapse-tags filterable clearable></el-cascader>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="compareQuery" icon="Search">对比查询</el-button>
<el-button type="success" plain icon="Edit" @click="updateData">数据修改</el-button>
</el-form-item>
</el-form>
</el-card>
<splitpanes :horizontal="device === 'mobile'" class="el-card-p card-shadow carder-border mt10 pad10 default-theme container-box" :push-other-panes="false">
<pane :size="firstSize" :min-size="SPLITPANES_CONFIG.MIN_SIZE" :max-size="SPLITPANES_CONFIG.MAX_SIZE" ref="firstPane" class="mr10">
<el-collapse v-model="activeName" accordion @change="handleChangeCollapse">
<el-collapse-item title="预处理数据" name="1">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="yclExport">导出 </el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="RefreshRight" @click="yclUpdate"> 整编 </el-button>
</el-col>
</el-row>
<!-- <el-table v-loading="loading" :data="tableData1" height="450" border style="width:100%">
<el-table-column prop="tm" label="时间" width="170">
</el-table-column>
<el-table-column prop="value" label="数值">
<template #default="scope">
<el-input type="text" v-model="scope.row.value" />
</template>
</el-table-column>
</el-table> -->
<vxe-grid v-bind="gridOptions1"></vxe-grid>
</el-collapse-item>
<el-collapse-item :title="stationType==='A'?'小时数据':'摘录数据'" name="2">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="hourExport">导出 </el-button>
</el-col>
</el-row>
<!-- <el-table v-loading="loading" :data="tableData1" height="450" border style="width:100%">
<el-table-column prop="tm" label="时间" width="170">
</el-table-column>
<el-table-column prop="value" label="数值">
<template #default="scope">
<el-input type="text" v-model="scope.row.value" />
</template>
</el-table-column>
</el-table> -->
<vxe-grid v-bind="gridOptions2"></vxe-grid>
</el-collapse-item>
<el-collapse-item title="遥测数据" name="3">
<!-- <el-table :data="tableData3" height="450" border>
<el-table-column width="180" :prop="item.prop" :label="item.label" v-for="(item, index) in tableHead" :key="index">
</el-table-column>
</el-table> -->
<vxe-grid v-bind="gridOptions3"></vxe-grid>
</el-collapse-item>
</el-collapse>
<e-tree ref="eTreeRef" :stationType="stationType" @stationChange="handleStationChange" :requestPrefix="requestPrefix" :isAreaRain="true"></e-tree>
</pane>
<pane :size="100 - firstSize">
<div v-table-height='{bottom:0}' style="width:100%;">
<TimeBarChart v-loading="echartsLoading" :legendData='legendData' :xAxisData="xAxisData" :seriesData="seriesData" :textTitle="textTitle" :unit="unit" :echartType="echartType" />
</div>
<splitpanes horizontal class="default-theme" :push-other-panes="false">
<pane size="50">
<BarChart v-loading="echartsLoading" :legendData='legendData' :xAxisData="xAxisData" :seriesData="seriesData" :echartType="echartType" :grid="grid" :BarFormatter="false" />
<!-- <el-tabs v-model="activeName" class="demo-tabs" @tab-change="changeTabs">
<el-tab-pane label="统计图" name="first" style="height:100%">
<BarChart v-loading="echartsLoading" :legendData='legendData' :xAxisData="xAxisData" :seriesData="seriesData" :echartType="echartType" />
</el-tab-pane>
<el-tab-pane label="趋势图" name="second" style="height:90%">
<TimeBarChart v-loading="echartsLoading" :legendData='legendData' :xAxisData="xAxisData" :seriesData="seriesData" :echartType="echartType" :timeType="timeType" />
</el-tab-pane>
</el-tabs> -->
</pane>
</splitpanes>
<el-dialog class="custom-dialog" title="数据修改" v-model="open" width="500px" append-to-body>
<el-form ref="formRef" :model="form" :rules="rules" label-width="auto">
<el-form-item label="修改方式" prop="updateType">
<el-select v-model="form.updateType" placeholder="请选择修改方式">
<el-option v-for="dict in update_type_options" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="开始时间" v-if="form.updateType!='2'&&form.updateType!=null">
<el-date-picker v-model="form.startTime" type="datetime" placeholder="选择开始时间" value-format="yyyy-MM-dd HH:mm:ss" class="w320">
</el-date-picker>
</el-form-item>
<el-form-item label="结束时间" v-if="form.updateType!='2'&&form.updateType!=null">
<el-date-picker v-model="form.endTime" type="datetime" placeholder="选择结束时间" value-format="yyyy-MM-dd HH:mm:ss" class="w320">
</el-date-picker>
</el-form-item>
<el-form-item label="替换值" v-if="form.updateType=='1'">
<el-input v-model="form.value1" placeholder="请输入替换值" style="width:220px" />
</el-form-item>
<div style="width:80%;margin: 0 auto;" v-if="form.updateType=='2'">
<el-upload class="upload-demo" drag action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15" multiple>
<el-icon class="el-icon--upload"><upload-filled /></el-icon>
<div class="el-upload__text">
将文件拖到此处<em>点击上传</em>
<pane size="50" class="mr10">
<div class="main-table-header">
<div class="table-title">{{tableTitle}}</div>
<!-- <div class="table-time mb5">
<div>
<span>时间: </span><span id="title1">{{ tableTime}}</span>
</div>
</el-upload>
<div>
<span>单位: </span><span id="title2">mm</span>
</div>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitForm(formRef)" v-loading='btnLoading'> </el-button>
<el-button @click="cancel"> </el-button>
</div> -->
</div>
</template>
</el-dialog>
<el-table class="scrollable-table" v-loading="loading" ref="myTable" :data="tableData" v-table-height="{bottom:90}" border>
<el-table-column :align="alignment" :width="item.label == '时间' ? '180': '' " :prop="item.prop" :label="item.label" v-for="(item, index) in tableHead" :key="index"></el-table-column>
</el-table>
</pane>
</splitpanes>
</pane>
</splitpanes>
</div>
</template>
<script setup>
@ -130,80 +60,42 @@ @@ -130,80 +60,42 @@
Pane
} from 'splitpanes'
import 'splitpanes/dist/splitpanes.css'
import TimeBarChart from '@/components/ChartsTimeBar/index.vue'
import BarChart from '@/components/ChartsBar/index.vue'
import TimeBarChart from '@/components/ChartsDataZoom/index.vue'
import ETree from '@/components/ETree/index.vue'
import useAppStore from '@/store/modules/app'
const device = computed(() => useAppStore().device);
const requestPrefix = '/report/getAreaStation'
const props = defineProps({
stationType: {
type: String,
default: 'A'
},
requestPrefix: {
tableTitle: {
type: String,
default: '/ycraindata'
default: '面平均降雨量'
},
fixed: {
type: Number,
default: 1
}
})
const {
proxy
} = getCurrentInstance()
const { update_type_options } = proxy.useDict("update_type_options")
const textTitle = computed(() => {
switch (props.stationType) {
case 'A':
return '雨量过程线';
case 'B':
return '水位过程线';
case 'C':
return '水位过程线';
case 'D':
return '潮位过程线';
case 'E':
return '流量过程线';
const { proxy } = getCurrentInstance()
const stationType = 'A'
const alignment = 'center'
const eTreeRef = ref(null)
let stnmIdsList = []
//
const handleStationChange = (stnmIds) => {
stnmIdsList = stnmIds
queryParams.ids = stnmIds.join(',')
if (stnmIdsList.length == 0) {
proxy.$modal.msgWarning("请选择站点后查询");
return
} else if (stnmIdsList.length > 50) {
proxy.$modal.msg("站点最多可选择50个");
return
} else {
getList()
getEchartsData()
}
});
const unit = computed(() => {
switch (props.stationType) {
case 'A':
return 'mm';
case 'B':
return 'm';
case 'C':
return 'm';
case 'D':
return 'm';
case 'E':
return 'm³/s';
}
});
const echartType = computed(() => {
switch (props.stationType) {
case 'A':
return 'bar';
case 'B':
return 'line';
case 'C':
return 'line';
case 'D':
return 'line';
case 'E':
return 'line';
}
});
const staticType = ref(0)
const queryParams = reactive({
startTime: dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
endTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
xindao: 1,
stnmId: null,
dataType: staticType.value,
chartType: echartType.value
startTime: dayjs().subtract(7, 'day').format('YYYY-MM-DD'),
endTime: dayjs().format('YYYY-MM-DD'),
});
//
@ -219,184 +111,73 @@ @@ -219,184 +111,73 @@
return dayjs(time).isAfter(dayjs()) ||
(startTime && dayjs(time).isBefore(startTime));
};
const tableTime = ref(queryParams.startTime.substring(0, 16) + " 至 " + queryParams.endTime.substring(0, 16))
const timeType = ref('day')
//
const selectOptions = ref([]);
const selectOptions2 = ref([]);
const defaultOption = ref([])
const defaultOption2 = ref([])
const getSingleStation = async () => {
let res = await proxy.axiosGet('/basic/stype/getTreeStation2New/' + props.stationType);
if (res.code === 0) {
selectOptions.value = res.data;
defaultOption.value = res.defaultOption
queryParams.stnmId = defaultOption.value.length > 0 ? parseInt(defaultOption.value[2]) : null
queryParams.stnmIds = queryParams.stnmId
try {
await Promise.all([
drawTable1(),
drawTable2(),
drawTable3(),
getEchartsData()
]);
} catch (error) {
console.error('请求执行出错:', error);
}
//
const changeTime = (val, type = 'start') => {
if (type == 'start') {
queryParams.startTime = dayjs(val).format('YYYY-MM-DD')
} else {
queryParams.endTime = dayjs(val).format('YYYY-MM-DD')
}
}
const firstSize = ref(proxy.SPLITPANES_CONFIG.DEFAULT_SIZE)
const activeName = ref('1')
const tableData1 = ref([])
const tableData2 = ref([])
const tableData3 = ref([])
//
const handleChangeCollapse = (val) => { }
//
const baseGridOptions = {
border: true,
loading: false,
showOverflow: false,
height: 450,
columnConfig: {
resizable: true
},
virtualYConfig: {
enabled: true,
gt: 0
}
}
//
const gridOptions1 = reactive({
...baseGridOptions,
columns: [{
title: '时间',
field: 'tm',
width: 160,
align: "center"
},
{
title: '数值',
field: 'value',
align: "center"
}
],
data: []
})
//
const drawTable1 = async () => {
gridOptions1.loading = true
const activeName = ref('first')
const loading = ref(false)
const tableData = ref([])
const tableHead = ref([])
const getList = async () => {
loading.value = true;
try {
let url = props.requestPrefix + '/originaldata'
let res = await proxy.axiosPost2(url, queryParams);
if (res.code === 0) {
let data = res.data;
for (var i = 0; i < data.length; i++) {
data[i].value = data[i].value.toFixed(proxy.fixed)
}
gridOptions1.data = data
// selectOptions.value = res.data;
let res = await proxy.axiosGet('/report/getAreaRainData', queryParams)
if (res.code == 0) {
tableHead.value = handleTableHead(res.header)
let data = res.data
tableData.value = data
}
} catch (error) {
tableHead.value = [];
tableData.value = [];
} finally {
gridOptions1.loading = false
loading.value = false
}
}
// /
const gridOptions2 = reactive({
...baseGridOptions,
columns: [{
title: '时间',
field: 'tm',
width: 160,
align: "center"
},
{
title: '数值',
field: 'value',
align: "center"
}
],
data: []
})
//
const drawTable2 = async () => {
gridOptions2.loading = true
try {
let url = props.requestPrefix + '/countdata'
let res = await proxy.axiosPost2(url, queryParams);
if (res.code === 0) {
let data = res.data;
gridOptions2.data = data
}
gridOptions2.loading = false
} catch (error) {
gridOptions2.loading = false
}
// res.data
const handleTableHead = (data) => {
const firstRow = data; //
const head = [];
// ""
head.push({ prop: 'tm', label: '时间' });
// firstRow key-value
Object.keys(firstRow).forEach(key => {
console.log(key)
if (key !== 'avg' && key !== 'tm') {
head.push({ prop: key, label: firstRow[key] });
}
//
const gridOptions3 = reactive({
...baseGridOptions,
columns: [],
data: []
})
//
const drawTable3 = async () => {
gridOptions3.loading = true
try {
let url = props.requestPrefix + '/xindaodaydata'
let res = await proxy.axiosPost2(url, queryParams);
if (res.code === 0) {
let data = res.data;
let header = data[0];
let tableColumn = []
tableColumn.push({
field: 'tm',
title: '时间',
width: 160,
align: "center"
});
for (let k in header) {
if (k != 'tm' && k != 'avg') {
tableColumn.push({
field: k,
title: k,
width: 100,
align: "center"
});
}
}
gridOptions3.columns = tableColumn;
gridOptions3.data = data
}
gridOptions3.loading = false
} catch (error) {
gridOptions3.loading = false
}
}
// echarts
return head;
};
const legendData = ref([])
const xAxisData = ref([])
const seriesData = ref([])
const echartsLoading = ref(false)
const getEchartsData = async () => {
echartsLoading.value = true
let baseUrl = '/chartdata'
if (staticType.value == 1) {
baseUrl = "/chartdatabyday";
let url = '/report/getAreaRainChart'
if (activeName.value == 'second') {
url = ''
}
try {
let url = props.requestPrefix + baseUrl
let res = await proxy.axiosPost2(url, queryParams);
let res = await proxy.axiosGet(url, queryParams);
if (res.code === 0) {
if (activeName.value == 'first') {
xAxisData.value = res.data.x
seriesData.value = res.data.y
}
if (activeName.value == 'second') {
legendData.value = res.data.legend
// seriesdata
if (res.data.series && res.data.series.length > 0) {
@ -415,88 +196,35 @@ @@ -415,88 +196,35 @@
}
seriesData.value = res.data.series
}
}
} catch (error) {
console.log(error)
} finally {
echartsLoading.value = false
}
};
//
const yclExport = () => {
}
//
const yclUpdate = () => {
}
//
const hourExport = () => { }
//
const handleQuery = async () => {
try {
await Promise.all([
drawTable1(),
drawTable2(),
drawTable3(),
const echartType = ref('bar')
const changeTabs = (val) => {
activeName.value = val
echartType.value = val == 'first' ? 'bar' : 'line'
getEchartsData()
]);
} catch (error) {
console.error('请求执行出错:', error);
}
const handleQuery = () => {
getList()
getEchartsData()
}
//
const compareQuery = () => {
}
let open = ref(false)
const form = reactive({
updateType: null
});
//
const updateData = () => {
open.value = true
}
/**************************************************** 数据修改弹窗 ******************************************************/
let formRef = ref(null)
//
const cancel = () => {
open.value = false;
reset();
}
const reset = () => {
Object.assign(form, {});
proxy.resetForm("formRef");
const grid = {
left: "5%",
right: "5%",
bottom: "10%",
top: "10%",
containLabel: true,
}
/** 提交按钮 */
const submitForm = async (formEl) => {
if (!formEl) return
await formEl.validate(async (valid, fields) => {
if (valid) {
try {
// let res = await proxy.axiosPost('/riverBasin', form);
// if (res.code === 0) {
// proxy.$modal.msgSuccess("");
// open.value = false;
// getList();
// }
} catch (error) { }
}
})
}
onMounted(() => {
getSingleStation();
})
</script>
<style lang="scss" scoped>
:deep(.el-collapse) {
border-top: none !important;
:deep(.el-tabs),
:deep(.el-tabs .el-tabs__content) {
height: 100%;
}
</style>

4
src/views/statistic/rain/jslmonth.vue

@ -19,8 +19,8 @@ @@ -19,8 +19,8 @@
<el-button type="primary" icon="Search" @click="handleQuery">查询</el-button>
</el-form-item>
<br />
<el-form-item label="报表排列方式(按站点)">
<el-radio-group v-model="direction" @change="getList">
<el-form-item label="报表排列方式(按站点)" style="margin-bottom: 0;">
<el-radio-group v-model="direction" @change="getList" class="pt10">
<el-radio label="zx">纵向</el-radio>
<el-radio label="hx">横向</el-radio>
</el-radio-group>

4
src/views/statistic/rain/jsltzz.vue

@ -19,8 +19,8 @@ @@ -19,8 +19,8 @@
<el-button type="primary" icon="Search" @click="handleQuery">查询</el-button>
</el-form-item>
<br />
<el-form-item label="报表排列方式(按站点)">
<el-radio-group v-model="direction" @change="getList">
<el-form-item label="报表排列方式(按站点)" style="margin-bottom: 0;">
<el-radio-group v-model="direction" @change="getList" class="pt10">
<el-radio label="zx">纵向</el-radio>
<el-radio label="hx">横向</el-radio>
</el-radio-group>

4
src/views/statistic/rain/lssdyl.vue

@ -21,8 +21,8 @@ @@ -21,8 +21,8 @@
<el-button type="primary" icon="Search" @click="handleQuery">查询</el-button>
</el-form-item>
<br />
<el-form-item label="报表排列方式(按站点)">
<el-radio-group v-model="direction" @change="getList">
<el-form-item label="报表排列方式(按站点)" style="margin-bottom: 0;">
<el-radio-group v-model="direction" @change="getList" class="pt10">
<el-radio label="zx">纵向</el-radio>
<el-radio label="hx">横向</el-radio>
</el-radio-group>

558
src/views/statistic/rain/lxwy.vue

@ -2,125 +2,48 @@ @@ -2,125 +2,48 @@
<div class="app-container app-container-bg">
<el-card class="first-card" ref='firstCard' shadow="always">
<el-form :model="queryParams" ref="queryForm" :inline="true" @submit.native.prevent>
<el-form-item label="站点">
<el-cascader v-model="defaultOption" placeholder="请选择站点" :options="selectOptions" style="width: 250px;" filterable clearable></el-cascader>
<el-form-item label="指标(小于)">
<el-input v-model="queryParams.value" placeholder="请输入内容" style="width: 100px;" @keyup.enter.native="handleQuery"></el-input>
</el-form-item>
<el-form-item label="开始时间">
<el-date-picker v-model="queryParams.startTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss" placeholder="选择开始时间" :disabled-date="disabledStartDate">
<el-date-picker v-model="queryParams.startTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss" placeholder="选择开始时间" :disabled-date="disabledStartDate" @change="(val)=>changeTime(val,'start')">
</el-date-picker>
</el-form-item>
<el-form-item label="结束时间">
<el-date-picker v-model="queryParams.endTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="选择结束时间" :disabled-date="disabledEndDate">
<el-date-picker v-model="queryParams.endTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss" placeholder="选择结束时间" :disabled-date="disabledEndDate" @change="(val)=>changeTime(val,'end')">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-checkbox v-model="queryParams.xindao" @change='handleQuery' :true-label="1" :false-label="0">遥测数据</el-checkbox>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">查询</el-button>
<el-switch class="ml20" v-model="staticType" size="large" inline-prompt style="--el-switch-on-color: #13ce66; --el-switch-off-color: #1890FF" active-text="逐日显示" inactive-text="逐时显示" />
</el-form-item>
<br />
<el-form-item label="对比站点">
<el-cascader v-model="defaultOption2" placeholder="请选择对比站" :options="selectOptions2" :props="{multiple: true, }" :show-all-levels="false" collapse-tags filterable clearable></el-cascader>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="compareQuery" icon="Search">对比查询</el-button>
<el-button type="success" plain icon="Edit" @click="updateData">数据修改</el-button>
</el-form-item>
</el-form>
</el-card>
<splitpanes :horizontal="device === 'mobile'" class="el-card-p card-shadow carder-border mt10 pad10 default-theme container-box" :push-other-panes="false">
<pane :size="firstSize" :min-size="SPLITPANES_CONFIG.MIN_SIZE" :max-size="SPLITPANES_CONFIG.MAX_SIZE" ref="firstPane" class="mr10">
<el-collapse v-model="activeName" accordion @change="handleChangeCollapse">
<el-collapse-item title="预处理数据" name="1">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="yclExport">导出 </el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="RefreshRight" @click="yclUpdate"> 整编 </el-button>
</el-col>
</el-row>
<!-- <el-table v-loading="loading" :data="tableData1" height="450" border style="width:100%">
<el-table-column prop="tm" label="时间" width="170">
</el-table-column>
<el-table-column prop="value" label="数值">
<template #default="scope">
<el-input type="text" v-model="scope.row.value" />
</template>
</el-table-column>
</el-table> -->
<vxe-grid v-bind="gridOptions1"></vxe-grid>
</el-collapse-item>
<el-collapse-item :title="stationType==='A'?'小时数据':'摘录数据'" name="2">
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="warning" plain icon="Download" @click="hourExport">导出 </el-button>
</el-col>
</el-row>
<!-- <el-table v-loading="loading" :data="tableData1" height="450" border style="width:100%">
<el-table-column prop="tm" label="时间" width="170">
</el-table-column>
<el-table-column prop="value" label="数值">
<template #default="scope">
<el-input type="text" v-model="scope.row.value" />
</template>
</el-table-column>
</el-table> -->
<vxe-grid v-bind="gridOptions2"></vxe-grid>
</el-collapse-item>
<el-collapse-item title="遥测数据" name="3">
<!-- <el-table :data="tableData3" height="450" border>
<el-table-column width="180" :prop="item.prop" :label="item.label" v-for="(item, index) in tableHead" :key="index">
</el-table-column>
</el-table> -->
<vxe-grid v-bind="gridOptions3"></vxe-grid>
</el-collapse-item>
</el-collapse>
<e-tree ref="eTreeRef" :stationType="stationType" @stationChange="handleStationChange"></e-tree>
</pane>
<pane :size="100 - firstSize">
<div v-table-height='{bottom:0}' style="width:100%;">
<TimeBarChart v-loading="echartsLoading" :legendData='legendData' :xAxisData="xAxisData" :seriesData="seriesData" :textTitle="textTitle" :unit="unit" :echartType="echartType" />
<splitpanes horizontal class="default-theme" :push-other-panes="false">
<pane size="100" class="mr10" style="height:100%;">
<div class="main-table-header">
<div class="table-title">{{tableTitle}}</div>
<div class="table-time mb5">
<div>
<span>时间: </span><span id="title1">{{ tableTime}}</span>
</div>
</pane>
</splitpanes>
<el-dialog class="custom-dialog" title="数据修改" v-model="open" width="500px" append-to-body>
<el-form ref="formRef" :model="form" :rules="rules" label-width="auto">
<el-form-item label="修改方式" prop="updateType">
<el-select v-model="form.updateType" placeholder="请选择修改方式">
<el-option v-for="dict in update_type_options" :key="dict.value" :label="dict.label" :value="dict.value"></el-option>
</el-select>
</el-form-item>
<el-form-item label="开始时间" v-if="form.updateType!='2'&&form.updateType!=null">
<el-date-picker v-model="form.startTime" type="datetime" placeholder="选择开始时间" value-format="yyyy-MM-dd HH:mm:ss" class="w320">
</el-date-picker>
</el-form-item>
<el-form-item label="结束时间" v-if="form.updateType!='2'&&form.updateType!=null">
<el-date-picker v-model="form.endTime" type="datetime" placeholder="选择结束时间" value-format="yyyy-MM-dd HH:mm:ss" class="w320">
</el-date-picker>
</el-form-item>
<el-form-item label="替换值" v-if="form.updateType=='1'">
<el-input v-model="form.value1" placeholder="请输入替换值" style="width:220px" />
</el-form-item>
<div style="width:80%;margin: 0 auto;" v-if="form.updateType=='2'">
<el-upload class="upload-demo" drag action="https://run.mocky.io/v3/9d059bf9-4660-45f2-925d-ce80ad6c4d15" multiple>
<el-icon class="el-icon--upload"><upload-filled /></el-icon>
<div class="el-upload__text">
将文件拖到此处<em>点击上传</em>
<div>
<span>单位: </span><span id="title2"></span>
</div>
</el-upload>
</div>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitForm(formRef)" v-loading='btnLoading'> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</template>
</el-dialog>
<el-table v-loading="loading" ref="myTable" :data="tableData" height="94%" border >
<el-table-column :align="alignment" :width="item.label=='站点'?'150':tableHead.length<7?'':'200'" :prop="item.prop" :label="item.label" v-for="(item, index) in tableHead" :key="index"></el-table-column>
</el-table>
</pane>
</splitpanes>
</pane>
</splitpanes>
</div>
</template>
<script setup>
@ -130,80 +53,40 @@ @@ -130,80 +53,40 @@
Pane
} from 'splitpanes'
import 'splitpanes/dist/splitpanes.css'
import TimeBarChart from '@/components/ChartsDataZoom/index.vue'
import ETree from '@/components/ETree/index.vue'
import useAppStore from '@/store/modules/app'
const device = computed(() => useAppStore().device);
const props = defineProps({
stationType: {
type: String,
default: 'A'
},
requestPrefix: {
tableTitle: {
type: String,
default: '/ycraindata'
default: '连续无雨日统计'
},
fixed: {
type: Number,
default: 1
}
})
const {
proxy
} = getCurrentInstance()
const { update_type_options } = proxy.useDict("update_type_options")
const textTitle = computed(() => {
switch (props.stationType) {
case 'A':
return '雨量过程线';
case 'B':
return '水位过程线';
case 'C':
return '水位过程线';
case 'D':
return '潮位过程线';
case 'E':
return '流量过程线';
}
});
const unit = computed(() => {
switch (props.stationType) {
case 'A':
return 'mm';
case 'B':
return 'm';
case 'C':
return 'm';
case 'D':
return 'm';
case 'E':
return 'm³/s';
const { proxy } = getCurrentInstance()
const stationType = 'A'
const alignment = 'center'
const eTreeRef = ref(null)
let stnmIdsList = []
//
const handleStationChange = (stnmIds) => {
stnmIdsList = stnmIds
queryParams.stnmIds = stnmIds.join(',')
if (stnmIdsList.length == 0) {
proxy.$modal.msgWarning("请选择站点后查询");
return
} else if (stnmIdsList.length > 50) {
proxy.$modal.msg("站点最多可选择50个");
return
} else {
getList()
}
});
const echartType = computed(() => {
switch (props.stationType) {
case 'A':
return 'bar';
case 'B':
return 'line';
case 'C':
return 'line';
case 'D':
return 'line';
case 'E':
return 'line';
}
});
const staticType = ref(0)
const queryParams = reactive({
startTime: dayjs().subtract(7, 'day').format('YYYY-MM-DD HH:mm:ss'),
endTime: dayjs().format('YYYY-MM-DD HH:mm:ss'),
xindao: 1,
stnmId: null,
dataType: staticType.value,
chartType: echartType.value
startTime: dayjs().subtract(7, 'day').format('YYYY-MM-DD 08:00:00'),
endTime: dayjs().format('YYYY-MM-DD 08:00:00'),
value: 1.0
});
//
@ -219,284 +102,121 @@ @@ -219,284 +102,121 @@
return dayjs(time).isAfter(dayjs()) ||
(startTime && dayjs(time).isBefore(startTime));
};
const tableTime = ref(queryParams.startTime.substring(0, 10) + " 至 " + queryParams.endTime.substring(0, 10))
const timeType = ref('day')
//
const selectOptions = ref([]);
const selectOptions2 = ref([]);
const defaultOption = ref([])
const defaultOption2 = ref([])
const getSingleStation = async () => {
let res = await proxy.axiosGet('/basic/stype/getTreeStation2New/' + props.stationType);
if (res.code === 0) {
selectOptions.value = res.data;
defaultOption.value = res.defaultOption
queryParams.stnmId = defaultOption.value.length > 0 ? parseInt(defaultOption.value[2]) : null
queryParams.stnmIds = queryParams.stnmId
try {
await Promise.all([
drawTable1(),
drawTable2(),
drawTable3(),
getEchartsData()
]);
} catch (error) {
console.error('请求执行出错:', error);
}
//
const changeTime = (val, type = 'start') => {
if (type == 'start') {
queryParams.startTime = dayjs(val).format('YYYY-MM-DD HH:mm:ss')
} else {
queryParams.endTime = dayjs(val).format('YYYY-MM-DD HH:mm:ss')
}
}
const firstSize = ref(proxy.SPLITPANES_CONFIG.DEFAULT_SIZE)
const activeName = ref('1')
const tableData1 = ref([])
const tableData2 = ref([])
const tableData3 = ref([])
//
const handleChangeCollapse = (val) => { }
//
const baseGridOptions = {
border: true,
loading: false,
showOverflow: false,
height: 450,
columnConfig: {
resizable: true
},
virtualYConfig: {
enabled: true,
gt: 0
}
}
//
const gridOptions1 = reactive({
...baseGridOptions,
columns: [{
title: '时间',
field: 'tm',
width: 160,
align: "center"
},
{
title: '数值',
field: 'value',
align: "center"
}
],
data: []
})
//
const drawTable1 = async () => {
gridOptions1.loading = true
const loading = ref(false)
const tableData = ref([])
const tableHead = ref([])
const getList = async () => {
loading.value = true;
try {
let url = props.requestPrefix + '/originaldata'
let res = await proxy.axiosPost2(url, queryParams);
if (res.code === 0) {
let data = res.data;
for (var i = 0; i < data.length; i++) {
data[i].value = data[i].value.toFixed(proxy.fixed)
}
gridOptions1.data = data
// selectOptions.value = res.data;
}
let res = await proxy.axiosPost2('/report/wxjsr', queryParams)
if (res.code == 0) {
const processedData = processData(res.data);
tableData.value = processedData;
} catch (error) {
} finally {
gridOptions1.loading = false
}
}
// /
const gridOptions2 = reactive({
...baseGridOptions,
columns: [{
title: '时间',
field: 'tm',
width: 160,
align: "center"
},
{
title: '数值',
field: 'value',
align: "center"
}
],
data: []
})
//
const drawTable2 = async () => {
gridOptions2.loading = true
try {
let url = props.requestPrefix + '/countdata'
let res = await proxy.axiosPost2(url, queryParams);
if (res.code === 0) {
let data = res.data;
gridOptions2.data = data
}
gridOptions2.loading = false
} catch (error) {
gridOptions2.loading = false
}
}
//
const gridOptions3 = reactive({
...baseGridOptions,
columns: [],
data: []
})
//
const drawTable3 = async () => {
gridOptions3.loading = true
try {
let url = props.requestPrefix + '/xindaodaydata'
let res = await proxy.axiosPost2(url, queryParams);
if (res.code === 0) {
let data = res.data;
let header = data[0];
let tableColumn = []
tableColumn.push({
field: 'tm',
title: '时间',
width: 160,
align: "center"
});
for (let k in header) {
if (k != 'tm' && k != 'avg') {
tableColumn.push({
field: k,
title: k,
width: 100,
align: "center"
});
}
}
gridOptions3.columns = tableColumn;
gridOptions3.data = data
}
gridOptions3.loading = false
} catch (error) {
gridOptions3.loading = false
}
}
// echarts
const legendData = ref([])
const xAxisData = ref([])
const seriesData = ref([])
const echartsLoading = ref(false)
const getEchartsData = async () => {
echartsLoading.value = true
let baseUrl = '/chartdata'
if (staticType.value == 1) {
baseUrl = "/chartdatabyday";
}
try {
let url = props.requestPrefix + baseUrl
let res = await proxy.axiosPost2(url, queryParams);
if (res.code === 0) {
legendData.value = res.data.legend
// seriesdata
if (res.data.series && res.data.series.length > 0) {
// seriesdata
xAxisData.value = res.data.series[0].data.map(item => {
// item
if (typeof item === 'object' && item !== null) {
// tm, time, or the first element
const timeValue = item.tm || item.time || item[0];
return dayjs(timeValue).format('YYYY-MM-DD HH:mm');
} else {
// item
return dayjs(item).format('YYYY-MM-DD HH:mm');
}
});
}
seriesData.value = res.data.series
//
const maxPeriods = getMaxPeriodCount(res.data);
tableHead.value = generateTableHead(maxPeriods);
}
} catch (error) {
console.log(error)
tableHead.value = [];
tableData.value = [];
} finally {
echartsLoading.value = false
loading.value = false;
}
};
//
const yclExport = () => {
//
const getMaxPeriodCount = (data) => {
return Math.max(...data.data.map(arr => arr.length));
};
//
const generateTableHead = (maxPeriods) => {
const head = [
{ prop: '站点', label: '站点' },
];
for (let i = 1; i <= maxPeriods; i++) {
head.push({ prop: `时段${i}`, label: `时段${i}` });
}
head.push(
{ prop: '最大连续无效日', label: '最大连续无效日' },
{ prop: '天数累计', label: '天数累计' },
);
return head;
};
const processData = (data) => {
const result = [];
const names = data.name;
const totalDays = data.list;
const maxIntervals = data.maxList;
//
const maxPeriods = getMaxPeriodCount(data);
data.data.forEach((intervals, index) => {
const stationName = names[index];
const totalDay = totalDays[index];
const maxInterval = maxIntervals[index];
//
const sortedIntervals = intervals
.map(item => ({
...item,
start: parseInt(item.interval.split('~')[0]),
}))
.sort((a, b) => a.start - b.start);
//
const periodValues = [];
for (let i = 0; i < maxPeriods; i++) {
const interval = sortedIntervals[i];
if (interval) {
periodValues.push(`${interval.interval} (${interval.cnt}日)`);
} else {
periodValues.push('-');
}
//
const yclUpdate = () => {
}
//
const maxPeriod = `${maxInterval.interval} (${maxInterval.cnt}日)`;
//
const hourExport = () => { }
//
const handleQuery = async () => {
try {
await Promise.all([
drawTable1(),
drawTable2(),
drawTable3(),
getEchartsData()
]);
} catch (error) {
console.error('请求执行出错:', error);
}
}
//
const row = {
站点: stationName,
'最大连续无效日': maxPeriod,
'天数累计': `${totalDay}`
};
//
const compareQuery = () => {
//
periodValues.forEach((val, i) => {
row[`时段${i + 1}`] = val;
});
}
let open = ref(false)
const form = reactive({
updateType: null
result.push(row);
});
//
const updateData = () => {
open.value = true
}
/**************************************************** 数据修改弹窗 ******************************************************/
let formRef = ref(null)
//
const cancel = () => {
open.value = false;
reset();
}
const reset = () => {
Object.assign(form, {});
proxy.resetForm("formRef");
}
/** 提交按钮 */
const submitForm = async (formEl) => {
if (!formEl) return
await formEl.validate(async (valid, fields) => {
if (valid) {
try {
// let res = await proxy.axiosPost('/riverBasin', form);
// if (res.code === 0) {
// proxy.$modal.msgSuccess("");
// open.value = false;
// getList();
// }
} catch (error) { }
}
})
return result;
};
const handleQuery = () => {
getList()
}
onMounted(() => {
getSingleStation();
})
</script>
<style lang="scss" scoped>
:deep(.el-collapse) {
border-top: none !important;
:deep(.el-tabs),
:deep(.el-tabs .el-tabs__content) {
height: 100%;
}
</style>

193
src/views/statistic/rain/lxyy.vue

@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
<!-- 有效降雨日统计 -->
<template>
<div class="app-container app-container-bg">
<el-card class="first-card" ref='firstCard' shadow="always">
<el-form :model="queryParams" ref="queryForm" :inline="true" @submit.native.prevent>
<el-form-item label="指标(于)">
<el-input placeholder="请输入指标(大于)" v-model="queryParams.filterText" clearable @keyup.enter.native="handleQuery"> </el-input>
<el-form-item label="指标(于)">
<el-input v-model="queryParams.value" placeholder="请输入内容" style="width: 100px;" @keyup.enter.native="handleQuery"></el-input>
</el-form-item>
<el-form-item label="开始时间">
<el-date-picker class="picker-year" v-model="queryParams.startTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss" placeholder="选择开始时间">
<el-date-picker v-model="queryParams.startTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss" placeholder="选择开始时间" :disabled-date="disabledStartDate" @change="(val)=>changeTime(val,'start')">
</el-date-picker>
</el-form-item>
<el-form-item label="结束时间">
<el-date-picker class="picker-year" v-model="queryParams.endTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss" placeholder="选择结束时间">
<el-date-picker v-model="queryParams.endTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss" placeholder="选择结束时间" :disabled-date="disabledEndDate" @change="(val)=>changeTime(val,'end')">
</el-date-picker>
</el-form-item>
<el-form-item>
@ -21,9 +21,11 @@ @@ -21,9 +21,11 @@
</el-card>
<splitpanes :horizontal="device === 'mobile'" class="el-card-p card-shadow carder-border mt10 pad10 default-theme container-box" :push-other-panes="false">
<pane :size="firstSize" :min-size="SPLITPANES_CONFIG.MIN_SIZE" :max-size="SPLITPANES_CONFIG.MAX_SIZE" ref="firstPane" class="mr10">
<e-tree ref="eTreeRef" :stationType="stationType" @stationChange="handleStationChange" @loadingChange="handleStationLoading"></e-tree>
<e-tree ref="eTreeRef" :stationType="stationType" @stationChange="handleStationChange"></e-tree>
</pane>
<pane :size="100 - firstSize" style="height: 100%;">
<pane :size="100 - firstSize">
<splitpanes horizontal class="default-theme" :push-other-panes="false">
<pane size="100" class="mr10" style="height:100%;">
<div class="main-table-header">
<div class="table-title">{{tableTitle}}</div>
<div class="table-time mb5">
@ -35,14 +37,14 @@ @@ -35,14 +37,14 @@
</div>
</div>
</div>
<el-table v-table-height v-loading="loading" :data="tableData" border :span-method="arraySpanMethod">
<el-table-column :align="alignment" v-for="column in tableColumns" :key="column.prop" :prop="column.prop" :label="column.label" :min-width="column.width || 120">
<el-table v-loading="loading" ref="myTable" :data="tableData" height="94%" border :span-method="arraySpanMethod">
<el-table-column :align="alignment" :prop="item.prop" :label="item.label" :width="item.width" v-for="(item, index) in tableHead" :key="index">
</el-table-column>
</el-table>
</pane>
</splitpanes>
</pane>
</splitpanes>
</div>
</template>
<script setup>
@ -53,28 +55,21 @@ @@ -53,28 +55,21 @@
} from 'splitpanes'
import 'splitpanes/dist/splitpanes.css'
import ETree from '@/components/ETree/index.vue'
import useAppStore from '@/store/modules/app'
const device = computed(() => useAppStore().device);
const props = defineProps({
tableTitle: {
type: String,
default: '表格标题'
default: '有效降雨日统计'
},
})
const {
proxy
} = getCurrentInstance()
// const { } = proxy.useDict("")
const { proxy } = getCurrentInstance()
const stationType = 'A'
const alignment = 'center'
const firstSize = ref(proxy.SPLITPANES_CONFIG.DEFAULT_SIZE)
const eTreeRef = ref(null)
let stnmIdsList = []
const handleStationLoading = (loadingState) => {
loading.value = loadingState;
}
//
const handleStationChange = (stnmIds) => {
stnmIdsList = stnmIds
@ -87,118 +82,128 @@ @@ -87,118 +82,128 @@
return
} else {
getList()
}
}
const tableTime = computed(() => {
let startTime = dayjs(queryParams.startTime).format('YYYY-MM-DD')
let endTime = dayjs(queryParams.endTime).format('YYYY-MM-DD')
return `${startTime}${endTime}`
})
const queryParams = reactive({
startTime: dayjs().subtract(7, 'day').format('YYYY-MM-DD 08:00:00'),
endTime: dayjs().format('YYYY-MM-DD 08:00:00'),
stnmIds: '',
filterText: 1.0,
value: 1.0
});
//
const disabledStartDate = (time) => {
const endTime = queryParams.endTime ? dayjs(queryParams.endTime) : null;
return dayjs(time).isAfter(dayjs()) ||
(endTime && dayjs(time).isAfter(endTime));
};
//
const disabledEndDate = (time) => {
const startTime = queryParams.startTime ? dayjs(queryParams.startTime) : null;
return dayjs(time).isAfter(dayjs()) ||
(startTime && dayjs(time).isBefore(startTime));
};
const tableTime = ref(queryParams.startTime.substring(0, 10) + " 至 " + queryParams.endTime.substring(0, 10))
const timeType = ref('day')
const tableColumns = ref([])
const tableData = ref([])
//
const changeTime = (val, type = 'start') => {
if (type == 'start') {
queryParams.startTime = dayjs(val).format('YYYY-MM-DD HH:mm:ss')
} else {
queryParams.endTime = dayjs(val).format('YYYY-MM-DD HH:mm:ss')
}
}
const firstSize = ref(proxy.SPLITPANES_CONFIG.DEFAULT_SIZE)
const loading = ref(false)
// getList
const tableData = ref([])
const tableHead = ref([])
const getList = async () => {
loading.value = true;
try {
let res = await proxy.axiosPost2('/report/yxjsr', queryParams)
if (res.code == 0) {
getZXTableData(res)
console.log(res.data, 'res.data')
const processedData = processData(res.data);
console.log(processedData, 'processedData')
tableData.value = processedData;
}
} catch (error) {
tableColumns.value = [];
tableHead.value = [];
tableData.value = [];
} finally {
loading.value = false
}
loading.value = false;
}
const getZXTableData = (res) => {
let { year, list, name, max, min } = res.data;
let columns = [
{
prop: "station",
label: "站点"
},
};
//
const getMaxPeriodCount = (data) => {
return Math.max(...data.map(arr => arr.length));
};
//
const generateTableHead = (maxPeriods) => {
const head = [
{ prop: '站点', label: '站点' },
{
prop: "type",
label: ""
}
]
//
year.forEach(item => {
columns.push({
prop: item,
label: item
});
});
columns.push(
];
{
prop: "max",
label: "最大值",
},
{
prop: "min",
label: "最小值",
for (let i = 1; i <= maxPeriods; i++) {
head.push({ prop: `时段${i}`, label: `时段${i}`, width: 160 });
}
head.push(
{ prop: '最大', label: '最大', width: 180 },
{ prop: '天数总和', label: '天数总和' }
);
tableColumns.value = columns
tableHead.value = head;
};
const processData = (val) => {
let { data, list, maxList, name } = val;
const maxPeriods = getMaxPeriodCount(data);
generateTableHead(maxPeriods)
// -
const processedData = [];
list.forEach((item, index) => {
// ""
data.forEach((intervals, index) => {
// ""
const row1 = {
station: name[index],
type: "天数"
站点: name[index],
type: "时间",
最大: maxList[index].interval || '-',
天数总和: '-'
};
//
year.forEach(y => {
row1[y] = item[0].value ? item[0].value.toFixed(1) : '-';
});
//
row1.max = max[index] && max[index].value ? max[index].value.toFixed(1) : '';
row1.min = min[index] && min[index].value ? min[index].value.toFixed(1) : '';
// // ""
// ""
const row2 = {
station: name[index],
type: "时间"
站点: name[index],
type: "天数",
最大: maxList[index].cnt || '-',
天数总和: list[index]
};
//
year.forEach(y => {
row2[y] = item[0].tm ? item[0].tm.slice(5) : '-';
});
//
row2.max = max[index] && max[index].tm ? max[index].tm : '';
row2.min = min[index] && min[index].tm ? min[index].tm : '';
// maxPeriods
for (let i = 0; i < maxPeriods; i++) {
if (i < intervals.length) {
row1[`时段${i + 1}`] = intervals[i].interval;
row2[`时段${i + 1}`] = `${intervals[i].cnt}`;
} else {
row1[`时段${i + 1}`] = '-';
row2[`时段${i + 1}`] = '-';
}
}
processedData.push(row1);
processedData.push(row2);
});
console.log(processedData, 'processedData')
tableData.value = processedData;
}
//
const handleQuery = async () => {
return processedData;
};
const handleQuery = () => {
getList()
}
//
const arraySpanMethod = ({ row, column, rowIndex, columnIndex }) => {
if (columnIndex === 0) {
//
if (rowIndex % 2 === 0) {
@ -209,8 +214,14 @@ @@ -209,8 +214,14 @@
return [0, 0];
}
}
}
</script>
<style lang="scss" scoped>
:deep(.el-tabs),
:deep(.el-tabs .el-tabs__content) {
height: 100%;
}
</style>

24
src/views/statistic/rain/rain_main.vue

@ -39,22 +39,22 @@ @@ -39,22 +39,22 @@
value: '6',
label: '雨量水位对照'
},
// {
// value: '7',
// label: ''
// },
{
value: '7',
label: '面平均降雨量'
},
{
value: '8',
label: '暴雨检索'
},
// {
// value: '9',
// label: ''
// },
// {
// value: '10',
// label: ''
// },
{
value: '9',
label: '连续无雨日统计'
},
{
value: '10',
label: '有效降雨日统计'
},
{
value: '11',
label: '时段降雨极值'

8
src/views/statistic/rain/sdjsl.vue

@ -9,11 +9,11 @@ @@ -9,11 +9,11 @@
</el-select>
</el-form-item>
<el-form-item label="开始时间">
<el-date-picker v-model="queryParams.startTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" placeholder="选择开始时间" :disabled-date="disabledStartDate" @change="(val)=>changeTime(val,'start')">
<el-date-picker v-model="queryParams.startTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss" placeholder="选择开始时间" :disabled-date="disabledStartDate" @change="(val)=>changeTime(val,'start')">
</el-date-picker>
</el-form-item>
<el-form-item label="结束时间">
<el-date-picker v-model="queryParams.endTime" type="datetime" format="YYYY-MM-DD HH:mm:ss" placeholder="选择结束时间" :disabled-date="disabledEndDate" @change="(val)=>changeTime(val,'end')">
<el-date-picker v-model="queryParams.endTime" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" format="YYYY-MM-DD HH:mm:ss" placeholder="选择结束时间" :disabled-date="disabledEndDate" @change="(val)=>changeTime(val,'end')">
</el-date-picker>
</el-form-item>
<el-form-item>
@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
<pane :size="100 - firstSize">
<splitpanes horizontal class="default-theme" :push-other-panes="false">
<pane size="50">
<BarChart v-loading="echartsLoading" :legendData='legendData' :xAxisData="xAxisData" :seriesData="seriesData" :echartType="echartType" :grid="grid" :BarFormatter="false"/>
<BarChart v-loading="echartsLoading" :legendData='legendData' :xAxisData="xAxisData" :seriesData="seriesData" :echartType="echartType" :grid="grid" :BarFormatter="false" />
<!-- <el-tabs v-model="activeName" class="demo-tabs" @tab-change="changeTabs">
<el-tab-pane label="统计图" name="first" style="height:100%">
<BarChart v-loading="echartsLoading" :legendData='legendData' :xAxisData="xAxisData" :seriesData="seriesData" :echartType="echartType" />
@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
const props = defineProps({
tableTitle: {
type: String,
default: '表格标题'
default: '时段降雨量'
},
})
const { proxy } = getCurrentInstance()

4
src/views/statistic/rain/sdjyjz.vue

@ -21,8 +21,8 @@ @@ -21,8 +21,8 @@
<el-button type="primary" icon="Search" @click="handleQuery">查询</el-button>
</el-form-item>
<!-- <br />
<el-form-item label="报表排列方式(按站点)">
<el-radio-group v-model="direction" @change="getList">
<el-form-item label="报表排列方式(按站点)" style="margin-bottom: 0;">
<el-radio-group v-model="direction" @change="getList" class="pt10">
<el-radio label="zx">纵向</el-radio>
<el-radio label="hx">横向</el-radio>
</el-radio-group>

Loading…
Cancel
Save