diff --git a/sub-government-affairs-service/src/router/index.js b/sub-government-affairs-service/src/router/index.js
index 23aaafe..b795f37 100644
--- a/sub-government-affairs-service/src/router/index.js
+++ b/sub-government-affairs-service/src/router/index.js
@@ -14,7 +14,6 @@ import productOperateMainRoutes from './modules/productOperateMain';
import inputSuppliesRoutes from './modules/inputSupplies';
import plantingAndBreedingRouter from './modules/plantingAndBreeding';
import systemRouter from './modules/system';
-import produceGoods from './modules/produceGoods';
export const constantRoutes = [
{
@@ -47,7 +46,21 @@ export const constantRoutes = [
...resourceRouter,
...productOperateMainRoutes,
...inputSuppliesRoutes,
- // produceGoods,
+ {
+ path: '/sub-government-affairs-service/output-products',
+ name: 'outputProducts',
+ component: Layout,
+ redirect: '/sub-government-affairs-service/output-products/index',
+ meta: { title: '产出品管理', icon: 'Box' },
+ children: [
+ {
+ path: '/sub-government-affairs-service/output-products/index',
+ component: () => import('@/views/outputProductsManage/index.vue'),
+ name: 'outputProductsIndex',
+ meta: { title: '产出品管理', icon: 'List' },
+ },
+ ],
+ },
// ...plantingAndBreedingRouter,
...traceRouter,
// ...systemRouter,
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 d891930..8ee4f7f 100644
--- a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js
+++ b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js
@@ -37,7 +37,7 @@ const inputSuppliesRoutes = [
path: '/sub-government-affairs-service/material/others',
name: 'input-supplies-others',
component: () => import('@/views/inputSuppliesManage/material/others/index.vue'),
- meta: { title: '其他投入品', icon: 'TakeawayBox' },
+ meta: { title: '其他投入品管理', icon: 'TakeawayBox' },
},
],
},
diff --git a/sub-government-affairs-service/src/router/modules/produceGoods/index.js b/sub-government-affairs-service/src/router/modules/produceGoods/index.js
deleted file mode 100644
index fefe229..0000000
--- a/sub-government-affairs-service/src/router/modules/produceGoods/index.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import Layout from '@/layouts/index.vue';
-
-export default {
- path: '/sub-government-affairs-service/produceGoodsMain',
- name: 'produceGoodsMain',
- component: Layout,
- redirect: '/sub-government-affairs-service/produceGoods',
- meta: { title: '产出品', icon: 'Document' },
- children: [
- // {
- // path: '/sub-government-affairs-service/produceGoods',
- // name: 'produceGoods',
- // component: () => import('@/views/produceGoods/list/index.vue'),
- // meta: { title: '产出品列表', icon: 'Document' },
- // },
- // {
- // path: '/sub-government-affairs-service/produceGoods1',
- // name: 'produceGoods1',
- // component: () => import('@/views/produceGoods/test/index.vue'),
- // meta: { title: '投入品监管平台', icon: 'Document' },
- // },
- ],
-};
-// export default produceGoodsRoutes;
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 27788f2..d1c0f80 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
@@ -63,6 +63,30 @@
+
+
+
种植信息登记
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 是
+ 否
+
+
+
+
+
+
巡查信息登记
@@ -218,6 +242,14 @@ const illegalForm = ref({
img: '', // 违法图片
status: '', // 状态
});
+const plantingForm = ref({
+ id: '',
+ inspectionId: '', // 任务ID
+ inspectionTaskName: '', // 巡查任务名称
+ recordedCrop: '甘蔗', // 备案种植作物
+ isCropMatch: '1', // 种植作物与备案作物是否一致
+ actualCrop: '甘蔗', // 实际种植作物
+});
const illegalForms = ref([{ ...illegalForm.value }]);
const crudData = ref([]);
const loading = ref(false);
diff --git a/sub-government-affairs-service/src/views/outputProductsManage/index.vue b/sub-government-affairs-service/src/views/outputProductsManage/index.vue
new file mode 100644
index 0000000..183afda
--- /dev/null
+++ b/sub-government-affairs-service/src/views/outputProductsManage/index.vue
@@ -0,0 +1,318 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 基础信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 品质信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sub-government-affairs-service/src/views/outputProductsManage/output.js b/sub-government-affairs-service/src/views/outputProductsManage/output.js
new file mode 100644
index 0000000..2c67c4f
--- /dev/null
+++ b/sub-government-affairs-service/src/views/outputProductsManage/output.js
@@ -0,0 +1,122 @@
+export const mockData = [
+ {
+ productName: '甘蔗',
+ landName: '勐撒坝子南片',
+ area: 28,
+ gridName: '勐撒村第三网格',
+ gridAreaName: '耿马县勐撒镇勐撒村',
+ name: '岩温罕',
+ contactInfo: '183****8823',
+ harvestTime: '2023-12-15',
+ yieldPerMu: 5800,
+ totalYield: 162400,
+ quality: '优等',
+ price: 0.48,
+ outputValue: 77952,
+ },
+ {
+ productName: '茶叶(普洱生茶)',
+ landName: '芒洪古茶山',
+ area: 6.5,
+ gridName: '芒洪村第一网格',
+ gridAreaName: '耿马县芒洪拉祜族布朗族乡',
+ name: '李秀兰',
+ contactInfo: '138****4671',
+ harvestTime: '2023-04-08',
+ yieldPerMu: 210,
+ totalYield: 1365,
+ quality: '特级',
+ price: 85,
+ outputValue: 116025,
+ },
+ {
+ productName: '澳洲坚果',
+ landName: '四排山基地',
+ area: 35,
+ gridName: '翁达村第五网格',
+ gridAreaName: '耿马县四排山乡翁达村',
+ name: '赵卫东',
+ contactInfo: '159****3098',
+ harvestTime: '2023-09-20',
+ yieldPerMu: 320,
+ totalYield: 11200,
+ quality: '良好',
+ price: 18.5,
+ outputValue: 207200,
+ },
+ {
+ productName: '橡胶',
+ landName: '河外胶林',
+ area: 42,
+ gridName: '河外村第二网格',
+ gridAreaName: '耿马县孟定镇河外村',
+ name: '叶嘎',
+ contactInfo: '187****5546',
+ harvestTime: '2023-11-01',
+ yieldPerMu: 95,
+ totalYield: 3990,
+ quality: '中等',
+ price: 10.2,
+ outputValue: 40698,
+ },
+ {
+ productName: '咖啡(阿拉比卡)',
+ landName: '福荣坡地',
+ area: 15,
+ gridName: '福荣村第四网格',
+ gridAreaName: '耿马县勐永镇福荣村',
+ name: '艾叶',
+ contactInfo: '152****7720',
+ harvestTime: '2023-02-18',
+ yieldPerMu: 280,
+ totalYield: 4200,
+ quality: '优等',
+ price: 26.8,
+ outputValue: 112560,
+ },
+ {
+ productName: '火龙果(红心)',
+ landName: '允捧大棚区',
+ area: 8,
+ gridName: '允捧村第一网格',
+ gridAreaName: '耿马县孟定镇允捧村',
+ name: '玉罕香',
+ contactInfo: '135****9924',
+ harvestTime: '2023-07-12',
+ yieldPerMu: 1800,
+ totalYield: 14400,
+ quality: '特级',
+ price: 7.5,
+ outputValue: 108000,
+ },
+ {
+ productName: '香蕉(威廉斯)',
+ landName: '班幸河谷',
+ area: 20,
+ gridName: '班幸村第四网格',
+ gridAreaName: '耿马县孟定镇班幸村',
+ name: '岩峰',
+ contactInfo: '158****3367',
+ harvestTime: '2023-06-30',
+ yieldPerMu: 3200,
+ totalYield: 64000,
+ quality: '良好',
+ price: 3.1,
+ outputValue: 198400,
+ },
+ {
+ productName: '砂仁(中药材)',
+ landName: '大浪坝林下',
+ area: 18,
+ gridName: '大浪坝村第三网格',
+ gridAreaName: '耿马县勐简乡大浪坝村',
+ name: '田志强',
+ contactInfo: '139****7189',
+ harvestTime: '2023-09-08',
+ yieldPerMu: 65,
+ totalYield: 1170,
+ quality: '中等',
+ price: 42,
+ outputValue: 49140,
+ },
+];
diff --git a/sub-government-affairs-service/src/views/resource/database/landData.js b/sub-government-affairs-service/src/views/resource/database/landData.js
index 3e599ec..2d3a5cb 100644
--- a/sub-government-affairs-service/src/views/resource/database/landData.js
+++ b/sub-government-affairs-service/src/views/resource/database/landData.js
@@ -5,7 +5,7 @@ export const mockData = [
area: 8.72,
landTypeName: '耕地',
soilTypeName: '红壤',
- fullRegionName: '云南省临沧市耿马傣族佤族自治县耿马镇允楞村',
+ fullRegionName: '耿马傣族佤族自治县耿马镇允楞村',
gridName: '耿马网格1',
address: '允楞村委会旁',
propertyName: '刘勇',
@@ -27,7 +27,7 @@ export const mockData = [
area: 12.34,
landTypeName: '耕地',
soilTypeName: '黄壤',
- fullRegionName: '云南省临沧市耿马傣族佤族自治县耿马镇复兴村',
+ fullRegionName: '耿马傣族佤族自治县耿马镇复兴村',
gridName: '耿马网格A',
address: '复兴村大路东侧',
propertyName: '张芳',
@@ -49,7 +49,7 @@ export const mockData = [
area: 5.6,
landTypeName: '耕地',
soilTypeName: '壤土',
- fullRegionName: '云南省临沧市耿马傣族佤族自治县勐撒镇城子村',
+ fullRegionName: '耿马傣族佤族自治县勐撒镇城子村',
gridName: '勐撒网格B',
address: '城子村太阳路北侧',
propertyName: '赵杰',
@@ -71,7 +71,7 @@ export const mockData = [
area: 14.28,
landTypeName: '耕地',
soilTypeName: '砂壤',
- fullRegionName: '云南省临沧市耿马傣族佤族自治县孟定镇罕宏村',
+ fullRegionName: '耿马傣族佤族自治县孟定镇罕宏村',
gridName: '孟定网格C',
address: '罕宏村公路旁',
propertyName: '周涛',
@@ -93,7 +93,7 @@ export const mockData = [
area: 7.95,
landTypeName: '耕地',
soilTypeName: '钙质红壤',
- fullRegionName: '云南省临沧市耿马傣族佤族自治县贺派乡芒抗村',
+ fullRegionName: '耿马傣族佤族自治县贺派乡芒抗村',
gridName: '贺派网格D',
address: '芒抗村文化站东侧',
propertyName: '钱海',
@@ -115,7 +115,7 @@ export const mockData = [
area: 10.5,
landTypeName: '耕地',
soilTypeName: '红壤',
- fullRegionName: '云南省临沧市耿马傣族佤族自治县四排山乡东坡村',
+ fullRegionName: '耿马傣族佤族自治县四排山乡东坡村',
gridName: '四排山网格E',
address: '东坡村卫生室旁',
propertyName: '吴强',
@@ -137,7 +137,7 @@ export const mockData = [
area: 6.3,
landTypeName: '耕地',
soilTypeName: '砂壤',
- fullRegionName: '云南省临沧市耿马傣族佤族自治县勐撒镇箐门口村',
+ fullRegionName: '耿马傣族佤族自治县勐撒镇箐门口村',
gridName: '勐撒网格F',
address: '箐门口村村委路口',
propertyName: '郑飞',
@@ -159,7 +159,7 @@ export const mockData = [
area: 9.11,
landTypeName: '耕地',
soilTypeName: '壤土',
- fullRegionName: '云南省临沧市耿马傣族佤族自治县孟定镇景信村',
+ fullRegionName: '耿马傣族佤族自治县孟定镇景信村',
gridName: '孟定网格G',
address: '景信村村口',
propertyName: '钱芳',
@@ -181,7 +181,7 @@ export const mockData = [
area: 11.76,
landTypeName: '耕地',
soilTypeName: '红壤',
- fullRegionName: '云南省临沧市耿马傣族佤族自治县耿马镇团结村',
+ fullRegionName: '耿马傣族佤族自治县耿马镇团结村',
gridName: '耿马网格H',
address: '团结村大桥旁',
propertyName: '孙明',
@@ -203,7 +203,7 @@ export const mockData = [
area: 7.22,
landTypeName: '耕地',
soilTypeName: '砂壤',
- fullRegionName: '云南省临沧市耿马傣族佤族自治县贺派乡落阳村',
+ fullRegionName: '耿马傣族佤族自治县贺派乡落阳村',
gridName: '贺派网格I',
address: '落阳村学校旁',
propertyName: '李平',