夏滨修改数据为真实数据

This commit is contained in:
13713575202 2025-05-23 14:33:04 +08:00
parent 92cf909ee6
commit 1502ba1d63
19 changed files with 205 additions and 129 deletions

View File

@ -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'

View File

@ -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,
//

View File

@ -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'

View File

@ -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'

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

View File

@ -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>

View File

@ -47,10 +47,10 @@ export const constantRoutes = [
...resourceRouter,
...productOperateMainRoutes,
...inputSuppliesRoutes,
produceGoods,
...plantingAndBreedingRouter,
// produceGoods,
// ...plantingAndBreedingRouter,
...traceRouter,
...systemRouter,
// ...systemRouter,
];
/**

View File

@ -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',

View File

@ -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',

View File

@ -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,
],
},

View File

@ -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',

View File

@ -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: '' },
},
],
},

View File

@ -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'],

View File

@ -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;
}

View File

@ -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',

View File

@ -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,
};

View File

@ -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>

View File

@ -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(
{

View File

@ -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>