diff --git a/sub-government-affairs-service/auto-imports.d.ts b/sub-government-affairs-service/auto-imports.d.ts new file mode 100644 index 0000000..369aad4 --- /dev/null +++ b/sub-government-affairs-service/auto-imports.d.ts @@ -0,0 +1,75 @@ +/* eslint-disable */ +/* prettier-ignore */ +// @ts-nocheck +// noinspection JSUnusedGlobalSymbols +// Generated by unplugin-auto-import +export {} +declare global { + const EffectScope: typeof import('vue')['EffectScope'] + const computed: typeof import('vue')['computed'] + const createApp: typeof import('vue')['createApp'] + const customRef: typeof import('vue')['customRef'] + const defineAsyncComponent: typeof import('vue')['defineAsyncComponent'] + const defineComponent: typeof import('vue')['defineComponent'] + const effectScope: typeof import('vue')['effectScope'] + const getCurrentInstance: typeof import('vue')['getCurrentInstance'] + const getCurrentScope: typeof import('vue')['getCurrentScope'] + const h: typeof import('vue')['h'] + const inject: typeof import('vue')['inject'] + const isProxy: typeof import('vue')['isProxy'] + const isReactive: typeof import('vue')['isReactive'] + const isReadonly: typeof import('vue')['isReadonly'] + const isRef: typeof import('vue')['isRef'] + const markRaw: typeof import('vue')['markRaw'] + const nextTick: typeof import('vue')['nextTick'] + const onActivated: typeof import('vue')['onActivated'] + const onBeforeMount: typeof import('vue')['onBeforeMount'] + const onBeforeRouteLeave: typeof import('vue-router')['onBeforeRouteLeave'] + const onBeforeRouteUpdate: typeof import('vue-router')['onBeforeRouteUpdate'] + const onBeforeUnmount: typeof import('vue')['onBeforeUnmount'] + const onBeforeUpdate: typeof import('vue')['onBeforeUpdate'] + const onDeactivated: typeof import('vue')['onDeactivated'] + const onErrorCaptured: typeof import('vue')['onErrorCaptured'] + const onMounted: typeof import('vue')['onMounted'] + const onRenderTracked: typeof import('vue')['onRenderTracked'] + const onRenderTriggered: typeof import('vue')['onRenderTriggered'] + const onScopeDispose: typeof import('vue')['onScopeDispose'] + const onServerPrefetch: typeof import('vue')['onServerPrefetch'] + const onUnmounted: typeof import('vue')['onUnmounted'] + const onUpdated: typeof import('vue')['onUpdated'] + const onWatcherCleanup: typeof import('vue')['onWatcherCleanup'] + const provide: typeof import('vue')['provide'] + const reactive: typeof import('vue')['reactive'] + const readonly: typeof import('vue')['readonly'] + const ref: typeof import('vue')['ref'] + const resolveComponent: typeof import('vue')['resolveComponent'] + const shallowReactive: typeof import('vue')['shallowReactive'] + const shallowReadonly: typeof import('vue')['shallowReadonly'] + const shallowRef: typeof import('vue')['shallowRef'] + const toRaw: typeof import('vue')['toRaw'] + const toRef: typeof import('vue')['toRef'] + const toRefs: typeof import('vue')['toRefs'] + const toValue: typeof import('vue')['toValue'] + const triggerRef: typeof import('vue')['triggerRef'] + const unref: typeof import('vue')['unref'] + const useAttrs: typeof import('vue')['useAttrs'] + const useCssModule: typeof import('vue')['useCssModule'] + const useCssVars: typeof import('vue')['useCssVars'] + const useId: typeof import('vue')['useId'] + const useLink: typeof import('vue-router')['useLink'] + const useModel: typeof import('vue')['useModel'] + const useRoute: typeof import('vue-router')['useRoute'] + const useRouter: typeof import('vue-router')['useRouter'] + const useSlots: typeof import('vue')['useSlots'] + const useTemplateRef: typeof import('vue')['useTemplateRef'] + const watch: typeof import('vue')['watch'] + const watchEffect: typeof import('vue')['watchEffect'] + const watchPostEffect: typeof import('vue')['watchPostEffect'] + const watchSyncEffect: typeof import('vue')['watchSyncEffect'] +} +// for type re-export +declare global { + // @ts-ignore + export type { Component, ComponentPublicInstance, ComputedRef, DirectiveBinding, ExtractDefaultPropTypes, ExtractPropTypes, ExtractPublicPropTypes, InjectionKey, PropType, Ref, MaybeRef, MaybeRefOrGetter, VNode, WritableComputedRef } from 'vue' + import('vue') +} diff --git a/sub-government-affairs-service/components.d.ts b/sub-government-affairs-service/components.d.ts new file mode 100644 index 0000000..e787dd0 --- /dev/null +++ b/sub-government-affairs-service/components.d.ts @@ -0,0 +1,16 @@ +/* eslint-disable */ +/* prettier-ignore */ +// @ts-nocheck +// Generated by unplugin-vue-components +// Read more: https://github.com/vuejs/core/pull/3399 +export {} + +declare module 'vue' { + export interface GlobalComponents { + CustCard: typeof import('./src/components/CustCard.vue')['default'] + LandType: typeof import('./src/components/LandType.vue')['default'] + Pagina: typeof import('./src/components/Pagina.vue')['default'] + RouterLink: typeof import('vue-router')['RouterLink'] + RouterView: typeof import('vue-router')['RouterView'] + } +} diff --git a/sub-government-affairs-service/src/apis/land.js b/sub-government-affairs-service/src/apis/land.js index c05d6c4..2e4d84f 100644 --- a/sub-government-affairs-service/src/apis/land.js +++ b/sub-government-affairs-service/src/apis/land.js @@ -1,7 +1,7 @@ import request from '@/utils/axios'; -export function getLandList(params = {}) { - return request('land-resource/gridManage/page', { +export function getLandsList(params = {}) { + return request('land-resource/landManage/page', { method: 'GET', params, }); diff --git a/sub-government-affairs-service/src/components/CustCard.vue b/sub-government-affairs-service/src/components/CustCard.vue index e8671a3..1215c93 100644 --- a/sub-government-affairs-service/src/components/CustCard.vue +++ b/sub-government-affairs-service/src/components/CustCard.vue @@ -1,5 +1,5 @@ diff --git a/sub-government-affairs-service/src/components/LandType.vue b/sub-government-affairs-service/src/components/LandType.vue new file mode 100644 index 0000000..306489d --- /dev/null +++ b/sub-government-affairs-service/src/components/LandType.vue @@ -0,0 +1,56 @@ + + + + + diff --git a/sub-government-affairs-service/src/layouts/component/Avatar/index.vue b/sub-government-affairs-service/src/layouts/component/Avatar/index.vue index 0bb9d45..da96b8c 100644 --- a/sub-government-affairs-service/src/layouts/component/Avatar/index.vue +++ b/sub-government-affairs-service/src/layouts/component/Avatar/index.vue @@ -59,6 +59,7 @@ const logOut = async () => { type: 'success', message: '退出登录成功!', }); + localStorage.removeItem('daimp-front-main_user_store'); } }); }); diff --git a/sub-government-affairs-service/src/router/index.js b/sub-government-affairs-service/src/router/index.js index d72cd55..0fa454c 100644 --- a/sub-government-affairs-service/src/router/index.js +++ b/sub-government-affairs-service/src/router/index.js @@ -11,6 +11,7 @@ import Layout from '@/layouts/index.vue'; import resourceRouter from './modules/resource'; import plantingAndBreedingRouter from './modules/plantingAndBreeding'; +import landsRoutes from './modules/lands'; const { VITE_APP_NAME } = import.meta.env; @@ -44,6 +45,7 @@ export const constantRoutes = [ }, // ...resourceRouter, ...plantingAndBreedingRouter, + ...landsRoutes, ]; /** diff --git a/sub-government-affairs-service/src/router/modules/lands.js b/sub-government-affairs-service/src/router/modules/lands.js new file mode 100644 index 0000000..a91dd01 --- /dev/null +++ b/sub-government-affairs-service/src/router/modules/lands.js @@ -0,0 +1,44 @@ +import Layout from '@/layouts/index.vue'; + +const landsRoutes = [ + { + path: '/landManage', + name: 'landManage', + component: Layout, + redirect: '/landsManage', + meta: { title: '土地管理', icon: 'Document' }, + children: [ + { + path: '/landsManage', + name: 'landsManage', + component: () => import('@/views/landManage/component/landsManage/index.vue'), + meta: { title: '土地管理', icon: 'Document' }, + }, + { + path: '/plantPlan', + name: 'plantPlan', + component: () => import('@/views/landManage/component/plantPlan/index.vue'), + meta: { title: '种植规划', icon: 'Document' }, + }, + { + path: '/landPartol', + name: 'landPartol', + component: () => import('@/views/landManage/component/landPartol/index.vue'), + meta: { title: '土地巡查', icon: 'Document' }, + }, + { + path: '/illegalHandle', + name: 'illegalHandle', + component: () => import('@/views/landManage/component/illegalHandle/index.vue'), + meta: { title: '土地违法处理', icon: 'Document' }, + }, + { + path: '/operationRecord', + name: 'operationRecord', + component: () => import('@/views/landManage/component/operationRecord/index.vue'), + meta: { title: '作业记录', icon: 'Document' }, + }, + ], + }, +]; +export default landsRoutes; diff --git a/sub-government-affairs-service/src/router/modules/plantingAndBreeding.js b/sub-government-affairs-service/src/router/modules/plantingAndBreeding.js index c4615b5..eea9c32 100644 --- a/sub-government-affairs-service/src/router/modules/plantingAndBreeding.js +++ b/sub-government-affairs-service/src/router/modules/plantingAndBreeding.js @@ -75,37 +75,4 @@ export default [ }, ], }, - { - path: '/landManage', - name: 'landManage', - component: Layout, - redirect: '/plantPlan', - meta: { title: '土地管理', icon: 'Document' }, - children: [ - { - path: '/plantPlan', - name: 'plantPlan', - component: () => import('@/views/landManage/component/plantPlan/index.vue'), - meta: { title: '种植规划', icon: 'Document' }, - }, - { - path: '/landPartol', - name: 'landPartol', - component: () => import('@/views/landManage/component/landPartol/index.vue'), - meta: { title: '土地巡查', icon: 'Document' }, - }, - { - path: '/illegalHandle', - name: 'illegalHandle', - component: () => import('@/views/landManage/component/illegalHandle/index.vue'), - meta: { title: '土地违法处理', icon: 'Document' }, - }, - { - path: '/operationRecord', - name: 'operationRecord', - component: () => import('@/views/landManage/component/operationRecord/index.vue'), - meta: { title: '作业记录', icon: 'Document' }, - }, - ], - }, ]; diff --git a/sub-government-affairs-service/src/views/landManage/component/landsManage/common/CreateLand.vue b/sub-government-affairs-service/src/views/landManage/component/landsManage/common/CreateLand.vue new file mode 100644 index 0000000..a172c32 --- /dev/null +++ b/sub-government-affairs-service/src/views/landManage/component/landsManage/common/CreateLand.vue @@ -0,0 +1,57 @@ + + + + + diff --git a/sub-government-affairs-service/src/views/landManage/component/landsManage/index.vue b/sub-government-affairs-service/src/views/landManage/component/landsManage/index.vue new file mode 100644 index 0000000..9a7623f --- /dev/null +++ b/sub-government-affairs-service/src/views/landManage/component/landsManage/index.vue @@ -0,0 +1,175 @@ + + + + + diff --git a/sub-government-affairs-service/src/views/landManage/component/plantPlan/index.vue b/sub-government-affairs-service/src/views/landManage/component/plantPlan/index.vue index 64079e2..c6356fd 100644 --- a/sub-government-affairs-service/src/views/landManage/component/plantPlan/index.vue +++ b/sub-government-affairs-service/src/views/landManage/component/plantPlan/index.vue @@ -11,7 +11,7 @@ import { ref, reactive, onMounted } from 'vue'; import Pagina from '@/components/pagina.vue'; import CustCard from '@/components/CustCard.vue'; -import { getLandList } from '@/apis/land.js'; +import { getLandsList } from '@/apis/land.js'; onMounted(() => { getList(); @@ -36,7 +36,7 @@ const pageData = reactive({ async function getList() { const params = { current: pageData.page, size: pageData.size }; - let res = await getLandList(params); + let res = await getLandsList(params); console.log('res ---------', res); }