From 5af6c81c0c4d76318aa4477ed3056ba8956df2f4 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 23 Jun 2022 17:19:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E5=AD=97=E6=8F=8F=E8=BF=B0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/shequzhili/csgltc/csgl.vue     | 5 +++--
 src/views/modules/shequzhili/csgltc/csglForm.vue | 2 +-
 src/views/modules/shequzhili/ggfwtc/ggfw.vue     | 5 +++--
 src/views/modules/shequzhili/ggfwtc/ggfwForm.vue | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/views/modules/shequzhili/csgltc/csgl.vue b/src/views/modules/shequzhili/csgltc/csgl.vue
index c2faec80..c7900d2a 100644
--- a/src/views/modules/shequzhili/csgltc/csgl.vue
+++ b/src/views/modules/shequzhili/csgltc/csgl.vue
@@ -526,8 +526,9 @@ export default {
       const { data, code, msg } = await requestPost(url, fileFormData)
       if (code === 0) {
         this.$message({
-          type: "success",
-          message: "上传成功"
+          showClose: true,
+          message: "导入中，请到系统管理-导入记录中查看进度",
+          duration: 0,
         });
 
         this.loadTable()
diff --git a/src/views/modules/shequzhili/csgltc/csglForm.vue b/src/views/modules/shequzhili/csgltc/csglForm.vue
index 9a77ae15..0bc1f14e 100644
--- a/src/views/modules/shequzhili/csgltc/csglForm.vue
+++ b/src/views/modules/shequzhili/csgltc/csglForm.vue
@@ -405,7 +405,7 @@ export default {
       geocoder
         .getAddress({ location: location }) // 将给定的坐标位置转换为地址
         .then((result) => {
-          this.formData.address = result.result.address === '' || result.result.address === null ? this.formData.address : result.result.address
+          this.formData.address = this.formData.address !== '' && this.formData.address !== null ? this.formData.address : (result.result.address === '' || result.result.address === null ? this.formData.address : result.result.address)
           // 显示搜索到的地址
         });
     },
diff --git a/src/views/modules/shequzhili/ggfwtc/ggfw.vue b/src/views/modules/shequzhili/ggfwtc/ggfw.vue
index a8783bcd..b73391e3 100644
--- a/src/views/modules/shequzhili/ggfwtc/ggfw.vue
+++ b/src/views/modules/shequzhili/ggfwtc/ggfw.vue
@@ -562,8 +562,9 @@ export default {
       const { data, code, msg } = await requestPost(url, fileFormData)
       if (code === 0) {
         this.$message({
-          type: "success",
-          message: "上传成功"
+          showClose: true,
+          message: "导入中，请到系统管理-导入记录中查看进度",
+          duration: 0,
         });
 
         this.loadTable()
diff --git a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue
index 9d0fb27f..798f50a4 100644
--- a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue
+++ b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue
@@ -384,7 +384,7 @@
         geocoder
                 .getAddress({ location: location }) // 将给定的坐标位置转换为地址
                 .then((result) => {
-                  this.formData.address = result.result.address === '' || result.result.address === null ? this.formData.address : result.result.address
+                  this.formData.address = this.formData.address !== '' && this.formData.address !== null ? this.formData.address : (result.result.address === '' || result.result.address === null ? this.formData.address : result.result.address)
                   // 显示搜索到的地址
                 });
       },