diff --git a/sub-government-affairs-service/src/apis/land.js b/sub-government-affairs-service/src/apis/land.js index e1425e4..242ed92 100644 --- a/sub-government-affairs-service/src/apis/land.js +++ b/sub-government-affairs-service/src/apis/land.js @@ -209,9 +209,17 @@ export function savelandInspection(data) { }); } -export function editlandInspection(data = {}) { - return request('land-resource/landInspection/update', { +export function enrolllandInspection(data = {}) { + return request('land-resource/landInspection/registrationResult', { method: 'PUT', data, }); } + +export function exportlandInspection(params = {}) { + return request('/land-resource/landInspection/export', { + method: 'GET', + params, + responseType: 'blob', + }); +} diff --git a/sub-government-affairs-service/src/router/index.js b/sub-government-affairs-service/src/router/index.js index 1b373f4..26299d6 100644 --- a/sub-government-affairs-service/src/router/index.js +++ b/sub-government-affairs-service/src/router/index.js @@ -3,17 +3,16 @@ * @Author: zenghua.wang * @Date: 2023-06-20 11:48:41 * @LastEditors: zenghua.wang - * @LastEditTime: 2025-03-04 10:42:19 + * @LastEditTime: 2025-03-06 16:11:29 */ import { createRouter, createWebHistory } from 'vue-router'; import Layout from '@/layouts/index.vue'; import resourceRouter from './modules/resource'; -import plantingAndBreedingRouter from './modules/plantingAndBreeding'; +import traceRouter from './modules/trace'; import landsRoutes from './modules/lands'; -import annualplanRoutes from './modules/annualplan'; -import statisticsRoutes from './modules/statisticAnalysis'; import dictRoutes from './modules/dict'; +import annualplanRoutes from './modules/annualplan'; export const constantRoutes = [ { @@ -44,10 +43,8 @@ export const constantRoutes = [ ], }, ...resourceRouter, - ...plantingAndBreedingRouter, - ...annualplanRoutes, + ...traceRouter, ...landsRoutes, - ...statisticsRoutes, ...dictRoutes, ]; diff --git a/sub-government-affairs-service/src/router/modules/annualplan.js b/sub-government-affairs-service/src/router/modules/annualplan.js index 61ee2b6..93fc336 100644 --- a/sub-government-affairs-service/src/router/modules/annualplan.js +++ b/sub-government-affairs-service/src/router/modules/annualplan.js @@ -1,10 +1,10 @@ -import Layout from '@/layouts/index.vue'; +import Views from '@/layouts/Views.vue'; const annualplanRoutes = [ { path: '/sub-government-affairs-service/annualPlan', name: 'annualPlan', - component: Layout, + component: Views, redirect: '/sub-government-affairs-service/annualPlans', meta: { title: '年度计划', icon: 'Document' }, children: [ diff --git a/sub-government-affairs-service/src/router/modules/resource.js b/sub-government-affairs-service/src/router/modules/resource.js index 7925448..52a5eac 100644 --- a/sub-government-affairs-service/src/router/modules/resource.js +++ b/sub-government-affairs-service/src/router/modules/resource.js @@ -1,5 +1,6 @@ import Layout from '@/layouts/index.vue'; -import Views from '@/layouts/Views.vue'; +import annualplanRouters from './annualplan'; +import statisticsRoutes from './statisticAnalysis'; export default [ { @@ -15,12 +16,8 @@ export default [ name: 'grid', meta: { title: '网格化管理', icon: 'Document' }, }, - // { - // path: '/annual-plan', - // component: () => import('@/views/resource/plan/index.vue'), - // name: 'annual-plan', - // meta: { title: '年度计划', icon: 'Document' }, - // }, + ...annualplanRouters, + ...statisticsRoutes, ], }, ]; diff --git a/sub-government-affairs-service/src/router/modules/statisticAnalysis.js b/sub-government-affairs-service/src/router/modules/statisticAnalysis.js index 764d159..0b94663 100644 --- a/sub-government-affairs-service/src/router/modules/statisticAnalysis.js +++ b/sub-government-affairs-service/src/router/modules/statisticAnalysis.js @@ -1,32 +1,31 @@ -import Layout from '@/layouts/index.vue'; import Views from '@/layouts/Views.vue'; export default [ { path: '/sub-government-affairs-service/analysis', name: 'analysis', - component: Layout, + component: Views, redirect: '/sub-government-affairs-service/analysis-land', meta: { title: '统计分析', icon: 'icon-test' }, children: [ { path: '/sub-government-affairs-service/analysis-land', - component: () => import('@/views/statisticAnalysis/land/index.vue'), + component: () => import('@/views/resource/statisticAnalysis/land/index.vue'), name: 'analysis-land', meta: { title: '土地利用与规划分析', icon: 'Document' }, }, - // { - // path: '/sub-government-affairs-service/analysis-agriculture', - // name: 'analysis-agriculture', - // component: () => import('@/views/statisticAnalysis/agriculture/index.vue'), - // meta: { title: '农业生产效率分析', icon: 'Document' }, - // }, - // { - // path: '/sub-government-affairs-service/analysis-environment', - // name: 'analysis-environment', - // component: () => import('@/views/statisticAnalysis/environment/index.vue'), - // meta: { title: '环境影响与经济效益分析', icon: 'Document' }, - // }, + { + path: '/sub-government-affairs-service/analysis-agriculture', + name: 'analysis-agriculture', + component: () => import('@/views/resource/statisticAnalysis/agriculture/index.vue'), + meta: { title: '农业生产效率分析', icon: 'Document' }, + }, + { + path: '/sub-government-affairs-service/analysis-environment', + name: 'analysis-environment', + component: () => import('@/views/resource/statisticAnalysis/environment/index.vue'), + meta: { title: '环境影响与经济效益分析', icon: 'Document' }, + }, ], }, ]; diff --git a/sub-government-affairs-service/src/router/modules/statistics.js b/sub-government-affairs-service/src/router/modules/statistics.js deleted file mode 100644 index 3982a11..0000000 --- a/sub-government-affairs-service/src/router/modules/statistics.js +++ /dev/null @@ -1,32 +0,0 @@ -import Layout from '@/layouts/index.vue'; - -const statisticsRoutes = [ - { - path: '/sub-government-affairs-service/statistics', - name: 'statistics', - component: Layout, - redirect: '/sub-government-affairs-service/utilizePlan', - meta: { title: '统计分析', icon: 'Document' }, - children: [ - { - path: '/sub-government-affairs-service/utilizePlan', - name: 'utilizePlan', - component: () => import('@/views/statistics/component/utilizePlan/index.vue'), - meta: { title: '土地利用与规划分析', icon: 'Document' }, - }, - { - path: '/sub-government-affairs-service/agriculture', - name: 'agriculture', - component: () => import('@/views/statistics/component/agriculture/index.vue'), - meta: { title: '农业生产效率分析', icon: 'Document' }, - }, - { - path: '/sub-government-affairs-service/environment', - name: 'environment', - component: () => import('@/views/statistics/component/environment/index.vue'), - meta: { title: '环境影响与经济效益分析', icon: 'Document' }, - }, - ], - }, -]; -export default statisticsRoutes; diff --git a/sub-government-affairs-service/src/router/modules/plantingAndBreeding.js b/sub-government-affairs-service/src/router/modules/trace.js similarity index 70% rename from sub-government-affairs-service/src/router/modules/plantingAndBreeding.js rename to sub-government-affairs-service/src/router/modules/trace.js index 2c328d0..13d871c 100644 --- a/sub-government-affairs-service/src/router/modules/plantingAndBreeding.js +++ b/sub-government-affairs-service/src/router/modules/trace.js @@ -3,11 +3,11 @@ import Views from '@/layouts/Views.vue'; export default [ { - path: '/sub-government-affairs-service/plantingAndBreeding', - name: 'plantingAndBreeding', + path: '/sub-government-affairs-service/trace', + name: 'trace', component: Layout, redirect: '/sub-government-affairs-service/breeding', - meta: { title: '种养殖管理', icon: 'Document' }, + meta: { title: '溯源管理', icon: 'Document' }, children: [ { path: '/sub-government-affairs-service/planting', @@ -51,27 +51,26 @@ export default [ }, ], }, - ], - }, - { - path: '/sub-government-affairs-service/trace', - name: 'trace', - component: Layout, - redirect: '/sub-government-affairs-service/trace-search', - meta: { title: '溯源查询', icon: 'Document' }, - children: [ { - path: '/sub-government-affairs-service/trace-search', - name: 'trace-search', - component: () => import('@/views/trace/search/index.vue'), - meta: { title: '溯源查询', icon: 'Document' }, - }, - { - path: '/sub-government-affairs-service/trace-info', - name: 'trace-info', - component: () => import('@/views/trace/search/info.vue'), - meta: { title: '溯源详情', icon: 'Document' }, - hidden: true, + path: '/sub-government-affairs-service/trace-manage', + name: 'trace-manage', + component: Views, + meta: { title: '溯源查询和统计', icon: 'Document' }, + children: [ + { + path: '/sub-government-affairs-service/trace-search', + name: 'trace-search', + component: () => import('@/views/trace/search/index.vue'), + meta: { title: '溯源查询', icon: 'Document' }, + }, + { + path: '/sub-government-affairs-service/trace-info', + name: 'trace-info', + component: () => import('@/views/trace/search/info.vue'), + meta: { title: '溯源详情', icon: 'Document' }, + hidden: true, + }, + ], }, ], }, diff --git a/sub-government-affairs-service/src/views/annualPlan/index.vue b/sub-government-affairs-service/src/views/annualPlan/index.vue index d7d9c29..b1644f7 100644 --- a/sub-government-affairs-service/src/views/annualPlan/index.vue +++ b/sub-government-affairs-service/src/views/annualPlan/index.vue @@ -2,7 +2,7 @@ - diff --git a/sub-government-affairs-service/src/views/dict/component/landCassification/index.vue b/sub-government-affairs-service/src/views/dict/component/landCassification/index.vue index 0fffd60..b2bef4e 100644 --- a/sub-government-affairs-service/src/views/dict/component/landCassification/index.vue +++ b/sub-government-affairs-service/src/views/dict/component/landCassification/index.vue @@ -21,6 +21,8 @@ @current-change="currentChange" @size-change="sizeChange" @row-del="rowDel" + @row-save="rowSave" + @row-update="rowUpdate" > + diff --git a/sub-government-affairs-service/src/views/resource/statisticAnalysis/environment/index.vue b/sub-government-affairs-service/src/views/resource/statisticAnalysis/environment/index.vue new file mode 100644 index 0000000..696eb0d --- /dev/null +++ b/sub-government-affairs-service/src/views/resource/statisticAnalysis/environment/index.vue @@ -0,0 +1,206 @@ + + + diff --git a/sub-government-affairs-service/src/views/statisticAnalysis/land/index.vue b/sub-government-affairs-service/src/views/resource/statisticAnalysis/land/index.vue similarity index 100% rename from sub-government-affairs-service/src/views/statisticAnalysis/land/index.vue rename to sub-government-affairs-service/src/views/resource/statisticAnalysis/land/index.vue diff --git a/sub-government-affairs-service/src/views/statistics/component/agriculture/index.vue b/sub-government-affairs-service/src/views/statistics/component/agriculture/index.vue deleted file mode 100644 index a68e56c..0000000 --- a/sub-government-affairs-service/src/views/statistics/component/agriculture/index.vue +++ /dev/null @@ -1,261 +0,0 @@ - - - - diff --git a/sub-government-affairs-service/src/views/statistics/component/environment/index.vue b/sub-government-affairs-service/src/views/statistics/component/environment/index.vue deleted file mode 100644 index 544f578..0000000 --- a/sub-government-affairs-service/src/views/statistics/component/environment/index.vue +++ /dev/null @@ -1,265 +0,0 @@ - - - - - diff --git a/sub-government-affairs-service/src/views/statistics/component/utilizePlan/index.vue b/sub-government-affairs-service/src/views/statistics/component/utilizePlan/index.vue deleted file mode 100644 index 8f7bfe0..0000000 --- a/sub-government-affairs-service/src/views/statistics/component/utilizePlan/index.vue +++ /dev/null @@ -1,187 +0,0 @@ - - - - diff --git a/sub-government-affairs-service/src/views/statistics/index.vue b/sub-government-affairs-service/src/views/statistics/index.vue deleted file mode 100644 index d7d9c29..0000000 --- a/sub-government-affairs-service/src/views/statistics/index.vue +++ /dev/null @@ -1,19 +0,0 @@ - - - - - diff --git a/sub-government-affairs-service/src/views/trace/breeding/coding/index.vue b/sub-government-affairs-service/src/views/trace/breeding/coding/index.vue index c499251..1c1e98e 100644 --- a/sub-government-affairs-service/src/views/trace/breeding/coding/index.vue +++ b/sub-government-affairs-service/src/views/trace/breeding/coding/index.vue @@ -89,6 +89,7 @@ const state = reactive({ { label: '溯源码', prop: 'id', + width: 200, search: true, addDisplay: false, editDisplay: false,