diff --git a/sub-government-affairs-service/src/assets/images/input/inputman.png b/sub-government-affairs-service/src/assets/images/input/inputman.png new file mode 100644 index 0000000..63c9e95 Binary files /dev/null and b/sub-government-affairs-service/src/assets/images/input/inputman.png differ 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 87cbd58..eef0fc2 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', diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/material/pesticide/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/material/pesticide/index.vue index 026b728..aca4e76 100644 --- a/sub-government-affairs-service/src/views/inputSuppliesManage/material/pesticide/index.vue +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/material/pesticide/index.vue @@ -199,14 +199,14 @@ const tableLoading = ref(false); const tableTotal = ref(0); const columns = ref([ // { prop: "id", label: "ID" }, - { prop: 'name', label: '类别名称' }, + { prop: 'name', label: '姓名' }, { prop: 'phone', label: '联系方式' }, { prop: 'landName', label: '用药地块' }, { prop: 'detectionTime', label: '检测时间' }, { prop: 'detectionResult', label: '检测结果' }, { prop: 'detectionUnit', label: '检测单位' }, - // { prop: 'status', label: '检测报告(是否上传)' }, - { prop: 'action', label: '操作', slotName: 'action', width: 230, fixed: 'right' }, + { prop: 'isUpload', label: '检测报告(是否上传)' }, + // { prop: 'action', label: '操作', slotName: 'action', width: 230, fixed: 'right' }, ]); const handlePaginationChange = ({ page, pageSize }) => { formInline.current = page; 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 facaeba..288f893 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 @@ -38,11 +38,11 @@ @page-change="handlePaginationChange" > -