From e7ae6433c3d17b312e6b2a5093c4197534fa1e15 Mon Sep 17 00:00:00 2001
From: shixiaoman <531268472@qq.com>
Date: Wed, 8 Dec 2021 18:15:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B1=9F=E6=B2=B3bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                                          |  2 +-
 src/views/water/river/collect/index.vue       | 43 +++++++++++++++----
 .../water/river/statistic/avg-standard.vue    |  4 +-
 3 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/.env b/.env
index b7bd75e..d301b38 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,3 @@
 VUE_APP_VERSION=1.0.0
 VUE_APP_NAME=生态环境监测数据综合分析平台
-VUE_APP_API_BASE_URL=http://1.14.132.108:10002/api
+VUE_APP_API_BASE_URL=http://localhost:10001/api
diff --git a/src/views/water/river/collect/index.vue b/src/views/water/river/collect/index.vue
index 78f771e..49ab3d1 100644
--- a/src/views/water/river/collect/index.vue
+++ b/src/views/water/river/collect/index.vue
@@ -235,6 +235,7 @@
               return;
             }
             const tasks = [];
+            let _this =this;
             if (billData.length > 0) {
               hide();
               saveJudgeInfo({
@@ -260,7 +261,10 @@
                                 title: "导入成功",
                                 content: `成功导入${billData.length}条数据`,
                               });
-                              this.$refs.water && this.$refs.water.reload();
+                              _this.$refs.water && _this.$refs.water.reload();
+                              _this.$router.replace({
+                                path: "/water/river/collect/water/" + res.data.data.surfaceWaterSectionBillId
+                            })
                             } else {
                               Modal.error({
                                 title: "导入失败",
@@ -287,7 +291,10 @@
                           title: "导入成功",
                           content: `成功导入${billData.length}条数据`,
                         });
-                        this.$refs.water && this.$refs.water.reload();
+                        _this.$refs.water && _this.$refs.water.reload();
+                        _this.$router.replace({
+                                path: "/water/river/collect/water/" + res.data.data.surfaceWaterSectionBillId
+                            })
                       } else {
                         Modal.error({
                           title: "导入失败",
@@ -368,6 +375,7 @@
             }
             const tasks = [];
             var varType = this.exportType;
+            let _this = this;
             if (billData.length > 0) {
               if (this.exportType == "1") {
                 hide();
@@ -391,7 +399,10 @@
                                   title: "导入成功",
                                   content: `成功导入${billData.length}条数据`,
                                 });
-                                this.$refs.water && this.$refs.water.reload();
+                                _this.$refs.water && _this.$refs.water.reload();
+                                _this.$router.replace({
+                                    path: "/water/river/function/collect/water/" + res.data.data.nationalLevelWaterFunctionAreaBillId
+                                })
                               } else {
                                 Modal.error({
                                   title: "导入失败",
@@ -417,7 +428,10 @@
                             title: "导入成功",
                             content: `成功导入${billData.length}条数据`,
                           });
-                          this.$refs.water && this.$refs.water.reload();
+                          _this.$refs.water && _this.$refs.water.reload();
+                          _this.$router.replace({
+                              path: "/water/river/function/collect/water/" + res.data.data.nationalLevelWaterFunctionAreaBillId
+                          })
                         } else {
                           Modal.error({
                             title: "导入失败",
@@ -457,7 +471,10 @@
                                   title: "导入成功",
                                   content: `成功导入${billData.length}条数据`,
                                 });
-                                this.$refs.water && this.$refs.water.reload();
+                                _this.$refs.water && _this.$refs.water.reload();
+                                _this.$router.replace({
+                                    path: "/water/river/function/city/collect/water/" + res.data.data.nationalLevelWaterFunctionAreaBillId
+                                })
                               } else {
                                 Modal.error({
                                   title: "导入失败",
@@ -483,7 +500,10 @@
                             title: "导入成功",
                             content: `成功导入${billData.length}条数据`,
                           });
-                          this.$refs.water && this.$refs.water.reload();
+                          _this.$refs.water && _this.$refs.water.reload();
+                          _this.$router.replace({
+                              path: "/water/river/function/city/collect/water/" + res.data.data.nationalLevelWaterFunctionAreaBillId
+                          })
                         } else {
                           Modal.error({
                             title: "导入失败",
@@ -563,6 +583,7 @@
             }
             const tasks = [];
             var system = this.param.system;
+            let _this = this;
             if (billData.length > 0) {
               hide();
               saveJudgeInfoSite({
@@ -585,7 +606,10 @@
                                 title: "导入成功",
                                 content: `成功导入${billData.length}条数据`,
                               });
-                              this.$refs.water && this.$refs.water.reload();
+                              _this.$refs.water && _this.$refs.water.reload();
+                              _this.$router.replace({
+                                path: "/water/river/station/collect/water/" + res.data.data.waterSiteBillId
+                              })
                             } else {
                               Modal.error({
                                 title: "导入失败",
@@ -611,7 +635,10 @@
                           title: "导入成功",
                           content: `成功导入${billData.length}条数据`,
                         });
-                        this.$refs.water && this.$refs.water.reload();
+                        _this.$refs.water && _this.$refs.water.reload();
+                        _this.$router.replace({
+                          path: "/water/river/station/collect/water/" + res.data.data.waterSiteBillId
+                        })
                       } else {
                         Modal.error({
                           title: "导入失败",
diff --git a/src/views/water/river/statistic/avg-standard.vue b/src/views/water/river/statistic/avg-standard.vue
index 0e065bd..1d30a09 100644
--- a/src/views/water/river/statistic/avg-standard.vue
+++ b/src/views/water/river/statistic/avg-standard.vue
@@ -171,7 +171,9 @@
           if (res.data.code == 0) {
             this.$message.success(res.data.msg);
             res.data.data.forEach((m) => {
-              m.transnormalItem = "--"
+              if(m.transnormalItem==""){
+                m.transnormalItem = "--"
+              }
               this.momData.push(m);
             })
           } else {