From d781ed83857aa3d72badc52b5953f22ae451e798 Mon Sep 17 00:00:00 2001 From: zhangyue <82248909@qq.com> Date: Thu, 23 Jul 2026 19:11:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=89=E5=8E=BF=E5=A2=9E=E5=8A=A0=E5=90=8E?= =?UTF-8?q?=E5=8F=B0=E8=8F=9C=E5=8D=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- .../SurvTransdataLivestockwater.api.ts | 72 +++++ .../SurvTransdataLivestockwater.data.ts | 133 +++++++++ .../SurvTransdataLivestockwaterList.vue | 279 ++++++++++++++++++ .../SurvTransdataLivestockwaterForm.vue | 193 ++++++++++++ .../SurvTransdataLivestockwaterModal.vue | 75 +++++ .../orient/SurvTransdataOrientwater.api.ts | 72 +++++ .../orient/SurvTransdataOrientwater.data.ts | 161 ++++++++++ .../orient/SurvTransdataOrientwaterList.vue | 278 +++++++++++++++++ .../SurvTransdataOrientwaterForm.vue | 240 +++++++++++++++ .../SurvTransdataOrientwaterModal.vue | 75 +++++ .../SurvTransdataLivestockwater.data.ts | 24 +- .../SurvTransdataLivestockwaterForm.vue | 62 ++-- .../appmana/zhibiao/ScEquZhibiao.data.ts | 43 ++- .../appmana/zhibiao/ScEquZhibiaoList.vue | 107 ++++--- .../zhibiao/components/ScEquZhibiaoForm.vue | 53 ++-- .../Analysis/components/VisitAnalysis.vue | 128 ++++---- 17 files changed, 1802 insertions(+), 197 deletions(-) create mode 100644 src/views/appmana/jixian/realtime/livestock/SurvTransdataLivestockwater.api.ts create mode 100644 src/views/appmana/jixian/realtime/livestock/SurvTransdataLivestockwater.data.ts create mode 100644 src/views/appmana/jixian/realtime/livestock/SurvTransdataLivestockwaterList.vue create mode 100644 src/views/appmana/jixian/realtime/livestock/components/SurvTransdataLivestockwaterForm.vue create mode 100644 src/views/appmana/jixian/realtime/livestock/components/SurvTransdataLivestockwaterModal.vue create mode 100644 src/views/appmana/jixian/realtime/orient/SurvTransdataOrientwater.api.ts create mode 100644 src/views/appmana/jixian/realtime/orient/SurvTransdataOrientwater.data.ts create mode 100644 src/views/appmana/jixian/realtime/orient/SurvTransdataOrientwaterList.vue create mode 100644 src/views/appmana/jixian/realtime/orient/components/SurvTransdataOrientwaterForm.vue create mode 100644 src/views/appmana/jixian/realtime/orient/components/SurvTransdataOrientwaterModal.vue diff --git a/.env.development b/.env.development index e4a1d61..b0855a0 100644 --- a/.env.development +++ b/.env.development @@ -6,7 +6,7 @@ VITE_PUBLIC_PATH = / # 跨域代理，您可以配置多个 ,请注意，没有换行符 VITE_PROXY = [["/jeecgboot","http://192.168.2.110:9999"],["/upload","http://192.168.2.110:3300/upload"]] -VITE_PROXY = [["/jeecgboot","https://fxnsp.sxcooh.com/lh-api/"],["/upload","http://192.168.2.111:3300/upload"]] +#VITE_PROXY = [["/jeecgboot","https://fxnsp.sxcooh.com/lh-api/"],["/upload","http://192.168.2.111:3300/upload"]] # 控制台不输出 VITE_DROP_CONSOLE = false @@ -16,7 +16,7 @@ VITE_GLOB_API_URL=/jeecgboot #后台接口全路径地址(必填) VITE_GLOB_DOMAIN_URL=http://192.168.2.110:9999 -VITE_GLOB_DOMAIN_URL=https://fxnsp.sxcooh.com +#VITE_GLOB_DOMAIN_URL=https://fxnsp.sxcooh.com # 接口前缀 VITE_GLOB_API_URL_PREFIX= diff --git a/src/views/appmana/jixian/realtime/livestock/SurvTransdataLivestockwater.api.ts b/src/views/appmana/jixian/realtime/livestock/SurvTransdataLivestockwater.api.ts new file mode 100644 index 0000000..f55c597 --- /dev/null +++ b/src/views/appmana/jixian/realtime/livestock/SurvTransdataLivestockwater.api.ts @@ -0,0 +1,72 @@ +import { defHttp } from '/@/utils/http/axios'; +import { useMessage } from "/@/hooks/web/useMessage"; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/appmana/survTransdataLivestockwater/list', + save='/appmana/survTransdataLivestockwater/add', + edit='/appmana/survTransdataLivestockwater/edit', + deleteOne = '/appmana/survTransdataLivestockwater/delete', + deleteBatch = '/appmana/survTransdataLivestockwater/deleteBatch', + importExcel = '/appmana/survTransdataLivestockwater/importExcel', + exportXls = '/appmana/survTransdataLivestockwater/exportXls', +} + +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; + +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; + +/** + * 列表接口 + * @param params + */ +export const list = (params) => defHttp.get({ url: Api.list, params }); + +/** + * 删除单个 + * @param params + * @param handleSuccess + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} + +/** + * 批量删除 + * @param params + * @param handleSuccess + */ +export const batchDelete = (params, handleSuccess) => { + createConfirm({ + iconType: 'warning', + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} + +/** + * 保存或者更新 + * @param params + * @param isUpdate + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({ url: url, params }, { isTransformResponse: false }); +} diff --git a/src/views/appmana/jixian/realtime/livestock/SurvTransdataLivestockwater.data.ts b/src/views/appmana/jixian/realtime/livestock/SurvTransdataLivestockwater.data.ts new file mode 100644 index 0000000..a58dac5 --- /dev/null +++ b/src/views/appmana/jixian/realtime/livestock/SurvTransdataLivestockwater.data.ts @@ -0,0 +1,133 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '站点名称', + align: 'center', + dataIndex: 'stationName', + }, + { + title: '设备编号', + align: 'center', + dataIndex: 'deployCode', + }, + { + title: '数据更新时间', + align: 'center', + dataIndex: 'dataDateTime', + }, + // { + // title: '数据ID', + // align: "center", + // dataIndex: 'dataId' + // }, + { + title: '总磷(mg/L)', + align: 'center', + dataIndex: 'dataWaterTpSy', + }, + { + title: '总氮(mg/L)', + align: 'center', + dataIndex: 'dataWaterTnSy', + }, + { + title: '氨氮(mg/L)', + align: 'center', + dataIndex: 'dataWaterNhSy', + }, + { + title: '化学需氧量(mg/L)', + align: 'center', + dataIndex: 'dataWaterCodSy', + }, + + // { + // title: '数据获取类型;realTime=实时，dayTime=日数据，month=月数据，year=年数据', + // align: "center", + // dataIndex: 'dataGatherType' + // }, +]; + +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; + +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '租户号', + field: 'tenantId', + component: 'Input', + }, + { + label: '乐观锁', + field: 'reVision', + component: 'InputNumber', + }, + { + label: '创建人', + field: 'createdBy', + component: 'Input', + }, + { + label: '创建时间', + field: 'createTime', + component: 'DatePicker', + }, + { + label: '更新人', + field: 'updatedBy', + component: 'Input', + }, + { + label: '逻辑删除', + field: 'isDel', + component: 'InputNumber', + }, + { + label: '更新时间', + field: 'updatedTime', + component: 'DatePicker', + }, + { + label: '数据ID', + field: 'dataId', + component: 'Input', + }, + { + label: '总磷', + field: 'dataWaterTp', + component: 'Input', + }, + { + label: '总氮', + field: 'dataWaterTn', + component: 'Input', + }, + { + label: '硝态氮', + field: 'dataWaterNo', + component: 'Input', + }, + { + label: '数据更新时间', + field: 'dataDateTime', + component: 'DatePicker', + }, + { + label: '数据获取类型;realTime=实时，dayTime=日数据，month=月数据，year=年数据', + field: 'dataGatherType', + component: 'Input', + }, + // TODO 主键隐藏字段，目前写死为ID + { + label: '', + field: 'id', + component: 'Input', + show: false, + }, +]; diff --git a/src/views/appmana/jixian/realtime/livestock/SurvTransdataLivestockwaterList.vue b/src/views/appmana/jixian/realtime/livestock/SurvTransdataLivestockwaterList.vue new file mode 100644 index 0000000..3b3a8f7 --- /dev/null +++ b/src/views/appmana/jixian/realtime/livestock/SurvTransdataLivestockwaterList.vue @@ -0,0 +1,279 @@ + + + + + diff --git a/src/views/appmana/jixian/realtime/livestock/components/SurvTransdataLivestockwaterForm.vue b/src/views/appmana/jixian/realtime/livestock/components/SurvTransdataLivestockwaterForm.vue new file mode 100644 index 0000000..9d3f368 --- /dev/null +++ b/src/views/appmana/jixian/realtime/livestock/components/SurvTransdataLivestockwaterForm.vue @@ -0,0 +1,193 @@ + + + + + diff --git a/src/views/appmana/jixian/realtime/livestock/components/SurvTransdataLivestockwaterModal.vue b/src/views/appmana/jixian/realtime/livestock/components/SurvTransdataLivestockwaterModal.vue new file mode 100644 index 0000000..3451d8b --- /dev/null +++ b/src/views/appmana/jixian/realtime/livestock/components/SurvTransdataLivestockwaterModal.vue @@ -0,0 +1,75 @@ + + + + + diff --git a/src/views/appmana/jixian/realtime/orient/SurvTransdataOrientwater.api.ts b/src/views/appmana/jixian/realtime/orient/SurvTransdataOrientwater.api.ts new file mode 100644 index 0000000..20f9afd --- /dev/null +++ b/src/views/appmana/jixian/realtime/orient/SurvTransdataOrientwater.api.ts @@ -0,0 +1,72 @@ +import { defHttp } from '/@/utils/http/axios'; +import { useMessage } from "/@/hooks/web/useMessage"; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/appmana/survTransdataOrientwater/list', + save='/appmana/survTransdataOrientwater/add', + edit='/appmana/survTransdataOrientwater/edit', + deleteOne = '/appmana/survTransdataOrientwater/delete', + deleteBatch = '/appmana/survTransdataOrientwater/deleteBatch', + importExcel = '/appmana/survTransdataOrientwater/importExcel', + exportXls = '/appmana/survTransdataOrientwater/exportXls', +} + +/** + * 导出api + * @param params + */ +export const getExportUrl = Api.exportXls; + +/** + * 导入api + */ +export const getImportUrl = Api.importExcel; + +/** + * 列表接口 + * @param params + */ +export const list = (params) => defHttp.get({ url: Api.list, params }); + +/** + * 删除单个 + * @param params + * @param handleSuccess + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} + +/** + * 批量删除 + * @param params + * @param handleSuccess + */ +export const batchDelete = (params, handleSuccess) => { + createConfirm({ + iconType: 'warning', + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } + }); +} + +/** + * 保存或者更新 + * @param params + * @param isUpdate + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({ url: url, params }, { isTransformResponse: false }); +} diff --git a/src/views/appmana/jixian/realtime/orient/SurvTransdataOrientwater.data.ts b/src/views/appmana/jixian/realtime/orient/SurvTransdataOrientwater.data.ts new file mode 100644 index 0000000..66a4fa8 --- /dev/null +++ b/src/views/appmana/jixian/realtime/orient/SurvTransdataOrientwater.data.ts @@ -0,0 +1,161 @@ +import {BasicColumn} from '/@/components/Table'; +import {FormSchema} from '/@/components/Table'; +import { rules} from '/@/utils/helper/validator'; +import { render } from '/@/utils/common/renderUtils'; +//列表数据 +export const columns: BasicColumn[] = [ + { + title: '站点名称', + align: "center", + dataIndex: 'stationName', + }, + { + title: '设备编号', + align: "center", + dataIndex: 'deployCode', + }, + { + title: '数据更新时间', + align: "center", + dataIndex: 'dataDateTime', + }, + // { + // title: '数据ID', + // align: "center", + // dataIndex: 'dataId' + // }, + { + title: '总磷(mg/L)', + align: "center", + dataIndex: 'dataWaterTpSy' + }, + { + title: '总氮(mg/L)', + align: "center", + dataIndex: 'dataWaterTnSy' + }, + { + title: '硝态氮(mg/L)', + align: "center", + dataIndex: 'dataWaterNoSy' + }, + // { + // title: '化学需氧量(mg/L)', + // align: "center", + // dataIndex: 'dataWaterCod' + // }, + // { + // title: '1#球阀状态', + // align: "center", + // dataIndex: 'firstValveStatus', + // customRender: ({ text }) => { + // if (!text || text == '00') { + // return '开'; + // } else if (text == '01') { + // return '关'; + // } + // }, + // }, + // { + // title: '2#球阀状态', + // align: "center", + // dataIndex: 'secondValveStatus', + // customRender: ({ text }) => { + // if (!text || text == '00') { + // return '开'; + // } else if (text == '01') { + // return '关'; + // } + // }, + // }, + // { + // title: '数据类型;realTime=实时，dayTime=日数据，month=月数据，year=年数据', + // align: "center", + // dataIndex: 'dataGatherType' + // }, +]; + +//查询数据 +export const searchFormSchema: FormSchema[] = [ +]; + +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '租户号', + field: 'tenantId', + component: 'Input', + }, + { + label: '乐观锁', + field: 'reVision', + component: 'InputNumber', + }, + { + label: '创建人', + field: 'createdBy', + component: 'Input', + }, + { + label: '创建时间', + field: 'createTime', + component: 'DatePicker', + }, + { + label: '更新人', + field: 'updatedBy', + component: 'Input', + }, + { + label: '逻辑删除', + field: 'isDel', + component: 'InputNumber', + }, + { + label: '更新时间', + field: 'updatedTime', + component: 'DatePicker', + }, + { + label: '数据ID', + field: 'dataId', + component: 'Input', + }, + { + label: '总磷', + field: 'dataWaterTp', + component: 'Input', + }, + { + label: '总氮', + field: 'dataWaterTn', + component: 'Input', + }, + { + label: '氨氮', + field: 'dataWaterNh', + component: 'Input', + }, + { + label: '化学需氧量', + field: 'dataWaterCod', + component: 'Input', + }, + { + label: '数据更新时间', + field: 'dataDateTime', + component: 'DatePicker', + }, + { + label: '数据类型;realTime=实时，dayTime=日数据，month=月数据，year=年数据', + field: 'dataGatherType', + component: 'Input', + }, + // TODO 主键隐藏字段，目前写死为ID + { + label: '', + field: 'id', + component: 'Input', + show: false, + }, +]; diff --git a/src/views/appmana/jixian/realtime/orient/SurvTransdataOrientwaterList.vue b/src/views/appmana/jixian/realtime/orient/SurvTransdataOrientwaterList.vue new file mode 100644 index 0000000..3ceb6ce --- /dev/null +++ b/src/views/appmana/jixian/realtime/orient/SurvTransdataOrientwaterList.vue @@ -0,0 +1,278 @@ + + + + + diff --git a/src/views/appmana/jixian/realtime/orient/components/SurvTransdataOrientwaterForm.vue b/src/views/appmana/jixian/realtime/orient/components/SurvTransdataOrientwaterForm.vue new file mode 100644 index 0000000..b52b83f --- /dev/null +++ b/src/views/appmana/jixian/realtime/orient/components/SurvTransdataOrientwaterForm.vue @@ -0,0 +1,240 @@ + + + + + diff --git a/src/views/appmana/jixian/realtime/orient/components/SurvTransdataOrientwaterModal.vue b/src/views/appmana/jixian/realtime/orient/components/SurvTransdataOrientwaterModal.vue new file mode 100644 index 0000000..e370e5d --- /dev/null +++ b/src/views/appmana/jixian/realtime/orient/components/SurvTransdataOrientwaterModal.vue @@ -0,0 +1,75 @@ + + + + + diff --git a/src/views/appmana/livestockwater/realtime/SurvTransdataLivestockwater.data.ts b/src/views/appmana/livestockwater/realtime/SurvTransdataLivestockwater.data.ts index 9fb76f8..a6842bc 100644 --- a/src/views/appmana/livestockwater/realtime/SurvTransdataLivestockwater.data.ts +++ b/src/views/appmana/livestockwater/realtime/SurvTransdataLivestockwater.data.ts @@ -6,17 +6,17 @@ import { render } from '/@/utils/common/renderUtils'; export const columns: BasicColumn[] = [ { title: '站点名称', - align: "center", + align: 'center', dataIndex: 'stationName', }, { title: '设备编号', - align: "center", - dataIndex: 'deviceCode', + align: 'center', + dataIndex: 'deployCode', }, { title: '数据更新时间', - align: "center", + align: 'center', dataIndex: 'dataDateTime', }, // { @@ -26,23 +26,23 @@ export const columns: BasicColumn[] = [ // }, { title: '总磷(mg/L)', - align: "center", - dataIndex: 'dataWaterTp' + align: 'center', + dataIndex: 'dataWaterTp', }, { title: '总氮(mg/L)', - align: "center", - dataIndex: 'dataWaterTn' + align: 'center', + dataIndex: 'dataWaterTn', }, { title: '氨氮(mg/L)', - align: "center", - dataIndex: 'dataWaterNh' + align: 'center', + dataIndex: 'dataWaterNh', }, { title: '化学需氧量(mg/L)', - align: "center", - dataIndex: 'dataWaterCod' + align: 'center', + dataIndex: 'dataWaterCod', }, // { diff --git a/src/views/appmana/livestockwater/realtime/components/SurvTransdataLivestockwaterForm.vue b/src/views/appmana/livestockwater/realtime/components/SurvTransdataLivestockwaterForm.vue index a93682d..9d3f368 100644 --- a/src/views/appmana/livestockwater/realtime/components/SurvTransdataLivestockwaterForm.vue +++ b/src/views/appmana/livestockwater/realtime/components/SurvTransdataLivestockwaterForm.vue @@ -8,8 +8,8 @@ - - + + @@ -45,7 +45,14 @@ - + + + + + + @@ -11,37 +36,38 @@ -