From 761ae3eb6f2835595459705cd18d3eb5123bd138 Mon Sep 17 00:00:00 2001 From: 13713575202 <1345916905@qq.com> Date: Fri, 23 May 2025 16:58:57 +0800 Subject: [PATCH] xiabin --- .../src/router/modules/inputSupplies/index.js | 48 ++++----- .../src/router/modules/productOperateMain.js | 12 +-- .../src/views/home/index.vue | 2 +- .../src/views/trace/record/base/index.vue | 97 ++++++++++++++----- .../src/views/trace/record/seed/index.vue | 2 +- .../src/views/trace/statistic/index.vue | 6 +- 6 files changed, 110 insertions(+), 57 deletions(-) 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 7274aca..f73f253 100644 --- a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js +++ b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js @@ -60,36 +60,36 @@ const inputSuppliesRoutes = [ // }, ], }, - { - path: '/sub-government-affairs-service/productionDealer', - name: 'productionDealer', - component: () => import('@/views/inputSuppliesManage/productionDealer/index.vue'), - meta: { title: '企业经销商管理', icon: '' }, - }, - { - path: '/sub-government-affairs-service/enterpriseDealerCheck', - name: 'enterpriseDealerCheck', - component: () => import('@/views/inputSuppliesManage/enterpriseDealerCheck/index.vue'), - meta: { title: '企业经销商抽检', icon: '' }, - }, + // { + // path: '/sub-government-affairs-service/productionDealer', + // name: 'productionDealer', + // component: () => import('@/views/inputSuppliesManage/productionDealer/index.vue'), + // meta: { title: '企业经销商管理', icon: '' }, + // }, + // { + // path: '/sub-government-affairs-service/enterpriseDealerCheck', + // name: 'enterpriseDealerCheck', + // 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/leaseSupervise', - name: 'leaseSupervise', - component: () => import('@/views/inputSuppliesManage/leaseSupervise/index.vue'), - meta: { title: '农机租赁监管', icon: '' }, - }, - { - path: '/sub-government-affairs-service/redBlackRank', - name: 'redBlackRank', - component: () => import('@/views/inputSuppliesManage/redBlackRank/index.vue'), - meta: { title: '企业红黑榜', icon: '' }, - }, + // { + // path: '/sub-government-affairs-service/leaseSupervise', + // name: 'leaseSupervise', + // component: () => import('@/views/inputSuppliesManage/leaseSupervise/index.vue'), + // meta: { title: '农机租赁监管', icon: '' }, + // }, + // { + // path: '/sub-government-affairs-service/redBlackRank', + // name: 'redBlackRank', + // component: () => import('@/views/inputSuppliesManage/redBlackRank/index.vue'), + // meta: { title: '企业红黑榜', icon: '' }, + // }, { path: '/sub-government-affairs-service/knowledgeManage', name: 'knowledgeManage', diff --git a/sub-government-affairs-service/src/router/modules/productOperateMain.js b/sub-government-affairs-service/src/router/modules/productOperateMain.js index eecb357..b7cd559 100644 --- a/sub-government-affairs-service/src/router/modules/productOperateMain.js +++ b/sub-government-affairs-service/src/router/modules/productOperateMain.js @@ -68,12 +68,12 @@ export default [ name: 'examineList', meta: { title: '主体审核管理', icon: '' }, }, - { - path: '/sub-government-affairs-service/examineRecord', - component: () => import('@/views/productOperateMain/examine/record.vue'), - name: 'examineRecord', - meta: { title: '主体审核历史', icon: '' }, - }, + // { + // path: '/sub-government-affairs-service/examineRecord', + // component: () => import('@/views/productOperateMain/examine/record.vue'), + // name: 'examineRecord', + // 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 b3888ca..730c89a 100644 --- a/sub-government-affairs-service/src/views/home/index.vue +++ b/sub-government-affairs-service/src/views/home/index.vue @@ -195,7 +195,7 @@ 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: 18, name: '种子使用', type: '投入品', max: 100, unit: '吨' }, // { value: 55, name: '兽药使用', type: '投入品', max: 100, unit: '千克' }, { value: 65, name: '肥料使用', type: '投入品', max: 100, unit: '吨' }, ], diff --git a/sub-government-affairs-service/src/views/trace/record/base/index.vue b/sub-government-affairs-service/src/views/trace/record/base/index.vue index 4be45fc..ef10f2d 100644 --- a/sub-government-affairs-service/src/views/trace/record/base/index.vue +++ b/sub-government-affairs-service/src/views/trace/record/base/index.vue @@ -6,7 +6,7 @@ v-model:search="state.query" v-model:page="state.page" :table-loading="state.loading" - :data="state.data" + :data="res" :option="state.options" @refresh-change="refreshChange" @search-reset="searchChange" @@ -32,25 +32,78 @@ import { sleep } from '@/utils'; import { CRUD_OPTIONS } from '@/config'; import Mock from 'mockjs'; -const res = Mock.mock({ - 'data|20': [ - { - id: '@increment(100000)', - // name: '@ctitle(5,10)', - name: '一号基地', - 'area|100-1000': 100, - 'status|1-2': 1, - location: '东经 98°53′至 99°15′，北纬 23°27′至 23°40′F', - 'type|1-2': 1, - 'p1|1-2': 1, - 'p2|100-1000': 100, - p3: '@cname(2,3)', - tag: '龙津河周边', - address: '耿马镇白塔社区', - createTime: '@datetime("yyyy-MM-dd HH:mm:ss")', - }, - ], -}); +const res = [ + { + id: '1000012', + name: `1号基地`, + area: 100, + status: 1, + location: '东经 92°54′至 99°23′，北纬 20°27′至 18°41′F', + type: 1, + p1: 1, + p2: 100, + p3: '农户', + tag: '龙津河周边', + address: '耿马镇白塔社区', + createTime: '2024-10-12 22:30', + }, + { + id: '1000013', + name: `2号基地`, + area: 211, + status: 1, + location: '东经 92°54′至 99°21′，北纬 20°25′至 18°31′F', + type: 1, + p1: 1, + p2: 120, + p3: '农户', + tag: '龙津河周边', + address: '耿马镇白马社区', + createTime: '2024-02-26 20:30', + }, + { + id: '1000014', + name: `3号基地`, + area: 121, + status: 1, + location: '东经 92°53′至 99°22′，北纬 20°21′至 18°32′F', + type: 1, + p1: 1, + p2: 56, + p3: '合作社', + tag: '龙津河周边', + address: '耿马镇石灰窑村', + createTime: '2024-11-02 23:30', + }, + { + id: '1000015', + name: `4号基地`, + area: 231, + status: 2, + location: '东经 92°53′至 99°22′，北纬 20°21′至 18°32′F', + type: 2, + p1: 2, + p2: 145, + p3: '农户', + tag: '龙津河周边', + address: '耿马镇芒蚌村', + createTime: '2024-02-02 12:30', + }, + { + id: '1000016', + name: `5号基地`, + area: 231, + status: 2, + location: '东经 92°43′至 99°26′，北纬 21°21′至 18°22′F', + type: 2, + p1: 2, + p2: 145, + p3: '农户', + tag: '龙津河周边', + address: '耿马镇菜籽地村', + createTime: '2024-04-12 16:21', + }, +]; const app = useApp(); const crudRef = ref(null); @@ -190,7 +243,7 @@ const state = reactive({ trigger: 'blur', }, formatter: (row) => { - return row.area + 'm'; + return row.p2 + 'm'; }, }, { @@ -251,7 +304,7 @@ const loadData = async () => { await sleep(500); state.data = res.data; state.page = { - total: 20, + total: 5, currentPage: 1, pageSize: 10, }; 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 dbaa5a3..bb45f25 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 @@ -90,7 +90,7 @@ const state = reactive({ }, }, { - label: '供应商', + label: '生产厂家', prop: 'shop', search: true, with: 300, 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 7310fe2..417a850 100644 --- a/sub-government-affairs-service/src/views/trace/statistic/index.vue +++ b/sub-government-affairs-service/src/views/trace/statistic/index.vue @@ -236,12 +236,12 @@ const loadData = async () => { state.rankList = [ { name: '农户', - num: 1000, + num: 1389, icon: '1', }, { - name: '合作社', - num: 1000, + name: '农企/合作社', + num: 54, icon: '2', }, // {