From df51b0a57f6e6e027cff71a26d63ff117ee01427 Mon Sep 17 00:00:00 2001
From: shixiaoman <531268472@qq.com>
Date: Tue, 7 Dec 2021 20:21:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E4=BB=A3=E7=A0=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ecology/river-statis.js                       |  2 +-
 .../water/water-function-area/statistic/auto-yoy.vue  |  4 +++-
 .../statistic/national-standard.vue                   |  1 +
 .../water-function-area/statistic/national-yoy.vue    | 11 +++++++++--
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/api/ecology/river-statis.js b/src/api/ecology/river-statis.js
index e4d5325..db05d24 100644
--- a/src/api/ecology/river-statis.js
+++ b/src/api/ecology/river-statis.js
@@ -4,7 +4,7 @@ import axios from 'axios';
 const nationalWaterFunctionTotalUrl = '/waterFunctionArea/riverStatic/nationalPage';
 //国家级水功能统计
 const listNationalWaterFunctionTotal = function (data) {
-    return axios.PostMapping("/waterFunctionArea/riverStatic/nationalPage",data)
+    return axios.post("/waterFunctionArea/riverStatic/nationalPage",data)
 }
 // /自治区水功能统计
 const listAutonomyWaterFunctionTotal = function (data) {
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 2d41be2..5f4dd07 100644
--- a/src/views/water/water-function-area/statistic/auto-yoy.vue
+++ b/src/views/water/water-function-area/statistic/auto-yoy.vue
@@ -54,6 +54,7 @@
 </template>
 
 <script>
+  import moment from "moment";
   import {
     listAutoYoy,
   } from "@/api/ecology/river-statis";
@@ -82,8 +83,9 @@
           },
           {
             title: "时间",
-            dataIndex: "monitorTime",
+            dataIndex: "samplingTime",
             sorter: true,
+            customRender: ({text})=> moment(text,"YYYY/MM").format("YYYY-MM")
           },
           {
             title: "水质目标",
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 1174701..bd6e54c 100644
--- a/src/views/water/water-function-area/statistic/national-standard.vue
+++ b/src/views/water/water-function-area/statistic/national-standard.vue
@@ -183,6 +183,7 @@
       /* 刷新表格 */
       reload() {
         this.loading = true;
+        this.datasource = [];
         listNationalStandard(this.where).then((res) => {
           console.log(res.data.data);
           if (res.data.code == 0) {
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 6f0e3fe..c6656be 100644
--- a/src/views/water/water-function-area/statistic/national-yoy.vue
+++ b/src/views/water/water-function-area/statistic/national-yoy.vue
@@ -54,6 +54,7 @@
 </template>
 
 <script>
+  import moment from "moment";
   import {
     listNationalYoy,
   } from "@/api/ecology/river-statis";
@@ -69,7 +70,7 @@
       return {
         data: [],
         locale,
-        datasource: {},
+        datasource: [],
         // 表格数据接口
         // url: autonomyWaterFunctionTotalUrl,
         selection: [],
@@ -84,6 +85,7 @@
             title: "时间",
             dataIndex: "samplingTime",
             sorter: true,
+            customRender: ({text})=> moment(text,"YYYY/MM").format("YYYY-MM")
           },
           {
             title: "水质目标",
@@ -136,8 +138,13 @@
         this.loading = true;
         listNationalYoy(this.where).then((res) => {
           console.log(res.data.data);
+          this.datasource = [];
           if (res.data.code == 0) {
-              this.datasource = res.data.data;
+            if (res.data.data) {
+              res.data.data.forEach(e => {
+                this.datasource.push(e);
+              })
+            }
           } else {
             this.$message.error(res.data.msg);
           }