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) => { diff --git a/src/views/modules/shequzhili/csgltc/csgl.vue b/src/views/modules/shequzhili/csgltc/csgl.vue index 50d6bb80..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 b09e52fd..63ab806f 100644 --- a/src/views/modules/shequzhili/csgltc/csglForm.vue +++ b/src/views/modules/shequzhili/csgltc/csglForm.vue @@ -62,6 +62,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 === '' ? '' : 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 { 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/ggfw.vue b/src/views/modules/shequzhili/ggfwtc/ggfw.vue index 922a5649..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 6b433e07..963de114 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 === '' ? '' : 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 { 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 // 显示搜索到的地址 }); },