Web/daimp-front
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tag2025061602master

Browse Source
This commit is contained in:
沈鸿 2025-06-16 22:54:51 +08:00
parent 5af0f0aefe
commit 7193836ea9
9 changed files with 27 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main/.env.development
View File

@ -13,9 +13,9 @@ VITE_APP_SUB_GSR = '//localhost:9530/new-digital-agriculture-screen/'
VITE_APP_BASE_API = '/apis'
VITE_APP_UPLOAD_API = '/uploadApis'
# 阿里云接口地址
# VITE_APP_BASE_URL = 'http://47.109.205.240:8080'
# VITE_APP_UPLOAD_URL = 'http://47.109.205.240:9300'
VITE_APP_BASE_URL = 'http://47.109.205.240:8080'
VITE_APP_UPLOAD_URL = 'http://47.109.205.240:9300'
# 内网接口地址
VITE_APP_BASE_URL = 'http://192.168.18.99:8080'
VITE_APP_UPLOAD_URL = 'http://192.168.18.99:8080'
# VITE_APP_BASE_URL = 'http://192.168.18.99:8080'
# VITE_APP_UPLOAD_URL = 'http://192.168.18.99:8080'
# VITE_APP_VIST_URL = 'http://192.168.18.99'

8
sub-government-affairs-service/.env.development
View File

@ -9,13 +9,11 @@ VITE_APP_BASE_API = '/apis'
VITE_APP_UPLOAD_API = '/uploadApis'
# 阿里云接口地址
# VITE_APP_BASE_URL = 'http://47.109.205.240:8080'
# VITE_APP_UPLOAD_URL = 'http://47.109.205.240:9204'
VITE_APP_BASE_URL = 'http://47.109.205.240:8080'
VITE_APP_UPLOAD_URL = 'http://47.109.205.240:9204'
# 内网测试库接口地址
VITE_APP_BASE_URL = 'http://192.168.18.99:8080'
# VITE_APP_UPLOAD_URL = 'http://192.168.18.98:9204'
VITE_APP_UPLOAD_URL = 'http://192.168.18.99:8080'
# VITE_APP_BASE_URL = 'http://192.168.18.99:8080'
# 本地开发接口地址
# VITE_APP_BASE_URL = 'http://192.168.18.74:8080'

7
sub-government-affairs-service/src/layouts/component/Avatar/index.vue
View File

@ -1,10 +1,3 @@
<!--
* @Description:
* @Author: zenghua.wang
* @Date: 2023-06-20 14:29:45
* @LastEditors: zenghua.wang
* @LastEditTime: 2025-02-18 09:48:18
-->
<template>
<el-dropdown class="layout-avatar">
<span class="el-dropdown-link">

7
sub-government-affairs-service/src/router/index.js
View File

@ -1,10 +1,3 @@
/*
* @Description: router
* @Author: zenghua.wang
* @Date: 2023-06-20 11:48:41
* @LastEditors: zenghua.wang
* @LastEditTime: 2025-03-26 16:14:45
*/
import { createRouter, createWebHistory } from 'vue-router';
import Layout from '@/layouts/index.vue';

30
sub-government-affairs-service/src/router/modules/inputSupplies/index.js
View File

@ -7,31 +7,31 @@ const inputSuppliesRoutes = [
name: 'inputSuppliesManage',
component: Layout,
redirect: '/sub-government-affairs-service/material/pesticide',
meta: { title: '投入品管理', icon: 'FullScreen' },
meta: { title: '农产品种植管理', icon: 'FullScreen' },
children: [
{
path: '/sub-government-affairs-service/material/annualPlans',
name: 'annualPlans',
component: () => import('@/views/inputSuppliesManage/material/annualPlan/index.vue'),
meta: { title: '农产品种植管理', icon: 'Timer' },
},
{
path: '/sub-government-affairs-service/material/pesticide',
name: 'input-supplies-pesticide',
component: () => import('@/views/inputSuppliesManage/material/pesticide/index.vue'),
meta: { title: '农药使用管理', icon: 'Orange' },
},
{
path: '/sub-government-affairs-service/material/fertilizer',
name: 'input-supplies-fertilizer',
component: () => import('@/views/inputSuppliesManage/material/fertilizer/index.vue'),
meta: { title: '肥料使用管理', icon: 'Grid' },
meta: { title: '农产品种植进度管理', icon: 'Timer' },
},
{
path: '/sub-government-affairs-service/material/seed',
name: 'input-supplies-seed',
component: () => import('@/views/inputSuppliesManage/material/seed/index.vue'),
meta: { title: '种子使用管理', icon: 'Watermelon' },
meta: { title: '种子种苗管理', icon: 'Watermelon' },
},
{
path: '/sub-government-affairs-service/material/fertilizer',
name: 'input-supplies-fertilizer',
component: () => import('@/views/inputSuppliesManage/material/fertilizer/index.vue'),
meta: { title: '肥料管理', icon: 'Grid' },
},
{
path: '/sub-government-affairs-service/material/pesticide',
name: 'input-supplies-pesticide',
component: () => import('@/views/inputSuppliesManage/material/pesticide/index.vue'),
meta: { title: '农药管理', icon: 'Orange' },
},
{
path: '/sub-government-affairs-service/material/others',

2
sub-government-affairs-service/src/views/inputSuppliesManage/material/annualPlan/index.vue
View File

@ -322,7 +322,7 @@ const state = reactive({
},
{ label: '所属行政区域', prop: 'regionName' },
{ label: '所属网格', prop: 'gridName' },
{ label: '当前进度', prop: 'currentProgress' },
{ label: '当前进度', prop: 'currentProgress', formatter: (row, column, cellValue) => `${cellValue} %` },
],
actions: [
{

2
sub-government-affairs-service/src/views/outputProductsManage/index.vue
View File

@ -159,7 +159,7 @@ const crudOptions = reactive({
column: [
{ label: '农产品名称', prop: 'productName', width: 150 },
{ label: '地块', prop: 'landName' },
{ label: '面积（亩）', prop: 'area' },
{ label: '面积（亩）', prop: 'area', formatter: (row, cloumn, cellValue) => `${Number(cellValue).toFixed(2)} 亩` },
{ label: '网格', prop: 'gridName' },
{ label: '行政区划', prop: 'gridAreaName' },
{ label: '姓名', prop: 'name' },

2
sub-government-affairs-service/src/views/productOperateMain/individual/index.vue
View File

@ -222,7 +222,7 @@ const crudOptions = reactive({
{ label: '年龄', prop: 'age' },
{ label: '联系方式', prop: 'phone' },
{ label: '居住地行政区划', prop: 'address' },
{ label: '种植作物', prop: 'planCrop' },
{ label: '种植作物', prop: 'planCropName' },
{ label: '创建时间', prop: 'createTime' },
{ label: '更新时间', prop: 'updateTime' },
],

2
sub-government-affairs-service/src/views/resource/database/Statistics.vue
View File

@ -13,5 +13,7 @@ import { getAssetsFile } from '@/utils';
<style scoped lang="scss">
.custom-page {
height: calc(100vh - 150px);
background-size: cover;
background-repeat: no-repeat;
}
</style>