From e80a2ddcbd34eca8d1213df1013f6f314a29db85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=83=B3?= <826276471@qq.com>
Date: Wed, 26 Feb 2025 13:36:43 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=96=B0=E5=A2=9E=E5=9C=9F=E5=9C=B0?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../auto-imports.d.ts                         |  75 ++++++++
 .../components.d.ts                           |  16 ++
 .../src/apis/land.js                          |   4 +-
 .../src/components/CustCard.vue               |   2 +-
 .../src/components/LandType.vue               |  56 ++++++
 .../src/layouts/component/Avatar/index.vue    |   1 +
 .../src/router/index.js                       |   2 +
 .../src/router/modules/lands.js               |  44 +++++
 .../src/router/modules/plantingAndBreeding.js |  33 ----
 .../landsManage/common/CreateLand.vue         |  57 ++++++
 .../component/landsManage/index.vue           | 175 ++++++++++++++++++
 .../landManage/component/plantPlan/index.vue  |   4 +-
 12 files changed, 431 insertions(+), 38 deletions(-)
 create mode 100644 sub-government-affairs-service/auto-imports.d.ts
 create mode 100644 sub-government-affairs-service/components.d.ts
 create mode 100644 sub-government-affairs-service/src/components/LandType.vue
 create mode 100644 sub-government-affairs-service/src/router/modules/lands.js
 create mode 100644 sub-government-affairs-service/src/views/landManage/component/landsManage/common/CreateLand.vue
 create mode 100644 sub-government-affairs-service/src/views/landManage/component/landsManage/index.vue

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 @@
 <template>
-  <el-card body-class="custom_content_card_" shadow="props.shadow">
+  <el-card body-class="custom_content_card_" :shadow="props.shadow">
     <slot></slot>
   </el-card>
 </template>
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 @@
+<template>
+  <el-select v-model="val" @change="change">
+    <el-option v-for="item in options" :key="`land_type_${item.value}`" :value="item.value" :label="item.label" placeholder="请选择">
+      {{ item.label }}
+    </el-option>
+  </el-select>
+</template>
+
+<script setup>
+import { ref, watch } from 'vue';
+
+const props = defineProps({
+  // 父组件传过来的值
+  value: {
+    type: Number,
+    default: 0,
+  },
+});
+const emit = defineEmits(['update:value']);
+/* --------------- data --------------- */
+// #region
+
+const val = ref(0);
+watch(
+  () => props.value,
+  () => {
+    val.value = props.value;
+  },
+  {
+    deep: true,
+    immediate: true,
+  }
+);
+const options = ref([
+  { label: '耕地', value: 0 },
+  { label: '果园', value: 1 },
+  { label: '茶园', value: 2 },
+  { label: '其他园地', value: 3 },
+  { label: '林地', value: 4 },
+  { label: '草地', value: 5 },
+  { label: '其他农用地', value: 6 },
+  { label: '农村宅基地', value: 7 },
+]);
+
+// #endregion
+
+/* --------------- methods --------------- */
+// #region
+function change(val_) {
+  val.value = val_;
+  emit('update:value', val_);
+}
+// #endregion
+</script>
+
+<style lang="scss" scoped></style>
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 @@
+<template>
+  <el-drawer v-model="visible" title="土地信息" :size="800">
+    <el-card>
+      <div>基础信息</div>
+      <el-form :model="baseInfo">
+        <el-form-item label="土地名称">
+          <el-input v-model="baseInfo.landName" placeholder="请输入名称"></el-input>
+        </el-form-item>
+        <el-form-item label="土地名称"></el-form-item>
+        <el-form-item label="土地名称"></el-form-item>
+        <el-form-item label="土地名称"></el-form-item>
+        <el-form-item label="土地名称"></el-form-item>
+        <el-form-item label="土地名称"></el-form-item>
+        <el-form-item label="土地名称"></el-form-item>
+        <el-form-item label="土地名称"></el-form-item>
+        <el-form-item label="土地名称"></el-form-item>
+      </el-form>
+      <LandType v-model:value="baseInfo.LandType" />
+    </el-card>
+    <el-card>
+      <div>土地产权信息</div>
+    </el-card>
+    <el-button @click="handleSubmit"></el-button>
+  </el-drawer>
+</template>
+
+<script setup>
+import { reactive, ref, watch } from 'vue';
+import LandType from '@/components/LandType.vue';
+
+/* --------------- data --------------- */
+// #region
+
+const visible = ref(true);
+const baseInfo = reactive({
+  landName: '',
+  gridName: '',
+  LandType: 1,
+});
+
+watch(
+  () => baseInfo,
+  () => {
+    console.log('---', baseInfo);
+  }
+);
+// #endregion
+
+/* --------------- methods --------------- */
+// #region
+function handleSubmit() {
+  console.log('submit', baseInfo);
+}
+// #endregion
+</script>
+
+<style lang="scss" scoped></style>
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 @@
+<template>
+  <CustCard>
+    <el-radio-group v-model="searchCondition.draftsSaveType" class="lands_types" style="margin-bottom: 30px" @change="getList()">
+      <el-radio-button v-for="item in landsType" :key="'landsType_' + item.value" :value="item.value">
+        {{ item.label }}
+      </el-radio-button>
+    </el-radio-group>
+    <el-form ref="searchRef" :model="searchCondition">
+      <el-row :gutter="20">
+        <el-col :span="6">
+          <el-form-item label="土地名称:" prop="landName">
+            <el-input v-model="searchCondition.landName" placeholder="请输入"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="所属网格" prop="gridName">
+            <el-input v-model="searchCondition.gridName" placeholder="请输入"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="产权人" prop="owner">
+            <el-input v-model="searchCondition.owner" placeholder="请输入"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-button type="primary" @click="getList()">查询</el-button>
+          <el-button type="" @click="handleResetSearch">重置</el-button>
+        </el-col>
+      </el-row>
+    </el-form>
+    <div class="options_btns">
+      <el-button v-for="(item, i) in btns" :key="'btns_' + i" type="primary" @click="item.method">
+        {{ item.label }}
+      </el-button>
+    </div>
+    <el-table :data="list">
+      <el-table-column type="selection" width="55" />
+      <el-table-column type="index"> </el-table-column>
+      <el-table-column label="地块名" prop="landName" width="240" show-overflow-tooltip />
+      <el-table-column label="地址" prop="address" show-overflow-tooltip />
+      <el-table-column label="产权人" prop="owner" show-overflow-tooltip />
+      <el-table-column label="所属网格" prop="gridName" show-overflow-tooltip />
+      <el-table-column label="农用地分类" prop="landClassificationType" show-overflow-tooltip />
+      <el-table-column label="面积" prop="978.2" show-overflow-tooltip />
+      <el-table-column label="坐标" prop="coordinate" show-overflow-tooltip />
+      <el-table-column label="是否土地流转" prop="landTransfer" show-overflow-tooltip>
+        <template #default="{ row }">
+          {{ !row.landTransfer ? '是' : '否' }}
+        </template>
+      </el-table-column>
+      <el-table-column label="产权编号" prop="" show-overflow-tooltip />
+      <el-table-column label="土壤类型" prop="soilType" show-overflow-tooltip />
+      <el-table-column label="是否上传附件" prop="isUpload" show-overflow-tooltip>
+        <template #default="{ row }">{{ !row.isUpload ? '是' : '否' }}</template>
+      </el-table-column>
+      <el-table-column fixed="right" label="操作" width="200" show-overflow-tooltip />
+    </el-table>
+    <Pagina :page-data="pageData" />
+  </CustCard>
+  <CreateLand />
+</template>
+
+<script setup>
+import { ref, reactive, onMounted } from 'vue';
+import Pagina from '@/components/pagina.vue';
+import CustCard from '@/components/CustCard.vue';
+import { getLandsList } from '@/apis/land.js';
+import CreateLand from './common/CreateLand.vue';
+
+onMounted(() => {
+  getList();
+});
+
+/* --------------- data --------------- */
+// #region
+const landsType = ref([
+  {
+    value: '0',
+    label: '农用地',
+  },
+  {
+    value: '1',
+    label: '住宅用地',
+  },
+  {
+    value: '2',
+    label: '园林',
+  },
+]);
+const searchCondition = reactive({
+  draftsSaveType: '0',
+  landName: '',
+  gridName: '',
+  owner: '',
+});
+const searchRef = ref();
+const pageData = reactive({
+  page: 1,
+  size: 10,
+  total: 0,
+});
+
+const list = ref([]);
+const btns = reactive([
+  {
+    label: '新增土地',
+    method: function () {
+      console.log('add');
+    },
+  },
+  {
+    label: '审核',
+    disabled: true,
+    method: function () {
+      console.log('examine');
+    },
+  },
+  {
+    label: '导入',
+    disabled: false,
+    method: function () {
+      console.log('import');
+    },
+  },
+  {
+    label: '导出',
+    disabled: true,
+    method: function () {
+      console.log('export');
+    },
+  },
+]);
+
+// #endregion
+
+/* --------------- methods --------------- */
+// #region
+
+async function getList() {
+  const params = {
+    current: pageData.page,
+    size: pageData.size,
+    ...searchCondition,
+  };
+  let res = await getLandsList(params);
+  console.log('res ---------', res);
+}
+function handleResetSearch() {
+  console.log('searchRef', searchRef.value);
+  searchRef.value && searchRef.value.resetFields();
+  getLandsList();
+}
+// #endregion
+</script>
+
+<style lang="scss" scoped>
+.lands_types {
+  width: 100%;
+  justify-content: center;
+  > label {
+    width: 12%;
+    ::v-deep() {
+      .el-radio-button__inner {
+        width: 100%;
+      }
+    }
+  }
+}
+.options_btns {
+  margin-bottom: 12px;
+  .el-button {
+    width: 120px;
+  }
+}
+</style>
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);
 }