diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue index 94cbe3f..30fed22 100644 --- a/src/views/deviceManage/listDevice.vue +++ b/src/views/deviceManage/listDevice.vue @@ -76,13 +76,13 @@ diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue index 94cbe3f..30fed22 100644 --- a/src/views/deviceManage/listDevice.vue +++ b/src/views/deviceManage/listDevice.vue @@ -76,13 +76,13 @@ diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue index 203d542..aebe0a7 100644 --- a/src/views/system/dept/editDept.vue +++ b/src/views/system/dept/editDept.vue @@ -16,7 +16,7 @@ - + diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue index 94cbe3f..30fed22 100644 --- a/src/views/deviceManage/listDevice.vue +++ b/src/views/deviceManage/listDevice.vue @@ -76,13 +76,13 @@ diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue index 203d542..aebe0a7 100644 --- a/src/views/system/dept/editDept.vue +++ b/src/views/system/dept/editDept.vue @@ -16,7 +16,7 @@ - + diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue index dbe9e84..b16b63e 100644 --- a/src/views/wellManage/addWell.vue +++ b/src/views/wellManage/addWell.vue @@ -83,7 +83,7 @@ - + @@ -116,6 +116,13 @@ + + + + + + + @@ -220,8 +227,9 @@ latGaode: '', // 高德纬度 photos: '', // 照片路径 notes: '', // 备注, - qu: '', + qu: '', // 区 area: '', // 街道 + road: '', // 道路 responsibleDept: '' // 维护人员部门 }, // 表单 deptProps: { @@ -250,9 +258,9 @@ coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }], coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }], deptid: [{ required: true, message: '组织机构必选', trigger: 'change' }], - wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }], - qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }], - area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }] + wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }] + // qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }], + // area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }] }, uploadPath: this.baseConfig.baseUrl + '/imageUpload', // 图片上传路径 dialogImageUrl: '', @@ -337,8 +345,9 @@ convertLnglat([this.wellForm.coordinateX, this.wellForm.coordinateY]).then(lnglat => { // 2.逆地址解析 reverseLnglat(lnglat).then(res => { - this.wellForm.position = res.formattedAddress - this.wellForm.qu = res.addressComponent.adcode + this.wellForm.position = res.formattedAddress // 完整地址 + this.wellForm.qu = res.addressComponent.adcode // 区编码 + this.wellForm.road = res.addressComponent.street // 道路 }) }) } diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue index 94cbe3f..30fed22 100644 --- a/src/views/deviceManage/listDevice.vue +++ b/src/views/deviceManage/listDevice.vue @@ -76,13 +76,13 @@ diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue index 203d542..aebe0a7 100644 --- a/src/views/system/dept/editDept.vue +++ b/src/views/system/dept/editDept.vue @@ -16,7 +16,7 @@ - + diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue index dbe9e84..b16b63e 100644 --- a/src/views/wellManage/addWell.vue +++ b/src/views/wellManage/addWell.vue @@ -83,7 +83,7 @@ - + @@ -116,6 +116,13 @@ + + + + + + + @@ -220,8 +227,9 @@ latGaode: '', // 高德纬度 photos: '', // 照片路径 notes: '', // 备注, - qu: '', + qu: '', // 区 area: '', // 街道 + road: '', // 道路 responsibleDept: '' // 维护人员部门 }, // 表单 deptProps: { @@ -250,9 +258,9 @@ coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }], coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }], deptid: [{ required: true, message: '组织机构必选', trigger: 'change' }], - wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }], - qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }], - area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }] + wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }] + // qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }], + // area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }] }, uploadPath: this.baseConfig.baseUrl + '/imageUpload', // 图片上传路径 dialogImageUrl: '', @@ -337,8 +345,9 @@ convertLnglat([this.wellForm.coordinateX, this.wellForm.coordinateY]).then(lnglat => { // 2.逆地址解析 reverseLnglat(lnglat).then(res => { - this.wellForm.position = res.formattedAddress - this.wellForm.qu = res.addressComponent.adcode + this.wellForm.position = res.formattedAddress // 完整地址 + this.wellForm.qu = res.addressComponent.adcode // 区编码 + this.wellForm.road = res.addressComponent.street // 道路 }) }) } diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue index 1eaa10a..0511c15 100644 --- a/src/views/wellManage/detailWell.vue +++ b/src/views/wellManage/detailWell.vue @@ -80,6 +80,7 @@ { type: 'areaName', label: '所在区域', value: 'areaName', placeholder: '未知', span: 2 }, { type: 'text', label: '经度', value: 'coordinateX', placeholder: '未知' }, { type: 'text', label: '纬度', value: 'coordinateY', placeholder: '未知' }, + { type: 'text', label: '所在道路', value: 'road', placeholder: '未知', span: 5 }, { type: 'text', label: '详细地址', value: 'position', placeholder: '未知', span: 5 }, { type: 'images', label: '路标图片', value: 'imageList', placeholder: '无', span: 5 } ], // 表单配置项 @@ -102,6 +103,7 @@ quName: '', area: '', // 街道 areaName: '', + road: '', responsibleDept: '', // 维护人员部门 responsibleDeptName: '' // 维护人员部门名称 }, // 表单 @@ -156,6 +158,7 @@ notes: row.notes, // 备注, qu: row.qu, area: row.area, // 街道 + road: row.road, responsibleDept: row.responsibleDept, // 维护人员部门 responsibleDeptName: row.responsibleDeptName // 维护人员部门 } diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue index 94cbe3f..30fed22 100644 --- a/src/views/deviceManage/listDevice.vue +++ b/src/views/deviceManage/listDevice.vue @@ -76,13 +76,13 @@ diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue index 203d542..aebe0a7 100644 --- a/src/views/system/dept/editDept.vue +++ b/src/views/system/dept/editDept.vue @@ -16,7 +16,7 @@ - + diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue index dbe9e84..b16b63e 100644 --- a/src/views/wellManage/addWell.vue +++ b/src/views/wellManage/addWell.vue @@ -83,7 +83,7 @@ - + @@ -116,6 +116,13 @@ + + + + + + + @@ -220,8 +227,9 @@ latGaode: '', // 高德纬度 photos: '', // 照片路径 notes: '', // 备注, - qu: '', + qu: '', // 区 area: '', // 街道 + road: '', // 道路 responsibleDept: '' // 维护人员部门 }, // 表单 deptProps: { @@ -250,9 +258,9 @@ coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }], coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }], deptid: [{ required: true, message: '组织机构必选', trigger: 'change' }], - wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }], - qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }], - area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }] + wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }] + // qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }], + // area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }] }, uploadPath: this.baseConfig.baseUrl + '/imageUpload', // 图片上传路径 dialogImageUrl: '', @@ -337,8 +345,9 @@ convertLnglat([this.wellForm.coordinateX, this.wellForm.coordinateY]).then(lnglat => { // 2.逆地址解析 reverseLnglat(lnglat).then(res => { - this.wellForm.position = res.formattedAddress - this.wellForm.qu = res.addressComponent.adcode + this.wellForm.position = res.formattedAddress // 完整地址 + this.wellForm.qu = res.addressComponent.adcode // 区编码 + this.wellForm.road = res.addressComponent.street // 道路 }) }) } diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue index 1eaa10a..0511c15 100644 --- a/src/views/wellManage/detailWell.vue +++ b/src/views/wellManage/detailWell.vue @@ -80,6 +80,7 @@ { type: 'areaName', label: '所在区域', value: 'areaName', placeholder: '未知', span: 2 }, { type: 'text', label: '经度', value: 'coordinateX', placeholder: '未知' }, { type: 'text', label: '纬度', value: 'coordinateY', placeholder: '未知' }, + { type: 'text', label: '所在道路', value: 'road', placeholder: '未知', span: 5 }, { type: 'text', label: '详细地址', value: 'position', placeholder: '未知', span: 5 }, { type: 'images', label: '路标图片', value: 'imageList', placeholder: '无', span: 5 } ], // 表单配置项 @@ -102,6 +103,7 @@ quName: '', area: '', // 街道 areaName: '', + road: '', responsibleDept: '', // 维护人员部门 responsibleDeptName: '' // 维护人员部门名称 }, // 表单 @@ -156,6 +158,7 @@ notes: row.notes, // 备注, qu: row.qu, area: row.area, // 街道 + road: row.road, responsibleDept: row.responsibleDept, // 维护人员部门 responsibleDeptName: row.responsibleDeptName // 维护人员部门 } diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue index e1312a5..9833884 100644 --- a/src/views/wellManage/editWell.vue +++ b/src/views/wellManage/editWell.vue @@ -98,7 +98,7 @@ 区/县 - + + + + + + + + @@ -235,6 +242,7 @@ notes: '', // 备注, qu: '', area: '', // 街道 + road: '', // 道路 responsibleDept: '', // 维护人员部门 responsibleDeptName: '' // 维护人员部门 }, // 表单 @@ -262,9 +270,9 @@ coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }], coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }], deptid: [{ required: true, message: '权属单位必选', trigger: 'change' }], - wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }], - qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }], - area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }] + wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }] + // qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }], + // area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }] }, deptShowTop: false, // 权属单位下拉是否显示顶级 dialogImageUrl: '', @@ -337,6 +345,7 @@ reverseLnglat(lnglat).then(res => { this.wellForm.position = res.formattedAddress this.wellForm.qu = res.addressComponent.adcode + this.wellForm.road = res.addressComponent.street // 道路 }) }) } diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue index 94cbe3f..30fed22 100644 --- a/src/views/deviceManage/listDevice.vue +++ b/src/views/deviceManage/listDevice.vue @@ -76,13 +76,13 @@ diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue index 203d542..aebe0a7 100644 --- a/src/views/system/dept/editDept.vue +++ b/src/views/system/dept/editDept.vue @@ -16,7 +16,7 @@ - + diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue index dbe9e84..b16b63e 100644 --- a/src/views/wellManage/addWell.vue +++ b/src/views/wellManage/addWell.vue @@ -83,7 +83,7 @@ - + @@ -116,6 +116,13 @@ + + + + + + + @@ -220,8 +227,9 @@ latGaode: '', // 高德纬度 photos: '', // 照片路径 notes: '', // 备注, - qu: '', + qu: '', // 区 area: '', // 街道 + road: '', // 道路 responsibleDept: '' // 维护人员部门 }, // 表单 deptProps: { @@ -250,9 +258,9 @@ coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }], coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }], deptid: [{ required: true, message: '组织机构必选', trigger: 'change' }], - wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }], - qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }], - area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }] + wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }] + // qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }], + // area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }] }, uploadPath: this.baseConfig.baseUrl + '/imageUpload', // 图片上传路径 dialogImageUrl: '', @@ -337,8 +345,9 @@ convertLnglat([this.wellForm.coordinateX, this.wellForm.coordinateY]).then(lnglat => { // 2.逆地址解析 reverseLnglat(lnglat).then(res => { - this.wellForm.position = res.formattedAddress - this.wellForm.qu = res.addressComponent.adcode + this.wellForm.position = res.formattedAddress // 完整地址 + this.wellForm.qu = res.addressComponent.adcode // 区编码 + this.wellForm.road = res.addressComponent.street // 道路 }) }) } diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue index 1eaa10a..0511c15 100644 --- a/src/views/wellManage/detailWell.vue +++ b/src/views/wellManage/detailWell.vue @@ -80,6 +80,7 @@ { type: 'areaName', label: '所在区域', value: 'areaName', placeholder: '未知', span: 2 }, { type: 'text', label: '经度', value: 'coordinateX', placeholder: '未知' }, { type: 'text', label: '纬度', value: 'coordinateY', placeholder: '未知' }, + { type: 'text', label: '所在道路', value: 'road', placeholder: '未知', span: 5 }, { type: 'text', label: '详细地址', value: 'position', placeholder: '未知', span: 5 }, { type: 'images', label: '路标图片', value: 'imageList', placeholder: '无', span: 5 } ], // 表单配置项 @@ -102,6 +103,7 @@ quName: '', area: '', // 街道 areaName: '', + road: '', responsibleDept: '', // 维护人员部门 responsibleDeptName: '' // 维护人员部门名称 }, // 表单 @@ -156,6 +158,7 @@ notes: row.notes, // 备注, qu: row.qu, area: row.area, // 街道 + road: row.road, responsibleDept: row.responsibleDept, // 维护人员部门 responsibleDeptName: row.responsibleDeptName // 维护人员部门 } diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue index e1312a5..9833884 100644 --- a/src/views/wellManage/editWell.vue +++ b/src/views/wellManage/editWell.vue @@ -98,7 +98,7 @@ 区/县 - + + + + + + + + @@ -235,6 +242,7 @@ notes: '', // 备注, qu: '', area: '', // 街道 + road: '', // 道路 responsibleDept: '', // 维护人员部门 responsibleDeptName: '' // 维护人员部门 }, // 表单 @@ -262,9 +270,9 @@ coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }], coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }], deptid: [{ required: true, message: '权属单位必选', trigger: 'change' }], - wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }], - qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }], - area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }] + wellType: [{ required: true, message: '点位类型必选', trigger: 'change' }] + // qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }], + // area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }] }, deptShowTop: false, // 权属单位下拉是否显示顶级 dialogImageUrl: '', @@ -337,6 +345,7 @@ reverseLnglat(lnglat).then(res => { this.wellForm.position = res.formattedAddress this.wellForm.qu = res.addressComponent.adcode + this.wellForm.road = res.addressComponent.street // 道路 }) }) } diff --git a/src/views/wellManage/infoWell.vue b/src/views/wellManage/infoWell.vue index 7e2209e..52c967f 100644 --- a/src/views/wellManage/infoWell.vue +++ b/src/views/wellManage/infoWell.vue @@ -80,6 +80,7 @@ notes: '', // 备注, qu: '', area: '', // 街道 + road: '', responsibleDept: '' // 维护人员部门 }, // 表单 formConfig: [ @@ -93,6 +94,7 @@ { type: 'areaName', label: '所在区域', value: 'areaName', placeholder: '未知', span: 2 }, { type: 'text', label: '经度', value: 'coordinateX', placeholder: '未知' }, { type: 'text', label: '纬度', value: 'coordinateY', placeholder: '未知' }, + { type: 'text', label: '所在道路', value: 'road', placeholder: '未知', span: 5 }, { type: 'text', label: '详细地址', value: 'position', placeholder: '未知', span: 5 }, { type: 'images', label: '路标图片', value: 'imageList', placeholder: '无', span: 5 } ], // 表单配置项 @@ -146,6 +148,7 @@ deep: row.deep, // 井深， bfztName: row.bfztName, // 布防状态 position: row.position, // 位置描述 + road: row.road, photos: row.photos, // 照片路径 notes: row.notes, // 备注, coordinateX: row.coordinateX,