diff --git a/sub-government-affairs-service/src/assets/images/trace/statistic-card-bg1.png b/sub-government-affairs-service/src/assets/images/trace/statistic-card-bg1.png
new file mode 100644
index 0000000..33aad5c
Binary files /dev/null and b/sub-government-affairs-service/src/assets/images/trace/statistic-card-bg1.png differ
diff --git a/sub-government-affairs-service/src/assets/images/trace/statistic-card-bg2.png b/sub-government-affairs-service/src/assets/images/trace/statistic-card-bg2.png
new file mode 100644
index 0000000..d63d1ff
Binary files /dev/null and b/sub-government-affairs-service/src/assets/images/trace/statistic-card-bg2.png differ
diff --git a/sub-government-affairs-service/src/assets/images/trace/statistic-card-bg3.png b/sub-government-affairs-service/src/assets/images/trace/statistic-card-bg3.png
new file mode 100644
index 0000000..41d0edc
Binary files /dev/null and b/sub-government-affairs-service/src/assets/images/trace/statistic-card-bg3.png differ
diff --git a/sub-government-affairs-service/src/assets/images/trace/statistic-card-bg4.png b/sub-government-affairs-service/src/assets/images/trace/statistic-card-bg4.png
new file mode 100644
index 0000000..e527af4
Binary files /dev/null and b/sub-government-affairs-service/src/assets/images/trace/statistic-card-bg4.png differ
diff --git a/sub-government-affairs-service/src/assets/images/trace/statistic-card1.png b/sub-government-affairs-service/src/assets/images/trace/statistic-card1.png
new file mode 100644
index 0000000..c8fac50
Binary files /dev/null and b/sub-government-affairs-service/src/assets/images/trace/statistic-card1.png differ
diff --git a/sub-government-affairs-service/src/assets/images/trace/statistic-card2.png b/sub-government-affairs-service/src/assets/images/trace/statistic-card2.png
new file mode 100644
index 0000000..561b373
Binary files /dev/null and b/sub-government-affairs-service/src/assets/images/trace/statistic-card2.png differ
diff --git a/sub-government-affairs-service/src/assets/images/trace/statistic-card3.png b/sub-government-affairs-service/src/assets/images/trace/statistic-card3.png
new file mode 100644
index 0000000..a982402
Binary files /dev/null and b/sub-government-affairs-service/src/assets/images/trace/statistic-card3.png differ
diff --git a/sub-government-affairs-service/src/assets/images/trace/statistic-card4.png b/sub-government-affairs-service/src/assets/images/trace/statistic-card4.png
new file mode 100644
index 0000000..443d673
Binary files /dev/null and b/sub-government-affairs-service/src/assets/images/trace/statistic-card4.png differ
diff --git a/sub-government-affairs-service/src/assets/images/trace/statistic-traceability-1.png b/sub-government-affairs-service/src/assets/images/trace/statistic-traceability-1.png
new file mode 100644
index 0000000..a4cd9bb
Binary files /dev/null and b/sub-government-affairs-service/src/assets/images/trace/statistic-traceability-1.png differ
diff --git a/sub-government-affairs-service/src/assets/images/trace/statistic-traceability-2.png b/sub-government-affairs-service/src/assets/images/trace/statistic-traceability-2.png
new file mode 100644
index 0000000..4424682
Binary files /dev/null and b/sub-government-affairs-service/src/assets/images/trace/statistic-traceability-2.png differ
diff --git a/sub-government-affairs-service/src/assets/images/trace/statistic-traceability-3.png b/sub-government-affairs-service/src/assets/images/trace/statistic-traceability-3.png
new file mode 100644
index 0000000..40a64e7
Binary files /dev/null and b/sub-government-affairs-service/src/assets/images/trace/statistic-traceability-3.png differ
diff --git a/sub-government-affairs-service/src/assets/images/trace/statistic-traceability-4.png b/sub-government-affairs-service/src/assets/images/trace/statistic-traceability-4.png
new file mode 100644
index 0000000..9364571
Binary files /dev/null and b/sub-government-affairs-service/src/assets/images/trace/statistic-traceability-4.png differ
diff --git a/sub-government-affairs-service/src/router/index.js b/sub-government-affairs-service/src/router/index.js
index 33f1c38..7448b8e 100644
--- a/sub-government-affairs-service/src/router/index.js
+++ b/sub-government-affairs-service/src/router/index.js
@@ -12,6 +12,7 @@ import resourceRouter from './modules/resource';
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 = [
@@ -44,8 +45,9 @@ export const constantRoutes = [
},
...resourceRouter,
...traceRouter,
- ...landsRoutes,
- ...dictRoutes,
+ // ...landsRoutes,
+ // ...dictRoutes,
+ ...productOperateMainRoutes,
...inputSuppliesRoutes,
];
diff --git a/sub-government-affairs-service/src/router/modules/dict.js b/sub-government-affairs-service/src/router/modules/dict.js
index eca219e..b2a5b88 100644
--- a/sub-government-affairs-service/src/router/modules/dict.js
+++ b/sub-government-affairs-service/src/router/modules/dict.js
@@ -1,10 +1,11 @@
import Layout from '@/layouts/index.vue';
+import Views from '@/layouts/Views.vue';
const dictRoutes = [
{
path: '/sub-government-affairs-service/dict',
name: 'dict',
- component: Layout,
+ component: Views,
redirect: '/sub-government-affairs-service/region',
meta: { title: '基础信息维护', icon: 'Document' },
children: [
diff --git a/sub-government-affairs-service/src/router/modules/lands.js b/sub-government-affairs-service/src/router/modules/lands.js
index 440eb12..d4424b2 100644
--- a/sub-government-affairs-service/src/router/modules/lands.js
+++ b/sub-government-affairs-service/src/router/modules/lands.js
@@ -1,10 +1,11 @@
import Layout from '@/layouts/index.vue';
+import Views from '@/layouts/Views.vue';
const landsRoutes = [
{
path: '/sub-government-affairs-service/landManage',
name: 'landManage',
- component: Layout,
+ component: Views,
redirect: '/sub-government-affairs-service/landsManage',
meta: { title: '土地管理', icon: 'Document' },
children: [
diff --git a/sub-government-affairs-service/src/router/modules/productOperateMain.js b/sub-government-affairs-service/src/router/modules/productOperateMain.js
new file mode 100644
index 0000000..25b8b5b
--- /dev/null
+++ b/sub-government-affairs-service/src/router/modules/productOperateMain.js
@@ -0,0 +1,31 @@
+import Layout from '@/layouts/index.vue';
+
+export default [
+ {
+ path: '/sub-government-affairs-service/productOperateMain',
+ name: 'productOperateMain',
+ component: Layout,
+ redirect: '/sub-government-affairs-service/individual',
+ meta: { title: '生产经营主体', icon: 'icon-test' },
+ children: [
+ {
+ path: '/sub-government-affairs-service/individual',
+ component: () => import('@/views/productOperateMain/individual/index.vue'),
+ name: 'individual',
+ meta: { title: '个体户', icon: 'Document' },
+ },
+ {
+ path: '/sub-government-affairs-service/collective',
+ component: () => import('@/views/productOperateMain/collective/index.vue'),
+ name: 'collective',
+ meta: { title: '村集体', icon: 'Document' },
+ },
+ {
+ path: '/sub-government-affairs-service/coop',
+ component: () => import('@/views/productOperateMain/coOp/index.vue'),
+ name: 'coop',
+ meta: { title: '合作社', icon: 'Document' },
+ },
+ ],
+ },
+];
diff --git a/sub-government-affairs-service/src/router/modules/resource.js b/sub-government-affairs-service/src/router/modules/resource.js
index 52a5eac..45cb536 100644
--- a/sub-government-affairs-service/src/router/modules/resource.js
+++ b/sub-government-affairs-service/src/router/modules/resource.js
@@ -1,6 +1,8 @@
import Layout from '@/layouts/index.vue';
import annualplanRouters from './annualplan';
import statisticsRoutes from './statisticAnalysis';
+import landsRoutes from './lands';
+import dictRoutes from './dict';
export default [
{
@@ -18,6 +20,8 @@ export default [
},
...annualplanRouters,
...statisticsRoutes,
+ ...landsRoutes,
+ ...dictRoutes,
],
},
];
diff --git a/sub-government-affairs-service/src/router/modules/trace.js b/sub-government-affairs-service/src/router/modules/trace.js
index 13d871c..f745b80 100644
--- a/sub-government-affairs-service/src/router/modules/trace.js
+++ b/sub-government-affairs-service/src/router/modules/trace.js
@@ -6,47 +6,53 @@ export default [
path: '/sub-government-affairs-service/trace',
name: 'trace',
component: Layout,
- redirect: '/sub-government-affairs-service/breeding',
+ redirect: '/sub-government-affairs-service/trace-home',
meta: { title: '溯源管理', icon: 'Document' },
children: [
{
- path: '/sub-government-affairs-service/planting',
- name: 'planting',
+ path: '/sub-government-affairs-service/trace-index',
+ name: 'trace-index',
+ component: () => import('@/views/trace/statistic/index.vue'),
+ meta: { title: '溯源首页', icon: 'Document' },
+ },
+ {
+ path: '/sub-government-affairs-service/record',
+ name: 'record',
component: Views,
- meta: { title: '种植档案', icon: 'Document' },
- redirect: '/sub-government-affairs-service/planting-base',
+ meta: { title: '种养植档案', icon: 'Document' },
+ redirect: '/sub-government-affairs-service/record-base',
children: [
{
- path: '/sub-government-affairs-service/planting-base',
- component: () => import('@/views/trace/planting/base/index.vue'),
- name: 'planting-base',
+ path: '/sub-government-affairs-service/record-base',
+ component: () => import('@/views/trace/record/base/index.vue'),
+ name: 'record-base',
meta: { title: '基地档案', icon: 'Document' },
},
{
- path: '/sub-government-affairs-service/planting-seed',
- component: () => import('@/views/trace/planting/seed/index.vue'),
- name: 'planting-seed',
- meta: { title: '种子档案', icon: 'Document' },
+ path: '/sub-government-affairs-service/record-seed',
+ component: () => import('@/views/trace/record/seed/index.vue'),
+ name: 'record-seed',
+ meta: { title: '种源档案', icon: 'Document' },
},
],
},
{
- path: '/sub-government-affairs-service/breeding',
- name: 'breeding',
+ path: '/sub-government-affairs-service/agricultural',
+ name: 'agricultural',
component: Views,
meta: { title: '农事管理', icon: 'Document' },
- redirect: '/sub-government-affairs-service/breeding-coding',
+ redirect: '/sub-government-affairs-service/agricultural-coding',
children: [
{
- path: '/sub-government-affairs-service/breeding-coding',
- component: () => import('@/views/trace/breeding/coding/index.vue'),
- name: 'breeding-coding',
+ path: '/sub-government-affairs-service/agricultural-coding',
+ component: () => import('@/views/trace/agricultural/coding/index.vue'),
+ name: 'agricultural-coding',
meta: { title: '采收与赋码管理', icon: 'Document' },
},
{
- path: '/sub-government-affairs-service/breeding-quality',
- component: () => import('@/views/trace/breeding/quality/index.vue'),
- name: 'breeding-quality',
+ path: '/sub-government-affairs-service/agricultural-quality',
+ component: () => import('@/views/trace/agricultural/quality/index.vue'),
+ name: 'agricultural-quality',
meta: { title: '产品质检管理', icon: 'Document' },
},
],
diff --git a/sub-government-affairs-service/src/views/landManage/component/landPartol/index.vue b/sub-government-affairs-service/src/views/landManage/component/landPartol/index.vue
index 782b575..7c4c17b 100644
--- a/sub-government-affairs-service/src/views/landManage/component/landPartol/index.vue
+++ b/sub-government-affairs-service/src/views/landManage/component/landPartol/index.vue
@@ -129,6 +129,10 @@ const state = reactive({
...CRUD_OPTIONS,
addBtnText: '新增',
updateBtnText: '确定',
+ searchSpan: 6,
+ searchGutter: 80,
+ searchMenuPosition: 'center',
+ index: true,
column: [
{
label: '任务编号',
@@ -307,7 +311,6 @@ const state = reactive({
],
},
],
- searchColumn: [],
actions: [
{
name: '登记结果',
@@ -491,3 +494,13 @@ const infoHide = () => {
infoVisible.value = false;
};
+
diff --git a/sub-government-affairs-service/src/views/landManage/component/operationRecord/index.vue b/sub-government-affairs-service/src/views/landManage/component/operationRecord/index.vue
index bb48ee8..0abe97d 100644
--- a/sub-government-affairs-service/src/views/landManage/component/operationRecord/index.vue
+++ b/sub-government-affairs-service/src/views/landManage/component/operationRecord/index.vue
@@ -108,6 +108,10 @@ const state = reactive({
options: {
...CRUD_OPTIONS,
addBtnText: '新增作业',
+ searchLabelWidth: '80px',
+ searchSpan: 6,
+ searchGutter: 80,
+ searchMenuPosition: 'center',
column: [
{
label: '作业日期',
diff --git a/sub-government-affairs-service/src/views/landManage/component/plantPlan/compoent/stage.vue b/sub-government-affairs-service/src/views/landManage/component/plantPlan/compoent/stage.vue
new file mode 100644
index 0000000..e19b34a
--- /dev/null
+++ b/sub-government-affairs-service/src/views/landManage/component/plantPlan/compoent/stage.vue
@@ -0,0 +1,274 @@
+
+