From 512a2c928665e4bd4f31e99e9800d4f70cbd582f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B2=88=E9=B8=BF?= <shenhongkm@163.com>
Date: Fri, 4 Jul 2025 17:09:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=8D=E6=A4=8D=E5=9F=BA=E5=9C=B0-=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E3=80=81=E5=88=A0=E9=99=A4=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../landInspection/index.js                   |   8 +-
 .../src/apis/planting/base.js                 |  48 +++++++
 .../src/apis/planting/batch.js                |   1 +
 .../src/apis/planting/crop.js                 |   1 +
 .../src/apis/planting/index.js                |   1 +
 .../src/apis/planting/task.js                 |   1 +
 .../planting-base/index.vue                   | 121 +++++++++++-------
 7 files changed, 130 insertions(+), 51 deletions(-)
 create mode 100644 sub-government-affairs-service/src/apis/planting/base.js
 create mode 100644 sub-government-affairs-service/src/apis/planting/batch.js
 create mode 100644 sub-government-affairs-service/src/apis/planting/crop.js
 create mode 100644 sub-government-affairs-service/src/apis/planting/index.js
 create mode 100644 sub-government-affairs-service/src/apis/planting/task.js

diff --git a/sub-government-affairs-service/src/apis/landResourceManagement/landInspection/index.js b/sub-government-affairs-service/src/apis/landResourceManagement/landInspection/index.js
index a884ea1..e3a9298 100644
--- a/sub-government-affairs-service/src/apis/landResourceManagement/landInspection/index.js
+++ b/sub-government-affairs-service/src/apis/landResourceManagement/landInspection/index.js
@@ -3,7 +3,7 @@ import request from '@/utils/axios';
 
 // 新增（POST）
 export function createLandInspection(data) {
-  return request('land-resource/landInspection/save', {
+  return request('/land-resource/landInspection/save', {
     method: 'POST',
     data,
   });
@@ -11,7 +11,7 @@ export function createLandInspection(data) {
 
 // 删除（DELETE）
 export function deleteLandInspection(id) {
-  return request(`land-resource/landInspection/${id}`, {
+  return request(`/land-resource/landInspection/${id}`, {
     method: 'DELETE',
   });
 }
@@ -32,14 +32,14 @@ export function updateLandInspectionStatus(data = {}) {
 }
 // 查询详情（GET）
 export function getLandInspectionDetail(id) {
-  return request(`land-resource/landInspection/${id}`, {
+  return request(`/land-resource/landInspection/${id}`, {
     method: 'GET',
   });
 }
 
 // 查询列表 admin （GET）
 export function fetchLandInspectionList(params = {}) {
-  return request('land-resource/landInspection/page', {
+  return request('/land-resource/landInspection/page', {
     method: 'GET',
     params,
   });
diff --git a/sub-government-affairs-service/src/apis/planting/base.js b/sub-government-affairs-service/src/apis/planting/base.js
new file mode 100644
index 0000000..89374c3
--- /dev/null
+++ b/sub-government-affairs-service/src/apis/planting/base.js
@@ -0,0 +1,48 @@
+// 种植基地管理 (base)
+import request from '@/utils/axios';
+
+// 新增（POST）
+export function createBase(data) {
+  return request('/inputGoods/plantationInfo', {
+    method: 'POST',
+    data,
+  });
+}
+
+// 删除（DELETE）
+export function deleteBase(id) {
+  return request(`/inputGoods/plantationInfo/${id}`, {
+    method: 'DELETE',
+  });
+}
+
+// 批量删除（DELETE）
+export function deleteBaseBatch(data) {
+  return request(`/inputGoods/plantationInfo`, {
+    method: 'DELETE',
+    data,
+  });
+}
+
+// 修改（PUT）
+export function updateBase(data = {}) {
+  return request('/inputGoods/plantationInfo', {
+    method: 'PUT',
+    data,
+  });
+}
+
+// 查询列表（GET）
+export function fetchBaseList(params = {}) {
+  return request('/inputGoods/plantationInfo/page', {
+    method: 'GET',
+    params,
+  });
+}
+
+// 查询详情（GET）
+export function getBaseDetail(id) {
+  return request(`/inputGoods/plantationInfo/${id}`, {
+    method: 'GET',
+  });
+}
diff --git a/sub-government-affairs-service/src/apis/planting/batch.js b/sub-government-affairs-service/src/apis/planting/batch.js
new file mode 100644
index 0000000..47673f5
--- /dev/null
+++ b/sub-government-affairs-service/src/apis/planting/batch.js
@@ -0,0 +1 @@
+// 种植批次管理
diff --git a/sub-government-affairs-service/src/apis/planting/crop.js b/sub-government-affairs-service/src/apis/planting/crop.js
new file mode 100644
index 0000000..a93db4b
--- /dev/null
+++ b/sub-government-affairs-service/src/apis/planting/crop.js
@@ -0,0 +1 @@
+// 作物基础数据API
diff --git a/sub-government-affairs-service/src/apis/planting/index.js b/sub-government-affairs-service/src/apis/planting/index.js
new file mode 100644
index 0000000..ef130f0
--- /dev/null
+++ b/sub-government-affairs-service/src/apis/planting/index.js
@@ -0,0 +1 @@
+// 统一导出入口
diff --git a/sub-government-affairs-service/src/apis/planting/task.js b/sub-government-affairs-service/src/apis/planting/task.js
new file mode 100644
index 0000000..b5e7199
--- /dev/null
+++ b/sub-government-affairs-service/src/apis/planting/task.js
@@ -0,0 +1 @@
+// 农事作业管理
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 638eab1..553b8cd 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
@@ -10,28 +10,29 @@
         <el-button @click="handleReset">重置</el-button>
       </el-form-item>
     </el-form>
-    <!-- 功能区域 -->
-    <section class="function-bar">
+    <!-- 功能区域 - 只在开发环境显示 -->
+    <section v-if="showAddButton" class="function-bar">
       <el-button type="primary" @click="handleAdd">新增</el-button>
     </section>
     <!-- 表格区域 -->
-    <TableComponent
-      :loading="loading"
-      :columns="columns"
-      :table-data="tableData"
-      :current-page="pageData.currentPage"
-      :page-size="pageData.pageSize"
-      :total="pageData.total"
-      :show-pagination="true"
-      :show-border="true"
-      :show-sort="true"
-      style="max-height: calc(100vh - 220px)"
-      @page-change="handlePageChange"
-    >
-      <template #action="scope">
-        <custom-table-operate :actions="actions" :data="scope" />
-      </template>
-    </TableComponent>
+    <div class="table-container">
+      <TableComponent
+        :loading="loading"
+        :columns="columns"
+        :table-data="tableData"
+        :current-page="pageData.currentPage"
+        :page-size="pageData.pageSize"
+        :total="pageData.total"
+        :show-pagination="true"
+        :show-border="true"
+        :show-sort="true"
+        @page-change="handlePageChange"
+      >
+        <template #action="scope">
+          <custom-table-operate :actions="actions" :data="scope" />
+        </template>
+      </TableComponent>
+    </div>
 
     <!-- 详情/编辑对话框 -->
     <el-dialog :key="dialogTitle" v-model="visible" :title="dialogTitle" width="60%" align-center :draggable="true">
@@ -43,8 +44,8 @@
             <el-row :gutter="20">
               <el-col :span="12">
                 <!-- 基地编码 -->
-                <el-form-item label="基地编码" prop="baseCode">
-                  <el-input v-model="formData.baseCode" :readonly="isReadonly" clearable />
+                <el-form-item label="基地编码" prop="code">
+                  <el-input v-model="formData.code" :readonly="isReadonly" clearable />
                 </el-form-item>
 
                 <!-- 所属行政区域 -->
@@ -89,8 +90,8 @@
 
               <el-col :span="12">
                 <!-- 基地名称 -->
-                <el-form-item label="基地名称" prop="baseName">
-                  <el-input v-model="formData.baseName" :readonly="isReadonly" clearable />
+                <el-form-item label="基地名称" prop="name">
+                  <el-input v-model="formData.name" :readonly="isReadonly" clearable />
                 </el-form-item>
 
                 <!-- 所属网格 -->
@@ -104,7 +105,7 @@
                     <el-input v-model="formData.longitude" placeholder="经度" :readonly="isReadonly" style="width: 45%" />
                     <span style="margin: 0 5px">,</span>
                     <el-input v-model="formData.latitude" placeholder="纬度" :readonly="isReadonly" style="width: 45%" />
-                    <el-button v-if="!isReadonly" type="primary" link @click="handleSelectOnMap"> 地图选取 </el-button>
+                    <!-- <el-button v-if="!isReadonly" type="primary" link @click="handleSelectOnMap"> 地图选取 </el-button> -->
                   </div>
                 </el-form-item>
 
@@ -225,7 +226,9 @@
 </template>
 
 <script setup>
-import { ref, onMounted } from 'vue';
+import { ref, onMounted, computed } from 'vue';
+import { ElMessage, ElMessageBox } from 'element-plus';
+import { createBase, updateBase, deleteBase, deleteBaseBatch, fetchBaseList, getBaseDetail } from '@/apis/planting/base';
 import { mockData } from './mockData';
 
 // ==================== 常量定义 ====================
@@ -234,7 +237,9 @@ const DIALOG_TITLE = {
   EDIT: '编辑基地信息',
   ADD: '新增基地信息',
 };
-
+// 获取环境变量
+const env = import.meta.env.VITE_MODE;
+console.log('环境变量:', env);
 // ==================== 状态管理 ====================
 const loading = ref(false);
 const visible = ref(false);
@@ -244,13 +249,7 @@ const activeFormTab = ref('basic');
 
 // 表单数据
 const searchForm = ref({});
-const formData = ref({
-  gridName: '',
-  gridAreaCode: '',
-  scope: '',
-  scopeImg: '',
-  note: '',
-});
+const formData = ref({});
 const initialFormData = { ...formData.value };
 
 // 分页数据
@@ -265,27 +264,27 @@ const tableData = ref([]);
 
 // ==================== 表格配置 ====================
 const columns = ref([
-  { label: '基地编码', prop: 'baseCode' },
-  { label: '基地名称', prop: 'baseName' },
+  { label: '基地编码', prop: 'code' },
+  { label: '基地名称', prop: 'name' },
   { label: '所属行政区域', prop: 'regionName' },
   { label: '所属网格', prop: 'gridName' },
-  { label: '具体位置', prop: 'adress' },
+  { label: '具体位置', prop: 'location' },
   {
     label: '经纬度',
     prop: 'coordinate',
-    formatter: (row) => `${row.longitude}, ${row.latitude}`,
+    // formatter: (row) => `${row.longitude}, ${row.latitude}`,
   },
-  { label: '气候条件', prop: 'weather' },
+  { label: '气候条件', prop: 'climate' },
   { label: '海拔（米）', prop: 'altitude' },
   {
     label: '面积（亩）',
     prop: 'area',
     formatter: (row, column, cellValue) => `${Number(cellValue).toFixed(2)} 亩`,
   },
-  { label: '使用状态', prop: 'status' },
-  { label: '经营主体代码', prop: 'businessCode' },
-  { label: '经营主体类型', prop: 'businessType' },
-  { label: '经营主体名称', prop: 'businessSubjectName' },
+  { label: '使用状态', prop: 'statusName' },
+  { label: '经营主体代码', prop: 'businessId' },
+  { label: '经营主体类型', prop: 'businessTypeName' },
+  { label: '经营主体名称', prop: 'businessName' },
   { label: '创建时间', prop: 'createTime' },
   {
     label: '操作',
@@ -319,13 +318,23 @@ onMounted(() => {
   getData();
 });
 
+// ==================== 计算属性 ====================
+const showAddButton = computed(() => {
+  return env === 'DEV';
+});
+
 // ==================== 数据获取 ====================
 const getData = async () => {
   loading.value = true;
   try {
-    await new Promise((resolve) => setTimeout(resolve, 300));
-    tableData.value = mockData;
-    pageData.value.total = tableData.value.length;
+    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;
   }
@@ -360,8 +369,12 @@ const handleEdit = (row) => {
 };
 
 const handleDelete = async (id) => {
-  console.log('删除', id);
-  // 实际删除逻辑
+  await ElMessageBox.confirm('确定删除该基地信息吗？', '提示', {
+    type: 'warning',
+  });
+  await deleteBase(id);
+  ElMessage.success('删除成功');
+  getData();
 };
 
 const resetForm = () => {
@@ -387,10 +400,24 @@ const submitAll = () => {
 
 <style scoped lang="scss">
 .custom-page {
+  display: flex;
+  flex-direction: column;
+  height: calc(100vh - 150px);
   .search-bar {
+    flex-shrink: 0;
     margin-bottom: 20px;
   }
 
+  .table-container {
+    flex: 1;
+    min-height: 0; /* 解决flex容器内滚动问题 */
+    display: flex;
+    flex-direction: column;
+    :deep(.el-table) {
+      flex: 1;
+      overflow: auto;
+    }
+  }
   .tabs-wrapper {
     width: 100%;
     display: flex;