gxwebsoft/jczxw-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

江河模块修改

Browse Source
This commit is contained in:
shixiaoman
2021-12-06 14:01:02 +08:00
parent 77f31ce301
commit 1b58bd132a
15 changed files with 82 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/water/river/collect/index.vue
View File

@@ -245,7 +245,7 @@
console.log('判断222' + resp.data.data);
if (resp.data.data == "true") {
Modal.confirm({
title: resp.data.msg + '有重复数据，确认是否覆盖？',
title: '有重复数据，确认是否覆盖？',
onOk() {
tasks.push(
saveRiverBill({
@@ -376,7 +376,7 @@
if (resp.data.code == 0) {
if (resp.data.data == "true") {
Modal.confirm({
title: resp.data.msg + '有重复数据，确认是否覆盖？',
title: '有重复数据，确认是否覆盖？',
onOk() {
tasks.push(
saveWaterFunctionAreaBill({
@@ -442,7 +442,7 @@
console.log('判断222' + resp.data.data);
if (resp.data.data == "true") {
Modal.confirm({
title: resp.data.msg + '有重复数据，确认是否覆盖？',
title:'有重复数据，确认是否覆盖？',
onOk() {
tasks.push(
saveRiverStationBill({
@@ -570,7 +570,7 @@
if (resp.data.code == 0) {
if (resp.data.data == "true") {
Modal.confirm({
title: resp.data.msg + '有重复数据，确认是否覆盖？',
title:'有重复数据，确认是否覆盖？',
onOk() {
tasks.push(
saveRiverSiteBill({

2
src/views/water/river/dict/place.vue
View File

@@ -214,6 +214,8 @@
title: "断面类别",
dataIndex: "sectionGenre",
sorter: true,
customRender:({text})=> text == "1"?"国控断面":text == "2"?"省控断面":text == "3"?"市控断面":text == "4"?"水环境功能区监控断面":text == "5"?"重点流域断面":""
},
{
title: "水质目标",

4
src/views/water/river/statistic/avg-index.vue
View File

@@ -33,10 +33,10 @@
</a-select>
</a-form-item>
<a-form-item label="开始时间:">
<a-month-picker v-model:value="where.startTime" :disabled-date="disabledDate" />
<a-month-picker valueFormat="YYYY-MM" v-model:value="where.startTime" :disabled-date="disabledDate" />
</a-form-item>
<a-form-item label="结束时间:">
<a-month-picker v-model:value="where.endTime" :disabled-date="disabledDate" />
<a-month-picker valueFormat="YYYY-MM" v-model:value="where.endTime" :disabled-date="disabledDate" />
</a-form-item>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">

11
src/views/water/river/statistic/avg-standard.vue
View File

@@ -32,17 +32,12 @@
</a-select-option>
</a-select>
</a-form-item>
<!-- <a-form-item label="年份:">
<a-date-picker valueFormat="YYYY" v-model:value="where.year"></a-date-picker>
</a-form-item>
<a-form-item label="月份:">
<a-date-picker valueFormat="MM" v-model:value="where.month"></a-date-picker>
</a-form-item> -->
<a-form-item label="开始时间:">
<a-month-picker v-model:value="where.startTime" :disabled-date="disabledDate" />
<a-month-picker valueFormat="YYYY-MM" v-model:value="where.startTime" :disabled-date="disabledDate" />
</a-form-item>
<a-form-item label="结束时间:">
<a-month-picker v-model:value="where.endTime" :disabled-date="disabledDate" />
<a-month-picker valueFormat="YYYY-MM" v-model:value="where.endTime" :disabled-date="disabledDate" />
</a-form-item>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">

10
src/views/water/river/statistic/base-index.vue
View File

@@ -32,17 +32,11 @@
</a-select-option>
</a-select>
</a-form-item>
<!-- <a-form-item label="年份:">
<a-date-picker valueFormat="YYYY" v-model:value="where.year"></a-date-picker>
</a-form-item>
<a-form-item label="月份:">
<a-date-picker valueFormat="MM" v-model:value="where.month"></a-date-picker>
</a-form-item> -->
<a-form-item label="开始时间:">
<a-month-picker v-model:value="where.startTime" :disabled-date="disabledDate" />
<a-month-picker valueFormat="YYYY-MM" v-model:value="where.startTime" :disabled-date="disabledDate" />
</a-form-item>
<a-form-item label="结束时间:">
<a-month-picker v-model:value="where.endTime" :disabled-date="disabledDate" />
<a-month-picker valueFormat="YYYY-MM" v-model:value="where.endTime" :disabled-date="disabledDate" />
</a-form-item>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">

11
src/views/water/river/statistic/base-standard.vue
View File

@@ -32,17 +32,12 @@
</a-select-option>
</a-select>
</a-form-item>
<!-- <a-form-item label="年份:">
<a-date-picker valueFormat="YYYY" v-model:value="where.year"></a-date-picker>
</a-form-item>
<a-form-item label="月份:">
<a-date-picker valueFormat="MM" v-model:value="where.month"></a-date-picker>
</a-form-item> -->
<a-form-item label="开始时间:">
<a-month-picker v-model:value="where.startTime" :disabled-date="disabledDate" />
<a-month-picker valueFormat="YYYY-MM" v-model:value="where.startTime" :disabled-date="disabledDate" />
</a-form-item>
<a-form-item label="结束时间:">
<a-month-picker v-model:value="where.endTime" :disabled-date="disabledDate" />
<a-month-picker valueFormat="YYYY-MM" v-model:value="where.endTime" :disabled-date="disabledDate" />
</a-form-item>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">

57
src/views/water/river/statistic/base.vue
View File

@@ -3,41 +3,24 @@
<div class="ele-body">
<a-card :bordered="false">
<!-- 搜索表单 -->
<!-- <a-form :model="where" :label-col="{ md: { span: 8 }, sm: { span: 36 } }"
:wrapper-col="{ md: { span: 16 }, sm: { span: 24 } }">
<a-row>
<a-form-item label="断面名称">
<a-select v-model:value="where.sectionName" allowClear showSearch>
<a-select-option v-for="item in sectionInfo" :key="item.sectionName">{{ item.sectionName }}
</a-select-option>
</a-select>
</a-form-item>
<a-form-item label="起始日期:">
<a-date-picker valueFormat="YYYY-MM-DD 00:00:00" v-model:value="where.timeStart"></a-date-picker>
</a-form-item>
<a-form-item label="结束日期:">
<a-date-picker valueFormat="YYYY-MM-DD 23:59:59" v-model:value="where.timeEnd"></a-date-picker>
</a-form-item>
<a-col :lg="6" :md="12" :sm="24" :xs="24">
<a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
<a-space>
<a-button type="primary" @click="reload">查询</a-button>
<a-button @click="reset">重置</a-button>
<a-button @click="exportFile">导出Excel</a-button>
</a-space>
</a-form-item>
</a-col>
</a-row>
</a-form> -->
<a-form :model="where" layout="inline">
<a-form-item label="起始日期:">
<a-date-picker valueFormat="YYYY-MM-DD 00:00:00" v-model:value="where.timeStart"></a-date-picker>
</a-form-item>
<a-form-item label="结束日期:">
<a-date-picker valueFormat="YYYY-MM-DD 23:59:59" v-model:value="where.timeEnd"></a-date-picker>
</a-form-item>
<a-form-item label="开始时间:">
<a-month-picker
v-model:value="where.startTime"
:disabled-date="disabledDate"
valueFormat="YYYY-MM"
placeholder="开始时间"
/>
</a-form-item>
<a-form-item label="结束时间:">
<a-month-picker
v-model:value="where.endTime"
:disabled-date="disabledDate"
valueFormat="YYYY-MM"
placeholder="结束时间"
/>
</a-form-item>
<a-form-item label="断面名称">
<a-select allow-clear mode="multiple" placeholder="请选择断面名称" v-model:value="where.name">
<a-select-option v-for="item in sectionInfo" :key="item.sectionName" :value="item.sectionName">
@@ -46,7 +29,7 @@
</a-select>
</a-form-item>
<a-form-item label="河段名称">
<a-select v-model:value="where.waterBody" allowClear showSearch>
<a-select v-model:value="where.riverLakeLibrary" allowClear showSearch>
<a-select-option v-for="item in waterSystemList" :key="item">{{ item }}
</a-select-option>
</a-select>
@@ -174,6 +157,12 @@
console.log(res.data.data)
this.visibleWater = true;
this.sectionInfo = res.data.data
res.data.data.forEach((m) => {
this.waterSystemList.push(m.waterBody);
this.waterBodyList.push(m.riverSystem);
})
this.waterSystemList = [...new Set(this.waterSystemList)];
this.waterBodyList = [...new Set(this.waterBodyList)];
} else {
this.$message.error(res.data.msg);
}