diff --git a/sub-government-affairs-service/src/apis/inputSuppliesApi/material.js b/sub-government-affairs-service/src/apis/inputSuppliesApi/material.js index 73eea46..632304d 100644 --- a/sub-government-affairs-service/src/apis/inputSuppliesApi/material.js +++ b/sub-government-affairs-service/src/apis/inputSuppliesApi/material.js @@ -84,7 +84,7 @@ export function delAnimalMedicine(ids) { // #region /* 查询种源 */ export function getSeedList(params) { - return request('/inputGoods/provenance/page', { + return request('/inputGoods/supervise/provenance/page', { params, }); } diff --git a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js index eef0fc2..58bf183 100644 --- a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js +++ b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js @@ -9,12 +9,12 @@ const inputSuppliesRoutes = [ redirect: '/sub-government-affairs-service/material/pesticide', meta: { title: '农产品种植管理', icon: 'FullScreen' }, children: [ - { - path: '/sub-government-affairs-service/statistics', - name: 'Statistics', - component: () => import('@/views/planting-management/statistics/index.vue'), - meta: { title: '使用监管概况统计', icon: 'PieChart' }, - }, + // { + // path: '/sub-government-affairs-service/statistics', + // name: 'Statistics', + // component: () => import('@/views/planting-management/statistics/index.vue'), + // meta: { title: '使用监管概况统计', icon: 'PieChart' }, + // }, { path: '/sub-government-affairs-service/variety-record', name: 'PlantVarietyRecord', @@ -27,42 +27,42 @@ const inputSuppliesRoutes = [ component: () => import('@/views/inputSuppliesManage/material/annualPlan/index.vue'), meta: { title: '农产品种植计划管理', icon: 'Timer' }, }, - { - path: '/sub-government-affairs-service/material/seed', - name: 'input-supplies-seed', - component: () => import('@/views/inputSuppliesManage/material/seed/index.vue'), - meta: { title: '种子种苗管理', icon: 'Watermelon' }, - }, - { - path: '/sub-government-affairs-service/material/fertilizer', - name: 'input-supplies-fertilizer', - component: () => import('@/views/inputSuppliesManage/material/fertilizer/index.vue'), - meta: { title: '肥料管理', icon: 'Grid' }, - }, - { - path: '/sub-government-affairs-service/material/pesticide', - name: 'input-supplies-pesticide', - component: () => import('@/views/inputSuppliesManage/material/pesticide/index.vue'), - meta: { title: '农药管理', icon: 'Orange' }, - }, - { - path: '/sub-government-affairs-service/material/others', - name: 'input-supplies-others', - component: () => import('@/views/inputSuppliesManage/material/others/index.vue'), - meta: { title: '其他投入品管理', icon: 'TakeawayBox' }, - }, + // { + // path: '/sub-government-affairs-service/material/seed', + // name: 'input-supplies-seed', + // component: () => import('@/views/inputSuppliesManage/material/seed/index.vue'), + // meta: { title: '种子种苗管理', icon: 'Watermelon' }, + // }, + // { + // path: '/sub-government-affairs-service/material/fertilizer', + // name: 'input-supplies-fertilizer', + // component: () => import('@/views/inputSuppliesManage/material/fertilizer/index.vue'), + // meta: { title: '肥料管理', icon: 'Grid' }, + // }, + // { + // path: '/sub-government-affairs-service/material/pesticide', + // name: 'input-supplies-pesticide', + // component: () => import('@/views/inputSuppliesManage/material/pesticide/index.vue'), + // meta: { title: '农药管理', icon: 'Orange' }, + // }, + // { + // path: '/sub-government-affairs-service/material/others', + // name: 'input-supplies-others', + // component: () => import('@/views/inputSuppliesManage/material/others/index.vue'), + // meta: { title: '其他投入品管理', icon: 'TakeawayBox' }, + // }, { path: '/sub-government-affairs-service/supervisionOfInputs ', name: 'supervisionOfInputs', redirect: '/sub-government-affairs-service/supervisionOfInputs/seedRegulation', meta: { title: '投入品使用监管', icon: 'Connection' }, children: [ - // { - // path: '/sub-government-affairs-service/supervisionOfInputs/regulatoryOverview', - // name: 'regulatoryOverview', - // component: () => import('@/views/inputSuppliesManage/supervisionOfInputs/regulatoryOverview.vue'), - // meta: { title: '使用监管概览', icon: '' }, - // }, + { + path: '/sub-government-affairs-service/statistics', + name: 'Statistics', + component: () => import('@/views/planting-management/statistics/index.vue'), + meta: { title: '使用监管概况统计', icon: '' }, + }, { path: '/sub-government-affairs-service/supervisionOfInputs/seedRegulation', name: 'seedRegulation', diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/material/seed/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/material/seed/index.vue index 288f893..5b3e3f2 100644 --- a/sub-government-affairs-service/src/views/inputSuppliesManage/material/seed/index.vue +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/material/seed/index.vue @@ -156,9 +156,9 @@ const columns = ref([ // 使用时间 { prop: 'useTime', label: '使用时间' }, // 生成经营主体编码 - { prop: 'generateBusinessSubjectCode', label: '生成经营主体编码' }, + { prop: 'businessEntityCode', label: '生成经营主体编码' }, // 生产经营主体名称 - { prop: 'generateBusinessSubjectName', label: '生产经营主体名称' }, + { prop: 'businessEntityName', label: '生产经营主体名称' }, // { prop: 'action', label: '操作', slotName: 'action', width: 230, fixed: 'right' }, ]); const handlePaginationChange = ({ page, pageSize }) => { diff --git a/sub-government-affairs-service/src/views/productOperateMain/coOp/index.vue b/sub-government-affairs-service/src/views/productOperateMain/coOp/index.vue index 0dc337b..e1559cc 100644 --- a/sub-government-affairs-service/src/views/productOperateMain/coOp/index.vue +++ b/sub-government-affairs-service/src/views/productOperateMain/coOp/index.vue @@ -178,14 +178,14 @@ const crudOptions = reactive({ { label: '企业负责人', prop: 'contactPerson' }, { label: '联系方式', prop: 'phone' }, { label: '企业地址', prop: 'address' }, - { label: '地块数量', prop: 'villageCount' }, - { label: '地块编号', prop: 'villageCode' }, - { label: '地块名称', prop: 'villageName' }, + { label: '地块数量', prop: 'landCount' }, + { label: '地块编号', prop: 'landCount' }, + { label: '地块名称', prop: 'landName' }, { label: '面积', prop: 'area', formatter: (row, column, cellValue) => `${Number(cellValue).toFixed(2)} 亩` }, { label: '所属行政区划', prop: 'address' }, { label: '所属网格', prop: 'gridCode' }, - { label: '种植作物', prop: 'primaryProduct' }, - { label: '账号(手机号)', prop: 'account' }, + { label: '种植作物', prop: 'planCrop' }, + { label: '账号(手机号)', prop: 'phone' }, { label: '信息录入时间', prop: 'createTime' }, { label: '信息更新时间', prop: 'updateTime' }, ], diff --git a/sub-government-affairs-service/src/views/productOperateMain/individual/index.vue b/sub-government-affairs-service/src/views/productOperateMain/individual/index.vue index 3953b1a..15b097f 100644 --- a/sub-government-affairs-service/src/views/productOperateMain/individual/index.vue +++ b/sub-government-affairs-service/src/views/productOperateMain/individual/index.vue @@ -208,14 +208,14 @@ const crudOptions = reactive({ { label: '联系方式', prop: 'phone' }, // 地址 { label: '地址', prop: 'address', width: '300px' }, - { label: '地块数量', prop: 'villageCount' }, - { label: '地块编号', prop: 'villageCode' }, - { label: '地块名称', prop: 'villageName' }, + { label: '地块数量', prop: 'landCount' }, + { label: '地块编号', prop: 'landNumber' }, + { label: '地块名称', prop: 'landName' }, { label: '面积', prop: 'area', formatter: (row, column, cellValue) => `${Number(cellValue).toFixed(2)} 亩` }, { label: '所属行政区划', prop: 'address' }, { label: '所属网格', prop: 'gridCode' }, { label: '种植作物', prop: 'planCropName' }, - { label: '账号(手机号)', prop: 'account' }, + { label: '账号(手机号)', prop: 'phone' }, { label: '创建时间', prop: 'createTime' }, { label: '更新时间', prop: 'updateTime' }, ], diff --git a/sub-government-affairs-service/src/views/resource/database/Statistics.vue b/sub-government-affairs-service/src/views/resource/database/Statistics.vue index f6b1187..caaf4d7 100644 --- a/sub-government-affairs-service/src/views/resource/database/Statistics.vue +++ b/sub-government-affairs-service/src/views/resource/database/Statistics.vue @@ -1,7 +1,6 @@