From 1b58bd132ac4304c66ad310f82e994e00c549ef1 Mon Sep 17 00:00:00 2001
From: shixiaoman <531268472@qq.com>
Date: Mon, 6 Dec 2021 14:01:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B1=9F=E6=B2=B3=E6=A8=A1=E5=9D=97=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../river-station/statistic/site-day-avg.vue  |  9 +--
 .../water/river-station/statistic/site.vue    | 14 ++---
 src/views/water/river/collect/index.vue       |  8 +--
 src/views/water/river/dict/place.vue          |  2 +
 src/views/water/river/statistic/avg-index.vue |  4 +-
 .../water/river/statistic/avg-standard.vue    | 11 +---
 .../water/river/statistic/base-index.vue      | 10 +---
 .../water/river/statistic/base-standard.vue   | 11 +---
 src/views/water/river/statistic/base.vue      | 57 ++++++++-----------
 .../statistic/auto-standard.vue               |  4 +-
 .../statistic/auto-yoy.vue                    |  6 +-
 .../water-function-area/statistic/auto.vue    | 33 +++++++----
 .../statistic/national-standard.vue           |  4 +-
 .../statistic/national-yoy.vue                |  4 +-
 .../statistic/national.vue                    |  4 +-
 15 files changed, 82 insertions(+), 99 deletions(-)

diff --git a/src/views/water/river-station/statistic/site-day-avg.vue b/src/views/water/river-station/statistic/site-day-avg.vue
index 0784e2d..03e4687 100644
--- a/src/views/water/river-station/statistic/site-day-avg.vue
+++ b/src/views/water/river-station/statistic/site-day-avg.vue
@@ -7,13 +7,14 @@
         :wrapper-col="{ md: { span: 16 }, sm: { span: 24 } }">
         <a-row>
           <a-form-item label="断面名称">
-            <a-select v-model:value="where.name" allowClear showSearch>
-              <a-select-option v-for="item in sectionInfo" :key="item.stationName">{{ item.stationName }}
+             <a-select allow-clear mode="multiple" placeholder="请选择断面名称" v-model:value="where.name">
+              <a-select-option v-for="item in sectionInfo" :key="item.stationName" :value="item.stationName">
+                {{ item.stationName }}
               </a-select-option>
             </a-select>
           </a-form-item>
-          <a-form-item label="月份:">
-            <a-month-picker v-model:value="where.time" :disabled-date="disabledDate" />
+          <a-form-item label="时间:">
+            <a-month-picker valueFormat="YYYY-MM" v-model:value="where.time" :disabled-date="disabledDate" />
           </a-form-item>
           <a-form-item label="类型:" style="width:100px">
             <a-select v-model:value="where.type" allowClear showSearch>
diff --git a/src/views/water/river-station/statistic/site.vue b/src/views/water/river-station/statistic/site.vue
index 0b9c2d8..7270714 100644
--- a/src/views/water/river-station/statistic/site.vue
+++ b/src/views/water/river-station/statistic/site.vue
@@ -7,21 +7,17 @@
         :wrapper-col="{ md: { span: 16 }, sm: { span: 24 } }">
         <a-row>
           <a-form-item label="断面名称">
-            <a-select v-model:value="where.name" allowClear showSearch>
-              <a-select-option v-for="item in sectionInfo" :key="item.stationName">{{ item.stationName }}
+           <a-select allow-clear mode="multiple" placeholder="请选择断面名称" v-model:value="where.name">
+              <a-select-option v-for="item in sectionInfo" :key="item.stationName" :value="item.stationName">
+                {{ item.stationName }}
               </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-form-item label="时间:">
               <a-month-picker
               v-model:value="where.time"
               :disabled-date="disabledDate"
+              valueFormat="YYYY-MM"
             />
           </a-form-item>
           <a-form-item label="类型:" style="width:100px"> 
diff --git a/src/views/water/river/collect/index.vue b/src/views/water/river/collect/index.vue
index 62adeaf..195ea9b 100644
--- a/src/views/water/river/collect/index.vue
+++ b/src/views/water/river/collect/index.vue
@@ -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({
diff --git a/src/views/water/river/dict/place.vue b/src/views/water/river/dict/place.vue
index cf1d488..efe0eea 100644
--- a/src/views/water/river/dict/place.vue
+++ b/src/views/water/river/dict/place.vue
@@ -214,6 +214,8 @@
             title: "断面类别",
             dataIndex: "sectionGenre",
             sorter: true,
+            customRender:({text})=>  text == "1"?"国控断面":text == "2"?"省控断面":text == "3"?"市控断面":text == "4"?"水环境功能区监控断面":text == "5"?"重点流域断面":""
+   
           },
           {
             title: "水质目标",
diff --git a/src/views/water/river/statistic/avg-index.vue b/src/views/water/river/statistic/avg-index.vue
index e00ca4b..a98fe59 100644
--- a/src/views/water/river/statistic/avg-index.vue
+++ b/src/views/water/river/statistic/avg-index.vue
@@ -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 }">
diff --git a/src/views/water/river/statistic/avg-standard.vue b/src/views/water/river/statistic/avg-standard.vue
index bdf0e05..ed3c2d7 100644
--- a/src/views/water/river/statistic/avg-standard.vue
+++ b/src/views/water/river/statistic/avg-standard.vue
@@ -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 }">
diff --git a/src/views/water/river/statistic/base-index.vue b/src/views/water/river/statistic/base-index.vue
index 2ec7036..ebab8e8 100644
--- a/src/views/water/river/statistic/base-index.vue
+++ b/src/views/water/river/statistic/base-index.vue
@@ -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 }">
diff --git a/src/views/water/river/statistic/base-standard.vue b/src/views/water/river/statistic/base-standard.vue
index 009ec6d..b9168e3 100644
--- a/src/views/water/river/statistic/base-standard.vue
+++ b/src/views/water/river/statistic/base-standard.vue
@@ -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 }">
diff --git a/src/views/water/river/statistic/base.vue b/src/views/water/river/statistic/base.vue
index a910b9d..eb261d2 100644
--- a/src/views/water/river/statistic/base.vue
+++ b/src/views/water/river/statistic/base.vue
@@ -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);
           }
diff --git a/src/views/water/water-function-area/statistic/auto-standard.vue b/src/views/water/water-function-area/statistic/auto-standard.vue
index 12a83ac..3b463c2 100644
--- a/src/views/water/water-function-area/statistic/auto-standard.vue
+++ b/src/views/water/water-function-area/statistic/auto-standard.vue
@@ -26,7 +26,7 @@
             </a-select>
           </a-form-item>
           <a-form-item label="查询日期:">
-            <a-date-picker valueFormat="YYYY" v-model:value="where.startTime"></a-date-picker>
+            <a-month-picker valueFormat="YYYY" v-model:value="where.startTime" />
           </a-form-item>
 
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
@@ -171,7 +171,7 @@
           this.visibleWater = true;
           this.sectionInfo = res.data.data
           res.data.data.forEach((m) => {
-            this.waterSystemList.push(m.waterBody);
+             this.waterSystemList.push(m.riverLakeLibrary);
           })
           this.waterSystemList = [...new Set(this.waterSystemList)];
         } else {
diff --git a/src/views/water/water-function-area/statistic/auto-yoy.vue b/src/views/water/water-function-area/statistic/auto-yoy.vue
index 3297dfd..2d41be2 100644
--- a/src/views/water/water-function-area/statistic/auto-yoy.vue
+++ b/src/views/water/water-function-area/statistic/auto-yoy.vue
@@ -26,10 +26,10 @@
             </a-select>
           </a-form-item>
           <a-form-item label="起始日期:">
-            <a-date-picker valueFormat="YYYY-MM" v-model:value="where.startTime"></a-date-picker>
+            <a-month-picker valueFormat="YYYY-MM" v-model:value="where.startTime"></a-month-picker>
           </a-form-item>
           <a-form-item label="结束日期:">
-            <a-date-picker valueFormat="YYYY-MM" v-model:value="where.endTime"></a-date-picker>
+            <a-month-picker valueFormat="YYYY-MM" v-model:value="where.endTime"></a-month-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 }">
@@ -123,7 +123,7 @@
           this.visibleWater = true;
           this.sectionInfo = res.data.data
           res.data.data.forEach((m) => {
-            this.waterSystemList.push(m.waterBody);
+             this.waterSystemList.push(m.riverLakeLibrary);
           })
           this.waterSystemList = [...new Set(this.waterSystemList)];
         } else {
diff --git a/src/views/water/water-function-area/statistic/auto.vue b/src/views/water/water-function-area/statistic/auto.vue
index 34e29c3..200f248 100644
--- a/src/views/water/water-function-area/statistic/auto.vue
+++ b/src/views/water/water-function-area/statistic/auto.vue
@@ -26,10 +26,10 @@
             </a-select>
           </a-form-item>
           <a-form-item label="起始日期:">
-            <a-date-picker valueFormat="YYYY-MM-DD" v-model:value="where.startTime"></a-date-picker>
+            <a-month-picker valueFormat="YYYY-MM" v-model:value="where.startTime"></a-month-picker>
           </a-form-item>
           <a-form-item label="结束日期:">
-            <a-date-picker valueFormat="YYYY-MM-DD" v-model:value="where.endTime"></a-date-picker>
+            <a-month-picker valueFormat="YYYY-MM" v-model:value="where.endTime"></a-month-picker>
           </a-form-item>
 
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
@@ -45,7 +45,7 @@
       </a-form>
       <!-- 表格 -->
       <a-spin :spinning="loading">
-        <ele-pro-table ref="table" :datasource="url" :columns="columns" :where="where"
+        <ele-pro-table ref="table" :datasource="datasource" :columns="columns" :where="where"
           :scroll="{ x: 'max-content' }" @done="(d) => (data = d.data)">
         </ele-pro-table>
       </a-spin>
@@ -56,7 +56,7 @@
 
 <script>
   import {
-    autonomyWaterFunctionTotalUrl,
+    autonomyWaterFunctionTotal,
   } from "@/api/ecology/river-statis";
   import {
     listInfo
@@ -75,7 +75,7 @@
         locale,
         datasource: {},
         // 表格数据接口
-        url: autonomyWaterFunctionTotalUrl,
+        // url: autonomyWaterFunctionTotalUrl,
         selection: [],
         tableColumns,
         // 表格列配置
@@ -104,7 +104,8 @@
           this.visibleWater = true;
           this.sectionInfo = res.data.data
           res.data.data.forEach((m) => {
-            this.waterSystemList.push(m.waterBody);
+            this.waterSystemList.push(m.riverLakeLibrary);
+            console.log(this.waterSystemList);
           })
           this.waterSystemList = [...new Set(this.waterSystemList)];
         } else {
@@ -116,11 +117,21 @@
       /* 刷新表格 */
       reload() {
         this.loading = true;
-        console.log(this.where);
-        this.$refs.table.reload({
-        where: this.where,
-      });
-      console.log(this.url);
+      //   console.log(this.where);
+      //   this.$refs.table.reload({
+      //   where: this.where,
+      // });
+      // console.log(this.url);
+      autonomyWaterFunctionTotal(this.where).then((res) => {
+          console.log(res.data.data);
+          if (res.data.code == 0) {
+            this.$message.success(res.data.msg);
+            this.datasource=res.data.data;
+          } else {
+            this.$message.error(res.data.msg);
+          }
+          this.loading = false;
+        });
       this.loading = false;
       },
       /* 重置搜索 */
diff --git a/src/views/water/water-function-area/statistic/national-standard.vue b/src/views/water/water-function-area/statistic/national-standard.vue
index 9ea4dda..1174701 100644
--- a/src/views/water/water-function-area/statistic/national-standard.vue
+++ b/src/views/water/water-function-area/statistic/national-standard.vue
@@ -26,7 +26,7 @@
             </a-select>
           </a-form-item>
           <a-form-item label="查询日期:">
-            <a-date-picker valueFormat="YYYY" v-model:value="where.startTime"></a-date-picker>
+            <a-month-picker valueFormat="YYYY" v-model:value="where.startTime"></a-month-picker>
           </a-form-item>
 
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
@@ -171,7 +171,7 @@
           this.visibleWater = true;
           this.sectionInfo = res.data.data
           res.data.data.forEach((m) => {
-            this.waterSystemList.push(m.waterBody);
+            this.waterSystemList.push(m.riverLakeLibrary);
           })
           this.waterSystemList = [...new Set(this.waterSystemList)];
         } else {
diff --git a/src/views/water/water-function-area/statistic/national-yoy.vue b/src/views/water/water-function-area/statistic/national-yoy.vue
index f1794bd..6f0e3fe 100644
--- a/src/views/water/water-function-area/statistic/national-yoy.vue
+++ b/src/views/water/water-function-area/statistic/national-yoy.vue
@@ -26,10 +26,10 @@
             </a-select>
           </a-form-item>
           <a-form-item label="起始日期:">
-            <a-date-picker valueFormat="YYYY-MM" v-model:value="where.startTime"></a-date-picker>
+            <a-month-picker valueFormat="YYYY-MM" v-model:value="where.startTime" />
           </a-form-item>
           <a-form-item label="结束日期:">
-            <a-date-picker valueFormat="YYYY-MM" v-model:value="where.endTime"></a-date-picker>
+            <a-month-picker valueFormat="YYYY-MM" v-model:value="where.endTime" />
           </a-form-item>
           <a-col :lg="6" :md="12" :sm="24" :xs="24">
             <a-form-item class="ele-text-right" :wrapper-col="{ span: 24 }">
diff --git a/src/views/water/water-function-area/statistic/national.vue b/src/views/water/water-function-area/statistic/national.vue
index be770dd..a656e0e 100644
--- a/src/views/water/water-function-area/statistic/national.vue
+++ b/src/views/water/water-function-area/statistic/national.vue
@@ -26,10 +26,10 @@
             </a-select>
           </a-form-item>
           <a-form-item label="起始日期:">
-            <a-date-picker valueFormat="YYYY-MM-DD " v-model:value="where.startTime"></a-date-picker>
+            <a-month-picker valueFormat="YYYY-MM" v-model:value="where.startTime"></a-month-picker>
           </a-form-item>
           <a-form-item label="结束日期:">
-            <a-date-picker valueFormat="YYYY-MM-DD " v-model:value="where.endTime"></a-date-picker>
+            <a-month-picker valueFormat="YYYY-MM" v-model:value="where.endTime"></a-month-picker>
           </a-form-item>
 
           <a-col :lg="6" :md="12" :sm="24" :xs="24">