diff --git a/src/api/basicData/breedingBaseApi.js b/src/api/basicData/breedingBaseApi.js index 5b3e47b..1318b16 100644 --- a/src/api/basicData/breedingBaseApi.js +++ b/src/api/basicData/breedingBaseApi.js @@ -43,7 +43,7 @@ export function editBreedingBase(data) { // 通过id删除基地 export function breedingBaseDeleteById(params) { return request({ - url: '/baseNurseryInfo/queryByPage', + url: '/baseNurseryInfo/deleteById', method: 'get', params: params }) diff --git a/src/views/basicData/breedingBase/breedingBaseForm.vue b/src/views/basicData/breedingBase/breedingBaseForm.vue index ac5c24d..c60da63 100644 --- a/src/views/basicData/breedingBase/breedingBaseForm.vue +++ b/src/views/basicData/breedingBase/breedingBaseForm.vue @@ -44,7 +44,7 @@ const geyById = (row) => { showDrawer.value = true selLoading.value = true breedingQueryById({id:row.id}).then(res =>{ - resetForm(res.data) + resetForm(res) }).finally(()=>{ selLoading.value = false }) @@ -157,13 +157,13 @@ const changeArea = (value) =>{ -
{{formData.location}}
+
{{formData.longitude}}
-
{{formData.location}}
+
{{formData.latitude}}
diff --git a/src/views/basicData/breedingBase/index.vue b/src/views/basicData/breedingBase/index.vue index 44ad5da..0acd309 100644 --- a/src/views/basicData/breedingBase/index.vue +++ b/src/views/basicData/breedingBase/index.vue @@ -44,7 +44,7 @@ - + @@ -162,7 +162,7 @@ const delBreedingBase = (item) => { customClass: 'message-box' } ).then(() => { - breedingBaseDeleteById(item.id).then(res => { + breedingBaseDeleteById({id: item.id}).then(res => { ElMessage.success(`${item.baseName}删除成功`) getList() }) diff --git a/src/views/system/base/baseTable.vue b/src/views/system/base/baseTable.vue index d978f36..15dbf6c 100644 --- a/src/views/system/base/baseTable.vue +++ b/src/views/system/base/baseTable.vue @@ -90,8 +90,8 @@ 导出Excel - 坐标点新增地块 - 绘制地块 + 坐标点新增地块 + 绘制地块 @@ -190,7 +190,7 @@ const columns = ref([ const toAddMassif = () => { massifFormRef.value.toAdd({ baseName:currentBase.value.baseName, - baseId:currentBase.value.baseId + id:currentBase.value.id }) } const toUpdateMassif = (row) => { @@ -317,8 +317,8 @@ function handleUpdate(row) { }; // 切换地图模式 const toBaseMap = (toAdd) => { - if (currentBase.value.baseId){ - router.push({path:'/system/base/massifMap/'+currentBase.value.baseId,query:toAdd?{toAdd:true}:{}}) + if (currentBase.value.id){ + router.push({path:'/system/base/massifMap/'+currentBase.value.id,query:toAdd?{toAdd:true}:{}}) }else{ router.push('/system/base/mapMarkers') }