From c6ddce366df61d0961e90317ba999d942d0a5448 Mon Sep 17 00:00:00 2001
From: shixiaoman <531268472@qq.com>
Date: Wed, 24 Nov 2021 18:33:51 +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

---
 .../river-station/statistic/site-day-avg.vue  |  7 +-
 .../water/river-station/statistic/site.vue    |  4 +
 src/views/water/river/statistic/avg-index.vue | 10 +--
 .../water/river/statistic/avg-standard.vue    | 20 +++--
 .../water/river/statistic/base-index.vue      | 12 ++-
 .../water/river/statistic/base-standard.vue   | 22 ++---
 .../water-function-area/statistic/auto.vue    | 83 +++++++++----------
 .../statistic/national.vue                    |  4 +
 8 files changed, 88 insertions(+), 74 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 c324d69..54e77f9 100644
--- a/src/views/water/river-station/statistic/site-day-avg.vue
+++ b/src/views/water/river-station/statistic/site-day-avg.vue
@@ -35,9 +35,11 @@
         </a-row>
       </a-form>
       <!-- 表格 -->
+      <a-spin :spinning="loading">
       <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>
     </a-card>
   </div>
   <!-- 编辑弹窗 -->
@@ -147,9 +149,7 @@
     methods: {
       /* 刷新表格 */
       reload() {
-        // this.$refs.table.reload({
-        //   where: this.where,
-        // });
+       this.loading = true;
         listWaterSiteMonthTotal(this.where).then((res) => {
           if (res.data.code == 0) {
             this.$message.success(res.data.msg);
@@ -157,6 +157,7 @@
           } else {
             this.$message.error(res.data.msg);
           }
+          this.loading = false;
         });
       },
       /* 重置搜索 */
diff --git a/src/views/water/river-station/statistic/site.vue b/src/views/water/river-station/statistic/site.vue
index 69094bc..6c728ae 100644
--- a/src/views/water/river-station/statistic/site.vue
+++ b/src/views/water/river-station/statistic/site.vue
@@ -43,6 +43,7 @@
         </a-row>
       </a-form>
       <!-- 表格 -->
+      <a-spin :spinning="loading">
       <ele-pro-table ref="table" :datasource="momData" :columns="columnsMom" :where="where"
         :scroll="{ x: 'max-content' }" @done="(d) => (data = d.data)">
       </ele-pro-table>
@@ -50,6 +51,7 @@
       <ele-pro-table ref="table" :datasource="yoyData" :columns="columnsYoy" :where="where"
         :scroll="{ x: 'max-content' }" @done="(d) => (data = d.data)">
       </ele-pro-table>
+    </a-spin>
     </a-card>
   </div>
   <!-- 编辑弹窗 -->
@@ -186,6 +188,7 @@
     methods: {
       /* 刷新表格 */
       reload() {
+        this.loading = true;
         listWaterSiteYoy(this.where).then((res) => {
           console.log(res.data.data);
           if (res.data.code == 0) {
@@ -199,6 +202,7 @@
             } else {
               this.$message.error(res.data.msg);
             }
+            this.loading = false;
         });
       },
       /* 重置搜索 */
diff --git a/src/views/water/river/statistic/avg-index.vue b/src/views/water/river/statistic/avg-index.vue
index b3916ed..1544af3 100644
--- a/src/views/water/river/statistic/avg-index.vue
+++ b/src/views/water/river/statistic/avg-index.vue
@@ -30,9 +30,11 @@
         </a-row>
       </a-form>
       <!-- 表格 -->
+      <a-spin :spinning="loading">
       <ele-pro-table ref="table" :datasource="momData" :columns="columns" :where="where" :scroll="{ x: 'max-content' }"
         @done="(d) => (data = d.data)">
       </ele-pro-table>
+    </a-spin>
     </a-card>
   </div>
   <!-- 编辑弹窗 -->
@@ -54,7 +56,6 @@
       return {
         data: [],
         momData: [],
-        yoyData: [],
         datasource: {},
         columns: [{
             title: '断面名称',
@@ -118,19 +119,18 @@
     methods: {
       /* 刷新表格 */
       reload() {
+        this.loading=true;
         listMonthCompositeIndex(this.where).then((res) => {
           console.log(res.data.data);
           if (res.data.code == 0) {
             this.$message.success(res.data.msg);
-            res.data.data.momData.forEach((m) => {
+            res.data.data.forEach((m) => {
               this.momData.push(m);
             })
-            res.data.data.yoyData.forEach((y) => {
-              this.yoyData.push(y);
-            })
           } else {
             this.$message.error(res.data.msg);
           }
+          this.loading=false;
         });
       },
       /* 重置搜索 */
diff --git a/src/views/water/river/statistic/avg-standard.vue b/src/views/water/river/statistic/avg-standard.vue
index d5981d1..a7b7662 100644
--- a/src/views/water/river/statistic/avg-standard.vue
+++ b/src/views/water/river/statistic/avg-standard.vue
@@ -36,9 +36,11 @@
         </a-row>
       </a-form>
       <!-- 表格 -->
-      <ele-pro-table ref="table" :datasource="momData" :columns="columns" :where="where" :scroll="{ x: 'max-content' }"
-        @done="(d) => (data = d.data)">
-      </ele-pro-table>
+      <a-spin :spinning="loading">
+        <ele-pro-table ref="table" :datasource="momData" :columns="columns" :where="where"
+          :scroll="{ x: 'max-content' }" @done="(d) => (data = d.data)">
+        </ele-pro-table>
+      </a-spin>
     </a-card>
   </div>
   <!-- 编辑弹窗 -->
@@ -69,8 +71,8 @@
           },
           {
             title: '断面名称',
-            dataIndex: 'stationName',
-            key: 'stationName',
+            dataIndex: 'sectionName',
+            key: 'sectionName',
           },
           {
             title: '考核城市',
@@ -126,19 +128,19 @@
     methods: {
       /* 刷新表格 */
       reload() {
+        this.loading = true;
         listMonthWaterQualitySandard(this.where).then((res) => {
           console.log(res.data.data);
           if (res.data.code == 0) {
             this.$message.success(res.data.msg);
-            res.data.data.momData.forEach((m) => {
+            res.data.data.forEach((m) => {
+              m.transnormalItem = "--"
               this.momData.push(m);
             })
-            res.data.data.yoyData.forEach((y) => {
-              this.yoyData.push(y);
-            })
           } else {
             this.$message.error(res.data.msg);
           }
+          this.loading = false;
         });
       },
       /* 重置搜索 */
diff --git a/src/views/water/river/statistic/base-index.vue b/src/views/water/river/statistic/base-index.vue
index fa01fd1..061b38d 100644
--- a/src/views/water/river/statistic/base-index.vue
+++ b/src/views/water/river/statistic/base-index.vue
@@ -33,9 +33,11 @@
         </a-row>
       </a-form>
       <!-- 表格 -->
-      <ele-pro-table ref="table" :datasource="momData" :columns="columns" :where="where" :scroll="{ x: 'max-content' }"
-        @done="(d) => (data = d.data)">
-      </ele-pro-table>
+      <a-spin :spinning="loading">
+        <ele-pro-table ref="table" :datasource="momData" :columns="columns" :where="where"
+          :scroll="{ x: 'max-content' }" @done="(d) => (data = d.data)">
+        </ele-pro-table>
+      </a-spin>
     </a-card>
   </div>
   <!-- 编辑弹窗 -->
@@ -121,11 +123,12 @@
     methods: {
       /* 刷新表格 */
       reload() {
+        this.loading = true;
         listMonthCompositeIndex(this.where).then((res) => {
           console.log(res.data.data);
           if (res.data.code == 0) {
             this.$message.success(res.data.msg);
-            res.data.data.momData.forEach((m) => {
+            res.data.data.forEach((m) => {
               this.momData.push(m);
             })
             res.data.data.yoyData.forEach((y) => {
@@ -134,6 +137,7 @@
           } else {
             this.$message.error(res.data.msg);
           }
+          this.loading = false;
         });
       },
       /* 重置搜索 */
diff --git a/src/views/water/river/statistic/base-standard.vue b/src/views/water/river/statistic/base-standard.vue
index b0cef4d..f3f90fa 100644
--- a/src/views/water/river/statistic/base-standard.vue
+++ b/src/views/water/river/statistic/base-standard.vue
@@ -1,4 +1,4 @@
-<!-- 江河水查看数据页面-->
+<!-- 当月水质目标-->
 <template>
   <div class="ele-body">
     <a-card :bordered="false">
@@ -33,9 +33,11 @@
         </a-row>
       </a-form>
       <!-- 表格 -->
-      <ele-pro-table ref="table" :datasource="momData" :columns="columns" :where="where" :scroll="{ x: 'max-content' }"
-        @done="(d) => (data = d.data)">
-      </ele-pro-table>
+      <a-spin :spinning="loading">
+        <ele-pro-table ref="table" :datasource="momData" :columns="columns" :where="where"
+          :scroll="{ x: 'max-content' }" @done="(d) => (data = d.data)">
+        </ele-pro-table>
+      </a-spin>
     </a-card>
   </div>
   <!-- 编辑弹窗 -->
@@ -57,7 +59,6 @@
       return {
         data: [],
         momData: [],
-        yoyData: [],
         datasource: {},
         columns: [{
             title: '断面类型',
@@ -66,8 +67,8 @@
           },
           {
             title: '断面名称',
-            dataIndex: 'stationName',
-            key: 'stationName',
+            dataIndex: 'sectionName',
+            key: 'sectionName',
           },
           {
             title: '考核城市',
@@ -123,19 +124,18 @@
     methods: {
       /* 刷新表格 */
       reload() {
+        this.loading = true;
         listMonthWaterQualitySandard(this.where).then((res) => {
           console.log(res.data.data);
           if (res.data.code == 0) {
             this.$message.success(res.data.msg);
-            res.data.data.momData.forEach((m) => {
+            res.data.data.forEach((m) => {
               this.momData.push(m);
             })
-            res.data.data.yoyData.forEach((y) => {
-              this.yoyData.push(y);
-            })
           } else {
             this.$message.error(res.data.msg);
           }
+          this.loading = false;
         });
       },
       /* 重置搜索 */
diff --git a/src/views/water/water-function-area/statistic/auto.vue b/src/views/water/water-function-area/statistic/auto.vue
index 8da09f3..2e07ee8 100644
--- a/src/views/water/water-function-area/statistic/auto.vue
+++ b/src/views/water/water-function-area/statistic/auto.vue
@@ -31,7 +31,7 @@
         </a-row>
       </a-form>
       <!-- 表格 -->
-      <ele-pro-table ref="table"  :datasource="datasource" :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-card>
@@ -60,7 +60,7 @@
         data: [],
         locale,
         datasource: {},
-         // 表格数据接口
+        // 表格数据接口
         // url: autonomyWaterFunctionTotalUrl,
         selection: [],
         tableColumns,
@@ -107,8 +107,8 @@
           e.nTotal = "-1";
           e.transp = "-1";
           e.chla = "-1";
-          e.ffeMajorOverStandardItemsMultiples =  "-1";
-          e.lprlMajorOverStandardItemsMultiples =  "-1";
+          e.ffeMajorOverStandardItemsMultiples = "-1";
+          e.lprlMajorOverStandardItemsMultiples = "-1";
         })
         this.datasource = res.data.data;
       });
@@ -127,45 +127,44 @@
     methods: {
       /* 刷新表格 */
       reload() {
-        // this.$refs.table.reload({
-        //   where: this.where,
-        // });
+        this.loading = true;
         autonomyWaterFunctionTotal().then((res) => {
-        res.data.data.forEach((e) => {
-          e.wTemp = "-1";
-          e.ph = "-1";
-          e.dissolvedOxygen = "-1";
-          e.cod = "-1";
-          e.fiveDayBod = "-1";
-          e.ammonia = "-1";
-          e.cu = "-1";
-          e.zn = "-1";
-          e.f = "-1";
-          e.se = "-1";
-          e.as = "-1";
-          e.hg = "-1";
-          e.cd = "-1";
-          e.cr6 = "-1";
-          e.pb = "-1";
-          e.cyanide = "-1";
-          e.vPhen = "-1";
-          e.oils = "-1";
-          e.anSaa = "-1";
-          e.s = "-1";
-          e.coloOrg = "-1";
-          e.so4 = "-1";
-          e.cl = "-1";
-          e.nitrateNitrogen = "-1";
-          e.fe = "-1";
-          e.mn = "-1";
-          e.nTotal = "-1";
-          e.transp = "-1";
-          e.chla = "-1";
-          e.ffeMajorOverStandardItemsMultiples =  "-1";
-          e.lprlMajorOverStandardItemsMultiples =  "-1";
-        })
-        this.datasource = res.data.data;
-      });
+          res.data.data.forEach((e) => {
+            e.wTemp = "-1";
+            e.ph = "-1";
+            e.dissolvedOxygen = "-1";
+            e.cod = "-1";
+            e.fiveDayBod = "-1";
+            e.ammonia = "-1";
+            e.cu = "-1";
+            e.zn = "-1";
+            e.f = "-1";
+            e.se = "-1";
+            e.as = "-1";
+            e.hg = "-1";
+            e.cd = "-1";
+            e.cr6 = "-1";
+            e.pb = "-1";
+            e.cyanide = "-1";
+            e.vPhen = "-1";
+            e.oils = "-1";
+            e.anSaa = "-1";
+            e.s = "-1";
+            e.coloOrg = "-1";
+            e.so4 = "-1";
+            e.cl = "-1";
+            e.nitrateNitrogen = "-1";
+            e.fe = "-1";
+            e.mn = "-1";
+            e.nTotal = "-1";
+            e.transp = "-1";
+            e.chla = "-1";
+            e.ffeMajorOverStandardItemsMultiples = "-1";
+            e.lprlMajorOverStandardItemsMultiples = "-1";
+          })
+          this.datasource = res.data.data;
+          this.loading = false;
+        });
       },
       /* 重置搜索 */
       reset() {
diff --git a/src/views/water/water-function-area/statistic/national.vue b/src/views/water/water-function-area/statistic/national.vue
index 6f1bc0c..14fce01 100644
--- a/src/views/water/water-function-area/statistic/national.vue
+++ b/src/views/water/water-function-area/statistic/national.vue
@@ -31,9 +31,11 @@
         </a-row>
       </a-form>
       <!-- 表格 -->
+      <a-spin :spinning="loading">
       <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>
     </a-card>
   </div>
   <!-- 编辑弹窗 -->
@@ -107,6 +109,7 @@
       };
     },
     mounted() {
+      this.loading = true;
       nationalWaterFunctionTotal().then((res) => {
         res.data.data.forEach((e) => {
           e.wTemp = "-1";
@@ -142,6 +145,7 @@
           e.lprlMajorOverStandardItemsMultiples =  "-1";
         })
         this.datasource = res.data.data;
+        this.loading = false;
       });
     },
     created() {