zhouhui
/
lcny-vue3-antd-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改样式

new-map
ihzero 2022-11-08 18:45:50 +08:00
parent 96b81c0a5e 3938cb121a
commit b028d43582
31 changed files with 9104 additions and 7370 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

281
src/api/sys/user.ts
View File

@ -245,21 +245,6 @@ export function editPassword(id: string, data, mode: ErrorMessageMode = 'modal')
)
}
/**
* @description:获取农作物
*/
// export function getCrops(data, mode: ErrorMessageMode = 'modal') {
// return defHttp.get(
// {
// url: `/api/crops`,
// data,
// },
// {
// errorMessageMode: mode,
// },
// )
// }
/**
* @description:新增区域数据
*/
@ -400,12 +385,62 @@ export function getShrimpPrices(params, mode: ErrorMessageMode = 'modal') {
)
}
/**
<<<<<<< HEAD
* @description:getCropYields
*/
export function getCropYields(params, mode: ErrorMessageMode = 'modal') {
return defHttp.get(
{
url: `/api/rice-shrimp-prices`,
=======
* @description:稻虾价格 - 添加
*/
export function addShrimpPrices(data, mode: ErrorMessageMode = 'modal') {
return defHttp.post(
{
url: `/api/rice-shrimp-prices`,
data,
},
{
errorMessageMode: mode,
},
)
}
/**
* @description:稻虾价格 - 修改
*/
export function editShrimpPrices(id: string, data, mode: ErrorMessageMode = 'modal') {
return defHttp.put(
{
url: `/api/rice-shrimp-prices/${id}`,
data,
},
{
errorMessageMode: mode,
},
)
}
/**
* @description:稻虾价格 - 删除
*/
export function deleteShrimpPrices(id: string, mode: ErrorMessageMode = 'modal') {
return defHttp.delete(
{
url: `/api/rice-shrimp-prices/${id}`,
},
{
errorMessageMode: mode,
},
)
}
/**
* @description:稻虾产业 - 列表
*/
export function getShrimpIndustries(params, mode: ErrorMessageMode = 'modal') {
return defHttp.get(
{
url: `/api/rice-shrimp-industries`,
>>>>>>> 3938cb121abb57822ba7daa68754d32be79f7dce
params,
},
{
@ -413,3 +448,219 @@ export function getCropYields(params, mode: ErrorMessageMode = 'modal') {
},
)
}
<<<<<<< HEAD
=======
/**
* @description:稻虾产业 - 添加
*/
export function addShrimpIndustries(data, mode: ErrorMessageMode = 'modal') {
return defHttp.post(
{
url: `/api/rice-shrimp-industries`,
data,
},
{
errorMessageMode: mode,
},
)
}
/**
* @description:稻虾产业 - 编辑
*/
export function editShrimpIndustries(id: string, data, mode: ErrorMessageMode = 'modal') {
return defHttp.put(
{
url: `/api/rice-shrimp-industries/${id}`,
data,
},
{
errorMessageMode: mode,
},
)
}
/**
* @description:稻虾产业 - 删除
*/
export function deleteShrimpIndustries(id: string, mode: ErrorMessageMode = 'modal') {
return defHttp.delete(
{
url: `/api/rice-shrimp-industries/${id}`,
},
{
errorMessageMode: mode,
},
)
}
/**
* @description:稻虾流向 - 列表
*/
export function getShrimpFlows(params, mode: ErrorMessageMode = 'modal') {
return defHttp.get(
{
url: `/api/rice-shrimp-flows`,
params,
},
{
errorMessageMode: mode,
},
)
}
/**
* @description:稻虾产业 - 添加
*/
export function addShrimpFlows(data, mode: ErrorMessageMode = 'modal') {
return defHttp.post(
{
url: `/api/rice-shrimp-flows`,
data,
},
{
errorMessageMode: mode,
},
)
}
/**
* @description:稻虾产业 - 编辑
*/
export function editShrimpFlows(id: string, data, mode: ErrorMessageMode = 'modal') {
return defHttp.put(
{
url: `/api/rice-shrimp-flows/${id}`,
data,
},
{
errorMessageMode: mode,
},
)
}
/**
* @description:稻虾产业 - 删除
*/
export function deleteShrimpFlows(id: string, mode: ErrorMessageMode = 'modal') {
return defHttp.delete(
{
url: `/api/rice-shrimp-flows/${id}`,
},
{
errorMessageMode: mode,
},
)
}
/**
* @description:大宗物资 - 列表
*/
export function getMateriels(params, mode: ErrorMessageMode = 'modal') {
return defHttp.get(
{
url: `/api/materiels`,
params,
},
{
errorMessageMode: mode,
},
)
}
/**
* @description:大宗物资 - 添加
*/
export function addMateriels(data, mode: ErrorMessageMode = 'modal') {
return defHttp.post(
{
url: `/api/materiels`,
data,
},
{
errorMessageMode: mode,
},
)
}
/**
* @description:大宗物资 - 编辑
*/
export function editMateriels(id: string, data, mode: ErrorMessageMode = 'modal') {
return defHttp.put(
{
url: `/api/materiels/${id}`,
data,
},
{
errorMessageMode: mode,
},
)
}
/**
* @description:大宗物资 - 删除
*/
export function deleteMateriels(id: string, mode: ErrorMessageMode = 'modal') {
return defHttp.delete(
{
url: `/api/materiels/${id}`,
},
{
errorMessageMode: mode,
},
)
}
/**
* @description:查看农作物产量
*/
export function getCropYields(params, mode: ErrorMessageMode = 'modal') {
params.isReturnNativeResponse = false
return defHttp.get(
{
url: `/api/crop-yields`,
params,
},
{
errorMessageMode: mode,
},
)
}
/**
* @description:添加农作物产量
*/
export function addCropYields(data, mode: ErrorMessageMode = 'modal') {
return defHttp.post(
{
url: `/api/crop-yields`,
data,
},
{
errorMessageMode: mode,
},
)
}
/**
* @description:更新农作物产量
*/
export function editCropYields(id: string, data, mode: ErrorMessageMode = 'modal') {
return defHttp.put(
{
url: `/api/crop-yields/${id}`,
data,
},
{
errorMessageMode: mode,
},
)
}
/**
* @description:删除农作物产量
*/
export function deleteCropYields(id: string, mode: ErrorMessageMode = 'modal') {
return defHttp.delete(
{
url: `/api/crop-yields/${id}`,
},
{
errorMessageMode: mode,
},
)
}
>>>>>>> 3938cb121abb57822ba7daa68754d32be79f7dce

22
src/router/routes/modules/base.ts
View File

@ -74,7 +74,7 @@ const main: AppRouteModule = {
{
path: 'town-yield',
name: 'TownYield',
component: () => import('/@/views/base/ranking-list/index1.vue'),
component: () => import('/@/views/base/crop-yields/town-yields/index.vue'),
meta: {
title: '城镇产量',
},
@ -82,7 +82,7 @@ const main: AppRouteModule = {
{
path: 'basics-yield',
name: 'BasicsYield',
component: () => import('/@/views/base/ranking-list/index1.vue'),
component: () => import('/@/views/base/crop-yields/base-yields/index.vue'),
meta: {
title: '基地产量',
},
@ -106,25 +106,25 @@ const main: AppRouteModule = {
},
},
{
path: 'industry-industry',
name: 'IndustryIndustry',
component: () => import('/@/views/base/base-data/index.vue'),
path: 'estate-industry',
name: 'EstateIndustry',
component: () => import('/@/views/base/estate/shrimp-industries/index.vue'),
meta: {
title: '稻虾产业',
},
},
{
path: 'basics-flow',
name: 'BasicsFlow',
component: () => import('/@/views/base/base-data/index.vue'),
path: 'estate-flows',
name: 'EstateFlows',
component: () => import('/@/views/base/estate/shrimp-flows/index.vue'),
meta: {
title: '稻虾流向',
},
},
{
path: 'basics-material',
name: 'BasicsMaterial',
component: () => import('/@/views/base/base-data/index.vue'),
path: 'estate-materiels',
name: 'EstateMateriels',
component: () => import('/@/views/base/estate/materiels/index.vue'),
meta: {
title: '大宗物资',
},

7
src/settings/componentSetting.ts
View File

@ -11,16 +11,17 @@ export default {
// The field name of the current page passed to the background
pageField: 'page',
// The number field name of each page displayed in the background
sizeField: 'pageSize',
sizeField: 'per_page',
// Field name of the form data returned by the interface
listField: 'items',
// Total number of tables returned by the interface field name
totalField: 'total',
},
// Number of pages that can be selected
pageSizeOptions: ['10', '50', '80', '100'],
// pageSizeOptions: ['10', '50', '80', '100'],
pageSizeOptions: ['20'],
// Default display quantity on one page
defaultPageSize: 10,
defaultPageSize: 20,
// Default Size
defaultSize: 'middle',
// Custom general sort function

9
src/utils/http/axios/index.ts
View File

@ -49,12 +49,15 @@ const transform: AxiosTransform = {
throw new Error(t('sys.api.apiRequestFailed'))
}
// 这里 code，result，message为 后台统一的字段，需要在 types.ts内修改为项目自己的接口返回格式
const { code, data: result, message } = data
const { code, data: result, message, meta } = data
const resDate = {
items: result,
total: meta?.total ?? null,
}
// 这里逻辑可以根据项目进行修改
const hasSuccess = data && Reflect.has(data, 'code') && code === ResultEnum.SUCCESS
if (hasSuccess) {
return result
return resDate
}
// 在此处根据自己项目的实际情况对不同的code执行不同的操作

33
src/utils/index.ts
View File

@ -100,3 +100,36 @@ export function formatDataByObject(obj) {
})
return arr
}
//递归生成树形结构
export function getTreeData(
data: any,
pid: any,
pidName = 'parentId',
idName = 'id',
childrenName = 'children',
key = 'key',
isNull = true,
) {
let arr = []
for (let i = 0; i < data.length; i++) {
if (data[i][pidName] == pid) {
data[i][key] = data[i][idName]
data[i]['disabled'] = data[i].is_end == 1 ? false : true
data[i][childrenName] = getTreeData(
data,
data[i][idName],
pidName,
idName,
childrenName,
key,
isNull,
)
if (isNull && data[i][childrenName].length == 0) delete data[i][childrenName]
arr.push(data[i])
}
}
return arr
}

4
src/views/base/base-data/base.data.ts
View File

@ -93,7 +93,7 @@ export const accountFormSchema: FormSchema[] = [
componentProps: {
api: async () => {
const res = await getTownAgriculturalBasic({ type: 2 })
return res
return res.items
},
labelField: 'name',
valueField: 'id',
@ -107,7 +107,7 @@ export const accountFormSchema: FormSchema[] = [
componentProps: {
api: async () => {
const res = await getcrops({ type: 'all', crop_type: 1 })
return res.map((e) => {
return res.items.map((e) => {
return {
...e,
disabled: e.is_end === 0,

2
src/views/base/city-data/index.vue
View File

@ -101,7 +101,7 @@
}
onMounted(async () => {
let res = await getCitydataStatistics()
CityDate.value = res
CityDate.value = res.items
})
return {
CityDate,

87
src/views/base/crop-yields/base-yields/BaseDrawer.vue 100644
View File

@ -0,0 +1,87 @@
<template>
<BasicDrawer
v-bind="$attrs"
@register="registerDrawer"
showFooter
:title="getTitle"
width="500px"
@ok="handleSubmit"
>
<BasicForm @register="registerForm">
<template #crop="{ model, field }">
<TreeSelect
v-model:value="model[field]"
:tree-data="treeData"
placeholder="请选择"
:fieldNames="{ children: 'children', label: 'name', value: 'id' }"
></TreeSelect>
</template>
</BasicForm>
</BasicDrawer>
</template>
<script lang="ts" setup>
import { getTreeData } from '/@/utils/index'
import dayjs from 'dayjs'
import { ref, computed, unref } from 'vue'
import { BasicForm, useForm } from '/@/components/Form/index'
import { accountFormSchema } from './base.data'
import { BasicDrawer, useDrawerInner } from '/@/components/Drawer'
import { addCropYields, editCropYields, getcrops } from '/@/api/sys/user'
import { TreeSelect } from 'ant-design-vue'
const emits = defineEmits(['success', 'register'])
const isUpdate = ref(false)
const treeData = ref([])
const getTitle = computed(() => (!isUpdate.value ? '新增产量' : '编辑产量'))
const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
labelWidth: 120,
baseColProps: { span: 24 },
schemas: accountFormSchema,
showActionButtonGroup: false,
})
const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
resetFields()
setDrawerProps({ confirmLoading: false })
if (unref(treeData).length === 0) {
const res = await getcrops({ type: 'all', crop_type: 1 })
treeData.value = getTreeData(res.items, 0, 'parent_id', 'id', 'children', 'key')
}
isUpdate.value = data?.isUpdate
if (unref(isUpdate)) {
await setFieldsValue({
id: data.id,
quarter: data.quarter.toString(),
time_year: dayjs(data.time_year.toString()),
base_id: data.base_id,
yield: data.yield,
output: data.output,
crop_id: data.crop_id,
cultivated: data.cultivated,
})
}
})
const handleSubmit = async () => {
try {
const values = await validate()
values.time_year = dayjs(values.time_year.toString()).format('YYYY')
values.type = 1
setDrawerProps({ confirmLoading: true })
if (values.id) {
// 修改
await editCropYields(values.id, values)
} else {
// 新增
await addCropYields(values)
}
closeDrawer()
emits('success')
} finally {
setDrawerProps({ confirmLoading: false })
}
}
</script>
<style lang="less" scoped>
:deep(.ant-picker) {
width: 100%;
}
</style>

175
src/views/base/crop-yields/base-yields/base.data.ts 100644
View File

@ -0,0 +1,175 @@
import { BasicColumn } from '/@/components/Table'
import { FormSchema } from '/@/components/Table'
import { getTownAgriculturalBasic } from '/@/api/sys/user'
export const columns: BasicColumn[] = [
{
title: '基地名称',
dataIndex: 'base_name',
},
{
title: '农作物名称',
dataIndex: 'crop_name',
},
{
title: '年份',
dataIndex: 'time_year',
customRender: ({ text }) => {
return text + '年'
},
},
{
title: '季度',
dataIndex: 'quarter',
},
{
title: '产量',
dataIndex: 'yield',
},
{
title: '产值',
dataIndex: 'output',
},
{
title: '耕种面积',
dataIndex: 'cultivated',
},
{
width: 180,
title: '操作',
dataIndex: 'action',
align: 'center',
fixed: undefined,
},
]
export const searchFormSchema: FormSchema[] = [
{
field: 'year',
label: '年份',
component: 'DatePicker',
componentProps: {
picker: 'year',
mode: 'year',
},
colProps: { span: 6 },
},
// {
// field: 'quarter',
// label: '季度',
// component: 'Select',
// componentProps: {
// options: [
// { label: '第一季度', value: '1' },
// { label: '第二季度', value: '2' },
// { label: '第三季度', value: '3' },
// { label: '第四季度', value: '4' },
// ],
// },
// colProps: { span: 6 },
// },
// {
// field: 'crop',
// label: '农作物',
// component: 'ApiSelect',
// componentProps: {
// api: async () => {
// const res = await getcrops({ type: 'all', crop_type: 2 })
// return res.filter((e) => e.is_end == 1)
// },
// labelField: 'name',
// valueField: 'id',
// },
// colProps: { span: 6 },
// },
]
export const accountFormSchema: FormSchema[] = [
{
field: 'id',
label: 'ID',
required: false,
dynamicDisabled: true,
component: 'Input',
ifShow: ({ values }) => {
return !!values.id
},
},
{
field: 'time_year',
label: '年份',
component: 'DatePicker',
required: true,
componentProps: {
picker: 'year',
mode: 'year',
},
},
{
field: 'quarter',
label: '季度',
component: 'Select',
required: true,
componentProps: {
options: [
{ label: '第一季度', value: '1' },
{ label: '第二季度', value: '2' },
{ label: '第三季度', value: '3' },
{ label: '第四季度', value: '4' },
],
},
},
{
field: 'base_id',
label: '区域',
component: 'ApiSelect',
required: true,
componentProps: {
api: async () => {
const res = await getTownAgriculturalBasic({ type: 1, page: 1, per_page: 99999 })
return res.items
},
labelField: 'name',
valueField: 'id',
},
},
{
field: 'yield',
label: '产量',
required: true,
component: 'InputNumber',
},
{
field: 'output',
label: '产值',
required: true,
component: 'InputNumber',
},
// {
// field: 'crop_id',
// label: '农作物',
// component: 'TreeSelect',
// required: true,
// componentProps: {
// api: async () => {
// const res = await getcrops({ type: 'all', crop_type: 2 })
// return res.filter((e) => e.is_end == 1)
// },
// labelField: 'name',
// valueField: 'id',
// },
// },
{
label: '农作物',
field: 'crop_id',
slot: 'crop',
component: 'TreeSelect',
required: true,
},
{
field: 'cultivated',
label: '耕种面积',
required: true,
component: 'InputNumber',
},
]

83
src/views/base/crop-yields/base-yields/index.vue 100644
View File

@ -0,0 +1,83 @@
<template>
<div>
<BasicTable title="基地总产量" @register="registerTable">
<template #toolbar>
<a-button type="primary" @click="handleCreate"> 新增 </a-button>
</template>
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'action'">
<div class="flex items-center justify-center">
<TableAction
:actions="[
{ label: '编辑', onClick: handleEdit.bind(null, record) },
{
label: '删除',
popConfirm: {
title: '是否确认删除',
placement: 'topRight',
confirm: handleDelete.bind(null, record),
},
},
]"
/>
</div>
</template>
</template>
</BasicTable>
<BaseDrawer @register="registerDrawer" @success="handleSuccess" />
</div>
</template>
<script lang="ts" setup>
import dayjs from 'dayjs'
import { BasicTable, useTable, TableAction } from '/@/components/Table'
import { getCropYields, deleteCropYields } from '/@/api/sys/user'
import { message } from 'ant-design-vue'
import { useDrawer } from '/@/components/Drawer'
import BaseDrawer from './BaseDrawer.vue'
import { columns, searchFormSchema } from './base.data'
const [registerDrawer, { openDrawer }] = useDrawer()
const [registerTable, { reload }] = useTable({
api: async (e) => {
if (e.year) e.year = dayjs(e.year).format('YYYY')
const res = await getCropYields({ ...e, type: 1 })
return res
},
rowKey: 'id',
columns,
formConfig: {
labelWidth: 120,
schemas: searchFormSchema,
},
useSearchForm: true,
showTableSetting: true,
bordered: true,
showIndexColumn: true,
})
const handleSuccess = () => {
message.success('操作成功')
reload()
}
const handleCreate = () => {
openDrawer(true, {
isUpdate: false,
})
}
const handleEdit = (record: Recordable) => {
openDrawer(true, {
...record,
isUpdate: true,
})
}
const handleDelete = async (record: Recordable) => {
await deleteCropYields(record.id)
message.success('删除成功')
reload()
}
</script>
<style lang="less" scoped>
:deep(.ant-picker) {
width: 100%;
}
</style>

87
src/views/base/crop-yields/town-yields/TownDrawer.vue 100644
View File

@ -0,0 +1,87 @@
<template>
<BasicDrawer
v-bind="$attrs"
@register="registerDrawer"
showFooter
:title="getTitle"
width="500px"
@ok="handleSubmit"
>
<BasicForm @register="registerForm">
<template #crop="{ model, field }">
<TreeSelect
v-model:value="model[field]"
:tree-data="treeData"
placeholder="请选择"
:fieldNames="{ children: 'children', label: 'name', value: 'id' }"
></TreeSelect>
</template>
</BasicForm>
</BasicDrawer>
</template>
<script lang="ts" setup>
import { getTreeData } from '/@/utils/index'
import dayjs from 'dayjs'
import { ref, computed, unref } from 'vue'
import { BasicForm, useForm } from '/@/components/Form/index'
import { accountFormSchema } from './town.data'
import { BasicDrawer, useDrawerInner } from '/@/components/Drawer'
import { addCropYields, editCropYields, getcrops } from '/@/api/sys/user'
import { TreeSelect } from 'ant-design-vue'
const emits = defineEmits(['success', 'register'])
const isUpdate = ref(false)
const treeData = ref([])
const getTitle = computed(() => (!isUpdate.value ? '新增产量' : '编辑产量'))
const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
labelWidth: 120,
baseColProps: { span: 24 },
schemas: accountFormSchema,
showActionButtonGroup: false,
})
const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
resetFields()
setDrawerProps({ confirmLoading: false })
if (unref(treeData).length === 0) {
const res = await getcrops({ type: 'all', crop_type: 2 })
treeData.value = getTreeData(res.items, 0, 'parent_id', 'id', 'children', 'key')
}
isUpdate.value = data?.isUpdate
if (unref(isUpdate)) {
await setFieldsValue({
id: data.id,
quarter: data.quarter.toString(),
time_year: dayjs(data.time_year.toString()),
base_id: data.base_id,
yield: data.yield,
output: data.output,
crop_id: data.crop_id,
cultivated: data.cultivated,
})
}
})
const handleSubmit = async () => {
try {
const values = await validate()
values.time_year = dayjs(values.time_year.toString()).format('YYYY')
values.type = 2
setDrawerProps({ confirmLoading: true })
if (values.id) {
// 修改
await editCropYields(values.id, values)
} else {
// 新增
await addCropYields(values)
}
closeDrawer()
emits('success')
} finally {
setDrawerProps({ confirmLoading: false })
}
}
</script>
<style lang="less" scoped>
:deep(.ant-picker) {
width: 100%;
}
</style>

83
src/views/base/crop-yields/town-yields/index.vue 100644
View File

@ -0,0 +1,83 @@
<template>
<div>
<BasicTable title="城镇总产量" @register="registerTable">
<template #toolbar>
<a-button type="primary" @click="handleCreate"> 新增 </a-button>
</template>
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'action'">
<div class="flex items-center justify-center">
<TableAction
:actions="[
{ label: '编辑', onClick: handleEdit.bind(null, record) },
{
label: '删除',
popConfirm: {
title: '是否确认删除',
placement: 'topRight',
confirm: handleDelete.bind(null, record),
},
},
]"
/>
</div>
</template>
</template>
</BasicTable>
<TownDrawer @register="registerDrawer" @success="handleSuccess" />
</div>
</template>
<script lang="ts" setup>
import dayjs from 'dayjs'
import { BasicTable, useTable, TableAction } from '/@/components/Table'
import { getCropYields, deleteCropYields } from '/@/api/sys/user'
import { message } from 'ant-design-vue'
import { useDrawer } from '/@/components/Drawer'
import TownDrawer from './TownDrawer.vue'
import { columns, searchFormSchema } from './town.data'
const [registerDrawer, { openDrawer }] = useDrawer()
const [registerTable, { reload }] = useTable({
api: async (e) => {
if (e.year) e.year = dayjs(e.year).format('YYYY')
const res = await getCropYields({ ...e, type: 2 })
return res
},
rowKey: 'id',
columns,
formConfig: {
labelWidth: 120,
schemas: searchFormSchema,
},
useSearchForm: true,
showTableSetting: true,
bordered: true,
showIndexColumn: true,
})
const handleSuccess = () => {
message.success('操作成功')
reload()
}
const handleCreate = () => {
openDrawer(true, {
isUpdate: false,
})
}
const handleEdit = (record: Recordable) => {
openDrawer(true, {
...record,
isUpdate: true,
})
}
const handleDelete = async (record: Recordable) => {
await deleteCropYields(record.id)
message.success('删除成功')
reload()
}
</script>
<style lang="less" scoped>
:deep(.ant-picker) {
width: 100%;
}
</style>

175
src/views/base/crop-yields/town-yields/town.data.ts 100644
View File

@ -0,0 +1,175 @@
import { BasicColumn } from '/@/components/Table'
import { FormSchema } from '/@/components/Table'
import { getTownAgriculturalBasic } from '/@/api/sys/user'
export const columns: BasicColumn[] = [
{
title: '基地名称',
dataIndex: 'base_name',
},
{
title: '农作物名称',
dataIndex: 'crop_name',
},
{
title: '年份',
dataIndex: 'time_year',
customRender: ({ text }) => {
return text + '年'
},
},
{
title: '季度',
dataIndex: 'quarter',
},
{
title: '产量',
dataIndex: 'yield',
},
{
title: '产值',
dataIndex: 'output',
},
{
title: '耕种面积',
dataIndex: 'cultivated',
},
{
width: 180,
title: '操作',
dataIndex: 'action',
align: 'center',
fixed: undefined,
},
]
export const searchFormSchema: FormSchema[] = [
{
field: 'year',
label: '年份',
component: 'DatePicker',
componentProps: {
picker: 'year',
mode: 'year',
},
colProps: { span: 6 },
},
// {
// field: 'quarter',
// label: '季度',
// component: 'Select',
// componentProps: {
// options: [
// { label: '第一季度', value: '1' },
// { label: '第二季度', value: '2' },
// { label: '第三季度', value: '3' },
// { label: '第四季度', value: '4' },
// ],
// },
// colProps: { span: 6 },
// },
// {
// field: 'crop',
// label: '农作物',
// component: 'ApiSelect',
// componentProps: {
// api: async () => {
// const res = await getcrops({ type: 'all', crop_type: 2 })
// return res.filter((e) => e.is_end == 1)
// },
// labelField: 'name',
// valueField: 'id',
// },
// colProps: { span: 6 },
// },
]
export const accountFormSchema: FormSchema[] = [
{
field: 'id',
label: 'ID',
required: false,
dynamicDisabled: true,
component: 'Input',
ifShow: ({ values }) => {
return !!values.id
},
},
{
field: 'time_year',
label: '年份',
component: 'DatePicker',
required: true,
componentProps: {
picker: 'year',
mode: 'year',
},
},
{
field: 'quarter',
label: '季度',
component: 'Select',
required: true,
componentProps: {
options: [
{ label: '第一季度', value: '1' },
{ label: '第二季度', value: '2' },
{ label: '第三季度', value: '3' },
{ label: '第四季度', value: '4' },
],
},
},
{
field: 'base_id',
label: '区域',
component: 'ApiSelect',
required: true,
componentProps: {
api: async () => {
const res = await getTownAgriculturalBasic({ type: 2, page: 1, per_page: 99999 })
return res.items
},
labelField: 'name',
valueField: 'id',
},
},
{
field: 'yield',
label: '产量',
required: true,
component: 'InputNumber',
},
{
field: 'output',
label: '产值',
required: true,
component: 'InputNumber',
},
// {
// field: 'crop_id',
// label: '农作物',
// component: 'TreeSelect',
// required: true,
// componentProps: {
// api: async () => {
// const res = await getcrops({ type: 'all', crop_type: 2 })
// return res.filter((e) => e.is_end == 1)
// },
// labelField: 'name',
// valueField: 'id',
// },
// },
{
label: '农作物',
field: 'crop_id',
slot: 'crop',
component: 'TreeSelect',
required: true,
},
{
field: 'cultivated',
label: '耕种面积',
required: true,
component: 'InputNumber',
},
]

21
src/views/base/crops/town-crops/TownDrawer.vue
View File

@ -38,13 +38,13 @@
<Input v-model:value="modelRef.name" placeholder="请输入" class="w-full"></Input>
</FormItem>
<FormItem label="上级">
<Select
:options="parentDate"
:fieldNames="{ label: 'name', value: 'id' }"
<TreeSelect
:tree-data="parentDate"
:fieldNames="{ children: 'children', label: 'name', value: 'id' }"
v-model:value="modelRef.parent_id"
placeholder="请选择"
class="w-full"
></Select>
></TreeSelect>
</FormItem>
<FormItem
label="单位"
@ -122,9 +122,10 @@
</BasicDrawer>
</template>
<script lang="ts" setup>
import { getTreeData } from '/@/utils/index'
import { ref, computed, unref } from 'vue'
import { BasicDrawer, useDrawerInner } from '/@/components/Drawer'
import { Form, Select, FormItem, Input, Switch, Button, Space } from 'ant-design-vue'
import { Form, Select, FormItem, Input, Switch, Button, Space, TreeSelect } from 'ant-design-vue'
import { MinusCircleOutlined, PlusOutlined } from '@ant-design/icons-vue'
import { getCropCate, addcrops, getcrops, editcrops } from '/@/api/sys/user'
import type { FormInstance } from 'ant-design-vue'
@ -160,11 +161,17 @@
const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
formRef.value?.resetFields()
// 获取产业
if (unref(categoryDate).length === 0) {
const res = await getCropCate()
categoryDate.value = res
categoryDate.value = res.items
}
//获取上级数据
if (unref(parentDate).length === 0) {
const resDate = await getcrops({ page: 1, per_page: 99999, crop_type: 2, type: 'all' })
parentDate.value = resDate.filter((e) => !e.is_end)
parentDate.value = getTreeData(resDate.items, 0, 'parent_id', 'id', 'children', 'key')
}
setDrawerProps({ confirmLoading: false })
isUpdate.value = data?.isUpdate
if (unref(isUpdate)) {

69
src/views/base/estate/materiels/MaterielsDrawer.vue 100644
View File

@ -0,0 +1,69 @@
<template>
<BasicDrawer
v-bind="$attrs"
@register="registerDrawer"
showFooter
:title="getTitle"
width="500px"
@ok="handleSubmit"
>
<BasicForm @register="registerForm"> </BasicForm>
</BasicDrawer>
</template>
<script lang="ts" setup>
import dayjs from 'dayjs'
import { ref, computed, unref } from 'vue'
import { BasicForm, useForm } from '/@/components/Form/index'
import { accountFormSchema } from './materiels.data'
import { BasicDrawer, useDrawerInner } from '/@/components/Drawer'
import { addMateriels, editMateriels } from '/@/api/sys/user'
const emits = defineEmits(['success', 'register'])
const isUpdate = ref(false)
const getTitle = computed(() => (!isUpdate.value ? '新增物资' : '编辑物资'))
const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
labelWidth: 120,
baseColProps: { span: 24 },
schemas: accountFormSchema,
showActionButtonGroup: false,
})
const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
resetFields()
setDrawerProps({ confirmLoading: false })
isUpdate.value = data?.isUpdate
if (unref(isUpdate)) {
await setFieldsValue({
id: data.id,
quarter: data.quarter.toString(),
year: dayjs(data.year.toString()),
type: data.type,
lowest_price: data.lowest_price,
highest_price: data.highest_price,
name: data.name,
})
}
})
const handleSubmit = async () => {
try {
const values = await validate()
values.year = dayjs(values.year.toString()).format('YYYY')
setDrawerProps({ confirmLoading: true })
if (values.id) {
// 修改
await editMateriels(values.id, values)
} else {
// 新增
await addMateriels(values)
}
closeDrawer()
emits('success')
} finally {
setDrawerProps({ confirmLoading: false })
}
}
</script>
<style lang="less" scoped>
:deep(.ant-picker) {
width: 100%;
}
</style>

84
src/views/base/estate/materiels/index.vue 100644
View File

@ -0,0 +1,84 @@
<template>
<div>
<BasicTable @register="registerTable">
<template #toolbar>
<a-button type="primary" @click="handleCreate"> 新增 </a-button>
</template>
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'action'">
<div class="flex items-center justify-center">
<TableAction
:actions="[
{ label: '编辑', onClick: handleEdit.bind(null, record) },
{
label: '删除',
popConfirm: {
title: '是否确认删除',
placement: 'topRight',
confirm: handleDelete.bind(null, record),
},
},
]"
/>
</div>
</template>
</template>
</BasicTable>
<MaterielsDrawer @register="registerDrawer" @success="handleSuccess" />
</div>
</template>
<script lang="ts" setup>
import dayjs from 'dayjs'
import { BasicTable, useTable, TableAction } from '/@/components/Table'
import { getMateriels, deleteMateriels } from '/@/api/sys/user'
import { message } from 'ant-design-vue'
import { useDrawer } from '/@/components/Drawer'
import MaterielsDrawer from './MaterielsDrawer.vue'
import { columns, searchFormSchema } from './materiels.data'
const [registerDrawer, { openDrawer }] = useDrawer()
const [registerTable, { reload }] = useTable({
title: '大宗物资 - 列表',
api: async (e) => {
if (e.year) e.year = dayjs(e.year).format('YYYY')
const res = await getMateriels({ ...e })
console.log(res)
return res
},
rowKey: 'id',
columns,
formConfig: {
labelWidth: 120,
schemas: searchFormSchema,
},
useSearchForm: true,
showTableSetting: true,
bordered: true,
showIndexColumn: true,
})
const handleSuccess = () => {
message.success('操作成功')
reload()
}
const handleCreate = () => {
openDrawer(true, {
isUpdate: false,
})
}
const handleEdit = (record: Recordable) => {
openDrawer(true, {
...record,
isUpdate: true,
})
}
const handleDelete = async (record: Recordable) => {
await deleteMateriels(record.id)
message.success('删除成功')
reload()
}
</script>
<style lang="less" scoped>
:deep(.ant-picker) {
width: 100%;
}
</style>

180
src/views/base/estate/materiels/materiels.data.ts 100644
View File

@ -0,0 +1,180 @@
import { BasicColumn } from '/@/components/Table'
import { FormSchema } from '/@/components/Table'
import { Tag } from 'ant-design-vue'
import { h } from 'vue'
export const columns: BasicColumn[] = [
{
title: '名称',
dataIndex: 'name',
},
{
title: '年份',
dataIndex: 'year',
customRender: ({ text }) => {
return text + '年'
},
},
{
title: '季度',
dataIndex: 'quarter',
},
{
title: '类型',
dataIndex: 'type',
customRender: ({ record }) => {
const status = record.type
const list = [
{
value: 1,
color: 'green',
label: '饲料',
},
{
value: 2,
color: 'pink',
label: '肥料',
},
]
const item = list.find((e) => e.value === status)
const color = item?.color ?? 'red'
const text = item?.label ?? status
return h(Tag, { color: color }, () => text)
},
},
{
title: '最低价',
dataIndex: 'lowest_price',
},
{
title: '最高价',
dataIndex: 'highest_price',
},
{
title: '创建人',
dataIndex: 'name',
customRender: ({ record: { created_by } }) => {
return created_by.name
},
},
{
width: 180,
title: '操作',
dataIndex: 'action',
align: 'center',
fixed: undefined,
},
]
export const searchFormSchema: FormSchema[] = [
{
field: 'year',
label: '年份',
component: 'DatePicker',
componentProps: {
picker: 'year',
mode: 'year',
},
colProps: { span: 6 },
},
{
field: 'quarter',
label: '季度',
component: 'Select',
componentProps: {
options: [
{ label: '第一季度', value: '1' },
{ label: '第二季度', value: '2' },
{ label: '第三季度', value: '3' },
{ label: '第四季度', value: '4' },
],
},
colProps: { span: 6 },
},
{
field: 'type',
label: '类型',
component: 'Select',
componentProps: {
options: [
{ label: '饲料', value: '1' },
{ label: '肥料', value: '2' },
],
},
colProps: { span: 6 },
},
{
field: 'name',
label: '名称',
required: false,
component: 'Input',
colProps: { span: 6 },
},
]
export const accountFormSchema: FormSchema[] = [
{
field: 'id',
label: 'ID',
required: false,
dynamicDisabled: true,
component: 'Input',
ifShow: ({ values }) => {
return !!values.id
},
},
{
field: 'name',
label: '名称',
required: true,
component: 'Input',
},
{
field: 'year',
label: '年份',
component: 'DatePicker',
required: true,
componentProps: {
picker: 'year',
mode: 'year',
},
},
{
field: 'quarter',
label: '季度',
component: 'Select',
required: true,
componentProps: {
options: [
{ label: '第一季度', value: '1' },
{ label: '第二季度', value: '2' },
{ label: '第三季度', value: '3' },
{ label: '第四季度', value: '4' },
],
},
},
{
field: 'type',
label: '类型',
component: 'Select',
required: true,
componentProps: {
options: [
{ label: '饲料', value: 1 },
{ label: '肥料', value: 2 },
],
},
},
{
field: 'lowest_price',
label: '最低价',
required: true,
component: 'InputNumber',
},
{
field: 'highest_price',
label: '最高价',
required: true,
component: 'InputNumber',
},
]

46
src/views/base/estate/shrim-price/PriceDrawer.vue
View File

@ -11,15 +11,15 @@
</BasicDrawer>
</template>
<script lang="ts" setup>
import dayjs from 'dayjs'
import { ref, computed, unref } from 'vue'
import { BasicForm, useForm } from '/@/components/Form/index'
import { accountFormSchema } from './shrim-price'
import { BasicDrawer, useDrawerInner } from '/@/components/Drawer'
import { defaultsDeep } from 'lodash-es'
import { createDevice, getDeviceTypes, updateDevice } from '/@/api/sys/other'
import { addShrimpPrices, editShrimpPrices } from '/@/api/sys/user'
const emits = defineEmits(['success', 'register'])
const isUpdate = ref(false)
const getTitle = computed(() => (!isUpdate.value ? '新增设备' : '编辑设备'))
const getTitle = computed(() => (!isUpdate.value ? '新增价格' : '编辑价格'))
const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
labelWidth: 120,
baseColProps: { span: 24 },
@ -31,45 +31,26 @@
setDrawerProps({ confirmLoading: false })
isUpdate.value = data?.isUpdate
if (unref(isUpdate)) {
const obj = Object.assign({}, { ...data, ...data?.extends })
const deviceTypes = await getDeviceTypes()
await setFieldsValue({
...obj,
agricultural_base_id: obj.base_id,
type: formatDataByObject(deviceTypes).find((e) => e.label == obj.type)?.value,
id: data.id,
quarter: data.quarter.toString(),
year: dayjs(data.year.toString()),
price: data.price,
})
}
})
const formatDataByObject = (obj) => {
const arr: any[] = []
Object.keys(obj).forEach((e) => {
arr.push({
label: obj[e],
value: e,
})
})
return arr
}
const setValue = (keys: any, value: any) => {
const object = {}
var last = keys.pop()
keys.reduce((o, k) => (o[k] = o[k] || {}), object)[last] = value
return object
}
const handleSubmit = async () => {
try {
const values = await validate()
let params = {}
for (const key in values) {
params = defaultsDeep({}, params, setValue(key.split('.'), values[key]))
}
values.year = dayjs(values.year.toString()).format('YYYY')
setDrawerProps({ confirmLoading: true })
if (values.id) {
// 修改
await updateDevice(values.id, params)
await editShrimpPrices(values.id, values)
} else {
// 新增
await createDevice(params)
await addShrimpPrices(values)
}
closeDrawer()
emits('success')
@ -78,3 +59,8 @@
}
}
</script>
<style lang="less" scoped>
:deep(.ant-picker) {
width: 100%;
}
</style>

16
src/views/base/estate/shrim-price/index.vue
View File

@ -2,7 +2,7 @@
<div>
<BasicTable @register="registerTable">
<template #toolbar>
<a-button type="primary" @click="handleCreate"> 新增设备 </a-button>
<a-button type="primary" @click="handleCreate"> 新增 </a-button>
</template>
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'action'">
@ -28,9 +28,9 @@
</div>
</template>
<script lang="ts" setup>
import dayjs from 'dayjs'
import { BasicTable, useTable, TableAction } from '/@/components/Table'
// import { getShrimpPrices, deleteDevice } from '/@/api/sys/other'
import { getShrimpPrices } from '/@/api/sys/user'
import { getShrimpPrices, deleteShrimpPrices } from '/@/api/sys/user'
import { message } from 'ant-design-vue'
import { useDrawer } from '/@/components/Drawer'
import PriceDrawer from './PriceDrawer.vue'
@ -38,7 +38,11 @@
const [registerDrawer, { openDrawer }] = useDrawer()
const [registerTable, { reload }] = useTable({
title: '稻虾价格 - 列表',
api: getShrimpPrices,
api: async (e) => {
if (e.year) e.year = dayjs(e.year).format('YYYY')
const res = await getShrimpPrices({ ...e })
return res
},
rowKey: 'id',
columns,
formConfig: {
@ -57,7 +61,7 @@
}
const handleCreate = () => {
openDrawer(true, {
id: false,
isUpdate: false,
})
}
const handleEdit = (record: Recordable) => {
@ -67,7 +71,7 @@
})
}
const handleDelete = async (record: Recordable) => {
await deleteDevice(record.id)
await deleteShrimpPrices(record.id)
message.success('删除成功')
reload()
}

120
src/views/base/estate/shrim-price/shrim-price.ts
View File

@ -1,19 +1,5 @@
import { BasicColumn } from '/@/components/Table'
import { FormSchema } from '/@/components/Table'
import { getAgriculturalBasic } from '/@/api/sys/user'
import { getDeviceTypes } from '/@/api/sys/other'
import { h } from 'vue'
import { DatePicker } from 'ant-design-vue'
function formatDataByObject(obj): any[] {
const arr: any[] = []
Object.keys(obj).forEach((e) => {
arr.push({
label: obj[e],
value: e,
})
})
return arr
}
export const columns: BasicColumn[] = [
{
title: '年份',
@ -51,16 +37,10 @@ export const searchFormSchema: FormSchema[] = [
{
field: 'year',
label: '年份',
component: 'Input',
render: ({ model, field }) => {
return h(DatePicker, {
placeholder: '请选择年份',
component: 'DatePicker',
componentProps: {
picker: 'year',
mode: 'year',
onChange: (e) => {
model[field] = e['$y']
},
})
},
colProps: { span: 6 },
},
@ -83,7 +63,7 @@ export const searchFormSchema: FormSchema[] = [
export const accountFormSchema: FormSchema[] = [
{
field: 'id',
label: '设备ID',
label: 'ID',
required: false,
dynamicDisabled: true,
component: 'Input',
@ -92,93 +72,33 @@ export const accountFormSchema: FormSchema[] = [
},
},
{
field: 'type',
label: '设备类型',
field: 'year',
label: '年份',
component: 'DatePicker',
required: true,
component: 'ApiSelect',
componentProps: {
api: async () => {
const res = await getDeviceTypes()
return formatDataByObject(res)
},
picker: 'year',
mode: 'year',
},
},
{
field: 'agricultural_base_id',
label: '基地',
field: 'quarter',
label: '季度',
component: 'Select',
required: true,
component: 'ApiSelect',
componentProps: {
api: getAgriculturalBasic,
labelField: 'name',
valueField: 'id',
options: [
{ label: '第一季度', value: '1' },
{ label: '第二季度', value: '2' },
{ label: '第三季度', value: '3' },
{ label: '第四季度', value: '4' },
],
},
},
{
field: 'sn',
label: '设备编号',
field: 'price',
label: '价格',
required: true,
component: 'Input',
},
{
field: 'monitoring_point',
label: '监控点',
required: true,
component: 'Input',
},
{
field: 'extends.ip',
label: '设备IP',
required: true,
component: 'Input',
ifShow: ({ values }) => {
return !!(values.type == 1)
},
},
{
field: 'extends.port',
label: '设备端口',
required: true,
component: 'Input',
ifShow: ({ values }) => {
return !!(values.type == 1)
},
},
{
field: 'extends.rtsp_url',
label: 'RTSP地址',
required: true,
component: 'Input',
ifShow: ({ values }) => {
return !!(values.type == 1)
},
},
{
field: 'extends.username',
label: '设备登录名',
required: true,
component: 'Input',
ifShow: ({ values }) => {
return !!(values.type == 1)
},
},
{
field: 'extends.password',
label: '设备登录密码',
required: true,
component: 'Input',
ifShow: ({ values }) => {
return !!(values.type == 1)
},
},
{
field: 'extends.passage',
label: '设备播放通道',
required: true,
component: 'Input',
ifShow: ({ values }) => {
return !!(values.type == 1)
},
component: 'InputNumber',
},
]

67
src/views/base/estate/shrimp-flows/FlowsDrawer.vue 100644
View File

@ -0,0 +1,67 @@
<template>
<BasicDrawer
v-bind="$attrs"
@register="registerDrawer"
showFooter
:title="getTitle"
width="500px"
@ok="handleSubmit"
>
<BasicForm @register="registerForm"> </BasicForm>
</BasicDrawer>
</template>
<script lang="ts" setup>
import dayjs from 'dayjs'
import { ref, computed, unref } from 'vue'
import { BasicForm, useForm } from '/@/components/Form/index'
import { accountFormSchema } from './shrimp-flows'
import { BasicDrawer, useDrawerInner } from '/@/components/Drawer'
import { addShrimpFlows, editShrimpFlows } from '/@/api/sys/user'
const emits = defineEmits(['success', 'register'])
const isUpdate = ref(false)
const getTitle = computed(() => (!isUpdate.value ? '新增流向' : '编辑流向'))
const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
labelWidth: 120,
baseColProps: { span: 24 },
schemas: accountFormSchema,
showActionButtonGroup: false,
})
const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
resetFields()
setDrawerProps({ confirmLoading: false })
isUpdate.value = data?.isUpdate
if (unref(isUpdate)) {
await setFieldsValue({
id: data.id,
quarter: data.quarter.toString(),
year: dayjs(data.year.toString()),
area: data.area,
sales: data.sales,
})
}
})
const handleSubmit = async () => {
try {
const values = await validate()
values.year = dayjs(values.year.toString()).format('YYYY')
setDrawerProps({ confirmLoading: true })
if (values.id) {
// 修改
await editShrimpFlows(values.id, values)
} else {
// 新增
await addShrimpFlows(values)
}
closeDrawer()
emits('success')
} finally {
setDrawerProps({ confirmLoading: false })
}
}
</script>
<style lang="less" scoped>
:deep(.ant-picker) {
width: 100%;
}
</style>

83
src/views/base/estate/shrimp-flows/index.vue 100644
View File

@ -0,0 +1,83 @@
<template>
<div>
<BasicTable @register="registerTable">
<template #toolbar>
<a-button type="primary" @click="handleCreate"> 新增 </a-button>
</template>
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'action'">
<div class="flex items-center justify-center">
<TableAction
:actions="[
{ label: '编辑', onClick: handleEdit.bind(null, record) },
{
label: '删除',
popConfirm: {
title: '是否确认删除',
placement: 'topRight',
confirm: handleDelete.bind(null, record),
},
},
]"
/>
</div>
</template>
</template>
</BasicTable>
<FlowsDrawer @register="registerDrawer" @success="handleSuccess" />
</div>
</template>
<script lang="ts" setup>
import dayjs from 'dayjs'
import { BasicTable, useTable, TableAction } from '/@/components/Table'
import { getShrimpFlows, deleteShrimpFlows } from '/@/api/sys/user'
import { message } from 'ant-design-vue'
import { useDrawer } from '/@/components/Drawer'
import FlowsDrawer from './FlowsDrawer.vue'
import { columns, searchFormSchema } from './shrimp-flows'
const [registerDrawer, { openDrawer }] = useDrawer()
const [registerTable, { reload }] = useTable({
title: '稻虾流向 - 列表',
api: async (e) => {
if (e.year) e.year = dayjs(e.year).format('YYYY')
const res = await getShrimpFlows({ ...e })
return res
},
rowKey: 'id',
columns,
formConfig: {
labelWidth: 120,
schemas: searchFormSchema,
},
useSearchForm: true,
showTableSetting: true,
bordered: true,
showIndexColumn: true,
})
const handleSuccess = () => {
message.success('操作成功')
reload()
}
const handleCreate = () => {
openDrawer(true, {
isUpdate: false,
})
}
const handleEdit = (record: Recordable) => {
openDrawer(true, {
...record,
isUpdate: true,
})
}
const handleDelete = async (record: Recordable) => {
await deleteShrimpFlows(record.id)
message.success('删除成功')
reload()
}
</script>
<style lang="less" scoped>
:deep(.ant-picker) {
width: 100%;
}
</style>

114
src/views/base/estate/shrimp-flows/shrimp-flows.ts 100644
View File

@ -0,0 +1,114 @@
import { BasicColumn } from '/@/components/Table'
import { FormSchema } from '/@/components/Table'
export const columns: BasicColumn[] = [
{
title: '年份',
dataIndex: 'year',
customRender: ({ text }) => {
return text + '年'
},
},
{
title: '季度',
dataIndex: 'quarter',
},
{
title: '地区',
dataIndex: 'area',
},
{
title: '销量',
dataIndex: 'sales',
},
{
title: '创建人',
dataIndex: 'name',
customRender: ({ record: { created_by } }) => {
return created_by.name
},
},
{
width: 180,
title: '操作',
dataIndex: 'action',
align: 'center',
fixed: undefined,
},
]
export const searchFormSchema: FormSchema[] = [
{
field: 'year',
label: '年份',
component: 'DatePicker',
componentProps: {
picker: 'year',
mode: 'year',
},
colProps: { span: 6 },
},
{
field: 'quarter',
label: '季度',
component: 'Select',
componentProps: {
options: [
{ label: '第一季度', value: '1' },
{ label: '第二季度', value: '2' },
{ label: '第三季度', value: '3' },
{ label: '第四季度', value: '4' },
],
},
colProps: { span: 6 },
},
]
export const accountFormSchema: FormSchema[] = [
{
field: 'id',
label: 'ID',
required: false,
dynamicDisabled: true,
component: 'Input',
ifShow: ({ values }) => {
return !!values.id
},
},
{
field: 'year',
label: '年份',
component: 'DatePicker',
required: true,
componentProps: {
picker: 'year',
mode: 'year',
},
},
{
field: 'quarter',
label: '季度',
component: 'Select',
required: true,
componentProps: {
options: [
{ label: '第一季度', value: '1' },
{ label: '第二季度', value: '2' },
{ label: '第三季度', value: '3' },
{ label: '第四季度', value: '4' },
],
},
},
{
field: 'area',
label: '地区',
required: true,
component: 'Input',
},
{
field: 'sales',
label: '销量',
required: true,
component: 'InputNumber',
},
]

68
src/views/base/estate/shrimp-industries/IndustriesDrawer.vue 100644
View File

@ -0,0 +1,68 @@
<template>
<BasicDrawer
v-bind="$attrs"
@register="registerDrawer"
showFooter
:title="getTitle"
width="500px"
@ok="handleSubmit"
>
<BasicForm @register="registerForm"> </BasicForm>
</BasicDrawer>
</template>
<script lang="ts" setup>
import dayjs from 'dayjs'
import { ref, computed, unref } from 'vue'
import { BasicForm, useForm } from '/@/components/Form/index'
import { accountFormSchema } from './shrimp-industries'
import { BasicDrawer, useDrawerInner } from '/@/components/Drawer'
import { addShrimpIndustries, editShrimpIndustries } from '/@/api/sys/user'
const emits = defineEmits(['success', 'register'])
const isUpdate = ref(false)
const getTitle = computed(() => (!isUpdate.value ? '新增产业' : '编辑产业'))
const [registerForm, { resetFields, setFieldsValue, validate }] = useForm({
labelWidth: 120,
baseColProps: { span: 24 },
schemas: accountFormSchema,
showActionButtonGroup: false,
})
const [registerDrawer, { setDrawerProps, closeDrawer }] = useDrawerInner(async (data) => {
resetFields()
setDrawerProps({ confirmLoading: false })
isUpdate.value = data?.isUpdate
if (unref(isUpdate)) {
await setFieldsValue({
id: data.id,
quarter: data.quarter.toString(),
year: dayjs(data.year.toString()),
area: data.area,
product_output: data.product_output,
product_value: data.product_value,
})
}
})
const handleSubmit = async () => {
try {
const values = await validate()
values.year = dayjs(values.year.toString()).format('YYYY')
setDrawerProps({ confirmLoading: true })
if (values.id) {
// 修改
await editShrimpIndustries(values.id, values)
} else {
// 新增
await addShrimpIndustries(values)
}
closeDrawer()
emits('success')
} finally {
setDrawerProps({ confirmLoading: false })
}
}
</script>
<style lang="less" scoped>
:deep(.ant-picker) {
width: 100%;
}
</style>

83
src/views/base/estate/shrimp-industries/index.vue 100644
View File

@ -0,0 +1,83 @@
<template>
<div>
<BasicTable @register="registerTable">
<template #toolbar>
<a-button type="primary" @click="handleCreate"> 新增 </a-button>
</template>
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'action'">
<div class="flex items-center justify-center">
<TableAction
:actions="[
{ label: '编辑', onClick: handleEdit.bind(null, record) },
{
label: '删除',
popConfirm: {
title: '是否确认删除',
placement: 'topRight',
confirm: handleDelete.bind(null, record),
},
},
]"
/>
</div>
</template>
</template>
</BasicTable>
<IndustriesDrawer @register="registerDrawer" @success="handleSuccess" />
</div>
</template>
<script lang="ts" setup>
import dayjs from 'dayjs'
import { BasicTable, useTable, TableAction } from '/@/components/Table'
import { getShrimpIndustries, deleteShrimpIndustries } from '/@/api/sys/user'
import { message } from 'ant-design-vue'
import { useDrawer } from '/@/components/Drawer'
import IndustriesDrawer from './IndustriesDrawer.vue'
import { columns, searchFormSchema } from './shrimp-industries'
const [registerDrawer, { openDrawer }] = useDrawer()
const [registerTable, { reload }] = useTable({
title: '稻虾产业 - 列表',
api: async (e) => {
if (e.year) e.year = dayjs(e.year).format('YYYY')
const res = await getShrimpIndustries({ ...e })
return res
},
rowKey: 'id',
columns,
formConfig: {
labelWidth: 120,
schemas: searchFormSchema,
},
useSearchForm: true,
showTableSetting: true,
bordered: true,
showIndexColumn: true,
})
const handleSuccess = () => {
message.success('操作成功')
reload()
}
const handleCreate = () => {
openDrawer(true, {
isUpdate: false,
})
}
const handleEdit = (record: Recordable) => {
openDrawer(true, {
...record,
isUpdate: true,
})
}
const handleDelete = async (record: Recordable) => {
await deleteShrimpIndustries(record.id)
message.success('删除成功')
reload()
}
</script>
<style lang="less" scoped>
:deep(.ant-picker) {
width: 100%;
}
</style>

124
src/views/base/estate/shrimp-industries/shrimp-industries.ts 100644
View File

@ -0,0 +1,124 @@
import { BasicColumn } from '/@/components/Table'
import { FormSchema } from '/@/components/Table'
export const columns: BasicColumn[] = [
{
title: '年份',
dataIndex: 'year',
customRender: ({ text }) => {
return text + '年'
},
},
{
title: '季度',
dataIndex: 'quarter',
},
{
title: '面积',
dataIndex: 'area',
},
{
title: '产量',
dataIndex: 'product_output',
},
{
title: '产值',
dataIndex: 'product_value',
},
{
title: '创建人',
dataIndex: 'name',
customRender: ({ record: { created_by } }) => {
return created_by.name
},
},
{
width: 180,
title: '操作',
dataIndex: 'action',
align: 'center',
fixed: undefined,
},
]
export const searchFormSchema: FormSchema[] = [
{
field: 'year',
label: '年份',
component: 'DatePicker',
componentProps: {
picker: 'year',
mode: 'year',
},
colProps: { span: 6 },
},
{
field: 'quarter',
label: '季度',
component: 'Select',
componentProps: {
options: [
{ label: '第一季度', value: '1' },
{ label: '第二季度', value: '2' },
{ label: '第三季度', value: '3' },
{ label: '第四季度', value: '4' },
],
},
colProps: { span: 6 },
},
]
export const accountFormSchema: FormSchema[] = [
{
field: 'id',
label: 'ID',
required: false,
dynamicDisabled: true,
component: 'Input',
ifShow: ({ values }) => {
return !!values.id
},
},
{
field: 'year',
label: '年份',
component: 'DatePicker',
required: true,
componentProps: {
picker: 'year',
mode: 'year',
},
},
{
field: 'quarter',
label: '季度',
component: 'Select',
required: true,
componentProps: {
options: [
{ label: '第一季度', value: '1' },
{ label: '第二季度', value: '2' },
{ label: '第三季度', value: '3' },
{ label: '第四季度', value: '4' },
],
},
},
{
field: 'area',
label: '面积',
required: true,
component: 'InputNumber',
},
{
field: 'product_output',
label: '产量',
required: true,
component: 'InputNumber',
},
{
field: 'product_value',
label: '产值',
required: true,
component: 'InputNumber',
},
]

4
src/views/base/ranking-list/index.vue
View File

@ -29,7 +29,7 @@
</template>
<script lang="ts" setup>
import { BasicTable, useTable, TableAction } from '/@/components/Table'
import { getCropYields } from '/@/api/sys/user'
// import { getCropYields } from '/@/api/sys/user'
import { message } from 'ant-design-vue'
import { useDrawer } from '/@/components/Drawer'
import DeviceDrawer from './RankingDrawer.vue'
@ -39,7 +39,7 @@
title: '产量列表',
api: async (e) => {
console.log(e)
const res = await getCropYields(e)
// const res = await getCropYields(e)
console.log(res)
return res.list
},

16
src/views/device/management/management.data.ts
View File

@ -80,7 +80,11 @@ export const searchFormSchema: FormSchema[] = [
label: '基地',
component: 'ApiSelect',
componentProps: {
api: getAgriculturalBasic,
api: async () => {
const res = await getAgriculturalBasic()
console.log(res)
return res.items
},
labelField: 'name',
valueField: 'id',
},
@ -93,7 +97,7 @@ export const searchFormSchema: FormSchema[] = [
componentProps: {
api: async () => {
const res = await getDeviceTypes()
return formatDataByObject(res)
return formatDataByObject(res.items)
},
},
colProps: { span: 6 },
@ -139,7 +143,7 @@ export const accountFormSchema: FormSchema[] = [
componentProps: {
api: async () => {
const res = await getDeviceTypes()
return formatDataByObject(res)
return formatDataByObject(res.items)
},
},
},
@ -149,7 +153,11 @@ export const accountFormSchema: FormSchema[] = [
required: true,
component: 'ApiSelect',
componentProps: {
api: getAgriculturalBasic,
api: async () => {
const res = await getAgriculturalBasic()
console.log(res)
return res.items
},
labelField: 'name',
valueField: 'id',
},

10
src/views/system/account/account.data.ts
View File

@ -141,7 +141,10 @@ export const accountFormSchema: FormSchema[] = [
required: true,
component: 'ApiSelect',
componentProps: {
api: getRoles,
api: async () => {
const res = await getRoles({})
return res.items
},
labelField: 'name',
valueField: 'id',
},
@ -205,7 +208,10 @@ export const accountFormSchema: FormSchema[] = [
required: false,
component: 'ApiSelect',
componentProps: {
api: getAgriculturalBasic,
api: async () => {
const res = await getAgriculturalBasic()
return res.items
},
labelField: 'name',
valueField: 'id',
mode: 'multiple',

4
src/views/system/role/RoleDrawer.vue
View File

@ -44,7 +44,9 @@
setDrawerProps({ confirmLoading: false })
// 需要在setFieldsValue之前先填充treeData，否则Tree组件可能会报key not exist警告
if (unref(treeData).length === 0) {
treeData.value = (await getPermissions()) as any as TreeItem[]
// treeData.value = (await getPermissions()) as any as TreeItem[]
const res = await getPermissions()
treeData.value = res.items
}
isUpdate.value = data?.isUpdate
if (unref(isUpdate)) {

14309
yarn.lock
View File

File diff suppressed because it is too large Load Diff