From cf7762c2814d3f009777c80549b1855dcd0961af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B2=88=E9=B8=BF?= <shenhongkm@163.com>
Date: Fri, 23 May 2025 13:02:15 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=89=E7=BA=A7=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=95=88=E6=9E=9C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/layouts/component/Hamburger/index.vue |  7 ---
 .../src/layouts/component/Menu/Icon.vue       |  7 ---
 .../src/layouts/component/Menu/Link.vue       |  7 ---
 .../src/layouts/component/Menu/SubItem.vue    | 61 ++++++++++++++++---
 .../src/layouts/component/Sider/index.vue     |  9 +--
 .../src/layouts/index.vue                     |  7 ---
 .../useSupervise/index.vue                    |  1 -
 7 files changed, 53 insertions(+), 46 deletions(-)

diff --git a/sub-government-affairs-service/src/layouts/component/Hamburger/index.vue b/sub-government-affairs-service/src/layouts/component/Hamburger/index.vue
index d21ba91..5f84d1e 100644
--- a/sub-government-affairs-service/src/layouts/component/Hamburger/index.vue
+++ b/sub-government-affairs-service/src/layouts/component/Hamburger/index.vue
@@ -1,10 +1,3 @@
-<!--
- * @Description: 
- * @Author: zenghua.wang
- * @Date: 2023-06-20 14:29:45
- * @LastEditors: zenghua.wang
- * @LastEditTime: 2024-01-26 23:04:29
--->
 <template>
   <div class="layout-hamburger" @click="handleCollapse">
     <el-icon v-if="isCollapse" class="icon"><expand /></el-icon>
diff --git a/sub-government-affairs-service/src/layouts/component/Menu/Icon.vue b/sub-government-affairs-service/src/layouts/component/Menu/Icon.vue
index b4a3fb4..2f35310 100644
--- a/sub-government-affairs-service/src/layouts/component/Menu/Icon.vue
+++ b/sub-government-affairs-service/src/layouts/component/Menu/Icon.vue
@@ -1,10 +1,3 @@
-<!--
- * @Description: 
- * @Author: zenghua.wang
- * @Date: 2024-01-27 16:02:43
- * @LastEditors: zenghua.wang
- * @LastEditTime: 2024-04-12 21:12:01
--->
 <template>
   <el-icon v-if="icon.includes('icon')" :class="`iconfont ${icon}`" :size="size" />
   <el-icon v-else :size="size"> <component :is="icon" /></el-icon>
diff --git a/sub-government-affairs-service/src/layouts/component/Menu/Link.vue b/sub-government-affairs-service/src/layouts/component/Menu/Link.vue
index e58bd3a..f2445d9 100644
--- a/sub-government-affairs-service/src/layouts/component/Menu/Link.vue
+++ b/sub-government-affairs-service/src/layouts/component/Menu/Link.vue
@@ -1,10 +1,3 @@
-<!--
- * @Description: 
- * @Author: zenghua.wang
- * @Date: 2023-06-20 14:29:45
- * @LastEditors: zenghua.wang
- * @LastEditTime: 2024-01-27 09:29:36
--->
 <template>
   <component :is="type" v-bind="linkProps(to)">
     <slot />
diff --git a/sub-government-affairs-service/src/layouts/component/Menu/SubItem.vue b/sub-government-affairs-service/src/layouts/component/Menu/SubItem.vue
index 91ffd30..38ac000 100644
--- a/sub-government-affairs-service/src/layouts/component/Menu/SubItem.vue
+++ b/sub-government-affairs-service/src/layouts/component/Menu/SubItem.vue
@@ -1,10 +1,3 @@
-<!--
- * @Description: 
- * @Author: zenghua.wang
- * @Date: 2023-06-20 14:29:45
- * @LastEditors: zenghua.wang
- * @LastEditTime: 2024-01-27 16:07:37
--->
 <template>
   <template v-if="!item.hidden">
     <template v-if="!item.alwaysShow && hasOneShowingChild(item.children, item)">
@@ -15,21 +8,41 @@
         </el-menu-item>
       </layout-link>
     </template>
+    <template v-else-if="level === 2 && !isCollapse">
+      <el-dropdown trigger="hover" placement="right-start" :show-timeout="100" @visible-change="(val) => (isDropdownOpen = val)">
+        <span class="el-dropdown-link el-menu-item" @mouseenter.prevent>
+          <layout-icon :size="20" :icon="item.meta?.icon" />
+          <span>{{ item.meta?.title + '1' }}</span>
+          <el-icon class="arrow-icon" v-if="item.children?.length">
+            <component :is="isDropdownOpen ? 'arrow-left' : 'arrow-right'" />
+          </el-icon>
+        </span>
+        <template #dropdown>
+          <el-menu class="third-level-menu el-menu--vertical el-menu--popup-container" :default-active="$route.path" @select="$router.push">
+            <el-menu-item v-for="child in item.children" :key="child.path" :index="child.path">
+              <layout-icon :size="20" :icon="child.meta?.icon" />
+              <span>{{ child.meta?.title }}</span>
+            </el-menu-item>
+          </el-menu>
+        </template>
+      </el-dropdown>
+    </template>
     <el-sub-menu v-else :index="item.path" teleported>
       <template #title>
         <layout-icon :size="20" :icon="item?.meta?.icon" />
         <span>{{ item.meta && item.meta?.title }}</span>
       </template>
-      <sub-item v-for="child in item.children" :key="child.path" :item="child" />
+      <sub-item v-for="child in item.children" :key="child.path" :item="child" :level="level + 1" />
     </el-sub-menu>
   </template>
 </template>
 
 <script setup name="sub-item">
-import { ref } from 'vue';
+import { ref, computed } from 'vue';
 // import { isExternal } from '@/utils/validate.js';
 import LayoutLink from './Link';
 import LayoutIcon from './Icon';
+import { useSettingStore } from '@/store/modules/setting';
 // import path from 'path-browserify';
 
 defineProps({
@@ -37,6 +50,10 @@ defineProps({
     type: Object,
     required: true,
   },
+  level: {
+    type: Number,
+    default: 1,
+  },
   basePath: {
     type: String,
     default: '',
@@ -44,6 +61,10 @@ defineProps({
 });
 
 const onlyOneChild = ref(null);
+const SettingStore = useSettingStore();
+const isDropdownOpen = ref(false);
+
+const isCollapse = computed(() => !SettingStore.isCollapse);
 const hasOneShowingChild = (children = [], parent) => {
   const showingChildren = children.filter((item) => {
     // 过滤掉需要隐藏的菜单
@@ -79,3 +100,25 @@ const hasOneShowingChild = (children = [], parent) => {
 //   return path.resolve(props.basePath, routePath);
 // };
 </script>
+
+<style scoped>
+.third-level-menu {
+  background: #fff;
+  border-radius: 4px;
+  box-shadow: 0 2px 12px rgba(0, 0, 0, 0.1);
+  min-width: 180px;
+}
+.el-dropdown-link {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  width: 100%;
+  box-sizing: border-box;
+}
+
+.arrow-icon {
+  margin-left: auto;
+  font-size: 14px;
+  color: #999;
+}
+</style>
diff --git a/sub-government-affairs-service/src/layouts/component/Sider/index.vue b/sub-government-affairs-service/src/layouts/component/Sider/index.vue
index 6704ba0..5eb5134 100644
--- a/sub-government-affairs-service/src/layouts/component/Sider/index.vue
+++ b/sub-government-affairs-service/src/layouts/component/Sider/index.vue
@@ -1,10 +1,3 @@
-<!--
- * @Description: 
- * @Author: zenghua.wang
- * @Date: 2024-01-27 20:01:45
- * @LastEditors: zenghua.wang
- * @LastEditTime: 2024-03-30 14:32:07
--->
 <template>
   <div class="layout-sider" :class="{ 'has-logo': themeConfig.showLogo }">
     <Logo v-if="themeConfig.showLogo" :is-collapse="isCollapse" />
@@ -19,7 +12,7 @@
         :collapse-transition="false"
         :collapse="isCollapse"
       >
-        <SubItem v-for="item in permissionRoutes" :key="item.path" :item="item" />
+        <SubItem v-for="item in permissionRoutes" :key="item.path" :item="item" :level="1" />
       </el-menu>
     </el-scrollbar>
   </div>
diff --git a/sub-government-affairs-service/src/layouts/index.vue b/sub-government-affairs-service/src/layouts/index.vue
index 05eea89..5311e8a 100644
--- a/sub-government-affairs-service/src/layouts/index.vue
+++ b/sub-government-affairs-service/src/layouts/index.vue
@@ -1,10 +1,3 @@
-<!--
- * @Description: layout
- * @Author: zenghua.wang
- * @Date: 2024-01-26 20:13:37
- * @LastEditors: zenghua.wang
- * @LastEditTime: 2024-02-05 16:03:31
--->
 <template>
   <div
     class="basic-layout"
diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/useSupervise/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/useSupervise/index.vue
index 6eb322d..b286985 100644
--- a/sub-government-affairs-service/src/views/inputSuppliesManage/useSupervise/index.vue
+++ b/sub-government-affairs-service/src/views/inputSuppliesManage/useSupervise/index.vue
@@ -4,7 +4,6 @@
       ref="crudRef"
       v-model:search="searchCondition"
       v-model:page="pageData"
-      :table-loading="_loading"
       :option="option"
       :data="data"
       @search-change="

From 1502ba1d63f18344dcd6d924c62a341ddeb8e2ef Mon Sep 17 00:00:00 2001
From: 13713575202 <1345916905@qq.com>
Date: Fri, 23 May 2025 14:33:04 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=8F=E6=BB=A8=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=BA=E7=9C=9F=E5=AE=9E=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/.env.development                         |   1 +
 main/src/views/login/index.vue                |   8 +-
 .../.env.development                          |   2 +
 .../.env.production                           |   3 +-
 .../src/assets/images/logo.png                | Bin 0 -> 12663 bytes
 .../src/layouts/component/Logo/index.vue      |   8 +-
 .../src/router/index.js                       |   6 +-
 .../src/router/modules/inputSupplies/index.js |  50 ++++++------
 .../src/router/modules/productOperateMain.js  |  40 +++++-----
 .../src/router/modules/resource.js            |  14 ++--
 .../src/router/modules/statisticAnalysis.js   |  12 +--
 .../src/router/modules/trace.js               |   4 +-
 .../src/views/home/index.vue                  |  56 +++++++-------
 .../enterpriseDealerCheck/index.vue           |  72 +++++++++++++++---
 .../material/seed/index.vue                   |   8 +-
 .../src/views/trace/record/seed/index.vue     |  24 +++++-
 .../src/views/trace/search/index.vue          |   2 +-
 .../src/views/trace/statistic/index.vue       |  22 +++---
 .../src/views/trace/search/index.vue          |   2 +-
 19 files changed, 205 insertions(+), 129 deletions(-)
 create mode 100644 sub-government-affairs-service/src/assets/images/logo.png

diff --git a/main/.env.development b/main/.env.development
index a332768..328aab0 100644
--- a/main/.env.development
+++ b/main/.env.development
@@ -12,5 +12,6 @@ VITE_APP_SUB_GSR = '//localhost:9530/new-digital-agriculture-screen/'
 # 接口
 VITE_APP_BASE_API = '/apis' 
 VITE_APP_BASE_URL = 'http://192.168.18.99:8080'
+# VITE_APP_BASE_URL = 'http://192.168.18.14:8080'//线下测试
 VITE_APP_UPLOAD_API = '/uploadApis'
 VITE_APP_UPLOAD_URL = 'http://192.168.18.99:8080'
\ No newline at end of file
diff --git a/main/src/views/login/index.vue b/main/src/views/login/index.vue
index a11cc1a..78e67eb 100644
--- a/main/src/views/login/index.vue
+++ b/main/src/views/login/index.vue
@@ -16,7 +16,7 @@
           </template>
         </el-input>
       </el-form-item>
-      <el-form-item v-if="captchaEnabled" prop="code">
+      <!-- <el-form-item v-if="captchaEnabled" prop="code">
         <el-input v-model="loginForm.code" auto-complete="off" placeholder="验证码" style="width: 63%" @keyup.enter="handleLogin">
           <template #prefix>
             <svg-icon icon-class="validCode" class="el-input__icon input-icon" />
@@ -25,7 +25,7 @@
         <div class="login-code">
           <img :src="codeUrl" class="login-code-img" @click="getCode" />
         </div>
-      </el-form-item>
+      </el-form-item> -->
       <el-checkbox v-model="loginForm.rememberMe" style="margin: 0px 0px 25px 0px">记住密码</el-checkbox>
       <el-form-item style="width: 100%">
         <el-button :loading="loading" size="large" type="primary" style="width: 100%" @click.prevent="handleLogin">
@@ -61,13 +61,13 @@ export default {
         username: 'admin',
         password: 'admin123',
         rememberMe: false,
-        code: '',
+        code: '1',
         uuid: '',
       },
       loginRules: {
         username: [{ required: true, trigger: 'blur', message: '请输入您的账号' }],
         password: [{ required: true, trigger: 'blur', message: '请输入您的密码' }],
-        code: [{ required: true, trigger: 'change', message: '请输入验证码' }],
+        // code: [{ required: true, trigger: 'change', message: '请输入验证码' }],
       },
       loading: false,
       // 验证码开关
diff --git a/sub-government-affairs-service/.env.development b/sub-government-affairs-service/.env.development
index 187aabc..ec64d21 100644
--- a/sub-government-affairs-service/.env.development
+++ b/sub-government-affairs-service/.env.development
@@ -6,5 +6,7 @@ VITE_APP_MIAN_URL = 'http://localhost:9000'
 VITE_APP_NAME = 'sub-government-affairs-service'
 VITE_APP_BASE_API = '/apis' 
 VITE_APP_BASE_URL = 'http://192.168.18.99:8080'
+# VITE_APP_BASE_URL = 'http://192.168.18.14:8080'
 VITE_APP_UPLOAD_API = '/uploadApis'
 VITE_APP_UPLOAD_URL = 'http://192.168.18.99:9300'
+# VITE_APP_UPLOAD_URL = 'http://192.168.18.14:8080'
\ No newline at end of file
diff --git a/sub-government-affairs-service/.env.production b/sub-government-affairs-service/.env.production
index fa327e9..63cf3cc 100644
--- a/sub-government-affairs-service/.env.production
+++ b/sub-government-affairs-service/.env.production
@@ -1,7 +1,8 @@
 # 生产环境
 VITE_MODE = 'PRO'
 VITE_APP_MIAN = 'daimp-front-main'
-VITE_APP_MIAN_URL = 'http://47.109.205.240:88'
+# VITE_APP_MIAN_URL = 'http://47.109.205.240:88'
+VITE_APP_MIAN_URL = 'http://192.168.18.14:8080'
 VITE_APP_NAME = 'sub-government-affairs-service'
 # 接口
 VITE_APP_BASE_API = '/apis' 
diff --git a/sub-government-affairs-service/src/assets/images/logo.png b/sub-government-affairs-service/src/assets/images/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d7da947304e8d9a5b15bb7b8c295a865cdf5b0a
GIT binary patch
literal 12663
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
LL99l^An<<x<;`U;

literal 0
HcmV?d00001

diff --git a/sub-government-affairs-service/src/layouts/component/Logo/index.vue b/sub-government-affairs-service/src/layouts/component/Logo/index.vue
index 1fda7e2..9462ca9 100644
--- a/sub-government-affairs-service/src/layouts/component/Logo/index.vue
+++ b/sub-government-affairs-service/src/layouts/component/Logo/index.vue
@@ -7,8 +7,8 @@
 -->
 <template>
   <div class="logo">
-    <!-- <img src="/images/logo.png" class="logo-picture" /> -->
-    <h2 v-show="!isCollapse" class="logo-title">{{ VITE_APP_TITLE }}</h2>
+    <!-- <img src="../../../assets/images/logo.png" class="logo-picture" />
+    <h2 v-show="!isCollapse" class="logo-title">{{ VITE_APP_TITLE }}</h2> -->
   </div>
 </template>
 
@@ -43,5 +43,9 @@ const { VITE_APP_TITLE } = import.meta.env;
     line-height: 35px;
     color: $color-primary;
   }
+  .logo-picture {
+    width: 100%;
+    height: 50px;
+  }
 }
 </style>
diff --git a/sub-government-affairs-service/src/router/index.js b/sub-government-affairs-service/src/router/index.js
index 9ac3c03..5e19252 100644
--- a/sub-government-affairs-service/src/router/index.js
+++ b/sub-government-affairs-service/src/router/index.js
@@ -47,10 +47,10 @@ export const constantRoutes = [
   ...resourceRouter,
   ...productOperateMainRoutes,
   ...inputSuppliesRoutes,
-  produceGoods,
-  ...plantingAndBreedingRouter,
+  // produceGoods,
+  // ...plantingAndBreedingRouter,
   ...traceRouter,
-  ...systemRouter,
+  // ...systemRouter,
 ];
 
 /**
diff --git a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js
index b4a21d2..7274aca 100644
--- a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js
+++ b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js
@@ -34,30 +34,30 @@ const inputSuppliesRoutes = [
             component: () => import('@/views/inputSuppliesManage/material/fertilizer/index.vue'),
             meta: { title: '肥料管理', icon: '' },
           },
-          {
-            path: '/sub-government-affairs-service/material/pesticide',
-            name: 'input-supplies-pesticide',
-            component: () => import('@/views/inputSuppliesManage/material/pesticide/index.vue'),
-            meta: { title: '农药管理', icon: '' },
-          },
-          {
-            path: '/sub-government-affairs-service/material/ratPoison',
-            name: 'input-supplies-ratPoison',
-            component: () => import('@/views/inputSuppliesManage/material/ratPoison/index.vue'),
-            meta: { title: '兽药管理', icon: '' },
-          },
+          // {
+          //   path: '/sub-government-affairs-service/material/pesticide',
+          //   name: 'input-supplies-pesticide',
+          //   component: () => import('@/views/inputSuppliesManage/material/pesticide/index.vue'),
+          //   meta: { title: '农药管理', icon: '' },
+          // },
+          // {
+          //   path: '/sub-government-affairs-service/material/ratPoison',
+          //   name: 'input-supplies-ratPoison',
+          //   component: () => import('@/views/inputSuppliesManage/material/ratPoison/index.vue'),
+          //   meta: { title: '兽药管理', icon: '' },
+          // },
           {
             path: '/sub-government-affairs-service/material/seed',
             name: 'input-supplies-seed',
             component: () => import('@/views/inputSuppliesManage/material/seed/index.vue'),
-            meta: { title: '种源管理', icon: '' },
-          },
-          {
-            path: '/sub-government-affairs-service/material/farmMachinery',
-            name: 'input-supplies-farmMachinery',
-            component: () => import('@/views/inputSuppliesManage/material/farmMachinery/index.vue'),
-            meta: { title: '农机管理', icon: '' },
+            meta: { title: '种子管理', icon: '' },
           },
+          // {
+          //   path: '/sub-government-affairs-service/material/farmMachinery',
+          //   name: 'input-supplies-farmMachinery',
+          //   component: () => import('@/views/inputSuppliesManage/material/farmMachinery/index.vue'),
+          //   meta: { title: '农机管理', icon: '' },
+          // },
         ],
       },
       {
@@ -72,12 +72,12 @@ const inputSuppliesRoutes = [
         component: () => import('@/views/inputSuppliesManage/enterpriseDealerCheck/index.vue'),
         meta: { title: '企业经销商抽检', icon: '' },
       },
-      {
-        path: '/sub-government-affairs-service/useSupervise',
-        name: 'useSupervise',
-        component: () => import('@/views/inputSuppliesManage/useSupervise/index.vue'),
-        meta: { title: '使用监管', icon: '' },
-      },
+      // {
+      //   path: '/sub-government-affairs-service/useSupervise',
+      //   name: 'useSupervise',
+      //   component: () => import('@/views/inputSuppliesManage/useSupervise/index.vue'),
+      //   meta: { title: '使用监管', icon: '' },
+      // },
       {
         path: '/sub-government-affairs-service/leaseSupervise',
         name: 'leaseSupervise',
diff --git a/sub-government-affairs-service/src/router/modules/productOperateMain.js b/sub-government-affairs-service/src/router/modules/productOperateMain.js
index 8ec8eb7..eecb357 100644
--- a/sub-government-affairs-service/src/router/modules/productOperateMain.js
+++ b/sub-government-affairs-service/src/router/modules/productOperateMain.js
@@ -8,37 +8,37 @@ export default [
     redirect: '/sub-government-affairs-service/mainHome',
     meta: { title: '生产经营主体', icon: 'icon-shop' },
     children: [
-      {
-        path: '/sub-government-affairs-service/mainHome',
-        component: () => import('@/views/productOperateMain/home/index.vue'),
-        name: 'mainHome',
-        meta: { title: '数据可视化管理', icon: '' },
-      },
+      // {
+      //   path: '/sub-government-affairs-service/mainHome',
+      //   component: () => import('@/views/productOperateMain/home/index.vue'),
+      //   name: 'mainHome',
+      //   meta: { title: '数据可视化管理', icon: '' },
+      // },
       {
         path: '/sub-government-affairs-service/individual',
         component: () => import('@/views/productOperateMain/individual/index.vue'),
         name: 'individual',
-        meta: { title: '个体户', icon: '' },
-      },
-      {
-        path: '/sub-government-affairs-service/collective',
-        component: () => import('@/views/productOperateMain/collective/index.vue'),
-        name: 'collective',
-        meta: { title: '村集体', icon: '' },
+        meta: { title: '农户', icon: '' },
       },
+      // {
+      //   path: '/sub-government-affairs-service/collective',
+      //   component: () => import('@/views/productOperateMain/collective/index.vue'),
+      //   name: 'collective',
+      //   meta: { title: '村集体', icon: '' },
+      // },
       {
         path: '/sub-government-affairs-service/coop',
         component: () => import('@/views/productOperateMain/coOp/index.vue'),
         name: 'coop',
-        meta: { title: '合作社', icon: '' },
-      },
-      {
-        path: '/sub-government-affairs-service/enterprise',
-        component: () => import('@/views/productOperateMain/enterprise/index.vue'),
-        name: 'enterprise',
-        meta: { title: '经营企业', icon: '' },
+        meta: { title: '农企合作社', icon: '' },
       },
       // {
+      //   path: '/sub-government-affairs-service/enterprise',
+      //   component: () => import('@/views/productOperateMain/enterprise/index.vue'),
+      //   name: 'enterprise',
+      //   meta: { title: '经营企业', icon: '' },
+      // },
+      // {
       //   path: '/sub-government-affairs-service/individual',
       //   component: () => import('@/views/productOperateMain/individual/index.vue'),
       //   name: 'individual',
diff --git a/sub-government-affairs-service/src/router/modules/resource.js b/sub-government-affairs-service/src/router/modules/resource.js
index cc07d30..570c443 100644
--- a/sub-government-affairs-service/src/router/modules/resource.js
+++ b/sub-government-affairs-service/src/router/modules/resource.js
@@ -31,17 +31,17 @@ export default [
             name: 'member',
             meta: { title: '新增网格员', icon: '' },
           },
-          {
-            path: '/sub-government-affairs-service/grid--management',
-            component: () => import('@/views/resource/grid/GridManagement.vue'),
-            name: 'management',
-            meta: { title: '网格化管理', icon: '' },
-          },
+          // {
+          //   path: '/sub-government-affairs-service/grid--management',
+          //   component: () => import('@/views/resource/grid/GridManagement.vue'),
+          //   name: 'management',
+          //   meta: { title: '网格化管理', icon: '' },
+          // },
         ],
       },
       ...annualplanRouters,
       ...landsRoutes,
-      ...statisticsRoutes,
+      // ...statisticsRoutes,
       ...dictRoutes,
     ],
   },
diff --git a/sub-government-affairs-service/src/router/modules/statisticAnalysis.js b/sub-government-affairs-service/src/router/modules/statisticAnalysis.js
index 870447c..cfe4464 100644
--- a/sub-government-affairs-service/src/router/modules/statisticAnalysis.js
+++ b/sub-government-affairs-service/src/router/modules/statisticAnalysis.js
@@ -8,12 +8,12 @@ export default [
     redirect: '/sub-government-affairs-service/analysis-land',
     meta: { title: '统计分析', icon: 'icon-test' },
     children: [
-      {
-        path: '/sub-government-affairs-service/analysis-land',
-        component: () => import('@/views/resource/statisticAnalysis/land/index.vue'),
-        name: 'analysis-land',
-        meta: { title: '土地利用与规划分析', icon: '' },
-      },
+      // {
+      //   path: '/sub-government-affairs-service/analysis-land',
+      //   component: () => import('@/views/resource/statisticAnalysis/land/index.vue'),
+      //   name: 'analysis-land',
+      //   meta: { title: '土地利用与规划分析', icon: '' },
+      // },
       {
         path: '/sub-government-affairs-service/analysis-agriculture',
         name: 'analysis-agriculture',
diff --git a/sub-government-affairs-service/src/router/modules/trace.js b/sub-government-affairs-service/src/router/modules/trace.js
index c223a69..ee74665 100644
--- a/sub-government-affairs-service/src/router/modules/trace.js
+++ b/sub-government-affairs-service/src/router/modules/trace.js
@@ -13,7 +13,7 @@ export default [
         path: '/sub-government-affairs-service/record',
         name: 'record',
         component: Views,
-        meta: { title: '种养植档案', icon: 'Tickets' },
+        meta: { title: '种植档案', icon: 'Tickets' },
         redirect: '/sub-government-affairs-service/record-base',
         children: [
           {
@@ -26,7 +26,7 @@ export default [
             path: '/sub-government-affairs-service/record-seed',
             component: () => import('@/views/trace/record/seed/index.vue'),
             name: 'record-seed',
-            meta: { title: '种源档案', icon: '' },
+            meta: { title: '种子档案', icon: '' },
           },
         ],
       },
diff --git a/sub-government-affairs-service/src/views/home/index.vue b/sub-government-affairs-service/src/views/home/index.vue
index 78ebb27..b3888ca 100644
--- a/sub-government-affairs-service/src/views/home/index.vue
+++ b/sub-government-affairs-service/src/views/home/index.vue
@@ -6,13 +6,13 @@
           <b class="statistic-title">综合数据统计</b>
           <el-row :gutter="16" style="margin-top: 40px">
             <el-col :span="8" class="text-center">
-              <p>农村人口</p>
+              <p>人口</p>
               <avue-count-up end="27.88" :decimals="2" class="text-primary" />
               <em>万人</em>
             </el-col>
             <el-col :span="8" class="text-center">
               <p>耕地面积</p>
-              <avue-count-up end="103.88" :decimals="2" class="text-warning" />
+              <avue-count-up end="17" :decimals="2" class="text-warning" />
               <em>万亩</em>
             </el-col>
             <el-col :span="8" class="text-center">
@@ -38,7 +38,8 @@
     <el-row :gutter="16" style="margin-bottom: 20px">
       <el-col :span="12">
         <el-card shadow="hover">
-          <custom-echart-bar :chart-data="state.breedingData" height="400px" :option="state.breedingOption" />
+          <!-- <custom-echart-bar :chart-data="state.breedingData" height="400px" :option="state.breedingOption" /> -->
+          <custom-echart-pie :chart-data="state.businessData" height="400px" :option="state.businessOption" />
         </el-card>
       </el-col>
       <el-col :span="12">
@@ -51,14 +52,15 @@
     <el-row :gutter="16" style="margin-bottom: 20px">
       <el-col :span="12">
         <el-card shadow="hover">
-          <custom-echart-pie :chart-data="state.businessData" height="400px" :option="state.businessOption" />
-        </el-card>
-      </el-col>
-      <el-col :span="12">
-        <el-card shadow="hover">
+          <!-- <custom-echart-pie :chart-data="state.businessData" height="400px" :option="state.businessOption" /> -->
           <custom-echart-mixin :chart-data="state.codingData" :option="state.codingOption" height="400px" />
         </el-card>
       </el-col>
+      <!-- <el-col :span="12">
+        <el-card shadow="hover">
+          <custom-echart-mixin :chart-data="state.codingData" :option="state.codingOption" height="400px" />
+        </el-card>
+      </el-col> -->
     </el-row>
   </div>
 </template>
@@ -85,11 +87,11 @@ const state = reactive({
     },
     yAxis: {
       type: 'value',
-      name: '亩',
+      name: '万亩',
     },
     tooltip: {
       formatter: function (params) {
-        return `${params.name}：${params.value}亩`;
+        return `${params.name}：${params.value}万亩`;
       },
     },
     barStyle: {
@@ -101,16 +103,16 @@ const state = reactive({
     },
   },
   areaData: [
-    { value: 230, name: '耿马镇' },
-    { value: 165, name: '勐永镇' },
-    { value: 217, name: '勐撒镇' },
-    { value: 200, name: '孟定镇' },
-    { value: 305, name: '大兴乡' },
+    { value: 2, name: '耿马镇' },
+    { value: 6, name: '勐永镇' },
+    { value: 4, name: '勐撒镇' },
+    { value: 2, name: '孟定镇' },
+    { value: 3, name: '大兴乡' },
   ],
   breedingOption: {
     color: ['#41b879', '#fed500'],
     title: {
-      text: '种养殖综合数据统计',
+      text: '种殖综合数据统计',
       textStyle: {
         color: '#333',
       },
@@ -131,9 +133,9 @@ const state = reactive({
   },
   breedingData: [
     { value: 230, name: '种植面积', unit: '亩' },
-    { value: 165, name: '养殖面积', unit: '亩' },
+    // { value: 165, name: '养殖面积', unit: '亩' },
     { value: 217, name: '种植基地', unit: '个' },
-    { value: 200, name: '养殖基地', unit: '个' },
+    // { value: 200, name: '养殖基地', unit: '个' },
   ],
   inputsOption: {
     color: ['#ffd500'],
@@ -192,9 +194,9 @@ const state = reactive({
   },
   inputsData: [
     { value: 75, name: '农药使用', type: '投入品', max: 100, unit: '吨' },
-    { value: 38, name: '农机使用', type: '投入品', max: 100, unit: '台' },
-    { value: 74, name: '种源使用', type: '投入品', max: 100, unit: '万吨' },
-    { value: 55, name: '兽药使用', type: '投入品', max: 100, unit: '千克' },
+    // { value: 38, name: '农机使用', type: '投入品', max: 100, unit: '台' },
+    { value: 74, name: '种子使用', type: '投入品', max: 100, unit: '吨' },
+    // { value: 55, name: '兽药使用', type: '投入品', max: 100, unit: '千克' },
     { value: 65, name: '肥料使用', type: '投入品', max: 100, unit: '吨' },
   ],
   businessOption: {
@@ -233,12 +235,12 @@ const state = reactive({
     ],
   },
   businessData: [
-    { value: 28, name: '个体户' },
-    { value: 358, name: '村集体' },
-    { value: 217, name: '合作社' },
-    { value: 128, name: '农资企业' },
-    { value: 22, name: '种源企业' },
-    { value: 41, name: '生产加工企业' },
+    { value: 217, name: '农户' },
+    // { value: 358, name: '村集体' },
+    { value: 28, name: '农企/合作社' },
+    // { value: 128, name: '农资企业' },
+    // { value: 22, name: '种源企业' },
+    // { value: 41, name: '生产加工企业' },
   ],
   codingOption: {
     color: ['#41b879', '#ffd500'],
diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/enterpriseDealerCheck/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/enterpriseDealerCheck/index.vue
index fc4c94f..2ab2ba9 100644
--- a/sub-government-affairs-service/src/views/inputSuppliesManage/enterpriseDealerCheck/index.vue
+++ b/sub-government-affairs-service/src/views/inputSuppliesManage/enterpriseDealerCheck/index.vue
@@ -21,7 +21,8 @@
       @row-update="handleRowUpdate"
     >
       <template #menu="{ row }">
-        <el-button type="primary">详情</el-button>
+        <!-- <el-button type="primary">详情</el-button> -->
+        暂无
       </template>
     </avue-crud>
   </section>
@@ -154,16 +155,65 @@ async function getData(resetPage) {
     searchCondition.value
   );
   console.log('params', params);
-  for (let i = 0; i < 14; i++) {
-    data.value.push({
-      taskNum: '20220101' + `${i}${i}${i}${i}${i}`,
-      taskType: i % 2 == 0 ? '0' : '1',
-      enterpriseName: '上海XX有限公司',
-      enterpriseOwner: '张三',
-      phone: '123456789',
-      status: i % 2 == 0 ? '0' : '1',
-    });
-  }
+  data.value = [
+    {
+      taskNum: '202451211',
+      taskType: '0',
+      enterpriseName: '合肥丰乐种业股份有限公司',
+      enterpriseOwner: '戴登安',
+      phone: '18785733748',
+      status: '0',
+    },
+    {
+      taskNum: '202471241',
+      taskType: '0',
+      enterpriseName: '山东登海种业股份有限公司',
+      enterpriseOwner: '唐世伟',
+      phone: '18785733748',
+      status: '0',
+    },
+    {
+      taskNum: '2024111241',
+      taskType: '0',
+      enterpriseName: '甘肃省敦煌种业股份有限公司',
+      enterpriseOwner: '李世晓',
+      phone: '15685474526',
+      status: '0',
+    },
+    {
+      taskNum: '2024112244',
+      taskType: '1',
+      enterpriseName: '河南秋乐种业科技股份有限公司',
+      enterpriseOwner: '侯传伟',
+      phone: '17485693256',
+      status: '1',
+    },
+    {
+      taskNum: '2024122242',
+      taskType: '0',
+      enterpriseName: '安徽荃银高科种业股份有限公司',
+      enterpriseOwner: '应敏杰',
+      phone: '18423568745',
+      status: '0',
+    },
+    {
+      taskNum: '2024122242',
+      taskType: '0',
+      enterpriseName: '辽宁东亚种业有限公司',
+      enterpriseOwner: '杨永华',
+      phone: '15236989568',
+      status: '0',
+    },
+    {
+      taskNum: '202472255',
+      taskType: '0',
+      enterpriseName: '云南广大种业有限公司',
+      enterpriseOwner: '王云贵',
+      phone: '13888965335',
+      status: '0',
+    },
+  ];
+
   pageData.value.total = data.value.length;
   _loading.value = false;
 }
diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/material/seed/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/material/seed/index.vue
index b17c05f..b5cae96 100644
--- a/sub-government-affairs-service/src/views/inputSuppliesManage/material/seed/index.vue
+++ b/sub-government-affairs-service/src/views/inputSuppliesManage/material/seed/index.vue
@@ -1,6 +1,6 @@
 <template>
   <section class="custom-page">
-    <h2>种源基本信息</h2>
+    <h2>种子基本信息</h2>
     <TypeMenu v-if="materialTypes['4'].length > 1" v-model:type="_type" :types="materialTypes['4']" />
     <br />
     <avue-crud
@@ -77,7 +77,7 @@ const option = ref({
   menuWidth: 160,
   column: [
     {
-      label: '种源名称',
+      label: '种子名称',
       prop: 'keywords',
       hide: true,
       search: true,
@@ -86,9 +86,9 @@ const option = ref({
       editDisplay: false,
     },
     {
-      label: '种源名称',
+      label: '种子名称',
       prop: 'seedName',
-      rules: customRules({ msg: '请输入种源名称' }),
+      rules: customRules({ msg: '请输入种子名称' }),
     },
     {
       prop: 'manufacturer',
diff --git a/sub-government-affairs-service/src/views/trace/record/seed/index.vue b/sub-government-affairs-service/src/views/trace/record/seed/index.vue
index c8ff0a6..dbaa5a3 100644
--- a/sub-government-affairs-service/src/views/trace/record/seed/index.vue
+++ b/sub-government-affairs-service/src/views/trace/record/seed/index.vue
@@ -33,11 +33,27 @@ import { CRUD_OPTIONS } from '@/config';
 
 import Mock from 'mockjs';
 const res = Mock.mock({
-  'data|20': [
+  'data|2': [
     {
       id: '@increment(100000)',
-      name: '@ctitle(5,10)',
-      shop: '@ctitle(10,30)',
+      name: '小麦',
+      shop: '万好芽种公司',
+      buyTime: '@datetime("yyyy-MM-dd HH:mm:ss")',
+      avalibleTime: '@datetime("yyyy-MM-dd HH:mm:ss")',
+      createdTime: '@datetime("yyyy-MM-dd HH:mm:ss")',
+    },
+    {
+      id: '@increment(100000)',
+      name: '玉米',
+      shop: '万好芽种公司',
+      buyTime: '@datetime("yyyy-MM-dd HH:mm:ss")',
+      avalibleTime: '@datetime("yyyy-MM-dd HH:mm:ss")',
+      createdTime: '@datetime("yyyy-MM-dd HH:mm:ss")',
+    },
+    {
+      id: '@increment(100000)',
+      name: '南瓜',
+      shop: '丰隆种源专卖点',
       buyTime: '@datetime("yyyy-MM-dd HH:mm:ss")',
       avalibleTime: '@datetime("yyyy-MM-dd HH:mm:ss")',
       createdTime: '@datetime("yyyy-MM-dd HH:mm:ss")',
@@ -153,7 +169,7 @@ const loadData = async () => {
   await sleep(500);
   state.data = res.data;
   state.page = {
-    total: 20,
+    total: 6,
     currentPage: 1,
     pageSize: 10,
   };
diff --git a/sub-government-affairs-service/src/views/trace/search/index.vue b/sub-government-affairs-service/src/views/trace/search/index.vue
index 6e85d38..cb794cc 100644
--- a/sub-government-affairs-service/src/views/trace/search/index.vue
+++ b/sub-government-affairs-service/src/views/trace/search/index.vue
@@ -9,7 +9,7 @@
       <el-card class="search-card" shadow="hover">
         <div class="search-card-item">
           <span class="icon"><img :src="getAssetsFile('images/trace/search-1.png')" /></span>
-          <span class="text">种养植档案管理</span>
+          <span class="text">种植档案管理</span>
         </div>
       </el-card>
       <div class="search-card-connector"></div>
diff --git a/sub-government-affairs-service/src/views/trace/statistic/index.vue b/sub-government-affairs-service/src/views/trace/statistic/index.vue
index a80e603..7310fe2 100644
--- a/sub-government-affairs-service/src/views/trace/statistic/index.vue
+++ b/sub-government-affairs-service/src/views/trace/statistic/index.vue
@@ -235,7 +235,7 @@ const loadData = async () => {
   await sleep(500);
   state.rankList = [
     {
-      name: '个人',
+      name: '农户',
       num: 1000,
       icon: '1',
     },
@@ -244,16 +244,16 @@ const loadData = async () => {
       num: 1000,
       icon: '2',
     },
-    {
-      name: '农业企业',
-      num: 1000,
-      icon: '3',
-    },
-    {
-      name: '种植企业',
-      num: 1000,
-      icon: '4',
-    },
+    // {
+    //   name: '农业企业',
+    //   num: 1000,
+    //   icon: '3',
+    // },
+    // {
+    //   name: '种植企业',
+    //   num: 1000,
+    //   icon: '4',
+    // },
   ];
   state.data = mockData(
     {
diff --git a/sub-operation-admin/src/views/trace/search/index.vue b/sub-operation-admin/src/views/trace/search/index.vue
index 6e85d38..cb794cc 100644
--- a/sub-operation-admin/src/views/trace/search/index.vue
+++ b/sub-operation-admin/src/views/trace/search/index.vue
@@ -9,7 +9,7 @@
       <el-card class="search-card" shadow="hover">
         <div class="search-card-item">
           <span class="icon"><img :src="getAssetsFile('images/trace/search-1.png')" /></span>
-          <span class="text">种养植档案管理</span>
+          <span class="text">种植档案管理</span>
         </div>
       </el-card>
       <div class="search-card-connector"></div>

From 1c56ca1d0f0da0e83060cfd39598dcfdfc28dff5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B2=88=E9=B8=BF?= <shenhongkm@163.com>
Date: Fri, 23 May 2025 16:40:36 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=9C=9F=E5=9C=B0=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/vite.config.js                           |  16 +-
 .../src/apis/resource/member.js               |  54 ++++
 .../src/router/modules/resource.js            |   4 +-
 .../src/views/resource/grid/AddGrid.vue       |  68 ++---
 .../{AddGridMember.vue => GridMember.vue}     | 248 ++++++------------
 5 files changed, 180 insertions(+), 210 deletions(-)
 create mode 100644 sub-government-affairs-service/src/apis/resource/member.js
 rename sub-government-affairs-service/src/views/resource/grid/{AddGridMember.vue => GridMember.vue} (52%)

diff --git a/main/vite.config.js b/main/vite.config.js
index 39d8c37..e836ec8 100644
--- a/main/vite.config.js
+++ b/main/vite.config.js
@@ -31,14 +31,14 @@ export default defineConfig(({ command, mode }) => {
         'Access-Control-Allow-Origin': '*',
       },
       proxy: {
-        // 仅 Brand 模块走子应用 DevServer
-        '/api/brand': {
-          target: 'http://localhost:9526',
-          changeOrigin: true,
-          // 如果想去掉 /api/brand 前缀（比如子应用实际监听的是 /brand/...），
-          // 可以加一个 rewrite：
-          // rewrite: path => path.replace(/^\/api\/brand/, '/brand'),
-        },
+        // // 仅 Brand 模块走子应用 DevServer
+        // '/api/brand': {
+        //   target: 'http://localhost:9526',
+        //   changeOrigin: true,
+        //   // 如果想去掉 /api/brand 前缀（比如子应用实际监听的是 /brand/...），
+        //   // 可以加一个 rewrite：
+        //   // rewrite: path => path.replace(/^\/api\/brand/, '/brand'),
+        // },
         [VITE_APP_BASE_API]: {
           target: VITE_APP_BASE_URL,
           changeOrigin: true,
diff --git a/sub-government-affairs-service/src/apis/resource/member.js b/sub-government-affairs-service/src/apis/resource/member.js
new file mode 100644
index 0000000..0203631
--- /dev/null
+++ b/sub-government-affairs-service/src/apis/resource/member.js
@@ -0,0 +1,54 @@
+import request from '@/utils/axios';
+
+// 获取网格列表
+export const GetGridList = (params = {}) => {
+  return request('/land-resource/gridManage/page', {
+    method: 'get',
+    params,
+  });
+};
+
+// 网格员管理 - 列表
+export function GetMemberList(params = {}) {
+  return request('/land-resource/grid-member/page', {
+    method: 'GET',
+    params,
+  });
+}
+
+// 网格员管理 - 新增
+export function AddMember(data = {}) {
+  return request('/land-resource/grid-member', {
+    method: 'POST',
+    data,
+  });
+}
+
+// 网格员管理 - 修改
+export function UpdateMember(data = {}) {
+  return request('/land-resource/grid-member', {
+    method: 'PUT',
+    data,
+  });
+}
+
+// 网格员管理 - 删除
+export function DeleteMember(id) {
+  return request(`/land-resource/grid-member/${id}`, {
+    method: 'DELETE',
+  });
+}
+
+// // 网格员管理 - 导出
+// export function ExportMember() {
+//   return request('/land-resource/grid-member/export', {
+//     method: 'POST',
+//   });
+// }
+export function ExportMember(data = {}) {
+  return request('/land-resource/grid-member/export', {
+    method: 'POST',
+    data,
+    responseType: 'blob', // 明确告诉 axios 返回 blob
+  });
+}
diff --git a/sub-government-affairs-service/src/router/modules/resource.js b/sub-government-affairs-service/src/router/modules/resource.js
index cc07d30..f34aea6 100644
--- a/sub-government-affairs-service/src/router/modules/resource.js
+++ b/sub-government-affairs-service/src/router/modules/resource.js
@@ -21,13 +21,13 @@ export default [
         children: [
           {
             path: '/sub-government-affairs-service/add-grid',
-            component: () => import('@/views/resource/grid/index.vue'),
+            component: () => import('@/views/resource/grid/AddGrid.vue'),
             name: 'add',
             meta: { title: '新增网格', icon: '' },
           },
           {
             path: '/sub-government-affairs-service/add--grid-member',
-            component: () => import('@/views/resource/grid/AddGridMember.vue'),
+            component: () => import('@/views/resource/grid/GridMember.vue'),
             name: 'member',
             meta: { title: '新增网格员', icon: '' },
           },
diff --git a/sub-government-affairs-service/src/views/resource/grid/AddGrid.vue b/sub-government-affairs-service/src/views/resource/grid/AddGrid.vue
index 52dd42d..128b2d7 100644
--- a/sub-government-affairs-service/src/views/resource/grid/AddGrid.vue
+++ b/sub-government-affairs-service/src/views/resource/grid/AddGrid.vue
@@ -53,20 +53,20 @@ const state = reactive({
     ...CRUD_OPTIONS,
     // addBtnText: '添加网格',
     column: [
-      {
-        label: '网格区',
-        prop: 'gridArea',
-        search: true,
-        width: 200,
-        addDisplay: false,
-        editDisplay: false,
-        viewDisplay: true,
-        rules: {
-          required: true,
-          message: '请输入',
-          trigger: 'blur',
-        },
-      },
+      // {
+      //   label: '网格区',
+      //   prop: 'gridArea',
+      //   search: true,
+      //   width: 200,
+      //   addDisplay: false,
+      //   editDisplay: false,
+      //   viewDisplay: true,
+      //   rules: {
+      //     required: true,
+      //     message: '请输入',
+      //     trigger: 'blur',
+      //   },
+      // },
       {
         label: '网格名称',
         prop: 'gridName',
@@ -80,7 +80,7 @@ const state = reactive({
       {
         label: '网格区域',
         prop: 'gridAreaName',
-        width: 300,
+        // width: 300,
         display: false,
         rules: {
           required: true,
@@ -117,24 +117,24 @@ const state = reactive({
           trigger: 'blur',
         },
       },
-      {
-        label: '网格管理员',
-        prop: 'gridManager',
-        rules: {
-          required: true,
-          message: '请输入',
-          trigger: 'blur',
-        },
-      },
-      {
-        label: '联系方式',
-        prop: 'contactInfo',
-        rules: {
-          required: true,
-          message: '请输入',
-          trigger: 'blur',
-        },
-      },
+      // {
+      //   label: '网格管理员',
+      //   prop: 'gridManager',
+      //   rules: {
+      //     required: true,
+      //     message: '请输入',
+      //     trigger: 'blur',
+      //   },
+      // },
+      // {
+      //   label: '联系方式',
+      //   prop: 'contactInfo',
+      //   rules: {
+      //     required: true,
+      //     message: '请输入',
+      //     trigger: 'blur',
+      //   },
+      // },
       {
         label: '省',
         prop: 'provinceCode',
@@ -172,7 +172,7 @@ const state = reactive({
         span: 24,
         rows: 4,
         overHidden: true,
-        width: 200,
+        // width: 200,
       },
       {
         label: '创建时间',
diff --git a/sub-government-affairs-service/src/views/resource/grid/AddGridMember.vue b/sub-government-affairs-service/src/views/resource/grid/GridMember.vue
similarity index 52%
rename from sub-government-affairs-service/src/views/resource/grid/AddGridMember.vue
rename to sub-government-affairs-service/src/views/resource/grid/GridMember.vue
index 52dd42d..6f776be 100644
--- a/sub-government-affairs-service/src/views/resource/grid/AddGridMember.vue
+++ b/sub-government-affairs-service/src/views/resource/grid/GridMember.vue
@@ -28,159 +28,99 @@
     </avue-crud>
   </div>
 </template>
+
 <script setup>
 import { reactive, ref } from 'vue';
 import { useApp } from '@/hooks';
 import { CRUD_OPTIONS } from '@/config';
 import { isEmpty, downloadFile } from '@/utils';
 import { useUserStore } from '@/store/modules/user';
-import { compact } from 'lodash';
-import { GetEntityList, AddEntity, UpdateEntity, DeleteEntity, ExportEntity } from '@/apis/resource/grid';
+
+// 请根据你的项目路径替换为实际的接口路径
+import { GetGridList, GetMemberList, AddMember, UpdateMember, DeleteMember, ExportMember } from '@/apis/resource/member';
 
 const { VITE_APP_BASE_API } = import.meta.env;
 const app = useApp();
 const UserStore = useUserStore();
 const crudRef = ref(null);
+
 const state = reactive({
   loading: false,
-  query: {
-    current: 1,
-    size: 10,
-  },
+  query: { current: 1, size: 10 },
   form: {},
   selection: [],
+  gridOptions: [],
   options: {
     ...CRUD_OPTIONS,
-    // addBtnText: '添加网格',
     column: [
       {
-        label: '网格区',
-        prop: 'gridArea',
+        label: '网格员姓名',
+        prop: 'memberName',
+        searchLabelWidth: 100,
         search: true,
-        width: 200,
-        addDisplay: false,
-        editDisplay: false,
-        viewDisplay: true,
         rules: {
           required: true,
-          message: '请输入',
+          message: '请输入网格员姓名',
           trigger: 'blur',
         },
       },
       {
-        label: '网格名称',
-        prop: 'gridName',
-        search: true,
-        rules: {
-          required: true,
-          message: '请输入',
-          trigger: 'blur',
-        },
-      },
-      {
-        label: '网格区域',
+        label: '所属行政区域',
         prop: 'gridAreaName',
         width: 300,
-        display: false,
+        searchLabelWidth: 110,
+        search: true,
         rules: {
           required: true,
-          message: '请输入',
+          message: '请输入所属区域',
           trigger: 'blur',
         },
       },
       {
-        label: '网格区域',
-        prop: 'cities',
-        type: 'cascader',
-        hide: true,
-        addDisplay: true,
-        editDisplay: true,
-        viewDisplay: false,
-        // multiple: true,
-        // checkStrictly: true,
-        // collapseTags: true,
-        // emitPath: false,
-        // checkDescendants: false,
+        label: '所属网格',
+        prop: 'gridId',
+        type: 'select',
+        width: 200,
+        search: true,
+        dicData: [], // 初始为空，将在mounted中填充
         props: {
-          label: 'areaName',
-          value: 'areaCode',
-          children: 'areaChildVOS',
+          label: 'gridName',
+          value: 'id',
         },
-        dicUrl: `${VITE_APP_BASE_API}/system/area/region?areaCode=530000`,
-        dicHeaders: {
-          authorization: UserStore.token,
-        },
-        dicFormatter: (res) => res.data ?? [],
         rules: {
           required: true,
-          message: '请选择',
-          trigger: 'blur',
+          message: '请选择所属网格',
+          trigger: 'change',
         },
       },
       {
-        label: '网格管理员',
-        prop: 'gridManager',
-        rules: {
-          required: true,
-          message: '请输入',
-          trigger: 'blur',
-        },
+        label: '管理员标识',
+        prop: 'adminFlag',
+        type: 'radio',
+        dicData: [
+          { label: '是', value: '1' },
+          { label: '否', value: '0' },
+        ],
+        valueDefault: '0',
+        hide: true, // 隐藏字段，如需显示可设置为false
       },
       {
-        label: '联系方式',
-        prop: 'contactInfo',
-        rules: {
-          required: true,
-          message: '请输入',
-          trigger: 'blur',
-        },
-      },
-      {
-        label: '省',
-        prop: 'provinceCode',
-        hide: true,
-        display: false,
-      },
-      {
-        label: '市',
-        prop: 'cityCode',
-        hide: true,
-        display: false,
-      },
-      {
-        label: '县/区',
-        prop: 'gridAreaCode',
-        hide: true,
-        display: false,
-      },
-      {
-        label: '乡镇',
-        prop: 'townCode',
-        hide: true,
-        display: false,
-      },
-      {
-        label: '乡镇',
-        prop: 'village',
-        hide: true,
-        display: false,
+        label: '电话号码',
+        prop: 'phone',
+        rules: [
+          { required: true, message: '请输入电话号码', trigger: 'blur' },
+          { pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码' },
+        ],
       },
       {
         label: '备注',
         prop: 'note',
         type: 'textarea',
         span: 24,
-        rows: 4,
+        rows: 3,
         overHidden: true,
         width: 200,
       },
-      {
-        label: '创建时间',
-        prop: 'createTime',
-        width: 200,
-        hide: true,
-        display: false,
-      },
     ],
     actions: [
       {
@@ -210,10 +150,9 @@ const state = reactive({
   currentRow: {},
 });
 
-// 加载
 const loadData = () => {
   state.loading = true;
-  GetEntityList(state.query)
+  GetMemberList(state.query)
     .then((res) => {
       if (res.code === 200) {
         const { current, size, total, records } = res.data;
@@ -233,60 +172,56 @@ const loadData = () => {
       state.loading = false;
     });
 };
-
 loadData();
 
-// 页数
+// 加载网格列表
+const loadGridOptions = async () => {
+  try {
+    const res = await GetGridList(); // 获取足够多的网格数据
+    if (res.code === 200) {
+      state.options.column.find((item) => item.prop === 'gridId').dicData = res.data.records;
+    }
+  } catch (error) {
+    app.$message.error('获取网格列表失败');
+  }
+};
+loadGridOptions();
 const currentChange = (current) => {
-  state.query.current = current;
-  loadData();
+  // state.query.current = current;
+  // loadData();
 };
 
-// 条数
 const sizeChange = (size) => {
-  state.query.size = size;
-  loadData();
+  // state.query.size = size;
+  // loadData();
 };
 
-// 搜索
 const searchChange = (params, done) => {
-  if (done) done();
-  state.query = params;
-  state.query.current = 1;
-  loadData();
+  // if (done) done();
+  // state.query = params;
+  // state.query.current = 1;
+  // loadData();
 };
 
-// 刷新
 const refreshChange = () => {
   loadData();
   app.$message.success('刷新成功');
 };
 
-// 选择
 const selectionChange = (rows) => {
   state.selection = rows;
 };
 
-// 查看
 const rowView = (row) => {
   crudRef.value.rowView(row);
 };
 
-const setCity = (row) => {
-  if (!isEmpty(row.cities)) {
-    row.provinceCode = row?.cities[0] ?? null;
-    row.cityCode = row?.cities[1] ?? null;
-    row.gridAreaCode = row?.cities[2] ?? null;
-    row.townCode = row?.cities[3] ?? null;
-    row.village = row?.cities[4] ?? null;
-    // row.village = row?.cities.join(',');
-  }
+const rowEdit = (row) => {
+  crudRef.value.rowEdit(row);
 };
 
-// 新增
 const rowSave = (row, done, loading) => {
-  setCity(row);
-  AddEntity(row)
+  AddMember(row)
     .then((res) => {
       if (res.code === 200) {
         app.$message.success('添加成功！');
@@ -294,23 +229,12 @@ const rowSave = (row, done, loading) => {
         loadData();
       }
     })
-    .catch((err) => {
-      app.$message.error(err.msg);
-    })
-    .finally(() => {
-      loading();
-    });
+    .catch((err) => app.$message.error(err.msg))
+    .finally(() => loading());
 };
 
-// 编辑
-const rowEdit = (row) => {
-  const village = !isEmpty(row.village) ? row.village : [];
-  row.cities = compact([row.provinceCode, row.cityCode, row.gridAreaCode ?? '', row.townCode ?? '', ...village]);
-  crudRef.value.rowEdit(row);
-};
 const rowUpdate = (row, index, done, loading) => {
-  setCity(row);
-  UpdateEntity(row)
+  UpdateMember(row)
     .then((res) => {
       if (res.code === 200) {
         app.$message.success('更新成功！');
@@ -318,56 +242,48 @@ const rowUpdate = (row, index, done, loading) => {
         loadData();
       }
     })
-    .catch((err) => {
-      app.$message.error(err.msg);
-    })
-    .finally(() => {
-      loading();
-    });
+    .catch((err) => app.$message.error(err.msg))
+    .finally(() => loading());
 };
 
-// 删除
 const rowDel = (row, index, done) => {
   if (isEmpty(row)) return;
   app
-    .$confirm(`删除后信息将不可查看，确认要删除吗？`, '确定删除', {
+    .$confirm(`确认删除该网格员吗？`, '提示', {
       confirmButtonText: '确定',
       cancelButtonText: '取消',
       type: 'warning',
     })
     .then(() => {
-      DeleteEntity({ id: row.id })
+      DeleteMember(row.id) // 👈 只传 id
         .then((res) => {
           if (res.code === 200) {
             app.$message.success('删除成功！');
             loadData();
+            done?.(); // 若使用 Table 的 inline 操作支持回调
           }
         })
-        .catch((err) => {
-          app.$message.error(err.msg);
-        });
+        .catch((err) => app.$message.error(err.msg || '删除失败'));
     })
     .catch(() => {});
 };
 
-// 导出
 const onExport = () => {
   if (isEmpty(state.data)) {
     app.$message.error('当前暂时没有可供导出的数据！');
     return;
   }
   state.loading = true;
-  const fileName = '网格明细表';
-  ExportEntity(state.query)
+
+  // 仅发送有效的查询条件
+  const { current, size, ...query } = state.query;
+
+  ExportMember(query)
     .then((res) => {
-      if (res.status === 200) {
-        downloadFile(res.data, `${fileName}.xlsx`, 'blob');
-        app.$message.success('导出成功！');
-      }
-    })
-    .catch((err) => {
-      app.$message.error('导出失败！');
+      downloadFile(res, '网格员明细表.xlsx', 'blob');
+      app.$message.success('导出成功！');
     })
+    .catch(() => app.$message.error('导出失败！'))
     .finally(() => {
       state.loading = false;
     });