diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/demandManage/demandOverview.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/demandManage/demandOverview.vue index 1170834..7898770 100644 --- a/sub-government-affairs-service/src/views/inputSuppliesManage/demandManage/demandOverview.vue +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/demandManage/demandOverview.vue @@ -19,7 +19,7 @@
-

产出品产量数据

+

种子种苗需求数据

 @@ -31,7 +31,7 @@ -

种植种苗需求排名前十

+

种子种苗需求排名前十

 @@ -39,7 +39,7 @@ -

农药 需求排名前十

+

农药需求排名前十

 diff --git a/sub-government-affairs-service/src/views/planting-management/planting-base/index.vue b/sub-government-affairs-service/src/views/planting-management/planting-base/index.vue index 553b8cd..9f24014 100644 --- a/sub-government-affairs-service/src/views/planting-management/planting-base/index.vue +++ b/sub-government-affairs-service/src/views/planting-management/planting-base/index.vue @@ -272,7 +272,7 @@ const columns = ref([ { label: '经纬度', prop: 'coordinate', - // formatter: (row) => `${row.longitude}, ${row.latitude}`, + formatter: (row) => `${row.longitude}, ${row.latitude}`, }, { label: '气候条件', prop: 'climate' }, { label: '海拔（米）', prop: 'altitude' }, @@ -325,19 +325,20 @@ const showAddButton = computed(() => { // ==================== 数据获取 ==================== const getData = async () => { - loading.value = true; - try { - const res = await fetchBaseList({ - ...searchForm.value, - current: pageData.value.currentPage, - size: pageData.value.pageSize, - }); + // loading.value = true; + // try { + // const res = await fetchBaseList({ + // ...searchForm.value, + // current: pageData.value.currentPage, + // size: pageData.value.pageSize, + // }); - tableData.value = res.data.records || []; - pageData.value.total = res.data.total || 0; - } finally { - loading.value = false; - } + // tableData.value = res.data.records || []; + // pageData.value.total = res.data.total || 0; + // } finally { + // loading.value = false; + // } + tableData.value = mockData; }; // ==================== 表格操作 ==================== diff --git a/sub-government-affairs-service/src/views/planting-management/planting-base/mockData.js b/sub-government-affairs-service/src/views/planting-management/planting-base/mockData.js index ada260f..4ee4003 100644 --- a/sub-government-affairs-service/src/views/planting-management/planting-base/mockData.js +++ b/sub-government-affairs-service/src/views/planting-management/planting-base/mockData.js @@ -1,39 +1,39 @@ export const mockData = [ // 第一条：耿马县孟定镇咖啡示范基地 { - baseCode: 'JD5325262023KM01', // 耿马县+2023+咖啡(KM)+01 - baseName: '孟定精品咖啡示范园', + code: 'JD5325262023KM01', // 耿马县+2023+咖啡(KM)+01 + name: '孟定精品咖啡示范园', regionName: ' 耿马县孟定镇', gridName: '孟定镇河西片区第3网格', - adress: '孟定镇河西村班幸组南汀河西岸', + location: '孟定镇河西村班幸组南汀河西岸', longitude: '99.0832°E', // 实际经纬度（孟定镇中心区域） latitude: '23.5521°N', - weather: '热带季风气候', // 年均温21.5℃，年降水量1600mm + climate: '热带季风气候', // 年均温21.5℃，年降水量1600mm altitude: 850, // 孟定坝区典型海拔 area: 286.5, // 示范基地面积 - status: '使用中', - businessCode: 'QY532526001', // 统一社会信用代码前段 - businessType: '合作社', - businessSubjectName: '耿马滇咖农业科技有限公司', // 实际注册企业 + statusName: '使用中', + businessId: 'QY532526001', // 统一社会信用代码前段 + businessTypeName: '合作社', + businessName: '耿马滇咖农业科技有限公司', // 实际注册企业 createTime: '2021-03-15 09:00:00', }, // 第二条：耿马县四排山乡坚果基地 { - baseCode: 'JD5325262023JG02', // 耿马县+2023+坚果(JG)+02 - baseName: '四排山澳洲坚果产业基地', + code: 'JD5325262023JG02', // 耿马县+2023+坚果(JG)+02 + name: '四排山澳洲坚果产业基地', regionName: ' 耿马县四排山乡', gridName: '四排山乡翁达村第5网格', - adress: '翁达村至芒关村公路东侧山坡地', + location: '翁达村至芒关村公路东侧山坡地', longitude: '99.2178°E', // 四排山乡中心区域坐标 latitude: '23.7865°N', - weather: '南亚热带气候', // 年均温19.8℃，年降水量1400mm + climate: '南亚热带气候', // 年均温19.8℃，年降水量1400mm altitude: 1200, // 山地种植区典型海拔 area: 580, // 连片种植面积 - status: '使用中', - businessCode: 'HZ532526001', // 合作社注册代码 - businessType: '合作社', - businessSubjectName: '耿马四排山坚果种植专业合作社', // 真实合作社 + statusName: '使用中', + businessId: 'HZ532526001', // 合作社注册代码 + businessTypeName: '合作社', + businessName: '耿马四排山坚果种植专业合作社', // 真实合作社 createTime: '2018-05-20 14:30:00', }, ]; diff --git a/sub-government-affairs-service/src/views/planting-management/statistics/index.vue b/sub-government-affairs-service/src/views/planting-management/statistics/index.vue index 923d349..8de2635 100644 --- a/sub-government-affairs-service/src/views/planting-management/statistics/index.vue +++ b/sub-government-affairs-service/src/views/planting-management/statistics/index.vue @@ -1,20 +1,3 @@ - -