diff --git a/sub-government-affairs-service/src/router/index.js b/sub-government-affairs-service/src/router/index.js index 0614a38..9e70b75 100644 --- a/sub-government-affairs-service/src/router/index.js +++ b/sub-government-affairs-service/src/router/index.js @@ -13,6 +13,7 @@ import traceRouter from './modules/trace'; import landsRoutes from './modules/lands'; import dictRoutes from './modules/dict'; import productOperateMainRoutes from './modules/productOperateMain'; +import inputSuppliesRoutes from './modules/inputSupplies'; export const constantRoutes = [ { @@ -47,6 +48,7 @@ export const constantRoutes = [ ...landsRoutes, ...dictRoutes, ...productOperateMainRoutes, + ...inputSuppliesRoutes, ]; /** diff --git a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js new file mode 100644 index 0000000..3de517a --- /dev/null +++ b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js @@ -0,0 +1,68 @@ +import Layout from '@/layouts/index.vue'; + +const inputSuppliesRoutes = [ + { + path: '/sub-government-affairs-service/inputSuppliesManage', + name: 'inputSuppliesManage', + component: Layout, + redirect: '/sub-government-affairs-service/basicInfo', + meta: { title: '投入品监管平台', icon: 'Document' }, + children: [ + // { + // path: '/sub-government-affairs-service/inputDataView', + // name: 'inputDataView', + // component: () => import('@/views/inputSuppliesManage/inputDataView/index.vue'), + // meta: { title: '投入品资源一张图', icon: 'Document' }, + // }, + { + path: '/sub-government-affairs-service/basicInfo', + name: 'basicInfo', + component: () => import('@/views/inputSuppliesManage/basicInfo/index.vue'), + meta: { title: '物资', icon: 'Document' }, + }, + // { + // path: '/sub-government-affairs-service/productionDealer', + // name: 'productionDealer', + // component: () => import('@/views/inputSuppliesManage/productionDealer/index.vue'), + // meta: { title: '生产经销商管理', icon: 'Document' }, + // }, + // { + // path: '/sub-government-affairs-service/enterpriseDealer', + // name: 'enterpriseDealer', + // component: () => import('@/views/inputSuppliesManage/enterpriseDealer/index.vue'), + // meta: { title: '企业经销商抽检', icon: 'Document' }, + // }, + // { + // path: '/sub-government-affairs-service/useSupervise', + // name: 'useSupervise', + // component: () => import('@/views/inputSuppliesManage/useSupervise/index.vue'), + // meta: { title: '使用监管', icon: 'Document' }, + // }, + // { + // path: '/sub-government-affairs-service/leaseSupervise', + // name: 'leaseSupervise', + // component: () => import('@/views/inputSuppliesManage/leaseSupervise/index.vue'), + // meta: { title: '农机租赁监管', icon: 'Document' }, + // }, + { + path: '/sub-government-affairs-service/redBlackRank', + name: 'redBlackRank', + component: () => import('@/views/inputSuppliesManage/redBlackRank/index.vue'), + meta: { title: '企业红黑榜', icon: 'Document' }, + }, + // { + // path: '/sub-government-affairs-service/knowledgeManage', + // name: 'knowledgeManage', + // component: () => import('@/views/inputSuppliesManage/knowledgeManage/index.vue'), + // meta: { title: '知识库', icon: 'Document' }, + // }, + // { + // path: '/sub-government-affairs-service/patrolCaseManage', + // name: 'patrolCaseManage', + // component: () => import('@/views/inputSuppliesManage/patrolCaseManage/index.vue'), + // meta: { title: '巡查与案件管理', icon: 'Document' }, + // }, + ], + }, +]; +export default inputSuppliesRoutes; diff --git a/sub-government-affairs-service/src/views/dict/component/soilClassification/useSoilTypeHook.js b/sub-government-affairs-service/src/views/dict/component/soilClassification/useSoilTypeHook.js index 82b282e..f16e863 100644 --- a/sub-government-affairs-service/src/views/dict/component/soilClassification/useSoilTypeHook.js +++ b/sub-government-affairs-service/src/views/dict/component/soilClassification/useSoilTypeHook.js @@ -6,22 +6,22 @@ export default function useSoilTypeHook() { const crudRef = ref(); const condition = ref({ - villageName: '', + soilType: '', }); const data = ref([ { - code: '1', - soilType: '1111111111111', + code: 'a123456', + soilType: '黑土地', status: 0, }, { - code: '2', - soilType: '2222222222222', + code: 'b258369', + soilType: '黄土地', status: 1, }, { - code: '3', - soilType: '3333333333333', + code: 'c987654', + soilType: '盐碱土地', status: 0, }, ]); @@ -38,15 +38,6 @@ export default function useSoilTypeHook() { refreshBtn: false, border: false, column: [ - { - label: '村名', - prop: 'villageName', - search: true, - hide: true, - display: false, - addDisplay: false, - viewDisplay: false, - }, { label: '编号', prop: 'code', @@ -54,10 +45,11 @@ export default function useSoilTypeHook() { addDisplay: false, }, { - label: '土壤类型', + label: '土壤类别', prop: 'soilType', labelWidth: 100, span: 23, + search: true, rules: [ { required: true, diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/basicInfo/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/basicInfo/index.vue new file mode 100644 index 0000000..318d7a7 --- /dev/null +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/basicInfo/index.vue @@ -0,0 +1,20 @@ + + + + + diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/common/typeRadio.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/common/typeRadio.vue new file mode 100644 index 0000000..82e50d3 --- /dev/null +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/common/typeRadio.vue @@ -0,0 +1,56 @@ + + + + + diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/enterpriseDealer/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/enterpriseDealer/index.vue new file mode 100644 index 0000000..d6492f1 --- /dev/null +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/enterpriseDealer/index.vue @@ -0,0 +1,20 @@ + + + + + diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/inputDataView/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/inputDataView/index.vue new file mode 100644 index 0000000..5677381 --- /dev/null +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/inputDataView/index.vue @@ -0,0 +1,20 @@ + + + + + diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/knowledgeManage/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/knowledgeManage/index.vue new file mode 100644 index 0000000..08c26cb --- /dev/null +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/knowledgeManage/index.vue @@ -0,0 +1,20 @@ + + + + + diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/leaseSupervise/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/leaseSupervise/index.vue new file mode 100644 index 0000000..e9e2927 --- /dev/null +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/leaseSupervise/index.vue @@ -0,0 +1,20 @@ + + + + + diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/patrolCaseManage/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/patrolCaseManage/index.vue new file mode 100644 index 0000000..1fbf9e0 --- /dev/null +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/patrolCaseManage/index.vue @@ -0,0 +1,20 @@ + + + + + diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/productionDealer/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/productionDealer/index.vue new file mode 100644 index 0000000..d817da6 --- /dev/null +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/productionDealer/index.vue @@ -0,0 +1,20 @@ + + + + + diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/redBlackRank/common/rankCard.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/redBlackRank/common/rankCard.vue new file mode 100644 index 0000000..f12c9a9 --- /dev/null +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/redBlackRank/common/rankCard.vue @@ -0,0 +1,67 @@ + + + + + diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/redBlackRank/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/redBlackRank/index.vue new file mode 100644 index 0000000..bd13997 --- /dev/null +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/redBlackRank/index.vue @@ -0,0 +1,78 @@ + + + + + diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/useSupervise/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/useSupervise/index.vue new file mode 100644 index 0000000..0182045 --- /dev/null +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/useSupervise/index.vue @@ -0,0 +1,20 @@ + + + + +