From 23d9736369738f571288d606f1d96d882e60f0d4 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Thu, 23 Jun 2022 15:38:52 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=88=AB=E9=97=AE=EF=BC=8C=E9=97=AE?= =?UTF-8?q?=E5=B0=B1=E6=98=AF=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/cpts/base/cpts/edit.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/cpts/base/cpts/edit.vue b/src/views/modules/cpts/base/cpts/edit.vue index 8955e14d..c2a66f13 100644 --- a/src/views/modules/cpts/base/cpts/edit.vue +++ b/src/views/modules/cpts/base/cpts/edit.vue @@ -506,7 +506,7 @@ export default { // 在地图显示范围内以给定的关键字搜索地点 search .searchRectangle({ - keyword: item.value, + keyword: this.fmData[item.keyName], bounds: map.getBounds(), }) .then((result) => { From 2f17a19b380fc7ba2a1a14ec06fe0c9385298978 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 23 Jun 2022 16:21:51 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/shequzhili/csgltc/csglForm.vue | 16 ++++++++++------ src/views/modules/shequzhili/ggfwtc/ggfwForm.vue | 14 +++++++++----- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/views/modules/shequzhili/csgltc/csglForm.vue b/src/views/modules/shequzhili/csgltc/csglForm.vue index b09e52fd..0280c093 100644 --- a/src/views/modules/shequzhili/csgltc/csglForm.vue +++ b/src/views/modules/shequzhili/csgltc/csglForm.vue @@ -72,6 +72,8 @@ label-width="150px"> @@ -240,8 +242,10 @@ export default { data : this.cityManagement } this.formData = { ...data } - map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude)) - this.setMarker(this.formData.latitude, this.formData.longitude) + const lat = this.formData.latitude === null || this.formData.latitude === '' ? '36.06203' : this.formData.latitude; + const lon = this.formData.longitude === null || this.formData.longitude === '' ? '120.38494' : this.formData.longitude; + map.setCenter(new TMap.LatLng(lat,lon)) + this.setMarker(lat,lon) } else { this.$message.error(msg) } @@ -274,7 +278,7 @@ export default { }else { url = '/gov/org/icCityManagement/edit' } - const { data, code, msg } = await requestPost(url, this.formData) + const { data, code, msg, internalMsg } = await requestPost(url, this.formData) if (code === 0) { this.$message({ type: 'success', @@ -285,7 +289,7 @@ export default { this.btnDisable = false } else { this.btnDisable = false - this.$message.error(msg) + this.$message.error(internalMsg) } }, @@ -298,7 +302,7 @@ export default { // 地图初始化函数，本例取名为init，开发者可根据实际情况定义 initMap () { // 定义地图中心点坐标 - var center = new window.TMap.LatLng(36.0722275, 120.38945519) + var center = new window.TMap.LatLng(36.52799, 120.7553) // 定义map变量，调用 TMap.Map() 构造函数创建地图 map = new window.TMap.Map(document.getElementById('app'), { center: center, // 设置地图中心点坐标 @@ -401,7 +405,7 @@ export default { geocoder .getAddress({ location: location }) // 将给定的坐标位置转换为地址 .then((result) => { - this.formData.address = result.result.address + this.formData.address = result.result.address === '' || result.result.address === null ? this.formData.address : result.result.address // 显示搜索到的地址 }); }, diff --git a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue index 6b433e07..9d0fb27f 100644 --- a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue +++ b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue @@ -44,6 +44,8 @@ label-width="150px"> 平方公里 @@ -218,8 +220,10 @@ } this.formData = { ...data } - map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude)) - this.setMarker(this.formData.latitude, this.formData.longitude) + const lat = this.formData.latitude === null || this.formData.latitude === '' ? '36.06203' : this.formData.latitude; + const lon = this.formData.longitude === null || this.formData.longitude === '' ? '120.38494' : this.formData.longitude; + map.setCenter(new TMap.LatLng(lat, lon)) + this.setMarker(lat, lon) } else { this.$message.error(msg) } @@ -252,7 +256,7 @@ }else { url = '/gov/org/icPublicService/edit' } - const { data, code, msg } = await requestPost(url, this.formData) + const { data, code, msg,internalMsg } = await requestPost(url, this.formData) if (code === 0) { this.$message({ type: 'success', @@ -263,7 +267,7 @@ this.btnDisable = false } else { this.btnDisable = false - this.$message.error(msg) + this.$message.error(internalMsg) } }, @@ -380,7 +384,7 @@ geocoder .getAddress({ location: location }) // 将给定的坐标位置转换为地址 .then((result) => { - this.formData.address = result.result.address + this.formData.address = result.result.address === '' || result.result.address === null ? this.formData.address : result.result.address // 显示搜索到的地址 }); }, From 777c44eec6a3623554a229eb0f097505114ae580 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 23 Jun 2022 16:34:10 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/shequzhili/csgltc/csglForm.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/shequzhili/csgltc/csglForm.vue b/src/views/modules/shequzhili/csgltc/csglForm.vue index 0280c093..9a77ae15 100644 --- a/src/views/modules/shequzhili/csgltc/csglForm.vue +++ b/src/views/modules/shequzhili/csgltc/csglForm.vue @@ -62,6 +62,8 @@ label-width="150px"> 平方公里 @@ -72,8 +74,6 @@ label-width="150px"> From 009504399c2d04aa8455cd867521d872e0f3021a Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 23 Jun 2022 16:56:44 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=96=87=E5=AD=97=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=E4=BF=AE=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 | 2 +- src/views/modules/shequzhili/ggfwtc/ggfw.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/shequzhili/csgltc/csgl.vue b/src/views/modules/shequzhili/csgltc/csgl.vue index 50d6bb80..c2faec80 100644 --- a/src/views/modules/shequzhili/csgltc/csgl.vue +++ b/src/views/modules/shequzhili/csgltc/csgl.vue @@ -527,7 +527,7 @@ export default { if (code === 0) { this.$message({ type: "success", - message: "导入成功" + message: "上传成功" }); this.loadTable() diff --git a/src/views/modules/shequzhili/ggfwtc/ggfw.vue b/src/views/modules/shequzhili/ggfwtc/ggfw.vue index 922a5649..a8783bcd 100644 --- a/src/views/modules/shequzhili/ggfwtc/ggfw.vue +++ b/src/views/modules/shequzhili/ggfwtc/ggfw.vue @@ -563,7 +563,7 @@ export default { if (code === 0) { this.$message({ type: "success", - message: "导入成功" + message: "上传成功" }); this.loadTable() 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 5/7] =?UTF-8?q?=E6=96=87=E5=AD=97=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=E4=BF=AE=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) // 显示搜索到的地址 }); }, From 8c2016965836fe7dc078e5de332aed739ba0f3ef Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 23 Jun 2022 17:42:23 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=9C=B0=E7=90=86=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/shequzhili/csgltc/csglForm.vue | 2 +- src/views/modules/shequzhili/ggfwtc/ggfwForm.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/shequzhili/csgltc/csglForm.vue b/src/views/modules/shequzhili/csgltc/csglForm.vue index 0bc1f14e..9a77ae15 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 = this.formData.address !== '' && this.formData.address !== null ? this.formData.address : (result.result.address === '' || result.result.address === null ? this.formData.address : result.result.address) + this.formData.address = result.result.address === '' || result.result.address === null ? this.formData.address : result.result.address // 显示搜索到的地址 }); }, diff --git a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue index 798f50a4..9d0fb27f 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 = this.formData.address !== '' && this.formData.address !== null ? this.formData.address : (result.result.address === '' || result.result.address === null ? this.formData.address : result.result.address) + this.formData.address = result.result.address === '' || result.result.address === null ? this.formData.address : result.result.address // 显示搜索到的地址 }); }, From 65854cc8e592605face9992e4b9e3ea5d626893b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 24 Jun 2022 10:36:16 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/shequzhili/csgltc/csglForm.vue | 4 ++-- src/views/modules/shequzhili/ggfwtc/ggfwForm.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/modules/shequzhili/csgltc/csglForm.vue b/src/views/modules/shequzhili/csgltc/csglForm.vue index 9a77ae15..63ab806f 100644 --- a/src/views/modules/shequzhili/csgltc/csglForm.vue +++ b/src/views/modules/shequzhili/csgltc/csglForm.vue @@ -242,8 +242,8 @@ export default { data : this.cityManagement } this.formData = { ...data } - const lat = this.formData.latitude === null || this.formData.latitude === '' ? '36.06203' : this.formData.latitude; - const lon = this.formData.longitude === null || this.formData.longitude === '' ? '120.38494' : this.formData.longitude; + const lat = this.formData.latitude === null || this.formData.latitude === '' ? '' : this.formData.latitude; + const lon = this.formData.longitude === null || this.formData.longitude === '' ? '' : this.formData.longitude; map.setCenter(new TMap.LatLng(lat,lon)) this.setMarker(lat,lon) } else { diff --git a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue index 9d0fb27f..963de114 100644 --- a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue +++ b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue @@ -220,8 +220,8 @@ } this.formData = { ...data } - const lat = this.formData.latitude === null || this.formData.latitude === '' ? '36.06203' : this.formData.latitude; - const lon = this.formData.longitude === null || this.formData.longitude === '' ? '120.38494' : this.formData.longitude; + const lat = this.formData.latitude === null || this.formData.latitude === '' ? '' : this.formData.latitude; + const lon = this.formData.longitude === null || this.formData.longitude === '' ? '' : this.formData.longitude; map.setCenter(new TMap.LatLng(lat, lon)) this.setMarker(lat, lon) } else {