diff --git a/sub-government-affairs-service/src/layouts/component/Header/index.vue b/sub-government-affairs-service/src/layouts/component/Header/index.vue
index 3f80024..8985021 100644
--- a/sub-government-affairs-service/src/layouts/component/Header/index.vue
+++ b/sub-government-affairs-service/src/layouts/component/Header/index.vue
@@ -61,7 +61,7 @@ const stylePlaceholder = () => {
width: calc(100% - 60px);
}
&.no-collapse {
- width: calc(100% - 210px);
+ width: calc(100% - 240px);
}
&-placeholder {
height: 50px;
diff --git a/sub-government-affairs-service/src/layouts/component/Sider/index.vue b/sub-government-affairs-service/src/layouts/component/Sider/index.vue
index 5eb5134..27263c7 100644
--- a/sub-government-affairs-service/src/layouts/component/Sider/index.vue
+++ b/sub-government-affairs-service/src/layouts/component/Sider/index.vue
@@ -56,7 +56,7 @@ const activeMenu = computed(() => {
left: 0;
z-index: 98;
overflow: hidden;
- width: 210px;
+ width: 240px;
height: 100%;
background-color: #ffffff;
box-shadow: 0 1px 4px rgb(0 21 41 / 8%);
diff --git a/sub-government-affairs-service/src/layouts/index.vue b/sub-government-affairs-service/src/layouts/index.vue
index 5311e8a..fc69a2d 100644
--- a/sub-government-affairs-service/src/layouts/index.vue
+++ b/sub-government-affairs-service/src/layouts/index.vue
@@ -37,7 +37,7 @@ const SettingStore = useSettingStore();
}
&-container {
position: relative;
- margin-left: 210px;
+ margin-left: 240px;
height: 100%;
transition: margin-left 0.28s;
box-sizing: border-box;
diff --git a/sub-government-affairs-service/src/router/modules/annualplan.js b/sub-government-affairs-service/src/router/modules/annualplan.js
index c0d115d..3d0574d 100644
--- a/sub-government-affairs-service/src/router/modules/annualplan.js
+++ b/sub-government-affairs-service/src/router/modules/annualplan.js
@@ -6,7 +6,7 @@ const annualplanRoutes = [
name: 'annualPlan',
component: Views,
redirect: '/sub-government-affairs-service/annualPlans',
- meta: { title: '年度种植计划', icon: '' },
+ meta: { title: '种植进度网格化管理', icon: '' },
children: [
// {
// path: '/sub-government-affairs-service/annualPlans',
@@ -18,7 +18,7 @@ const annualplanRoutes = [
path: '/sub-government-affairs-service/annualPlans',
name: 'annualPlans',
component: () => import('@/views/annualPlan/component/annualPlans/index.vue'),
- meta: { title: '网格种植进度', icon: 'Memo' },
+ meta: { title: '种植进度网格化管理', icon: 'Memo' },
},
],
},
diff --git a/sub-government-affairs-service/src/router/modules/dict.js b/sub-government-affairs-service/src/router/modules/dict.js
index ba5f8c3..6ce6f77 100644
--- a/sub-government-affairs-service/src/router/modules/dict.js
+++ b/sub-government-affairs-service/src/router/modules/dict.js
@@ -9,19 +9,19 @@ const dictRoutes = [
redirect: '/sub-government-affairs-service/region',
meta: { title: '基础信息维护', icon: 'DocumentRemove' },
children: [
- // {
- // path: '/sub-government-affairs-service/region',
- // name: 'region',
- // component: () => import('@/views/dict/component/region/index.vue'),
- // meta: { title: '行政信息', icon: '' },
- // },
{
- path: '/sub-government-affairs-service/landCassification',
- name: 'landCassification',
- component: () => import('@/views/dict/component/landCassification/index.vue'),
- meta: { title: '土地分类', icon: '' },
+ path: '/sub-government-affairs-service/region',
+ name: 'region',
+ component: () => import('@/views/dict/component/region/index.vue'),
+ meta: { title: '行政信息', icon: '' },
},
// {
+ // path: '/sub-government-affairs-service/landCassification',
+ // name: 'landCassification',
+ // component: () => import('@/views/dict/component/landCassification/index.vue'),
+ // meta: { title: '土地分类', icon: '' },
+ // },
+ // {
// path: '/sub-government-affairs-service/dictCrop',
// name: 'dictCrop',
// component: () => import('@/views/dict/component/dictCrop/index.vue'),
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 23526cb..ec56f28 100644
--- a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js
+++ b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js
@@ -25,7 +25,7 @@ const inputSuppliesRoutes = [
path: '/sub-government-affairs-service/material/seed',
name: 'input-supplies-seed',
component: () => import('@/views/inputSuppliesManage/material/seed/index.vue'),
- meta: { title: '种子管理', icon: '' },
+ meta: { title: '种子使用监督管理', icon: '' },
},
{
path: '/sub-government-affairs-service/material/others',
@@ -33,6 +33,12 @@ const inputSuppliesRoutes = [
component: () => import('@/views/inputSuppliesManage/material/others/index.vue'),
meta: { title: '其他投入品', icon: '' },
},
+ {
+ path: '/sub-government-affairs-service/material/annualPlans',
+ name: 'annualPlans',
+ component: () => import('@/views/inputSuppliesManage/material/annualPlan/index.vue'),
+ meta: { title: '种植进度网格化管理', icon: '' },
+ },
// {
// path: '/sub-government-affairs-service/materialManage',
// name: 'materialManage',
diff --git a/sub-government-affairs-service/src/router/modules/productOperateMain.js b/sub-government-affairs-service/src/router/modules/productOperateMain.js
index dbe46c5..59f4b19 100644
--- a/sub-government-affairs-service/src/router/modules/productOperateMain.js
+++ b/sub-government-affairs-service/src/router/modules/productOperateMain.js
@@ -6,7 +6,7 @@ export default [
name: 'productOperateMain',
component: Layout,
redirect: '/sub-government-affairs-service/mainHome',
- meta: { title: '生产经营主体', icon: 'icon-shop' },
+ meta: { title: '农业生产经营主体管理', icon: 'icon-shop' },
children: [
// {
// path: '/sub-government-affairs-service/mainHome',
@@ -30,7 +30,7 @@ export default [
path: '/sub-government-affairs-service/coop',
component: () => import('@/views/productOperateMain/coOp/index.vue'),
name: 'coop',
- meta: { title: '农企合作社管理', icon: '' },
+ meta: { title: '企业管理', icon: '' },
},
// {
// path: '/sub-government-affairs-service/enterprise',
diff --git a/sub-government-affairs-service/src/router/modules/resource.js b/sub-government-affairs-service/src/router/modules/resource.js
index 329abfb..d22effb 100644
--- a/sub-government-affairs-service/src/router/modules/resource.js
+++ b/sub-government-affairs-service/src/router/modules/resource.js
@@ -9,15 +9,21 @@ export default [
path: '/sub-government-affairs-service/resource',
name: 'resourceManagement',
component: Layout,
- redirect: '/sub-government-affairs-service/grid',
+ redirect: '/sub-government-affairs-service/landCassification',
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: '' },
+ },
{
redirect: '/sub-government-affairs-service/add-grid',
path: '/sub-government-affairs-service/grid',
// component: () => import('@/views/resource/grid/index.vue'),
name: 'grid',
- meta: { title: '网格化管理', icon: 'Memo' },
+ meta: { title: '土地资源网格化管理', icon: 'Memo' },
children: [
{
path: '/sub-government-affairs-service/add-grid',
@@ -39,7 +45,7 @@ export default [
// },
],
},
- ...annualplanRouters,
+ // ...annualplanRouters,
...landsRoutes,
// ...statisticsRoutes,
...dictRoutes,
diff --git a/sub-government-affairs-service/src/router/modules/trace.js b/sub-government-affairs-service/src/router/modules/trace.js
index ee74665..9ddcd56 100644
--- a/sub-government-affairs-service/src/router/modules/trace.js
+++ b/sub-government-affairs-service/src/router/modules/trace.js
@@ -7,7 +7,7 @@ export default [
name: 'trace',
component: Layout,
redirect: '/sub-government-affairs-service/trace-home',
- meta: { title: '溯源管理', icon: 'Connection' },
+ meta: { title: '农产品流通溯源管理', icon: 'Connection' },
children: [
{
path: '/sub-government-affairs-service/record',
diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/material/annualPlan/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/material/annualPlan/index.vue
new file mode 100644
index 0000000..0fb4525
--- /dev/null
+++ b/sub-government-affairs-service/src/views/inputSuppliesManage/material/annualPlan/index.vue
@@ -0,0 +1,445 @@
+
+
+
+
+ 新增
+ 导出
+
+
+
+ 待提交
+ 审核中
+ 通过
+ 拒绝
+
+
+
+
+
+ 天
+
+
+ -
+
+
+ 天
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+