diff --git a/sub-government-affairs-service/.env.development b/sub-government-affairs-service/.env.development index 7a86ca4..cdf02f5 100644 --- a/sub-government-affairs-service/.env.development +++ b/sub-government-affairs-service/.env.development @@ -10,8 +10,13 @@ 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_UPLOAD_URL = 'http://47.109.205.240:9204' -# 内网接口地址 +# 内网测试库接口地址 VITE_APP_BASE_URL = 'http://192.168.18.99:8080' +# VITE_APP_UPLOAD_URL = 'http://192.168.18.98:9204' VITE_APP_UPLOAD_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 diff --git a/sub-government-affairs-service/src/assets/images/landBase/land1.png b/sub-government-affairs-service/src/assets/images/landBase/land1.png new file mode 100644 index 0000000..302ef75 Binary files /dev/null and b/sub-government-affairs-service/src/assets/images/landBase/land1.png differ diff --git a/sub-government-affairs-service/src/assets/images/landBase/land2.png b/sub-government-affairs-service/src/assets/images/landBase/land2.png new file mode 100644 index 0000000..daf7adc Binary files /dev/null and b/sub-government-affairs-service/src/assets/images/landBase/land2.png differ diff --git a/sub-government-affairs-service/src/assets/images/landBase/land3.png b/sub-government-affairs-service/src/assets/images/landBase/land3.png new file mode 100644 index 0000000..be7dfc6 Binary files /dev/null and b/sub-government-affairs-service/src/assets/images/landBase/land3.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 4a265f4..d891930 100644 --- a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js +++ b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js @@ -9,23 +9,29 @@ const inputSuppliesRoutes = [ redirect: '/sub-government-affairs-service/material/pesticide', meta: { title: '投入品管理', icon: 'FullScreen' }, children: [ + { + path: '/sub-government-affairs-service/material/annualPlans', + name: 'annualPlans', + component: () => import('@/views/inputSuppliesManage/material/annualPlan/index.vue'), + meta: { title: '农产品种植管理', icon: 'Timer' }, + }, { path: '/sub-government-affairs-service/material/pesticide', name: 'input-supplies-pesticide', component: () => import('@/views/inputSuppliesManage/material/pesticide/index.vue'), - meta: { title: '农药管理', icon: 'Orange' }, + meta: { title: '农药使用管理', icon: 'Orange' }, }, { path: '/sub-government-affairs-service/material/fertilizer', name: 'input-supplies-fertilizer', component: () => import('@/views/inputSuppliesManage/material/fertilizer/index.vue'), - meta: { title: '肥料管理', icon: 'Grid' }, + meta: { title: '肥料使用管理', icon: 'Grid' }, }, { path: '/sub-government-affairs-service/material/seed', name: 'input-supplies-seed', component: () => import('@/views/inputSuppliesManage/material/seed/index.vue'), - meta: { title: '种子使用监督管理', icon: 'Watermelon' }, + meta: { title: '种子使用管理', icon: 'Watermelon' }, }, { path: '/sub-government-affairs-service/material/others', @@ -33,99 +39,6 @@ const inputSuppliesRoutes = [ component: () => import('@/views/inputSuppliesManage/material/others/index.vue'), meta: { title: '其他投入品', icon: 'TakeawayBox' }, }, - { - path: '/sub-government-affairs-service/material/annualPlans', - name: 'annualPlans', - component: () => import('@/views/inputSuppliesManage/material/annualPlan/index.vue'), - meta: { title: '种植进度网格化管理', icon: 'Timer' }, - }, - // { - // path: '/sub-government-affairs-service/materialManage', - // name: 'materialManage', - // component: Views, - // redirect: '/sub-government-affairs-service/material/pesticide', - // meta: { title: '投入品管理', icon: 'OfficeBuilding' }, - // children: [ - // { - // path: '/sub-government-affairs-service/material/pesticide', - // name: 'input-supplies-pesticide', - // component: () => import('@/views/inputSuppliesManage/material/pesticide/index.vue'), - // meta: { title: '农药管理', icon: '' }, - // }, - // { - // path: '/sub-government-affairs-service/material/fertilizer', - // name: 'input-supplies-fertilizer', - // component: () => import('@/views/inputSuppliesManage/material/fertilizer/index.vue'), - // meta: { title: '肥料管理', icon: '' }, - // }, - // // { - // // path: '/sub-government-affairs-service/material/pesticide', - // // name: 'input-supplies-pesticide', - // // component: () => import('@/views/inputSuppliesManage/material/pesticide/index.vue'), - // // meta: { title: '农药管理', icon: '' }, - // // }, - // // { - // // path: '/sub-government-affairs-service/material/ratPoison', - // // name: 'input-supplies-ratPoison', - // // component: () => import('@/views/inputSuppliesManage/material/ratPoison/index.vue'), - // // meta: { title: '兽药管理', icon: '' }, - // // }, - // { - // path: '/sub-government-affairs-service/material/seed', - // name: 'input-supplies-seed', - // component: () => import('@/views/inputSuppliesManage/material/seed/index.vue'), - // meta: { title: '种子管理', icon: '' }, - // }, - // // { - // // path: '/sub-government-affairs-service/material/farmMachinery', - // // name: 'input-supplies-farmMachinery', - // // component: () => import('@/views/inputSuppliesManage/material/farmMachinery/index.vue'), - // // meta: { title: '农机管理', icon: '' }, - // // }, - // ], - // }, - // { - // path: '/sub-government-affairs-service/productionDealer', - // name: 'productionDealer', - // component: () => import('@/views/inputSuppliesManage/productionDealer/index.vue'), - // meta: { title: '企业经销商管理', icon: '' }, - // }, - // { - // path: '/sub-government-affairs-service/enterpriseDealerCheck', - // name: 'enterpriseDealerCheck', - // component: () => import('@/views/inputSuppliesManage/enterpriseDealerCheck/index.vue'), - // meta: { title: '企业经销商抽检', icon: '' }, - // }, - // { - // path: '/sub-government-affairs-service/useSupervise', - // name: 'useSupervise', - // component: () => import('@/views/inputSuppliesManage/useSupervise/index.vue'), - // meta: { title: '使用监管', icon: '' }, - // }, - // { - // path: '/sub-government-affairs-service/leaseSupervise', - // name: 'leaseSupervise', - // component: () => import('@/views/inputSuppliesManage/leaseSupervise/index.vue'), - // meta: { title: '农机租赁监管', icon: '' }, - // }, - // { - // path: '/sub-government-affairs-service/redBlackRank', - // name: 'redBlackRank', - // component: () => import('@/views/inputSuppliesManage/redBlackRank/index.vue'), - // meta: { title: '企业红黑榜', icon: '' }, - // }, - // { - // path: '/sub-government-affairs-service/knowledgeManage', - // name: 'knowledgeManage', - // component: () => import('@/views/inputSuppliesManage/knowledgeManage/index.vue'), - // meta: { title: '知识库', icon: '' }, - // }, - // { - // path: '/sub-government-affairs-service/patrolCaseManage', - // name: 'patrolCaseManage', - // component: () => import('@/views/inputSuppliesManage/patrolCaseManage/index.vue'), - // meta: { title: '巡查与案件管理', icon: 'Document' }, - // }, ], }, ]; diff --git a/sub-government-affairs-service/src/router/modules/lands.js b/sub-government-affairs-service/src/router/modules/lands.js index 94bf110..1f5ce16 100644 --- a/sub-government-affairs-service/src/router/modules/lands.js +++ b/sub-government-affairs-service/src/router/modules/lands.js @@ -9,12 +9,12 @@ const landsRoutes = [ redirect: '/sub-government-affairs-service/plantPlan', meta: { title: '土地管理', icon: 'Grape' }, children: [ - { - path: '/sub-government-affairs-service/landsManage', - name: 'landsManage', - component: () => import('@/views/landManage/component/landsManage/index.vue'), - meta: { title: '土地资源信息登记', icon: '' }, - }, + // { + // path: '/sub-government-affairs-service/landsManage', + // name: 'landsManage', + // component: () => import('@/views/landManage/component/landsManage/index.vue'), + // meta: { title: '土地资源信息登记', icon: '' }, + // }, // { // path: '/sub-government-affairs-service/plantPlan', // name: 'plantPlan', @@ -33,12 +33,12 @@ const landsRoutes = [ component: () => import('@/views/landManage/component/landPartol/index.vue'), meta: { title: '土地使用巡查', icon: '' }, }, - // { - // path: '/sub-government-affairs-service/illegalHandle', - // name: 'illegalHandle', - // component: () => import('@/views/landManage/component/illegalHandle/index.vue'), - // meta: { title: '土地案件', icon: '' }, - // }, + { + path: '/sub-government-affairs-service/illegalHandle', + name: 'illegalHandle', + component: () => import('@/views/landManage/component/illegalHandle/index.vue'), + meta: { title: '土地案件', icon: '' }, + }, ], }, ]; diff --git a/sub-government-affairs-service/src/router/modules/resource.js b/sub-government-affairs-service/src/router/modules/resource.js index 24e54d4..e825662 100644 --- a/sub-government-affairs-service/src/router/modules/resource.js +++ b/sub-government-affairs-service/src/router/modules/resource.js @@ -1,22 +1,57 @@ import Layout from '@/layouts/index.vue'; -// import annualplanRouters from './annualplan'; -import statisticsRoutes from './statisticAnalysis'; import landsRoutes from './lands'; -// import dictRoutes from './dict'; export default [ { path: '/sub-government-affairs-service/resource', name: 'resourceManagement', component: Layout, - redirect: '/sub-government-affairs-service/landCassification', + redirect: '/sub-government-affairs-service/resource/database/statistics', meta: { title: '土地资源管理', icon: 'icon-test' }, children: [ { - path: '/sub-government-affairs-service/landCassification', - name: 'landCassification', - component: () => import('@/views/dict/component/landCassification/index.vue'), - meta: { title: '土地分类', icon: 'Discount' }, + path: '/sub-government-affairs-service/resource/database', + name: 'landResourceDatabase', + redirect: '/sub-government-affairs-service/resource/database/statistics', + meta: { title: '土地资源库', icon: 'Connection' }, + children: [ + { + path: '/sub-government-affairs-service/resource/database/statistics', + name: 'landStatistics', + component: () => import('@/views/resource/database/Statistics.vue'), + meta: { title: '统计数据', icon: '' }, + }, + { + path: '/sub-government-affairs-service/resource/database/map', + name: 'landMap', + component: () => import('@/views/resource/database/LandMap.vue'), + meta: { title: '地块地图', icon: '' }, + }, + { + path: '/sub-government-affairs-service/resource/database/cultivated-land', + name: 'cultivatedLand', + component: () => import('@/views/resource/database/CultivatedLand.vue'), + meta: { title: '耕地', icon: '' }, + }, + { + path: '/sub-government-affairs-service/resource/database/orchard', + name: 'orchardLand', + component: () => import('@/views/resource/database/Orchard.vue'), + meta: { title: '园地', icon: '' }, + }, + { + path: '/sub-government-affairs-service/resource/database/forest', + name: 'forestLand', + component: () => import('@/views/resource/database/Forest.vue'), + meta: { title: '林地', icon: '' }, + }, + { + path: '/sub-government-affairs-service/resource/database/grassland', + name: 'grassLand', + component: () => import('@/views/resource/database/Grassland.vue'), + meta: { title: '草地', icon: '' }, + }, + ], }, { redirect: '/sub-government-affairs-service/add-grid', @@ -45,10 +80,7 @@ export default [ // }, ], }, - // ...annualplanRouters, ...landsRoutes, - // ...statisticsRoutes, - // ...dictRoutes, ], }, ]; diff --git a/sub-government-affairs-service/src/views/landManage/component/illegalHandle/index.vue b/sub-government-affairs-service/src/views/landManage/component/illegalHandle/index.vue index 0fd8666..1f7ccf2 100644 --- a/sub-government-affairs-service/src/views/landManage/component/illegalHandle/index.vue +++ b/sub-government-affairs-service/src/views/landManage/component/illegalHandle/index.vue @@ -23,7 +23,6 @@ -
填写网格信息
+填写网格信息
+填写网格信息
+