diff --git a/src/views/modules/shequzhili/csgltc/csglForm.vue b/src/views/modules/shequzhili/csgltc/csglForm.vue index 38a681d2..a39a2b94 100644 --- a/src/views/modules/shequzhili/csgltc/csglForm.vue +++ b/src/views/modules/shequzhili/csgltc/csglForm.vue @@ -209,11 +209,13 @@ export default { data : this.cityManagement } this.formData = { ...data } - let { latitude, longitude } = this.$store.state.user; - const lat = this.formData.latitude === null || this.formData.latitude === '' ? latitude : this.formData.latitude; - const lon = this.formData.longitude === null || this.formData.longitude === '' ? longitude : this.formData.longitude; - map.setCenter(new TMap.LatLng(lat,lon)) - this.setMarker(lat,lon) + // let { latitude, longitude } = this.$store.state.user; + // const lat = this.formData.latitude === null || this.formData.latitude === '' ? latitude : this.formData.latitude; + // const lon = this.formData.longitude === null || this.formData.longitude === '' ? longitude : this.formData.longitude; + if (this.formData.latitude !== null && this.formData.latitude !== '' && this.formData.longitude !== null && this.formData.longitude !== ''){ + map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude)) + this.setMarker(this.formData.latitude, this.formData.longitude) + } } else { this.$message.error(msg) } @@ -301,7 +303,7 @@ export default { map.on('panend', () => { this.handleMoveCenter() }) - this.handleMoveCenter() + // this.handleMoveCenter() this.convert() }, @@ -381,7 +383,8 @@ 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 = 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.longitude === '' || this.formData.longitude === 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 d19b6d3b..53de80d4 100644 --- a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue +++ b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue @@ -190,11 +190,13 @@ } this.formData = { ...data } - let { latitude, longitude } = this.$store.state.user; - const lat = this.formData.latitude === null || this.formData.latitude === '' ? latitude : this.formData.latitude; - const lon = this.formData.longitude === null || this.formData.longitude === '' ? longitude : this.formData.longitude; - map.setCenter(new TMap.LatLng(lat, lon)) - this.setMarker(lat, lon) + // let { latitude, longitude } = this.$store.state.user; + // const lat = this.formData.latitude === null || this.formData.latitude === '' ? '' : this.formData.latitude; + // const lon = this.formData.longitude === null || this.formData.longitude === '' ? '' : this.formData.longitude; + if (this.formData.latitude !== null && this.formData.latitude !== '' && this.formData.longitude !== null && this.formData.longitude !== ''){ + map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude)) + this.setMarker(this.formData.latitude, this.formData.longitude) + } } else { this.$message.error(msg) } @@ -281,7 +283,7 @@ map.on('panend', () => { this.handleMoveCenter() }) - this.handleMoveCenter() + // this.handleMoveCenter() this.convert() }, @@ -361,7 +363,9 @@ geocoder .getAddress({ location: location }) // 将给定的坐标位置转换为地址 .then((result) => { - this.formData.address = result.result.address === '' || result.result.address === null ? this.formData.address : result.result.address + console.log(this.formData) + // 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.longitude === '' || this.formData.longitude === null) ? this.formData.address : result.result.address // 显示搜索到的地址 }); },