diff --git a/main/.env.development b/main/.env.development index 6687280..e4c3565 100644 --- a/main/.env.development +++ b/main/.env.development @@ -16,6 +16,6 @@ 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://192.168.18.74:8080' +VITE_APP_BASE_URL = 'http://192.168.18.99:8080' # VITE_APP_UPLOAD_URL = 'http://192.168.18.99:8080' # VITE_APP_VIST_URL = 'http://192.168.18.99' diff --git a/sub-government-affairs-service/.env.development b/sub-government-affairs-service/.env.development index 83d7258..4c1a109 100644 --- a/sub-government-affairs-service/.env.development +++ b/sub-government-affairs-service/.env.development @@ -16,5 +16,5 @@ VITE_APP_UPLOAD_API = '/uploadApis' # VITE_APP_BASE_URL = 'http://192.168.18.99:8080' # 本地开发接口地址 -VITE_APP_BASE_URL = 'http://192.168.18.74:8080' -VITE_APP_UPLOAD_URL = 'http://192.168.18.74:8080' \ No newline at end of file +VITE_APP_BASE_URL = 'http://192.168.18.99:8080' +VITE_APP_UPLOAD_URL = 'http://192.168.18.99:8080' \ No newline at end of file diff --git a/sub-government-affairs-service/src/apis/inputSuppliesApi/supervisionOfInputs.js b/sub-government-affairs-service/src/apis/inputSuppliesApi/supervisionOfInputs.js new file mode 100644 index 0000000..e22dc3d --- /dev/null +++ b/sub-government-affairs-service/src/apis/inputSuppliesApi/supervisionOfInputs.js @@ -0,0 +1,31 @@ +import request from '@/utils/axios'; + +/* 种子使用监管-列表 */ +export function getSeedUseRegulatoryRecords(params) { + return request('/inputGoods/supervise/provenance/page', { + params, + }); +} +/* 种子使用监管-新增 */ +export function seedUseRegulatorySave(data) { + return request('/inputGoods/supervise/provenance/save', { + method: 'POST', + data, + }); +} +/* 种子使用监管-编辑 */ +export function editSeedUseRegulatory(data) { + return request('/inputGoods/supervise/provenance/edit', { + data, + method: 'PUT', + }); +} +/* 种子使用监管-删除 */ +export function delSeedUseRegulatory(ids) { + return request(`/inputGoods/supervise/provenance/delete/${ids}`); +} + +/* 获取详情-通用,传入url和参数 */ +export function getRowDetails({ url, id }) { + return request(`${url}${id}`); +} 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 e03e12f..92e323d 100644 --- a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js +++ b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js @@ -52,6 +52,32 @@ const inputSuppliesRoutes = [ 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/supervisionOfInputs/seedRegulation', + name: 'seedRegulation', + component: () => import('@/views/inputSuppliesManage/supervisionOfInputs/seedRegulation.vue'), + meta: { title: '种子使用监管', icon: '' }, + }, + { + path: '/sub-government-affairs-service/supervisionOfInputs/fertilizerRegulation', + name: 'fertilizerRegulation', + component: () => import('@/views/inputSuppliesManage/supervisionOfInputs/fertilizerRegulation.vue'), + meta: { title: '肥料使用监管', icon: '' }, + }, + ], + }, ], }, ]; 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 cc955d8..026b728 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 @@ -76,7 +76,7 @@ :clearable="false" type="date" value-format="YYYY-MM-DD" - placeholder="请选择起始日期" + placeholder="请选择检测时间" /> 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 74b710f..facaeba 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 @@ -136,6 +136,7 @@ const selectedIds = ref([]); const tableLoading = ref(false); const tableTotal = ref(0); const columns = ref([ + { prop: 'id', label: '编码' }, { prop: 'seedName', label: '种子种苗名称' }, { prop: 'varietyName', label: '品种名称' }, { prop: 'brand', label: '品牌' }, diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/supervisionOfInputs/fertilizerRegulation.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/supervisionOfInputs/fertilizerRegulation.vue new file mode 100644 index 0000000..0832720 --- /dev/null +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/supervisionOfInputs/fertilizerRegulation.vue @@ -0,0 +1,414 @@ + + + + diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/supervisionOfInputs/regulatoryOverview.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/supervisionOfInputs/regulatoryOverview.vue new file mode 100644 index 0000000..d8b9ba7 --- /dev/null +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/supervisionOfInputs/regulatoryOverview.vue @@ -0,0 +1,7 @@ + + + + + diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/supervisionOfInputs/seedRegulation.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/supervisionOfInputs/seedRegulation.vue new file mode 100644 index 0000000..f22045d --- /dev/null +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/supervisionOfInputs/seedRegulation.vue @@ -0,0 +1,434 @@ + + + +