Merge branch 'dev' of http://47.109.205.240:3000/Web/daimp-front into dev

sub-government-affairs-service/src/router/modules/trace.js

@@ -141,61 +141,60 @@ export default [
           },
         ],
       },
+      // {
+      //   path: '/sub-government-affairs-service/record',
+      //   name: 'record',
+      //   component: Views,
+      //   meta: { title: '种植档案', icon: 'Tickets' },
+      //   redirect: '/sub-government-affairs-service/record-base',
+      //   children: [
+      //     {
+      //       path: '/sub-government-affairs-service/record-base',
+      //       component: () => import('@/views/trace/record/base/index.vue'),
+      //       name: 'record-base',
+      //       meta: { title: '基地档案', icon: '' },
+      //     },
+      //     {
+      //       path: '/sub-government-affairs-service/record-seed',
+      //       component: () => import('@/views/trace/record/seed/index.vue'),
+      //       name: 'record-seed',
+      //       meta: { title: '种子档案', icon: '' },
+      //     },
+      //   ],
+      // },
+      // {
+      //   path: '/sub-government-affairs-service/agricultural',
+      //   name: 'agricultural',
+      //   component: Views,
+      //   meta: { title: '农事管理', icon: 'SetUp' },
+      //   redirect: '/sub-government-affairs-service/agricultural-coding',
+      //   children: [
+      //     {
+      //       path: '/sub-government-affairs-service/agricultural-coding',
+      //       component: () => import('@/views/trace/agricultural/coding/index.vue'),
+      //       name: 'agricultural-coding',
+      //       meta: { title: '采收与赋码管理', icon: '' },
+      //     },
+      //     {
+      //       path: '/sub-government-affairs-service/agricultural-quality',
+      //       component: () => import('@/views/trace/agricultural/quality/index.vue'),
+      //       name: 'agricultural-quality',
+      //       meta: { title: '产品质检管理', icon: '' },
+      //     },
+      //   ],
+      // },
       {
-        path: '/sub-government-affairs-service/record',
+        path: '/sub-government-affairs-service/trace',
-        name: 'record',
+        name: 'trace-management',
-        component: Views,
+        meta: { title: '溯源管理', icon: 'Connection' },
-        meta: { title: '种植档案', icon: 'Tickets' },
+        redirect: '/sub-government-affairs-service/trace-search',
-        redirect: '/sub-government-affairs-service/record-base',
         children: [
-          {
-            path: '/sub-government-affairs-service/record-base',
-            component: () => import('@/views/trace/record/base/index.vue'),
-            name: 'record-base',
-            meta: { title: '基地档案', icon: '' },
-          },
-          {
-            path: '/sub-government-affairs-service/record-seed',
-            component: () => import('@/views/trace/record/seed/index.vue'),
-            name: 'record-seed',
-            meta: { title: '种子档案', icon: '' },
-          },
-        ],
-      },
-      {
-        path: '/sub-government-affairs-service/agricultural',
-        name: 'agricultural',
-        component: Views,
-        meta: { title: '农事管理', icon: 'SetUp' },
-        redirect: '/sub-government-affairs-service/agricultural-coding',
-        children: [
-          {
-            path: '/sub-government-affairs-service/agricultural-coding',
-            component: () => import('@/views/trace/agricultural/coding/index.vue'),
-            name: 'agricultural-coding',
-            meta: { title: '采收与赋码管理', icon: '' },
-          },
-          {
-            path: '/sub-government-affairs-service/agricultural-quality',
-            component: () => import('@/views/trace/agricultural/quality/index.vue'),
-            name: 'agricultural-quality',
-            meta: { title: '产品质检管理', icon: '' },
-          },
-        ],
-      },
           {
             path: '/sub-government-affairs-service/trace-search',
             name: 'trace-search',
             component: () => import('@/views/trace/search/index.vue'),
             meta: { title: '溯源查询', icon: 'Files' },
           },
-      {
-        path: '/sub-government-affairs-service/trace-info',
-        name: 'trace-info',
-        component: () => import('@/views/trace/search/info.vue'),
-        meta: { title: '溯源详情', icon: 'DocumentCopy' },
-        hidden: true,
-      },
           {
             path: '/sub-government-affairs-service/trace-statistic',
             name: 'trace-statistic',
@@ -204,4 +203,13 @@ export default [
           },
         ],
       },
+      {
+        path: '/sub-government-affairs-service/trace-info',
+        name: 'trace-info',
+        component: () => import('@/views/trace/search/info.vue'),
+        meta: { title: '溯源详情', icon: 'DocumentCopy' },
+        hidden: true,
+      },
+    ],
+  },
 ];

sub-government-affairs-service/src/views/productOperateMain/coOp/index.vue

@@ -185,7 +185,7 @@ const crudOptions = reactive({
     { label: '所属行政区划', prop: 'address' },
     { label: '所属网格', prop: 'gridCode' },
     { label: '种植作物', prop: 'planCrop' },
-    { label: '账号（手机号）', prop: 'phone' },
+    // { label: '账号（手机号）', prop: 'phone' },
     { label: '信息录入时间', prop: 'createTime' },
     { label: '信息更新时间', prop: 'updateTime' },
   ],

sub-government-affairs-service/src/views/resource/database/Forest.vue

@@ -20,7 +20,13 @@
       :show-sort="true"
       style="height: calc(100vh - 320px)"
       @page-change="handlePageChange"
-    />
+    >
+      <template #action="scope">
+        <!-- <el-button size="small" @click="handleEdit(scope.row)">编辑</el-button>
+        <el-button size="small" type="danger" @click="handleDelete(scope.row)">删除</el-button> -->
+        <custom-table-operate :actions="getActions(scope.row)" :data="scope" />
+      </template>
+    </TableComponent>
     <el-dialog :key="dialogTitle" v-model="visible" :title="dialogTitle" width="60%" align-center :draggable="true">
       <el-tabs v-model="activeFormTab" class="tabs-wrapper">
         <el-tab-pane label="土地基本信息" name="basic">
@@ -40,7 +46,6 @@
                     clearable
                     check-strictly
                     :render-after-expand="false"
-                    @change="handleLandTypeChange"
                   />
                 </el-form-item>
                 <el-form-item label="具体位置" prop="address">
@@ -157,7 +162,6 @@ const activeTab = ref('1');
 const handleTabChange = ({ name }) => {
   //   activeTab.value = name;
   console.log('切换tab', activeTab.value);
-  searchForm.value.landStatus = Number(activeTab.value);
   getData();
 };
 
@@ -180,7 +184,7 @@ const columns = ref([
   { label: '土地承包经营人', prop: 'propertyName' },
   { label: '联系电话', prop: 'propertyPhone' },
   { label: '土地经营权证书编号', prop: 'landCode', width: 160 },
-  { label: '是否土地流转', prop: 'isTransfer' },
+  { label: '是否土地流转', prop: 'isTransfer', formatter: (row, column, cellValue) => (cellValue === 1 ? '是' : '否') },
   { label: '土地受让方', prop: 'transferName' },
   { label: '受让方联系电话', prop: 'transferPhone', width: 100 },
   { label: '流转合同', prop: 'transferContract' },
@@ -190,8 +194,62 @@ const columns = ref([
   // { label: '信息更新人', prop: 'updateName' },
   // { label: '信息更新单位', prop: 'updateGroup' },
   { label: '信息更新时间', prop: 'updateTime' },
+  { label: '操作', prop: 'action', slotName: 'action', fixed: 'right' },
 ]);
 
+const actions = [
+  {
+    name: '查看',
+    icon: 'view',
+    event: ({ row }) => handleView(row),
+  },
+  {
+    name: '编辑',
+    icon: 'edit',
+    event: ({ row }) => handleEdit(row),
+  },
+  {
+    type: 'danger',
+    name: '删除',
+    icon: 'delete',
+    event: ({ row }) => handleDelete(row.id),
+  },
+];
+const handleView = async (row) => {
+  isReadonly.value = true;
+  formData.value = await getLandDetail(row.id);
+  dialogTitle.value = '查看网格';
+  visible.value = true;
+};
+const handleEdit = (row) => {
+  isReadonly.value = false;
+  formData.value = { ...row };
+  dialogTitle.value = '编辑网格';
+  visible.value = true;
+};
+const handleDelete = async (row) => {
+  console.log('删除', row);
+  //   try {
+  //     await ElMessageBox.confirm('确认删除该网格吗？', '提示', {
+  //       confirmButtonText: '确定',
+  //       cancelButtonText: '取消',
+  //       type: 'warning',
+  //     });
+
+  //     const response = await deleteGrid(row.id);
+
+  //     ElMessage.success('删除成功');
+  //     getData();
+  //   } catch (error) {
+  //     if (error === 'cancel') {
+  //       ElMessage.info('已取消删除');
+  //     } else {
+  //       ElMessage.error('删除失败');
+  //       console.error('删除异常:', error);
+  //     }
+  //   }
+};
+
 const handlePageChange = ({ page, pageSize }) => {
   pageData.value.currentPage = page;
   pageData.value.pageSize = pageSize;
@@ -218,18 +276,16 @@ import { mockData } from './landData';
 import { createLand, deleteLand, editLand, fetchLandList, getLandById, approveLand } from '@/apis/landResourceManagement/landManagement';
 import request from '@/utils/axios';
 const getData = async () => {
-  //   const filteredParams = filterObject(searchForm.value);
-  //   const response = await fetchGridList(filteredParams);
-  //   crudData.value = Array.isArray(response.data.records) ? response.data.records : [];
   loading.value = true;
-  // 模拟接口延迟
+  const requestData = {
-  await new Promise((resolve) => setTimeout(resolve, 300));
+    ...searchForm.value,
-  tableData.value = mockData
+    page: pageData.value.currentPage,
-    .filter((item) => item.status === activeTab.value)
+    size: pageData.value.pageSize,
-    .map((item) => ({
+    landStatus: activeTab.value,
-      ...item,
+    landTypeName: '草地',
-      landTypeName: '林地',
+  };
-    }));
+  const response = await fetchLandList(requestData);
+  tableData.value = Array.isArray(response.data.records) ? response.data.records : [];
   pageData.value.total = tableData.value.length;
   loading.value = false;
 };
@@ -270,4 +326,51 @@ h1 {
   font-size: 20px;
   font-weight: bold;
 }
+.tabs-wrapper {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  // background-color: #7daaaa;
+
+  .el-tabs__header {
+    width: 100%;
+
+    .el-tabs__nav-scroll {
+      display: flex;
+      justify-content: center;
+    }
+
+    .el-tabs__item {
+      font-size: 16px;
+      color: #555555;
+      font-weight: 500;
+    }
+  }
+  :deep(.el-tabs__content) {
+    padding: 20px;
+    // background-color: #af8686;
+    border-radius: 4px;
+    width: 80%;
+    height: calc(100vh - 400px);
+    overflow-y: auto;
+
+    .el-tab-pane {
+      margin: 0 auto;
+      width: 100%;
+      // background-color: #555555;
+    }
+  }
+}
+
+.form-title {
+  font-size: 16px;
+  font-weight: 500;
+  margin: 30px 0;
+  color: #333333;
+}
+
+.dialog-footer {
+  display: block;
+  text-align: center;
+}
 </style>

sub-government-affairs-service/src/views/resource/database/Grassland.vue

@@ -31,7 +31,7 @@
       @size-change="handleSizeChange"
     >
       <template #menu="scope">
-        <custom-table-operate :actions="crudOptions.actions" :show="false" :data="scope" />
+        <custom-table-operate :actions="crudOptions.actions" :data="scope" />
       </template>
     </avue-crud>
     <el-dialog :key="dialogTitle" v-model="visible" :title="dialogTitle" width="60%" align-center :draggable="true">
@@ -236,7 +236,7 @@ const crudOptions = reactive({
     { label: '土地承包经营人', prop: 'propertyName' },
     { label: '联系电话', prop: 'propertyPhone' },
     { label: '土地经营权证书编号', prop: 'landCode', width: 160 },
-    { label: '是否土地流转', prop: 'landTransfer' },
+    { label: '是否土地流转', prop: 'landTransfer', formatter: (row, column, cellValue) => (cellValue === 1 ? '是' : '否') },
     { label: '土地受让方', prop: 'transferName' },
     { label: '受让方联系电话', prop: 'transferPhone', width: 100 },
     { label: '流转合同', prop: 'transferContract' },

sub-government-affairs-service/src/views/resource/database/components/LandSearch.vue

@@ -25,7 +25,7 @@
 </template>
 
 <script setup>
-import { ref } from 'vue';
+import { ref, computed } from 'vue';
 
 const props = defineProps({
   search: {

sub-government-affairs-service/src/views/trace/production-subjects/farmer/index.vue

@@ -190,10 +190,7 @@ const resetForm = () => {
 // ==============================
 const crudOptions = reactive({
   ...CRUD_OPTIONS,
-  addBtn: false,
+  header: false,
-  searchBtn: false,
-  emptyBtn: false,
-  refreshBtn: false,
   column: [
     { label: '主体编码', prop: 'id' },
     { label: '姓名', prop: 'name' },

sub-operation-service/src/assets/images/quit.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1751332976710" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9309" xmlns:xlink="http://www.w3.org/1999/xlink" width="48" height="48"><path d="M950.093 487.772L770.318 314.694c-14.382-13.851-35.955-13.851-50.336 0-14.382 13.842-14.382 34.614 0 48.465l118.647 114.228H493.461c-21.573 0-35.955 13.842-35.955 34.614s14.382 34.614 35.955 34.614h345.168L719.99 660.843c-14.382 13.851-14.382 34.623 0 48.465 7.192 6.93 14.382 10.386 25.164 10.386 10.792 0 17.982-3.465 25.173-10.386l179.775-176.535s0-3.465 3.6-3.465c10.782-10.386 10.782-31.149-3.6-41.535z" p-id="9310"></path><path d="M853.01 754.307c-21.573 0-35.955 13.851-35.955 34.614v69.237c0 20.763-14.382 34.614-35.955 34.614H169.865c-21.573 0-35.955-13.851-35.955-34.614V165.841c0-20.763 14.382-34.614 35.955-34.614H781.1c21.573 0 35.955 13.851 35.955 34.614v69.237c0 20.764 14.382 34.614 35.955 34.614s35.955-13.851 35.955-34.614v-69.237c0-58.842-46.736-103.842-107.865-103.842H169.865c-61.119 0-107.865 45-107.865 103.842v692.317C62 917 108.747 962 169.865 962H781.1c61.128 0 107.865-45 107.865-103.842v-69.237c0-20.764-14.382-34.614-35.955-34.614z" p-id="9311"></path></svg>

sub-operation-service/src/layouts/component/Header/index.vue

@@ -24,9 +24,12 @@
             <span>商家中心</span>
           </el-badge>
           <span @click="toUserCenter">个人中心</span>
-          <span class="block-icon" @click="toHome">
+          <span class="block-icon" style="line-height: 28px" @click="toHome">
-            <div class="iconfont icon-home" style="font-size: 12px"></div>
+            <el-tooltip effect="dark" content="退出" placement="bottom">
-            <span>返回首页</span>
+              <img src="@/assets/images/quit.svg" style="width: 20px" alt="" />
+            </el-tooltip>
+            <!-- <div class="iconfont icon-home" style="font-size: 12px"></div>
+            <span>返回首页</span> -->
           </span>
         </div>
       </div>
@@ -75,8 +78,6 @@ import { getAssetsFile } from '@/utils';
 import { getGoodNum } from '@/apis/agricultural.js';
 import { useMethodsStore } from '@/store/modules/methods';
 
-const { VITE_APP_PLATFORM } = import.meta.env;
-
 const router = useRouter();
 
 const keyword = ref('');
@@ -142,8 +143,7 @@ function Search() {
 
 const toHome = () => {
   console.info('toHome', router);
-  // router.push('/sub-operation-service');
+  router.push('/');
-  window.location.href = VITE_APP_PLATFORM;
 };
 
 const toUserCenter = () => {