diff --git a/main/.env.development b/main/.env.development index 4054b6b..6e8881e 100644 --- a/main/.env.development +++ b/main/.env.development @@ -13,8 +13,8 @@ VITE_APP_SUB_GSR = '//localhost:9530/new-digital-agriculture-screen/' VITE_APP_BASE_API = '/apis' VITE_APP_UPLOAD_API = '/uploadApis' # 阿里云接口地址 -# VITE_APP_BASE_URL = 'http://47.109.205.240:8080' -# VITE_APP_UPLOAD_URL = 'http://47.109.205.240:9300' +VITE_APP_BASE_URL = 'http://47.109.205.240:8080' +VITE_APP_UPLOAD_URL = 'http://47.109.205.240:9300' # 内网接口地址 -VITE_APP_BASE_URL = 'http://192.168.18.9:8080' -VITE_APP_UPLOAD_URL = 'http://192.168.18.9:9300' +# VITE_APP_BASE_URL = 'http://192.168.18.74:8080' +# VITE_APP_UPLOAD_URL = 'http://192.168.18.74:8080' diff --git a/sub-government-affairs-service/.env.development b/sub-government-affairs-service/.env.development index 4d4265a..1b4ea19 100644 --- a/sub-government-affairs-service/.env.development +++ b/sub-government-affairs-service/.env.development @@ -9,9 +9,9 @@ VITE_APP_BASE_API = '/apis' VITE_APP_UPLOAD_API = '/uploadApis' # 阿里云接口地址 -# VITE_APP_BASE_URL = 'http://47.109.205.240:8080' -# VITE_APP_UPLOAD_URL = 'http://47.109.205.240:9300' +VITE_APP_BASE_URL = 'http://47.109.205.240:8080' +VITE_APP_UPLOAD_URL = 'http://47.109.205.240:9300' # 内网接口地址 -VITE_APP_BASE_URL = 'http://192.168.18.99:8080' -VITE_APP_UPLOAD_URL = 'http://192.168.18.99:9300' +# VITE_APP_BASE_URL = 'http://192.168.18.74:8080' +# VITE_APP_UPLOAD_URL = 'http://192.168.18.74:8080' diff --git a/sub-government-affairs-service/index.html b/sub-government-affairs-service/index.html index e1d7b64..0309d84 100644 --- a/sub-government-affairs-service/index.html +++ b/sub-government-affairs-service/index.html @@ -5,7 +5,7 @@ - 政务服务 + 农业产业政务平台 diff --git a/sub-government-affairs-service/src/apis/landResourceManagement/basicInfoMaintenance/index.js b/sub-government-affairs-service/src/apis/landResourceManagement/basicInfoMaintenance/index.js new file mode 100644 index 0000000..e69de29 diff --git a/sub-government-affairs-service/src/apis/landResourceManagement/cropsManagement/index.js b/sub-government-affairs-service/src/apis/landResourceManagement/cropsManagement/index.js new file mode 100644 index 0000000..ab3995c --- /dev/null +++ b/sub-government-affairs-service/src/apis/landResourceManagement/cropsManagement/index.js @@ -0,0 +1,16 @@ +import request from '@/utils/axios'; + +/** + * 获取种植作物分页列表 + * @param {Object} params - 请求参数 + * @param {string} [params.status] - 状态 0-禁用，1-启用 + * @param {number} [params.current] - 页码 + * @param {number} [params.size] - 每页数量 + * @returns {Promise} - 返回包含种植作物分页数据的 Promise + */ +export function pageCropsList(params = {}) { + return request('/land-resource/crops/page', { + method: 'GET', + params, + }); +} diff --git a/sub-government-affairs-service/src/apis/landResourceManagement/gridManagement/index.js b/sub-government-affairs-service/src/apis/landResourceManagement/gridManagement/index.js new file mode 100644 index 0000000..e69de29 diff --git a/sub-government-affairs-service/src/apis/landResourceManagement/gridMemberManagement/index.js b/sub-government-affairs-service/src/apis/landResourceManagement/gridMemberManagement/index.js new file mode 100644 index 0000000..e69de29 diff --git a/sub-government-affairs-service/src/apis/landResourceManagement/index.js b/sub-government-affairs-service/src/apis/landResourceManagement/index.js new file mode 100644 index 0000000..774e3ae --- /dev/null +++ b/sub-government-affairs-service/src/apis/landResourceManagement/index.js @@ -0,0 +1,19 @@ +import * as plantingPlan from './plantingPlan'; +import * as operationRecord from './operationRecord'; +import * as landIllegal from './landIllegal'; +import * as landInspection from './landInspection'; +import * as gridManagement from './gridManagement'; +import * as gridMemberManagement from './gridMemberManagement'; +import * as basicInfoMaintenance from './basicInfoMaintenance'; +import * as cropsManagement from './cropsManagement'; + +export default { + ...plantingPlan, + ...operationRecord, + ...landIllegal, + ...landInspection, + ...gridManagement, + ...gridMemberManagement, + ...basicInfoMaintenance, + ...cropsManagement, +}; diff --git a/sub-government-affairs-service/src/apis/landResourceManagement/landIllegal/index.js b/sub-government-affairs-service/src/apis/landResourceManagement/landIllegal/index.js new file mode 100644 index 0000000..e69de29 diff --git a/sub-government-affairs-service/src/apis/landResourceManagement/landInspection/index.js b/sub-government-affairs-service/src/apis/landResourceManagement/landInspection/index.js new file mode 100644 index 0000000..e69de29 diff --git a/sub-government-affairs-service/src/apis/landResourceManagement/landManagement/index.js b/sub-government-affairs-service/src/apis/landResourceManagement/landManagement/index.js new file mode 100644 index 0000000..5800c7a --- /dev/null +++ b/sub-government-affairs-service/src/apis/landResourceManagement/landManagement/index.js @@ -0,0 +1,71 @@ +import request from '@/utils/axios'; + +/** + * 分页查询土地列表 + * @param {Object} params 请求参数 + * @param {string} [params.current] 每页条数 + * @param {string} [params.size] 分页 + * @param {string} [params.landType] 土地类型 传入id，土地资源管理/基础信息维护/土地类型列表查询 + * @param {string} [params.regionCode] 区域编码 + * @param {string} [params.keyword] 关键字 + * @param {string} [params.gridId] 网格id + * @returns {Promise} 返回包含接口响应数据的 Promise + */ +export function getLandList(params) { + return request({ + url: '/land-resource/landManage/page', + method: 'get', + params, + }); +} + +/** + * 保存土地基础信息 + * @param {Object} [data={}] 请求数据，默认为空对象 + * @returns {Promise} 返回包含接口响应数据的 Promise + */ +export function saveBaseInfo(data = {}) { + return request({ + url: '/land-resource/landManage/v1/saveBaseInfo', + method: 'post', + data, + }); +} + +/** + * 保存土地产权信息 + * @param {Object} [data={}] 请求数据，默认为空对象 + * @returns {Promise} 返回包含接口响应数据的 Promise + */ +export function saveProperty(data = {}) { + return request({ + url: '/land-resource/landManage/v1/saveProperty', + method: 'put', + data, + }); +} + +/** + * 编辑土地信息 + * @param {Object} [data={}] 请求数据，默认为空对象，用于传递要编辑的土地信息 + * @returns {Promise} 返回包含接口响应数据的 Promise + */ +export function editLand(data = {}) { + return request({ + url: '/land-resource/landManage/edit', + method: 'post', + data, + }); +} + +/** + * 删除指定 ID 的土地信息 + * @param {string|number} id 要删除的土地信息的 ID + * @returns {Promise} 返回包含接口响应数据的 Promise + */ +export function deleteLand(id) { + return request({ + url: `/land-resource/landManage/delete/${id}`, + method: 'delete', + }); +} diff --git a/sub-government-affairs-service/src/apis/landResourceManagement/operationRecord/index.js b/sub-government-affairs-service/src/apis/landResourceManagement/operationRecord/index.js new file mode 100644 index 0000000..e69de29 diff --git a/sub-government-affairs-service/src/apis/landResourceManagement/plantingPlan/index.js b/sub-government-affairs-service/src/apis/landResourceManagement/plantingPlan/index.js new file mode 100644 index 0000000..9908842 --- /dev/null +++ b/sub-government-affairs-service/src/apis/landResourceManagement/plantingPlan/index.js @@ -0,0 +1,68 @@ +import request from '@/utils/axios'; + +/** + * 年度计划管理-新增 + * @param {Object} data 年度计划新增数据对象 + * @param {string} [data.year] 计划年份 + * @param {string} [data.regionCode] 区划编码 + * @param {string} [data.gridId] 网格id + * @param {string} data.planName 计划名称 + * @param {string} [data.cropsId] 作物id,调用接口：种植作物/列表 + * @param {number} [data.plantingArea] 种植面积 + * @param {string} [data.plantingMonths] 种植月份 + * @param {string} [data.growthCycle] 成长周期 + * @param {string} [data.note] 备注 + * @param {string} [data.growthCycleUnit] 成长周期单位 1：天 2：周 3：月 4：年 + * @returns {Promise} 返回包含接口响应数据的 Promise + */ +export function saveAnnual(data = {}) { + return request('/land-resource/annualManage/save', { + method: 'POST', + data, + }); +} + +/** + * 年度计划管理-编辑 + * @param {Object} data 年度计划更新数据对象 + * @param {string} [data.id] 计划 ID + * @param {string} [data.planName] 计划名称 + * @param {string} [data.plantingMonths] 种植月份 + * @param {number} [data.plantingArea] 种植面积 + * @param {string} [data.growthCycle] 成长周期 + * @param {string} [data.growthCycleUnit] 成长周期单位 1：天 2：周 3：月 4：年 + * @returns {Promise} 返回包含接口响应数据的 Promise + */ +export function editAnnual(data = {}) { + return request('/land-resource/annualManage/edit', { + method: 'PUT', + data: data, + }); +} + +/** + * 填报实际进度 + * @param {Object} annualActualAddDTO 年度计划实际进度新增数据对象 + * @param {string} [annualActualAddDTO.planId] 年度计划id + * @param {number} [annualActualAddDTO.plantingArea] 实际种植面积 + * @param {number} [annualActualAddDTO.plantingMonths] 实际种植月份 + * @param {number} [annualActualAddDTO.growthCycle] 实际种植周期 + * @returns {Promise} 返回包含接口响应数据的 Promise + */ +export function saveActualProgress(annualActualAddDTO = {}) { + return request('/land-resource/annualManage/save-actual', { + method: 'POST', + data: annualActualAddDTO, + }); +} + +/** + * 年度计划管理-获取详情 + * @param {string} id 计划编号 + * @returns {Promise} 返回包含接口响应数据的 Promise，响应数据包含年度计划详情 + */ +export function getAnnualDetail(id) { + return request(`/land-resource/annualManage/${id}`, { + method: 'GET', + }); +} diff --git a/sub-government-affairs-service/src/apis/landResourceManagement/readme.txt b/sub-government-affairs-service/src/apis/landResourceManagement/readme.txt new file mode 100644 index 0000000..8d59b02 --- /dev/null +++ b/sub-government-affairs-service/src/apis/landResourceManagement/readme.txt @@ -0,0 +1,31 @@ +src/ +├── apis/ +│ ├── landResourceManagement/ # 土地资源管理 +│ │ ├── plantingPlan/ # 种植规划 +│ │ │ ├── index.js +│ │ ├── operationRecord/ # 作业记录 +│ │ │ ├── index.js +│ │ ├── landIllegal/ # 土地违法处理 +│ │ │ ├── index.js +│ │ ├── landManagement/ # 土地管理 +│ │ │ ├── index.js +│ │ ├── landInspection/ # 土地巡查 +│ │ │ ├── index.js +│ │ ├── gridManagement/ # 网格管理 +│ │ │ ├── index.js +│ │ ├── gridMemberManagement/ # 网格员管理 +│ │ │ ├── index.js +│ │ ├── basicInfoMaintenance/ # 基础信息维护 +│ │ │ ├── index.js +│ │ ├── cropsManagement/ # 种植作物 +│ │ │ ├── index.js +│ │ ├── index.js # 土地资源管理模块统一入口 +│ ├── productionEntityManagement/ # 生产经营主体管理 +│ │ ├── index.js +│ ├── inputManagement/ # 投入品管理 +│ │ ├── index.js +│ ├── productTraceability/ # 农产品溯源 +│ │ ├── index.js +│ ├── index.js # 项目统一入口文件 +├── utils/ +│ ├── axios.js # 封装的请求工具 \ No newline at end of file diff --git a/sub-government-affairs-service/src/components/AreaCascader/index.vue b/sub-government-affairs-service/src/components/AreaCascader/index.vue index fb63210..8e498bb 100644 --- a/sub-government-affairs-service/src/components/AreaCascader/index.vue +++ b/sub-government-affairs-service/src/components/AreaCascader/index.vue @@ -1,36 +1,79 @@ diff --git a/sub-government-affairs-service/src/layouts/component/Breadcrumb/index.vue b/sub-government-affairs-service/src/layouts/component/Breadcrumb/index.vue index c460e2b..b4552ff 100644 --- a/sub-government-affairs-service/src/layouts/component/Breadcrumb/index.vue +++ b/sub-government-affairs-service/src/layouts/component/Breadcrumb/index.vue @@ -8,9 +8,9 @@