From bc4c3f11eb26994ddf9e7b6fef574a9d266b2a6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=83=B3?= <826276471@qq.com>
Date: Tue, 18 Mar 2025 10:50:56 +0800
Subject: [PATCH 1/3] feat
---
.../src/router/modules/inputSupplies/index.js | 8 ++++++-
.../inputSuppliesManage/hooks/useBasicInfo.js | 9 ++++----
.../materialManage/index.vue | 21 +++++++++++++++++++
.../materialManage/useMaterialHook.js | 12 +++++++++++
4 files changed, 45 insertions(+), 5 deletions(-)
create mode 100644 sub-government-affairs-service/src/views/inputSuppliesManage/materialManage/index.vue
create mode 100644 sub-government-affairs-service/src/views/inputSuppliesManage/materialManage/useMaterialHook.js
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 e29804a..fe35113 100644
--- a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js
+++ b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js
@@ -6,7 +6,7 @@ const inputSuppliesRoutes = [
path: '/sub-government-affairs-service/inputSuppliesManage',
name: 'inputSuppliesManage',
component: Layout,
- redirect: '/sub-government-affairs-service/material',
+ redirect: '/sub-government-affairs-service/materialManage',
meta: { title: '投入品监管平台', icon: 'Document' },
children: [
// {
@@ -15,6 +15,12 @@ const inputSuppliesRoutes = [
// component: () => import('@/views/inputSuppliesManage/inputDataView/index.vue'),
// meta: { title: '投入品资源一张图', icon: 'Document' },
// },
+ {
+ path: '/sub-government-affairs-service/materialManage',
+ name: 'materialManage',
+ component: () => import('@/views/inputSuppliesManage/materialManage/index.vue'),
+ meta: { title: '物资管理融合', icon: 'Document' },
+ },
{
path: '/sub-government-affairs-service/material',
name: 'material',
diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/hooks/useBasicInfo.js b/sub-government-affairs-service/src/views/inputSuppliesManage/hooks/useBasicInfo.js
index fef2aba..20d8480 100644
--- a/sub-government-affairs-service/src/views/inputSuppliesManage/hooks/useBasicInfo.js
+++ b/sub-government-affairs-service/src/views/inputSuppliesManage/hooks/useBasicInfo.js
@@ -19,14 +19,15 @@ export function useBasicInfo() {
label: '化学成分',
value: '2',
children: [
- { label: '无机农药', value: '2-1' },
- { label: '生物农药', value: '2-2' },
+ { label: '无机农药', pid: '2', value: '2-1' },
+ { label: '生物农药', pid: '2', value: '2-2' },
{
label: '有机农药',
+ pid: '2',
value: '2-3',
children: [
- { label: '天然有机农药', value: '2-3-1' },
- { label: '人工合成农药', value: '2-3-2' },
+ { label: '天然有机农药', pid: '2-3', value: '2-3-1' },
+ { label: '人工合成农药', pid: '2-3', value: '2-3-2' },
],
},
],
diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/materialManage/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/materialManage/index.vue
new file mode 100644
index 0000000..dfc2ff9
--- /dev/null
+++ b/sub-government-affairs-service/src/views/inputSuppliesManage/materialManage/index.vue
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/materialManage/useMaterialHook.js b/sub-government-affairs-service/src/views/inputSuppliesManage/materialManage/useMaterialHook.js
new file mode 100644
index 0000000..cec889a
--- /dev/null
+++ b/sub-government-affairs-service/src/views/inputSuppliesManage/materialManage/useMaterialHook.js
@@ -0,0 +1,12 @@
+import { ref } from 'vue';
+
+export const useMaterialHook = () => {
+ const pageData = ref({
+ currentPage: 1,
+ pageSize: 10,
+ total: 0,
+ });
+ const data = ref([]);
+
+ return { pageData, data };
+};
From 7bf7f956afe9b685d00622cdf351b26ae0f90664 Mon Sep 17 00:00:00 2001
From: wangzenghua <1048523306@qq.com>
Date: Wed, 19 Mar 2025 02:15:36 +0100
Subject: [PATCH 2/3] =?UTF-8?q?feat:=E7=96=AB=E7=97=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/router/modules/plantingAndBreeding.js | 6 +
.../epidemicDisease/index.vue | 567 ++++++++++++++++++
.../epidemicDisease/info.vue | 94 +++
3 files changed, 667 insertions(+)
create mode 100644 sub-government-affairs-service/src/views/plantingAndBreeding/epidemicDisease/index.vue
create mode 100644 sub-government-affairs-service/src/views/plantingAndBreeding/epidemicDisease/info.vue
diff --git a/sub-government-affairs-service/src/router/modules/plantingAndBreeding.js b/sub-government-affairs-service/src/router/modules/plantingAndBreeding.js
index 9f70fcf..4007b1b 100644
--- a/sub-government-affairs-service/src/router/modules/plantingAndBreeding.js
+++ b/sub-government-affairs-service/src/router/modules/plantingAndBreeding.js
@@ -27,6 +27,12 @@ export default [
component: () => import('@/views/plantingAndBreeding/pest/index.vue'),
meta: { title: '病虫害监测信息', icon: 'Document' },
},
+ {
+ path: '/sub-government-affairs-service/epidemic-disease-monitor',
+ name: 'epidemic-disease-monitor',
+ component: () => import('@/views/plantingAndBreeding/epidemicDisease/index.vue'),
+ meta: { title: '疫病监测信息', icon: 'Document' },
+ },
// {
// path: '/sub-government-affairs-service/breeding-base-information',
// name: 'breeding-base-information',
diff --git a/sub-government-affairs-service/src/views/plantingAndBreeding/epidemicDisease/index.vue b/sub-government-affairs-service/src/views/plantingAndBreeding/epidemicDisease/index.vue
new file mode 100644
index 0000000..0680446
--- /dev/null
+++ b/sub-government-affairs-service/src/views/plantingAndBreeding/epidemicDisease/index.vue
@@ -0,0 +1,567 @@
+
+
+
+
+
+
+
+
+
+ 添加
+ 批量删除
+
+
+
+
+
+
+
+
+
+ 下载
+
+
+
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sub-government-affairs-service/src/views/plantingAndBreeding/epidemicDisease/info.vue b/sub-government-affairs-service/src/views/plantingAndBreeding/epidemicDisease/info.vue
new file mode 100644
index 0000000..304efb2
--- /dev/null
+++ b/sub-government-affairs-service/src/views/plantingAndBreeding/epidemicDisease/info.vue
@@ -0,0 +1,94 @@
+
+
+
+
+
From 5d57520041784fae1ce5dde824f9d73aa7bf21be Mon Sep 17 00:00:00 2001
From: wangzenghua <1048523306@qq.com>
Date: Wed, 19 Mar 2025 07:45:27 +0100
Subject: [PATCH 3/3] fix
---
sub-government-affairs-service/src/router/modules/resource.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sub-government-affairs-service/src/router/modules/resource.js b/sub-government-affairs-service/src/router/modules/resource.js
index 45cb536..3c6740f 100644
--- a/sub-government-affairs-service/src/router/modules/resource.js
+++ b/sub-government-affairs-service/src/router/modules/resource.js
@@ -19,8 +19,8 @@ export default [
meta: { title: '网格化管理', icon: 'Document' },
},
...annualplanRouters,
- ...statisticsRoutes,
...landsRoutes,
+ ...statisticsRoutes,
...dictRoutes,
],
},