Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
姚俊旭 2025-06-24 15:23:21 +08:00
commit 8a94240c7b
24 changed files with 15018 additions and 1820 deletions

View File

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

View File

@ -9,13 +9,13 @@ VITE_APP_BASE_API = '/apis'
VITE_APP_UPLOAD_API = '/uploadApis' VITE_APP_UPLOAD_API = '/uploadApis'
# 阿里云接口地址 # 阿里云接口地址
VITE_APP_BASE_URL = 'http://47.109.205.240:8080' # VITE_APP_BASE_URL = 'http://47.109.205.240:8080'
VITE_APP_UPLOAD_URL = 'http://47.109.205.240:9204' # VITE_APP_UPLOAD_URL = 'http://47.109.205.240:9204'
# 内网测试库接口地址 # 内网测试库接口地址
# VITE_APP_BASE_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_UPLOAD_URL = 'http://192.168.18.99:8080'
# 本地开发接口地址 # 本地开发接口地址
# VITE_APP_BASE_URL = 'http://192.168.18.74:8080' VITE_APP_BASE_URL = 'http://192.168.18.99:8080'
# VITE_APP_UPLOAD_URL = 'http://192.168.18.74:8080' VITE_APP_UPLOAD_URL = 'http://192.168.18.99:8080'

View File

@ -0,0 +1,19 @@
/* eslint-disable */
/* prettier-ignore */
// @ts-nocheck
// Generated by unplugin-vue-components
// Read more: https://github.com/vuejs/core/pull/3399
export {}
declare module 'vue' {
export interface GlobalComponents {
AreaCascader: typeof import('./src/components/AreaCascader/index.vue')['default']
AreaSelect: typeof import('./src/components/AreaSelect/index.vue')['default']
CodeDialog: typeof import('./src/components/code-dialog/index.vue')['default']
FileUploader: typeof import('./src/components/FileUploader/index.vue')['default']
RouterLink: typeof import('vue-router')['RouterLink']
RouterView: typeof import('vue-router')['RouterView']
TableComponent: typeof import('./src/components/tableComponent.vue')['default']
UrlSelect: typeof import('./src/components/UrlSelect/index.vue')['default']
}
}

File diff suppressed because it is too large Load Diff

View File

@ -34,6 +34,7 @@
"screenfull": "^6.0.2", "screenfull": "^6.0.2",
"splitpanes": "^4.0.3", "splitpanes": "^4.0.3",
"vue": "^3.3.11", "vue": "^3.3.11",
"vue-demi": "^0.14.10",
"vue-router": "^4.2.5", "vue-router": "^4.2.5",
"vue-tianditu": "^2.7.6" "vue-tianditu": "^2.7.6"
}, },

View File

@ -84,7 +84,7 @@ export function delAnimalMedicine(ids) {
// #region // #region
/* 查询种源 */ /* 查询种源 */
export function getSeedList(params) { export function getSeedList(params) {
return request('/inputGoods/provenance/page', { return request('/inputGoods/supervise/provenance/page', {
params, params,
}); });
} }

View File

@ -0,0 +1,56 @@
import request from '@/utils/axios';
/* 种子使用监管-列表 */
export function getSeedUseRegulatoryRecords(params) {
return request('/inputGoods/supervise/provenance/page', {
params,
});
}
/* 种子使用监管-新增 */
export function seedUseRegulatorySave(data) {
return request('/inputGoods/supervise/provenance/save', {
method: 'POST',
data,
});
}
/* 种子使用监管-编辑 */
export function editSeedUseRegulatory(data) {
return request('/inputGoods/supervise/provenance/edit', {
data,
method: 'PUT',
});
}
/* 种子使用监管-删除 */
export function delSeedUseRegulatory(ids) {
return request(`/inputGoods/supervise/provenance/delete/${ids}`);
}
/* 获取详情-通用传入url和参数 */
export function getRowDetails({ url, id }) {
return request(`${url}${id}`);
}
/* 肥料使用监管-列表 */
export function getFertilizeUseRegulatoryRecords(params) {
return request('/inputGoods/supervise/fertilize/page', {
params,
});
}
/* 肥料使用监管-新增 */
export function fertilizeUseRegulatorySave(data) {
return request('/inputGoods/supervise/fertilize/save', {
method: 'POST',
data,
});
}
/* 肥料使用监管-编辑 */
export function editFertilizeUseRegulatory(data) {
return request('/inputGoods/supervise/fertilize/edit', {
data,
method: 'PUT',
});
}
/* 肥料使用监管-删除 */
export function delFertilizeUseRegulatory(ids) {
return request(`/inputGoods/supervise/fertilize/delete/${ids}`);
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 472 KiB

View File

@ -9,12 +9,12 @@ const inputSuppliesRoutes = [
redirect: '/sub-government-affairs-service/material/pesticide', redirect: '/sub-government-affairs-service/material/pesticide',
meta: { title: '农产品种植管理', icon: 'FullScreen' }, meta: { title: '农产品种植管理', icon: 'FullScreen' },
children: [ children: [
{ // {
path: '/sub-government-affairs-service/statistics', // path: '/sub-government-affairs-service/statistics',
name: 'Statistics', // name: 'Statistics',
component: () => import('@/views/planting-management/statistics/index.vue'), // component: () => import('@/views/planting-management/statistics/index.vue'),
meta: { title: '使用监管概况统计', icon: 'PieChart' }, // meta: { title: '使用监管概况统计', icon: 'PieChart' },
}, // },
{ {
path: '/sub-government-affairs-service/variety-record', path: '/sub-government-affairs-service/variety-record',
name: 'PlantVarietyRecord', name: 'PlantVarietyRecord',
@ -25,31 +25,57 @@ const inputSuppliesRoutes = [
path: '/sub-government-affairs-service/material/annualPlans', path: '/sub-government-affairs-service/material/annualPlans',
name: 'annualPlans', name: 'annualPlans',
component: () => import('@/views/inputSuppliesManage/material/annualPlan/index.vue'), component: () => import('@/views/inputSuppliesManage/material/annualPlan/index.vue'),
meta: { title: '农产品种植进度管理', icon: 'Timer' }, 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' },
// },
// {
// 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',
// name: 'input-supplies-others',
// component: () => import('@/views/inputSuppliesManage/material/others/index.vue'),
// meta: { title: '其他投入品管理', icon: 'TakeawayBox' },
// },
{ {
path: '/sub-government-affairs-service/material/seed', path: '/sub-government-affairs-service/supervisionOfInputs ',
name: 'input-supplies-seed', name: 'supervisionOfInputs',
component: () => import('@/views/inputSuppliesManage/material/seed/index.vue'), redirect: '/sub-government-affairs-service/supervisionOfInputs/seedRegulation',
meta: { title: '种子种苗管理', icon: 'Watermelon' }, meta: { title: '投入品使用监管', icon: 'Connection' },
}, children: [
{ {
path: '/sub-government-affairs-service/material/fertilizer', path: '/sub-government-affairs-service/statistics',
name: 'input-supplies-fertilizer', name: 'Statistics',
component: () => import('@/views/inputSuppliesManage/material/fertilizer/index.vue'), component: () => import('@/views/planting-management/statistics/index.vue'),
meta: { title: '肥料管理', icon: 'Grid' }, meta: { title: '使用监管概况统计', icon: '' },
}, },
{ {
path: '/sub-government-affairs-service/material/pesticide', path: '/sub-government-affairs-service/supervisionOfInputs/seedRegulation',
name: 'input-supplies-pesticide', name: 'seedRegulation',
component: () => import('@/views/inputSuppliesManage/material/pesticide/index.vue'), component: () => import('@/views/inputSuppliesManage/supervisionOfInputs/seedRegulation.vue'),
meta: { title: '农药管理', icon: 'Orange' }, meta: { title: '种子使用监管', icon: '' },
}, },
{ {
path: '/sub-government-affairs-service/material/others', path: '/sub-government-affairs-service/supervisionOfInputs/fertilizerRegulation',
name: 'input-supplies-others', name: 'fertilizerRegulation',
component: () => import('@/views/inputSuppliesManage/material/others/index.vue'), component: () => import('@/views/inputSuppliesManage/supervisionOfInputs/fertilizerRegulation.vue'),
meta: { title: '其他投入品管理', icon: 'TakeawayBox' }, meta: { title: '肥料使用监管', icon: '' },
},
],
}, },
], ],
}, },

View File

@ -9,12 +9,12 @@ const landsRoutes = [
redirect: '/sub-government-affairs-service/plantPlan', redirect: '/sub-government-affairs-service/plantPlan',
meta: { title: '土地管理', icon: 'Grape' }, meta: { title: '土地管理', icon: 'Grape' },
children: [ children: [
{ // {
path: '/sub-government-affairs-service/landsManage', // path: '/sub-government-affairs-service/landsManage',
name: 'landsManage', // name: 'landsManage',
component: () => import('@/views/landManage/component/landsManage/index.vue'), // component: () => import('@/views/landManage/component/landsManage/index.vue'),
meta: { title: '土地资源信息登记', icon: '' }, // meta: { title: '土地资源信息登记', icon: '' },
}, // },
// { // {
// path: '/sub-government-affairs-service/plantPlan', // path: '/sub-government-affairs-service/plantPlan',
// name: 'plantPlan', // name: 'plantPlan',

View File

@ -37,8 +37,8 @@
> >
<!-- 自定义-操作 --> <!-- 自定义-操作 -->
<template #action="slotProps"> <template #action="slotProps">
<el-button type="primary" @click="seeDetails(slotProps.row)">详情</el-button> <!-- <el-button type="primary" @click="seeDetails(slotProps.row)">详情</el-button> -->
<el-button type="primary" @click="handleEdit(slotProps.row)">编辑</el-button> <!-- <el-button type="primary" @click="handleEdit(slotProps.row)">编辑</el-button> -->
<el-button @click="handleDelete(slotProps.row)">删除</el-button> <el-button @click="handleDelete(slotProps.row)">删除</el-button>
</template> </template>
</tableComponent> </tableComponent>
@ -76,7 +76,7 @@
:clearable="false" :clearable="false"
type="date" type="date"
value-format="YYYY-MM-DD" value-format="YYYY-MM-DD"
placeholder="请选择起始日期" placeholder="请选择检测时间"
/> />
</el-form-item> </el-form-item>
<el-form-item label="检测结果" prop="detectionResult" class="dialog-form-item"> <el-form-item label="检测结果" prop="detectionResult" class="dialog-form-item">
@ -199,14 +199,14 @@ const tableLoading = ref(false);
const tableTotal = ref(0); const tableTotal = ref(0);
const columns = ref([ const columns = ref([
// { prop: "id", label: "ID" }, // { prop: "id", label: "ID" },
{ prop: 'name', label: '类别名称' }, { prop: 'name', label: '姓名' },
{ prop: 'phone', label: '联系方式' }, { prop: 'phone', label: '联系方式' },
{ prop: 'landName', label: '用药地块' }, { prop: 'landName', label: '用药地块' },
{ prop: 'detectionTime', label: '检测时间' }, { prop: 'detectionTime', label: '检测时间' },
{ prop: 'detectionResult', label: '检测结果' }, { prop: 'detectionResult', label: '检测结果' },
{ prop: 'detectionUnit', label: '检测单位' }, { prop: 'detectionUnit', label: '检测单位' },
// { prop: 'status', label: '()' }, { prop: 'isUpload', label: '检测报告(是否上传)' },
{ prop: 'action', label: '操作', slotName: 'action', width: 230, fixed: 'right' }, // { prop: 'action', label: '', slotName: 'action', width: 230, fixed: 'right' },
]); ]);
const handlePaginationChange = ({ page, pageSize }) => { const handlePaginationChange = ({ page, pageSize }) => {
formInline.current = page; formInline.current = page;

View File

@ -38,11 +38,11 @@
@page-change="handlePaginationChange" @page-change="handlePaginationChange"
> >
<!-- 自定义-操作 --> <!-- 自定义-操作 -->
<template #action="slotProps"> <!-- <template #action="slotProps">
<el-button type="primary" @click="seeDetails(slotProps.row)">查看</el-button> <el-button type="primary" @click="seeDetails(slotProps.row)">查看</el-button>
<el-button type="primary" @click="handleEdit(slotProps.row)">编辑</el-button> <el-button type="primary" @click="handleEdit(slotProps.row)">编辑</el-button>
<el-button @click="handleDelete(slotProps.row)">删除</el-button> <el-button @click="handleDelete(slotProps.row)">删除</el-button>
</template> </template> -->
</tableComponent> </tableComponent>
</div> </div>
</div> </div>
@ -136,13 +136,30 @@ const selectedIds = ref([]);
const tableLoading = ref(false); const tableLoading = ref(false);
const tableTotal = ref(0); const tableTotal = ref(0);
const columns = ref([ const columns = ref([
{ prop: 'seedName', label: '种子种苗名称' }, //
{ prop: 'varietyName', label: '品种名称' }, { prop: 'regionCode', label: '行政区划编码' },
{ prop: 'brand', label: '品牌' }, //
{ prop: 'manufacturer', label: '生产厂家' }, { prop: 'regionCode', label: '行政区划名称' },
{ prop: 'classifyName', label: '分类' }, //
{ prop: 'productUnit', label: '产品规格' }, { prop: 'gridId', label: '网格编码' },
{ prop: 'action', label: '操作', slotName: 'action', width: 230, fixed: 'right' }, //
{ prop: 'gridName', label: '网格名称' },
//
{ prop: 'landId', label: '地块编号' },
//
{ prop: 'landName', label: '地块名称' },
//
{ prop: 'provenanceId', label: '种子编号' },
{ prop: 'provenanceName', label: '种子种苗名称' },
// 使
{ prop: 'useNumber', label: '使用量' },
// 使
{ prop: 'useTime', label: '使用时间' },
//
{ prop: 'businessEntityCode', label: '生成经营主体编码' },
//
{ prop: 'businessEntityName', label: '生产经营主体名称' },
// { prop: 'action', label: '', slotName: 'action', width: 230, fixed: 'right' },
]); ]);
const handlePaginationChange = ({ page, pageSize }) => { const handlePaginationChange = ({ page, pageSize }) => {
formInline.current = page; formInline.current = page;

View File

@ -0,0 +1,424 @@
<template>
<div class="app-container">
<div class="container-custom">
<h2 class="custom-h2">肥料使用监管</h2>
<div ref="searchBarRef" class="search-box">
<div class="search-bar">
<div class="search-bar-left">
<el-form ref="searchForm" :inline="true" :model="formInline" class="demo-form-inline" :label-width="'auto'">
<el-form-item label="关键字" prop="name">
<el-input v-model="formInline.name" placeholder="请输入姓名" clearable />
</el-form-item>
<!-- <el-form-item label="分类" prop="seedTypeId">
<el-select v-model="formInline.seedTypeId" placeholder="请选择" clearable @change="seedTypeChange">
<el-option v-for="item in seedTypeList" :key="item.id" :value="item.id" :label="item.dataName" />
</el-select>
</el-form-item> -->
<el-form-item label="">
<el-button type="primary" icon="Search" @click="onSubmit">查询</el-button>
<el-button icon="Refresh" @click="resetForm">重置</el-button>
</el-form-item>
</el-form>
</div>
</div>
</div>
<div class="table-toolbar">
<el-button type="primary" icon="plus" @click="addItem()">新增</el-button>
</div>
<div class="table-cont">
<tableComponent
:table-data="tableData"
:columns="columns"
:show-selection="false"
:loading="tableLoading"
:total="tableTotal"
:current-page="formInline.current"
:page-size="formInline.size"
:show-sort="false"
@page-change="handlePaginationChange"
>
<!-- 自定义-操作 -->
<template #action="slotProps">
<el-button type="primary" @click="seeDetails(slotProps.row)">查看</el-button>
<el-button type="primary" @click="handleEdit(slotProps.row)">编辑</el-button>
<el-button @click="handleDelete(slotProps.row)">删除</el-button>
</template>
</tableComponent>
</div>
</div>
<el-dialog v-model="dialogFormVisible" :title="dialogTitle" width="800" :close-on-click-modal="false">
<el-form
ref="dialogRef"
:model="dialogForm"
:inline="true"
:label-width="'120'"
:rules="dialogFormRules"
:disabled="formDisabled"
class="dialog-form-container"
>
<el-form-item label="种子种苗名称" prop="seedName" class="dialog-form-item">
<el-input v-model="dialogForm.seedName" clearable placeholder="请输入种子种苗名称" />
</el-form-item>
<el-form-item label="品种名称" prop="varietyName" class="dialog-form-item">
<el-input v-model="dialogForm.varietyName" clearable placeholder="请输入品种名称" />
</el-form-item>
<el-form-item label="品牌" prop="brand" class="dialog-form-item">
<el-input v-model="dialogForm.brand" clearable placeholder="请输入品牌" />
</el-form-item>
<el-form-item label="生产厂家" prop="manufacturer" class="dialog-form-item">
<el-input v-model="dialogForm.manufacturer" clearable placeholder="请输入生产厂家" />
</el-form-item>
<el-form-item label="蔬菜种苗" prop="classifyId" class="dialog-form-item">
<el-cascader
v-model="dialogForm.classifyId"
:options="seedTypeDialogList"
:props="cascaderProps"
placeholder="请选择"
@change="handleCascaderChange"
/>
</el-form-item>
<el-form-item label="产品规格" prop="productUnit" class="dialog-form-item">
<el-input v-model="dialogForm.productUnit" clearable placeholder="请输入产品规格" />
</el-form-item>
<div style="display: flex">
<div style="width: 50%; display: inline-block">
<el-form-item label="种子种苗主图" prop="photoUrl" class="dialog-form-item" style="width: 100%">
<FileUploader v-model="dialogForm.photoUrl" :limit="1" />
</el-form-item>
</div>
<div style="width: 50%; display: inline-block">
<el-form-item label="种子种苗详情图" prop="photoUrlDetail" class="dialog-form-item" style="width: 100%">
<FileUploader v-model="dialogForm.photoUrlDetail" :limit="1" />
</el-form-item>
</div>
</div>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button v-if="!formDisabled" type="primary" @click="onSaveCategory">保存</el-button>
<el-button v-if="!formDisabled" @click="cancelDialog">取消</el-button>
<el-button v-else @click="cancelDialog">关闭</el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script setup>
import { ref, reactive, computed, onMounted, onBeforeUnmount, nextTick } from 'vue';
import tableComponent from '@/components/tableComponent.vue';
import { ElMessage } from 'element-plus';
import inputSuppliesApi from '@/apis/inputSuppliesApi';
const { getMaterailTypes } = inputSuppliesApi;
import {
getFertilizeUseRegulatoryRecords,
fertilizeUseRegulatorySave,
editFertilizeUseRegulatory,
delFertilizeUseRegulatory,
getRowDetails,
} from '@/apis/inputSuppliesApi/supervisionOfInputs';
import { useApp } from '@/hooks';
const app = useApp();
//
const formInline = reactive({
name: '',
seedTypeId: '',
current: 1,
size: 10,
});
const searchForm = ref(null);
const onSubmit = () => {
formInline.current = 1;
loadData();
};
const resetForm = () => {
searchForm.value.resetFields();
};
//
const tableData = ref([]);
const selectedIds = ref([]);
const tableLoading = ref(false);
const tableTotal = ref(0);
const columns = ref([
{ prop: 'regionName', label: '所属行政区域' },
{ prop: 'regionCode', label: '行政区域编号' },
{ prop: 'landName', label: '地块名称' },
{ prop: 'landId', label: '地块编号' },
{ prop: 'gridName', label: '所属网格' },
{ prop: 'gridId', label: '网格编号' },
{ prop: 'name', label: '负责人姓名' },
{ prop: 'phone', label: '联系方式' },
{ prop: 'fertilizeId', label: '化肥编号' },
{ prop: 'fertilizeName', label: '化肥名称' },
// { prop: 'action', label: '', slotName: 'action', width: 230, fixed: 'right' },
]);
const handlePaginationChange = ({ page, pageSize }) => {
formInline.current = page;
formInline.size = pageSize;
loadData();
};
const loadData = async () => {
tableLoading.value = true;
try {
let response = await getFertilizeUseRegulatoryRecords(formInline);
tableLoading.value = false;
if (response.code == 200) {
tableData.value = response.data.records;
tableTotal.value = response.data.total;
}
} catch (error) {
tableLoading.value = false;
console.error(error);
}
};
const extractThirdLevelChildren = (dataArray) => {
let result = [];
//
for (const level1 of dataArray) {
// children
if (level1.children && Array.isArray(level1.children)) {
//
for (const level2 of level1.children) {
// children
if (level2.children && Array.isArray(level2.children)) {
//
result.push(...level2.children);
}
}
}
}
return result;
};
const seedTypeChange = () => {
console.log(formInline.seedTypeId);
//
};
const dialogFormVisible = ref(false);
const dialogRef = ref(null);
const dialogTitle = ref('新增');
const formDisabled = ref(false);
const dialogForm = reactive({
id: '',
seedName: '', //
varietyName: '', //
brand: '', //
manufacturer: '', //
classifyId: '', //id
classifyName: '', //
productSpecification: '', //number
productUnit: '', //
productAttributes: '', //
photoUrl: '', //
photoUrlDetail: '', //
});
const dialogFormRules = ref({
seedName: [{ required: true, message: '请输入种子种苗名称', trigger: 'blur' }],
varietyName: [{ required: true, message: '请输入品种名称', trigger: 'blur' }],
brand: [{ required: true, message: '请输入品牌', trigger: 'blur' }],
manufacturer: [{ required: true, message: '请输入品牌', trigger: 'blur' }],
classifyId: [
{
required: true,
message: '请选择蔬菜种苗',
trigger: ['change', 'blur'],
},
],
productUnit: [{ required: true, message: '请输入产品规格', trigger: 'blur' }],
});
//
const addItem = async () => {
restDialogForm();
dialogTitle.value = '新增';
formDisabled.value = false;
dialogFormVisible.value = true;
};
//
const seeDetails = async (row) => {
dialogTitle.value = '详情';
setDialogForm(row);
formDisabled.value = true;
dialogFormVisible.value = true;
};
//
const handleEdit = (row) => {
console.log('要编辑的行: ', row);
dialogTitle.value = '编辑';
setDialogForm(row);
formDisabled.value = false;
dialogFormVisible.value = true;
};
const setDialogForm = (row) => {
dialogForm.id = row.id;
dialogForm.seedName = row.seedName;
dialogForm.varietyName = row.varietyName;
dialogForm.brand = row.brand;
dialogForm.manufacturer = row.manufacturer;
dialogForm.classifyId = row.classifyId;
dialogForm.classifyName = row.classifyName;
dialogForm.productSpecification = row.productSpecification;
dialogForm.productUnit = row.productUnit;
dialogForm.productAttributes = row.productAttributes;
dialogForm.photoUrl = row.photoUrl;
dialogForm.photoUrlDetail = row.photoUrlDetail;
};
//
const handleDelete = (row) => {
app
.$confirm(`删除后信息将不可查看,确认要删除吗?`, '确定删除', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
deleteGoods(row.id)
.then((res) => {
if (res.code === 200) {
onSubmit();
app.$message.success('删除成功!');
}
})
.catch((err) => {
app.$message.error(err.msg);
});
})
.catch(() => {});
};
const deleteGoods = async (ids) => {
try {
let res = await delFertilizeUseRegulatory(ids);
return res;
} catch (error) {
return false;
}
};
const onSaveCategory = () => {
console.log(dialogForm);
dialogRef.value.validate(async (valid, fields) => {
if (valid) {
try {
let param = { ...dialogForm };
param.classifyId = dialogForm.classifyId.join(',');
param.classifyName = dialogForm.classifyName.join(',');
console.log(param);
let response;
if (dialogTitle.value == '新增') {
response = await fertilizeUseRegulatorySave(param);
} else {
response = await editFertilizeUseRegulatory(param);
}
if (response.code == 200) {
cancelDialog();
onSubmit();
if (dialogTitle.value == '新增') {
ElMessage.success('新增成功!');
} else {
ElMessage.success('编辑成功!');
}
} else {
ElMessage.error(response.msg);
}
} catch (error) {
console.error(error);
}
}
});
};
const cancelDialog = async () => {
restDialogForm();
dialogFormVisible.value = false;
};
const restDialogForm = () => {
Object.assign(dialogForm, {
id: '',
seedName: '', //
varietyName: '', //
brand: '', //
manufacturer: '', //
classifyId: '', //id
classifyName: '', //
productSpecification: '', //number
productUnit: '', //
productAttributes: '', //
photoUrl: '', //
photoUrlDetail: '', //
});
};
const seedTypeList = ref([]);
const seedTypeDialogList = ref([]);
const getSeedTypeList = async () => {
try {
let response = await getMaterailTypes({ moduleType: '4' });
console.log(response);
if (response.code == 200) {
if (response.data?.length > 0) {
seedTypeDialogList.value = response.data[0].children;
let result = extractThirdLevelChildren(response.data);
seedTypeList.value = result;
console.log(seedTypeDialogList.value);
}
}
} catch (error) {
console.error(error);
}
};
//
const cascaderProps = ref({
label: 'dataName', //
value: 'id', //
children: 'children', //
emitPath: true,
expandTrigger: 'hover',
});
const handleCascaderChange = () => {
const selectedNames = getSelectedNames(dialogForm.classifyId);
console.log('对应的名称:', selectedNames); // : ['', '']
//
dialogForm.classifyName = selectedNames;
};
const getSelectedNames = (ids) => {
if (!ids || !ids.length) return [];
let names = [];
let currentLevel = seedTypeDialogList.value;
for (const id of ids) {
const foundItem = currentLevel.find((item) => item.id === id);
if (!foundItem) break;
names.push(foundItem.dataName);
currentLevel = foundItem.children || [];
}
return names;
};
onMounted(() => {
onSubmit();
getSeedTypeList();
});
</script>
<style lang="scss" scoped>
.dialog-form-item {
:deep(.el-upload--picture-card) {
width: 100px;
height: 100px;
}
:deep(.file-uploader__upload) {
width: 100px;
height: 100px;
}
:deep(.el-upload-list__item) {
width: 100px;
height: 100px;
}
}
</style>

View File

@ -0,0 +1,7 @@
<template>
<div>使用监管概览开发中...</div>
</template>
<script setup></script>
<style lang="scss" scoped></style>

View File

@ -0,0 +1,438 @@
<template>
<div class="app-container">
<div class="container-custom">
<h2 class="custom-h2">种子使用监管</h2>
<div ref="searchBarRef" class="search-box">
<div class="search-bar">
<div class="search-bar-left">
<el-form ref="searchForm" :inline="true" :model="formInline" class="demo-form-inline" :label-width="'auto'">
<el-form-item label="关键字" prop="name">
<el-input v-model="formInline.name" placeholder="请输入" clearable />
</el-form-item>
<!-- <el-form-item label="分类" prop="seedTypeId">
<el-select v-model="formInline.seedTypeId" placeholder="请选择" clearable @change="seedTypeChange">
<el-option v-for="item in seedTypeList" :key="item.id" :value="item.id" :label="item.dataName" />
</el-select>
</el-form-item> -->
<el-form-item label="">
<el-button type="primary" icon="Search" @click="onSubmit">查询</el-button>
<el-button icon="Refresh" @click="resetForm">重置</el-button>
</el-form-item>
</el-form>
</div>
</div>
</div>
<div class="table-toolbar">
<el-button type="primary" icon="plus" @click="addItem()">新增</el-button>
</div>
<div class="table-cont">
<tableComponent
:table-data="tableData"
:columns="columns"
:show-selection="false"
:loading="tableLoading"
:total="tableTotal"
:current-page="formInline.current"
:page-size="formInline.size"
:show-sort="false"
@page-change="handlePaginationChange"
>
<!-- 自定义-操作 -->
<template #action="slotProps">
<el-button type="primary" @click="seeDetails(slotProps.row)">查看</el-button>
<el-button type="primary" @click="handleEdit(slotProps.row)">编辑</el-button>
<el-button @click="handleDelete(slotProps.row)">删除</el-button>
</template>
</tableComponent>
</div>
</div>
<el-dialog v-model="dialogFormVisible" :title="dialogTitle" width="800" :close-on-click-modal="false">
<el-form :inline="true" :label-width="'auto'">
<el-form-item label="地块编号" prop="seedName">
<el-input v-model="dialogForm.id" placeholder="请输入地块编号" clearable />
</el-form-item>
<el-form-item label="">
<el-button type="primary" icon="Search" @click="getDetails">查询</el-button>
</el-form-item>
</el-form>
<el-descriptions title="地块信息" border>
<el-descriptions-item label="地块">kooriookami</el-descriptions-item>
<el-descriptions-item label="所属行政区">18100000000</el-descriptions-item>
<el-descriptions-item label="所属网格">Suzhou</el-descriptions-item>
</el-descriptions>
<el-descriptions title="经营主体信息" border>
<el-descriptions-item label="姓名">kooriookami</el-descriptions-item>
<el-descriptions-item label="联系方式">18100000000</el-descriptions-item>
</el-descriptions>
<el-form
ref="dialogRef"
:model="dialogForm"
:inline="true"
:label-width="'80'"
:rules="dialogFormRules"
:disabled="formDisabled"
class="dialog-form-container"
>
<div class="dialog-form-title">农药用药详情</div>
<el-form-item label="种子编号" prop="name" class="dialog-form-item">
<el-input v-model="dialogForm.name" clearable placeholder="请输入姓名" />
</el-form-item>
<el-form-item label="种子名称" prop="phone" class="dialog-form-item">
<el-input v-model="dialogForm.phone" clearable placeholder="请输入联系方式" />
</el-form-item>
<el-form-item label="使用量" required prop="useNumber" class="dialog-form-item">
<el-input-number v-model="dialogForm.useNumber" :min="1" :controls="false" placeholder="请输入用药量" style="width: 150px" />
<el-select v-model="dialogForm.useUnit" placeholder="请选择" style="width: 80px">
<el-option v-for="el in unitList" :key="el.unit" :value="el.unit" :label="el.unit" />
</el-select>
</el-form-item>
<el-form-item label="使用时间" prop="detectionTime" class="dialog-form-item">
<el-date-picker v-model="dialogForm.detectionTime" :clearable="false" type="date" value-format="YYYY-MM-DD" placeholder="请选择使用时间" />
</el-form-item>
</el-form>
<template #footer>
<div class="dialog-footer">
<el-button v-if="!formDisabled" type="primary" @click="onSaveCategory">保存</el-button>
<el-button v-if="!formDisabled" @click="cancelDialog">取消</el-button>
<el-button v-else @click="cancelDialog">关闭</el-button>
</div>
</template>
</el-dialog>
</div>
</template>
<script setup>
import { ref, reactive, computed, onMounted, onBeforeUnmount, nextTick } from 'vue';
import tableComponent from '@/components/tableComponent.vue';
import { ElMessage } from 'element-plus';
import inputSuppliesApi from '@/apis/inputSuppliesApi';
const { getMaterailTypes } = inputSuppliesApi;
import {
getSeedUseRegulatoryRecords,
seedUseRegulatorySave,
editSeedUseRegulatory,
delSeedUseRegulatory,
getRowDetails,
} from '@/apis/inputSuppliesApi/supervisionOfInputs';
import { useApp } from '@/hooks';
const app = useApp();
//
const formInline = reactive({
name: '',
seedTypeId: '',
current: 1,
size: 10,
});
const searchForm = ref(null);
const onSubmit = () => {
formInline.current = 1;
loadData();
};
const resetForm = () => {
searchForm.value.resetFields();
};
//
const tableData = ref([]);
const selectedIds = ref([]);
const tableLoading = ref(false);
const tableTotal = ref(0);
const columns = ref([
{ prop: 'regionName', label: '所属行政区域' },
{ prop: 'regionCode', label: '行政区域编号' },
{ prop: 'landName', label: '地块名称' },
{ prop: 'landId', label: '地块编号' },
{ prop: 'gridName', label: '所属网格' },
{ prop: 'gridId', label: '网格编号' },
{ prop: 'name', label: '负责人姓名' },
{ prop: 'phone', label: '联系方式' },
{ prop: 'provenanceId', label: '种子编号' },
{ prop: 'provenanceName', label: '种子名称' },
// { prop: 'action', label: '', slotName: 'action', width: 230, fixed: 'right' },
]);
const handlePaginationChange = ({ page, pageSize }) => {
formInline.current = page;
formInline.size = pageSize;
loadData();
};
const loadData = async () => {
tableLoading.value = true;
try {
let response = await getSeedUseRegulatoryRecords(formInline);
tableLoading.value = false;
if (response.code == 200) {
tableData.value = response.data.records;
tableTotal.value = response.data.total;
}
} catch (error) {
tableLoading.value = false;
console.error(error);
}
};
const extractThirdLevelChildren = (dataArray) => {
let result = [];
//
for (const level1 of dataArray) {
// children
if (level1.children && Array.isArray(level1.children)) {
//
for (const level2 of level1.children) {
// children
if (level2.children && Array.isArray(level2.children)) {
//
result.push(...level2.children);
}
}
}
}
return result;
};
const seedTypeChange = () => {
console.log(formInline.seedTypeId);
//
};
const dialogFormVisible = ref(false);
const dialogRef = ref(null);
const dialogTitle = ref('新增');
const formDisabled = ref(false);
const dialogForm = reactive({
id: '',
seedName: '', //
varietyName: '', //
brand: '', //
manufacturer: '', //
classifyId: '', //id
classifyName: '', //
productSpecification: '', //number
productUnit: '', //
productAttributes: '', //
photoUrl: '', //
photoUrlDetail: '', //
});
const dialogFormRules = ref({
seedName: [{ required: true, message: '请输入种子种苗名称', trigger: 'blur' }],
varietyName: [{ required: true, message: '请输入品种名称', trigger: 'blur' }],
brand: [{ required: true, message: '请输入品牌', trigger: 'blur' }],
manufacturer: [{ required: true, message: '请输入品牌', trigger: 'blur' }],
classifyId: [{ required: true, message: '请选择蔬菜种苗', trigger: ['change', 'blur'] }],
productUnit: [{ required: true, message: '请输入产品规格', trigger: 'blur' }],
});
//
const addItem = async () => {
ElMessage.success('点击新增!');
// restDialogForm();
// dialogTitle.value = '';
// formDisabled.value = false;
// dialogFormVisible.value = true;
};
//
const seeDetails = async (row) => {
console.log('查看详情: ', row);
ElMessage.success('点击查看详情!');
// dialogTitle.value = '';
// setDialogForm(row);
// formDisabled.value = true;
// dialogFormVisible.value = true;
};
//
const handleEdit = (row) => {
console.log('要编辑的行: ', row);
ElMessage.success('点击编辑!');
// dialogTitle.value = '';
// setDialogForm(row);
// formDisabled.value = false;
// dialogFormVisible.value = true;
};
const getDetails = async () => {
let response = await getRowDetails({
url: '/inputGoods/supervise/provenance/getDetail/',
id: dialogForm.id,
});
console.log(response);
if (response.code == 200) {
setDialogForm(response.data);
} else {
ElMessage.error(response.message);
}
};
const setDialogForm = (row) => {
dialogForm.id = row.id;
dialogForm.seedName = row.seedName;
dialogForm.varietyName = row.varietyName;
dialogForm.brand = row.brand;
dialogForm.manufacturer = row.manufacturer;
dialogForm.classifyId = row.classifyId;
dialogForm.classifyName = row.classifyName;
dialogForm.productSpecification = row.productSpecification;
dialogForm.productUnit = row.productUnit;
dialogForm.productAttributes = row.productAttributes;
dialogForm.photoUrl = row.photoUrl;
dialogForm.photoUrlDetail = row.photoUrlDetail;
};
//
const handleDelete = (row) => {
console.log('删除操作: ', row);
app
.$confirm(`删除后信息将不可查看,确认要删除吗?`, '确定删除', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
deleteGoods(row.id)
.then((res) => {
if (res.code === 200) {
onSubmit();
app.$message.success('删除成功!');
}
})
.catch((err) => {
app.$message.error(err.msg);
});
})
.catch(() => {});
};
const deleteGoods = async (ids) => {
try {
let res = await delSeedUseRegulatory(ids);
return res;
} catch (error) {
return false;
}
};
const onSaveCategory = () => {
console.log(dialogForm);
dialogRef.value.validate(async (valid, fields) => {
if (valid) {
try {
let param = { ...dialogForm };
param.classifyId = dialogForm.classifyId.join(',');
param.classifyName = dialogForm.classifyName.join(',');
console.log(param);
let response;
if (dialogTitle.value == '新增') {
response = await seedUseRegulatorySave(param);
} else {
response = await editSeedUseRegulatory(param);
}
if (response.code == 200) {
cancelDialog();
onSubmit();
if (dialogTitle.value == '新增') {
ElMessage.success('新增成功!');
} else {
ElMessage.success('编辑成功!');
}
} else {
ElMessage.error(response.msg);
}
} catch (error) {
console.error(error);
}
}
});
};
const cancelDialog = async () => {
restDialogForm();
dialogFormVisible.value = false;
};
const restDialogForm = () => {
Object.assign(dialogForm, {
id: '',
seedName: '', //
varietyName: '', //
brand: '', //
manufacturer: '', //
classifyId: '', //id
classifyName: '', //
productSpecification: '', //number
productUnit: '', //
productAttributes: '', //
photoUrl: '', //
photoUrlDetail: '', //
});
};
const seedTypeList = ref([]);
const seedTypeDialogList = ref([]);
const getSeedTypeList = async () => {
try {
let response = await getMaterailTypes({ moduleType: '4' });
console.log(response);
if (response.code == 200) {
if (response.data?.length > 0) {
seedTypeDialogList.value = response.data[0].children;
let result = extractThirdLevelChildren(response.data);
seedTypeList.value = result;
console.log(seedTypeDialogList.value);
}
}
} catch (error) {
console.error(error);
}
};
//
const cascaderProps = ref({
label: 'dataName', //
value: 'id', //
children: 'children', //
emitPath: true,
expandTrigger: 'hover',
});
const handleCascaderChange = () => {
const selectedNames = getSelectedNames(dialogForm.classifyId);
console.log('对应的名称:', selectedNames); // : ['', '']
//
dialogForm.classifyName = selectedNames;
};
const getSelectedNames = (ids) => {
if (!ids || !ids.length) return [];
let names = [];
let currentLevel = seedTypeDialogList.value;
for (const id of ids) {
const foundItem = currentLevel.find((item) => item.id === id);
if (!foundItem) break;
names.push(foundItem.dataName);
currentLevel = foundItem.children || [];
}
return names;
};
const unitList = ref([
{ id: '1', unit: 'kg' },
{ id: '2', unit: 'g' },
{ id: '3', unit: 'L' },
{ id: '4', unit: 'ml' },
]);
onMounted(() => {
onSubmit();
// getSeedTypeList();
});
</script>
<style lang="scss" scoped>
.dialog-form-item {
:deep(.el-upload--picture-card) {
width: 100px;
height: 100px;
}
:deep(.file-uploader__upload) {
width: 100px;
height: 100px;
}
:deep(.el-upload-list__item) {
width: 100px;
height: 100px;
}
}
</style>

View File

@ -33,7 +33,6 @@ import Register from './common/Register.vue';
import FileUpload from './common/FileUpload.vue'; import FileUpload from './common/FileUpload.vue';
import { getIllegalList, createLandIllegal, registerLandIllegal, illegalInfo } from '@/apis/land'; import { getIllegalList, createLandIllegal, registerLandIllegal, illegalInfo } from '@/apis/land';
import { ElMessage, ElMessageBox } from 'element-plus'; import { ElMessage, ElMessageBox } from 'element-plus';
import Attrs from '../../common/Attrs.vue';
import { add } from 'lodash'; import { add } from 'lodash';
const { VITE_APP_BASE_API } = import.meta.env; const { VITE_APP_BASE_API } = import.meta.env;

View File

@ -1,9 +1,19 @@
<template> <template>
<div class="custom-page"></div> <div class="custom-page" :style="`background-image: url(${getAssetsFile('images/input/inputman.png')})`">
<!-- <h1>统计数据</h1>
<div class="content"></div> -->
</div>
</template> </template>
<script setup> <script setup>
import { ref, watch, onMounted, computed } from 'vue'; import { ref, watch, onMounted, computed } from 'vue';
import { getAssetsFile } from '@/utils';
</script> </script>
<style scoped lang="scss"></style> <style scoped lang="scss">
.custom-page {
height: calc(100vh - 150px);
background-size: cover;
background-repeat: no-repeat;
}
</style>

View File

@ -3,9 +3,9 @@
<SearchBar v-model:search="searchForm" @search="handleSearch" @reset="handleReset" /> <SearchBar v-model:search="searchForm" @search="handleSearch" @reset="handleReset" />
<el-tabs v-model="activeTab" @tab-click="handleTabChange"> <el-tabs v-model="activeTab" @tab-click="handleTabChange">
<!-- <el-tab-pane label="待提交" name="-1" /> --> <!-- <el-tab-pane label="待提交" name="-1" /> -->
<el-tab-pane label="待审核" name="0" /> <el-tab-pane label="待审核" name="1" />
<el-tab-pane label="已通过" name="1" /> <el-tab-pane label="已通过" name="2" />
<el-tab-pane label="已驳回" name="2" /> <el-tab-pane label="已驳回" name="3" />
</el-tabs> </el-tabs>
<avue-crud <avue-crud
ref="crudRef" ref="crudRef"
@ -16,9 +16,9 @@
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
@size-change="handleSizeChange" @size-change="handleSizeChange"
> >
<template #menu="scope"> <!-- <template #menu="scope">
<custom-table-operate :actions="getActions(scope.row)" :data="scope" /> <custom-table-operate :actions="getActions(scope.row)" :data="scope" />
</template> </template> -->
</avue-crud> </avue-crud>
<el-dialog v-model="visible" title="查看" width="60%" align-center :draggable="true"> <el-dialog v-model="visible" title="查看" width="60%" align-center :draggable="true">
<RecordForm ref="formRef" v-model="formData" :disabled="mode === 'view'" /> <RecordForm ref="formRef" v-model="formData" :disabled="mode === 'view'" />

View File

@ -178,14 +178,14 @@ const crudOptions = reactive({
{ label: '企业负责人', prop: 'contactPerson' }, { label: '企业负责人', prop: 'contactPerson' },
{ label: '联系方式', prop: 'phone' }, { label: '联系方式', prop: 'phone' },
{ label: '企业地址', prop: 'address' }, { label: '企业地址', prop: 'address' },
{ label: '地块数量', prop: 'villageCount' }, { label: '地块数量', prop: 'landCount' },
{ label: '地块编号', prop: 'villageCode' }, { label: '地块编号', prop: 'landCount' },
{ label: '地块名称', prop: 'villageName' }, { label: '地块名称', prop: 'landName' },
{ label: '面积', prop: 'area', formatter: (row, column, cellValue) => `${Number(cellValue).toFixed(2)}` }, { label: '面积', prop: 'area', formatter: (row, column, cellValue) => `${Number(cellValue).toFixed(2)}` },
{ label: '所属行政区划', prop: 'address' }, { label: '所属行政区划', prop: 'address' },
{ label: '所属网格', prop: 'gridCode' }, { label: '所属网格', prop: 'gridCode' },
{ label: '种植作物', prop: 'primaryProduct' }, { label: '种植作物', prop: 'planCrop' },
{ label: '账号(手机号)', prop: 'account' }, { label: '账号(手机号)', prop: 'phone' },
{ label: '信息录入时间', prop: 'createTime' }, { label: '信息录入时间', prop: 'createTime' },
{ label: '信息更新时间', prop: 'updateTime' }, { label: '信息更新时间', prop: 'updateTime' },
], ],

View File

@ -208,14 +208,14 @@ const crudOptions = reactive({
{ label: '联系方式', prop: 'phone' }, { label: '联系方式', prop: 'phone' },
// //
{ label: '地址', prop: 'address', width: '300px' }, { label: '地址', prop: 'address', width: '300px' },
{ label: '地块数量', prop: 'villageCount' }, { label: '地块数量', prop: 'landCount' },
{ label: '地块编号', prop: 'villageCode' }, { label: '地块编号', prop: 'landNumber' },
{ label: '地块名称', prop: 'villageName' }, { label: '地块名称', prop: 'landName' },
{ label: '面积', prop: 'area', formatter: (row, column, cellValue) => `${Number(cellValue).toFixed(2)}` }, { label: '面积', prop: 'area', formatter: (row, column, cellValue) => `${Number(cellValue).toFixed(2)}` },
{ label: '所属行政区划', prop: 'address' }, { label: '所属行政区划', prop: 'address' },
{ label: '所属网格', prop: 'gridCode' }, { label: '所属网格', prop: 'gridCode' },
{ label: '种植作物', prop: 'planCropName' }, { label: '种植作物', prop: 'planCropName' },
{ label: '账号(手机号)', prop: 'account' }, { label: '账号(手机号)', prop: 'phone' },
{ label: '创建时间', prop: 'createTime' }, { label: '创建时间', prop: 'createTime' },
{ label: '更新时间', prop: 'updateTime' }, { label: '更新时间', prop: 'updateTime' },
], ],

View File

@ -1,401 +1,47 @@
<template> <template>
<div class="field-management"> <div class="mapDiv">
<!-- 左侧面板 --> <tdt-map ref="tdtMapRef" :center="state.center" :zoom="state.zoom" :style="{ height: mapHeight }">
<div class="panel left"> <!-- <tdt-tile-layer :layer-type="'img_w'"></tdt-tile-layer> -->
<el-input v-model="searchTerm" placeholder="搜索地块名称" clearable style="margin-bottom: 15px"></el-input> <!-- <tdt-tile-layer :layer-type="'cia_w'" :z-index="2"></tdt-tile-layer> -->
<tdt-tilelayer :url="state.img_w_url" :z-index="1"></tdt-tilelayer>
<el-table :data="filteredFields" highlight-current-row style="width: 100%" height="calc(100vh - 300px)" @row-click="selectField"> <tdt-tilelayer :url="state.cia_w_url" :z-index="2"></tdt-tilelayer>
<el-table-column prop="name" label="名称"></el-table-column> </tdt-map>
<el-table-column prop="area" label="面积(㎡)">
<template #default="{ row }">
{{ row.area.toFixed(2) }}
</template>
</el-table-column>
</el-table>
<div class="stats">总面积: {{ totalArea.toFixed(2) }} </div>
<div class="button-group">
<el-button type="primary" @click="startDrawing">新增地块</el-button>
<el-button type="danger" :disabled="!selectedField" @click="removeField">删除地块</el-button>
</div>
</div>
<!-- 右侧地图区域 -->
<div class="panel right">
<tdt-map class="map" :center="mapCenter" :zoom="mapZoom" @init="onMapInit"> </tdt-map>
<div class="layer-switch">
<el-radio-group v-model="layerType" size="small" @change="changeBaseLayer">
<el-radio-button label="vector">矢量</el-radio-button>
<el-radio-button label="image">影像</el-radio-button>
</el-radio-group>
</div>
<div class="field-layer-switch">
<el-switch v-model="showFieldLayer" active-text="显示地块"></el-switch>
</div>
<div class="zoom-scale">缩放级别: {{ mapZoom }}, 比例尺: 1:{{ scale.toLocaleString() }}</div>
<el-dialog v-model="drawDialogVisible" title="新增地块">
<el-form>
<el-form-item label="地块名称">
<el-input v-model="newFieldName"></el-input>
</el-form-item>
<el-form-item label="地块面积">
<el-input :value="newFieldArea.toFixed(2) + ' ㎡'" readonly></el-input>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="cancelDrawing">取消</el-button>
<el-button type="primary" @click="saveNewField">保存</el-button>
</template>
</el-dialog>
</div>
</div> </div>
</template> </template>
<script setup> <script setup>
import { ref, computed, onMounted, watch } from 'vue'; import { reactive, onMounted, ref } from 'vue';
import { TdtMap } from 'vue-tianditu'; import { TdtMap, TdtTileLayer } from 'vue-tianditu';
import { ElMessage } from 'element-plus'; import { map_config } from '@/config/map';
// import { map_config } from '../../config/map';
// 使localStorage const key = map_config.tianditu.token;
const fieldService = {
getFields() {
const fields = localStorage.getItem('fields');
return Promise.resolve(fields ? JSON.parse(fields) : []);
},
createField(field) {
return this.getFields().then((fields) => {
field.id = Date.now();
fields.push(field);
localStorage.setItem('fields', JSON.stringify(fields));
return field;
});
},
deleteField(id) {
return this.getFields().then((fields) => {
const newFields = fields.filter((f) => f.id !== id);
localStorage.setItem('fields', JSON.stringify(newFields));
return newFields;
});
},
};
// const state = reactive({
const fields = ref([]); center: [100.088, 23.883],
const selectedField = ref(null); zoom: 14,
const searchTerm = ref(''); img_w_url: `http://t0.tianditu.gov.cn/img_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=${key}`,
const newFieldName = ref(''); cia_w_url: `http://t0.tianditu.gov.cn/cia_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cia&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=${key}`,
const drawDialogVisible = ref(false); // URL
const newFieldCoords = ref([]); // ...
const newFieldArea = ref(0);
const layerType = ref('vector');
const showFieldLayer = ref(true);
const map = ref(null);
const mapCenter = ref([100.088, 23.883]);
const mapZoom = ref(12);
const scale = ref(0);
//
const baseLayers = {
vector: null,
vectorLabel: null,
image: null,
imageLabel: null,
};
//
const overlayLayer = ref(null);
//
const filteredFields = computed(() => {
const term = searchTerm.value.toLowerCase();
return term ? fields.value.filter((f) => f.name.toLowerCase().includes(term)) : fields.value;
}); });
const totalArea = computed(() => { //
return fields.value.reduce((sum, field) => sum + field.area, 0); const mapHeight = ref('100vh');
});
// onMounted(() => {
const onMapInit = (mapInstance) => { console.log('地图组件已挂载');
map.value = mapInstance; // API
if (window.T) {
// console.log('天地图API已加载:', window.T);
baseLayers.vector = new T.TileLayer('vec');
baseLayers.vectorLabel = new T.TileLayer('cva');
baseLayers.image = new T.TileLayer('img');
baseLayers.imageLabel = new T.TileLayer('cia');
//
map.value.addLayer(baseLayers.image);
map.value.addLayer(baseLayers.imageLabel);
//
overlayLayer.value = new T.Map.OverlayLayer();
map.value.addLayer(overlayLayer.value);
//
map.value.addControl(new T.Control.Zoom());
map.value.addControl(new T.Control.Scale());
//
map.value.addEventListener('zoomend', updateScale);
map.value.addEventListener('moveend', updateScale);
//
loadFields();
};
//
const updateScale = () => {
if (map.value) {
mapZoom.value = map.value.getZoom();
scale.value = Math.round(map.value.getScale());
}
};
//
const changeBaseLayer = () => {
if (!map.value) return;
//
map.value.removeLayer(baseLayers.vector);
map.value.removeLayer(baseLayers.vectorLabel);
map.value.removeLayer(baseLayers.image);
map.value.removeLayer(baseLayers.imageLabel);
//
if (layerType.value === 'vector') {
map.value.addLayer(baseLayers.vector);
map.value.addLayer(baseLayers.vectorLabel);
} else { } else {
map.value.addLayer(baseLayers.image); console.error('天地图API未加载');
map.value.addLayer(baseLayers.imageLabel);
} }
}; });
//
const loadFields = () => {
fieldService.getFields().then((data) => {
fields.value = data;
refreshOverlays();
});
};
//
const refreshOverlays = () => {
if (!map.value || !overlayLayer.value) return;
//
overlayLayer.value.clearOverLays();
//
if (!showFieldLayer.value) return;
//
fields.value.forEach((field) => {
const isSelected = selectedField.value?.id === field.id;
const polygon = createPolygon(field, isSelected);
overlayLayer.value.addOverLay(polygon);
});
};
//
const createPolygon = (field, isSelected = false) => {
const coords = field.geometry.coordinates[0].map((c) => new T.LngLat(c[0], c[1]));
return new T.Polygon(coords, {
color: isSelected ? '#ff0000' : '#1890ff',
weight: isSelected ? 3 : 2,
opacity: 0.8,
fillColor: isSelected ? '#ffa39e' : '#e6f7ff',
fillOpacity: 0.5,
});
};
//
const selectField = (field) => {
selectedField.value = field;
refreshOverlays();
//
if (map.value) {
const coords = field.geometry.coordinates[0];
const center = coords.reduce(
(acc, coord) => {
acc[0] += coord[0];
acc[1] += coord[1];
return acc;
},
[0, 0]
);
center[0] /= coords.length;
center[1] /= coords.length;
map.value.panTo(new T.LngLat(center[0], center[1]));
}
};
//
const startDrawing = () => {
if (!map.value) return;
//
refreshOverlays();
//
const polygonTool = new T.PolygonTool(map.value, {
showLabel: true,
color: '#fa541c',
weight: 3,
opacity: 0.6,
fillColor: '#ffbb96',
fillOpacity: 0.4,
});
polygonTool.open();
//
polygonTool.addEventListener('draw', (e) => {
newFieldCoords.value = e.currentLnglats.map((lnglat) => [lnglat.lng, lnglat.lat]);
newFieldArea.value = e.currentArea;
drawDialogVisible.value = true;
//
polygonTool.close();
});
};
//
const saveNewField = () => {
if (!newFieldName.value.trim()) {
ElMessage.error('请输入地块名称');
return;
}
const newField = {
id: Date.now(),
name: newFieldName.value,
area: newFieldArea.value,
geometry: {
type: 'Polygon',
coordinates: [newFieldCoords.value],
},
};
fieldService.createField(newField).then(() => {
ElMessage.success('地块创建成功');
drawDialogVisible.value = false;
newFieldName.value = '';
loadFields();
});
};
//
const cancelDrawing = () => {
drawDialogVisible.value = false;
refreshOverlays();
};
//
const removeField = () => {
if (!selectedField.value) return;
fieldService.deleteField(selectedField.value.id).then(() => {
ElMessage.success('地块已删除');
selectedField.value = null;
loadFields();
});
};
//
watch(showFieldLayer, refreshOverlays);
</script> </script>
<style scoped> <style scoped>
.field-management { .mapDiv {
display: flex;
height: calc(100vh - 160px);
}
.panel.left {
width: 320px;
padding: 15px;
border-right: 1px solid #e4e7ed;
display: flex;
flex-direction: column;
background: #f8fafc;
}
.panel.right {
flex: 1;
position: relative;
}
.map {
width: 100%; width: 100%;
height: 100%; height: 100vh; /* 确保容器有明确高度 */
}
.layer-switch {
position: absolute;
top: 15px;
right: 15px;
background: white;
padding: 8px;
border-radius: 4px;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
z-index: 1000;
}
.field-layer-switch {
position: absolute;
top: 60px;
right: 15px;
background: white;
padding: 8px;
border-radius: 4px;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
z-index: 1000;
display: flex;
align-items: center;
gap: 8px;
}
.zoom-scale {
position: absolute;
bottom: 15px;
left: 50%;
transform: translateX(-50%);
background: rgba(255, 255, 255, 0.85);
padding: 6px 12px;
border-radius: 4px;
font-size: 14px;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
z-index: 1000;
}
.stats {
padding: 12px;
margin: 10px 0;
background: #edf2ff;
border-radius: 4px;
font-weight: 500;
color: #364fc7;
}
.button-group {
display: flex;
gap: 10px;
margin-top: 10px;
}
.button-group > * {
flex: 1;
} }
</style> </style>

View File

@ -1,47 +1,401 @@
<template> <template>
<div class="mapDiv"> <div class="field-management">
<tdt-map ref="tdtMapRef" :center="state.center" :zoom="state.zoom" :style="{ height: mapHeight }"> <!-- 左侧面板 -->
<!-- <tdt-tile-layer :layer-type="'img_w'"></tdt-tile-layer> --> <div class="panel left">
<!-- <tdt-tile-layer :layer-type="'cia_w'" :z-index="2"></tdt-tile-layer> --> <el-input v-model="searchTerm" placeholder="搜索地块名称" clearable style="margin-bottom: 15px"></el-input>
<tdt-tilelayer :url="state.img_w_url" :z-index="1"></tdt-tilelayer>
<tdt-tilelayer :url="state.cia_w_url" :z-index="2"></tdt-tilelayer> <el-table :data="filteredFields" highlight-current-row style="width: 100%" height="calc(100vh - 300px)" @row-click="selectField">
</tdt-map> <el-table-column prop="name" label="名称"></el-table-column>
<el-table-column prop="area" label="面积(㎡)">
<template #default="{ row }">
{{ row.area.toFixed(2) }}
</template>
</el-table-column>
</el-table>
<div class="stats">总面积: {{ totalArea.toFixed(2) }} </div>
<div class="button-group">
<el-button type="primary" @click="startDrawing">新增地块</el-button>
<el-button type="danger" :disabled="!selectedField" @click="removeField">删除地块</el-button>
</div>
</div>
<!-- 右侧地图区域 -->
<div class="panel right">
<tdt-map class="map" :center="mapCenter" :zoom="mapZoom" @init="onMapInit"> </tdt-map>
<div class="layer-switch">
<el-radio-group v-model="layerType" size="small" @change="changeBaseLayer">
<el-radio-button label="vector">矢量</el-radio-button>
<el-radio-button label="image">影像</el-radio-button>
</el-radio-group>
</div>
<div class="field-layer-switch">
<el-switch v-model="showFieldLayer" active-text="显示地块"></el-switch>
</div>
<div class="zoom-scale">缩放级别: {{ mapZoom }}, 比例尺: 1:{{ scale.toLocaleString() }}</div>
<el-dialog v-model="drawDialogVisible" title="新增地块">
<el-form>
<el-form-item label="地块名称">
<el-input v-model="newFieldName"></el-input>
</el-form-item>
<el-form-item label="地块面积">
<el-input :value="newFieldArea.toFixed(2) + ' ㎡'" readonly></el-input>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="cancelDrawing">取消</el-button>
<el-button type="primary" @click="saveNewField">保存</el-button>
</template>
</el-dialog>
</div>
</div> </div>
</template> </template>
<script setup> <script setup>
import { reactive, onMounted, ref } from 'vue'; import { ref, computed, onMounted, watch } from 'vue';
import { TdtMap, TdtTileLayer } from 'vue-tianditu'; import { TdtMap } from 'vue-tianditu';
import { map_config } from '@/config/map'; import { ElMessage } from 'element-plus';
// import { map_config } from '../../config/map';
const key = map_config.tianditu.token; // 使localStorage
const fieldService = {
getFields() {
const fields = localStorage.getItem('fields');
return Promise.resolve(fields ? JSON.parse(fields) : []);
},
createField(field) {
return this.getFields().then((fields) => {
field.id = Date.now();
fields.push(field);
localStorage.setItem('fields', JSON.stringify(fields));
return field;
});
},
deleteField(id) {
return this.getFields().then((fields) => {
const newFields = fields.filter((f) => f.id !== id);
localStorage.setItem('fields', JSON.stringify(newFields));
return newFields;
});
},
};
const state = reactive({ //
center: [100.088, 23.883], const fields = ref([]);
zoom: 14, const selectedField = ref(null);
img_w_url: `http://t0.tianditu.gov.cn/img_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=img&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=${key}`, const searchTerm = ref('');
cia_w_url: `http://t0.tianditu.gov.cn/cia_w/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=cia&STYLE=default&TILEMATRIXSET=w&FORMAT=tiles&TILEMATRIX={z}&TILEROW={y}&TILECOL={x}&tk=${key}`, const newFieldName = ref('');
// URL const drawDialogVisible = ref(false);
// ... const newFieldCoords = ref([]);
const newFieldArea = ref(0);
const layerType = ref('vector');
const showFieldLayer = ref(true);
const map = ref(null);
const mapCenter = ref([100.088, 23.883]);
const mapZoom = ref(12);
const scale = ref(0);
//
const baseLayers = {
vector: null,
vectorLabel: null,
image: null,
imageLabel: null,
};
//
const overlayLayer = ref(null);
//
const filteredFields = computed(() => {
const term = searchTerm.value.toLowerCase();
return term ? fields.value.filter((f) => f.name.toLowerCase().includes(term)) : fields.value;
}); });
// const totalArea = computed(() => {
const mapHeight = ref('100vh'); return fields.value.reduce((sum, field) => sum + field.area, 0);
});
onMounted(() => { //
console.log('地图组件已挂载'); const onMapInit = (mapInstance) => {
// API map.value = mapInstance;
if (window.T) {
console.log('天地图API已加载:', window.T); //
} else { baseLayers.vector = new T.TileLayer('vec');
console.error('天地图API未加载'); baseLayers.vectorLabel = new T.TileLayer('cva');
baseLayers.image = new T.TileLayer('img');
baseLayers.imageLabel = new T.TileLayer('cia');
//
map.value.addLayer(baseLayers.image);
map.value.addLayer(baseLayers.imageLabel);
//
overlayLayer.value = new T.Map.OverlayLayer();
map.value.addLayer(overlayLayer.value);
//
map.value.addControl(new T.Control.Zoom());
map.value.addControl(new T.Control.Scale());
//
map.value.addEventListener('zoomend', updateScale);
map.value.addEventListener('moveend', updateScale);
//
loadFields();
};
//
const updateScale = () => {
if (map.value) {
mapZoom.value = map.value.getZoom();
scale.value = Math.round(map.value.getScale());
} }
}); };
//
const changeBaseLayer = () => {
if (!map.value) return;
//
map.value.removeLayer(baseLayers.vector);
map.value.removeLayer(baseLayers.vectorLabel);
map.value.removeLayer(baseLayers.image);
map.value.removeLayer(baseLayers.imageLabel);
//
if (layerType.value === 'vector') {
map.value.addLayer(baseLayers.vector);
map.value.addLayer(baseLayers.vectorLabel);
} else {
map.value.addLayer(baseLayers.image);
map.value.addLayer(baseLayers.imageLabel);
}
};
//
const loadFields = () => {
fieldService.getFields().then((data) => {
fields.value = data;
refreshOverlays();
});
};
//
const refreshOverlays = () => {
if (!map.value || !overlayLayer.value) return;
//
overlayLayer.value.clearOverLays();
//
if (!showFieldLayer.value) return;
//
fields.value.forEach((field) => {
const isSelected = selectedField.value?.id === field.id;
const polygon = createPolygon(field, isSelected);
overlayLayer.value.addOverLay(polygon);
});
};
//
const createPolygon = (field, isSelected = false) => {
const coords = field.geometry.coordinates[0].map((c) => new T.LngLat(c[0], c[1]));
return new T.Polygon(coords, {
color: isSelected ? '#ff0000' : '#1890ff',
weight: isSelected ? 3 : 2,
opacity: 0.8,
fillColor: isSelected ? '#ffa39e' : '#e6f7ff',
fillOpacity: 0.5,
});
};
//
const selectField = (field) => {
selectedField.value = field;
refreshOverlays();
//
if (map.value) {
const coords = field.geometry.coordinates[0];
const center = coords.reduce(
(acc, coord) => {
acc[0] += coord[0];
acc[1] += coord[1];
return acc;
},
[0, 0]
);
center[0] /= coords.length;
center[1] /= coords.length;
map.value.panTo(new T.LngLat(center[0], center[1]));
}
};
//
const startDrawing = () => {
if (!map.value) return;
//
refreshOverlays();
//
const polygonTool = new T.PolygonTool(map.value, {
showLabel: true,
color: '#fa541c',
weight: 3,
opacity: 0.6,
fillColor: '#ffbb96',
fillOpacity: 0.4,
});
polygonTool.open();
//
polygonTool.addEventListener('draw', (e) => {
newFieldCoords.value = e.currentLnglats.map((lnglat) => [lnglat.lng, lnglat.lat]);
newFieldArea.value = e.currentArea;
drawDialogVisible.value = true;
//
polygonTool.close();
});
};
//
const saveNewField = () => {
if (!newFieldName.value.trim()) {
ElMessage.error('请输入地块名称');
return;
}
const newField = {
id: Date.now(),
name: newFieldName.value,
area: newFieldArea.value,
geometry: {
type: 'Polygon',
coordinates: [newFieldCoords.value],
},
};
fieldService.createField(newField).then(() => {
ElMessage.success('地块创建成功');
drawDialogVisible.value = false;
newFieldName.value = '';
loadFields();
});
};
//
const cancelDrawing = () => {
drawDialogVisible.value = false;
refreshOverlays();
};
//
const removeField = () => {
if (!selectedField.value) return;
fieldService.deleteField(selectedField.value.id).then(() => {
ElMessage.success('地块已删除');
selectedField.value = null;
loadFields();
});
};
//
watch(showFieldLayer, refreshOverlays);
</script> </script>
<style scoped> <style scoped>
.mapDiv { .field-management {
display: flex;
height: calc(100vh - 160px);
}
.panel.left {
width: 320px;
padding: 15px;
border-right: 1px solid #e4e7ed;
display: flex;
flex-direction: column;
background: #f8fafc;
}
.panel.right {
flex: 1;
position: relative;
}
.map {
width: 100%; width: 100%;
height: 100vh; /* 确保容器有明确高度 */ height: 100%;
}
.layer-switch {
position: absolute;
top: 15px;
right: 15px;
background: white;
padding: 8px;
border-radius: 4px;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
z-index: 1000;
}
.field-layer-switch {
position: absolute;
top: 60px;
right: 15px;
background: white;
padding: 8px;
border-radius: 4px;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
z-index: 1000;
display: flex;
align-items: center;
gap: 8px;
}
.zoom-scale {
position: absolute;
bottom: 15px;
left: 50%;
transform: translateX(-50%);
background: rgba(255, 255, 255, 0.85);
padding: 6px 12px;
border-radius: 4px;
font-size: 14px;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
z-index: 1000;
}
.stats {
padding: 12px;
margin: 10px 0;
background: #edf2ff;
border-radius: 4px;
font-weight: 500;
color: #364fc7;
}
.button-group {
display: flex;
gap: 10px;
margin-top: 10px;
}
.button-group > * {
flex: 1;
} }
</style> </style>

View File

@ -1,7 +1,6 @@
<template> <template>
<!-- <div class="custom-page" :style="`background-image: url(${getAssetsFile('images/landBase/land2.png')})`"> --> <div class="custom-page" :style="`background-image: url(${getAssetsFile('images/landBase/land2.png')})`">
<div class="custom-page"> <!-- <div class="custom-page">
<!-- <h1>统计数据</h1> -->
<div class="content"> <div class="content">
<div style="display: flex"> <div style="display: flex">
<pieChart v-for="(item, index) in data" :key="index" class="m-left" :refs="item.refs" :title="item.title" :data="item.data" /> <pieChart v-for="(item, index) in data" :key="index" class="m-left" :refs="item.refs" :title="item.title" :data="item.data" />
@ -9,12 +8,13 @@
<div style="display: flex; margin-top: 20px"> <div style="display: flex; margin-top: 20px">
<pieChart v-for="(item, index) in data1" :key="index" class="m-left" :refs="item.refs" :title="item.title" :data="item.data" /> <pieChart v-for="(item, index) in data1" :key="index" class="m-left" :refs="item.refs" :title="item.title" :data="item.data" />
</div> </div>
</div> </div> -->
</div> </div>
</template> </template>
<script setup> <script setup>
import { getOverview, getSubArea } from '../../../apis/resource/statisticAnalysis'; import { getOverview, getSubArea } from '../../../apis/resource/statisticAnalysis';
import { getAssetsFile } from '@/utils';
import { ref, onBeforeMount, reactive } from 'vue'; import { ref, onBeforeMount, reactive } from 'vue';
import 'echarts-gl'; import 'echarts-gl';
import pieChart from './components/pie-chart.vue'; import pieChart from './components/pie-chart.vue';
@ -57,7 +57,7 @@ let data1 = ref([
]); ]);
onBeforeMount(() => { onBeforeMount(() => {
getData(); // getData();
}); });
const getData = async () => { const getData = async () => {

File diff suppressed because it is too large Load Diff