From 37e786ca23fd6f45113105885ab08d3688ac9d0b Mon Sep 17 00:00:00 2001 From: zy <82248909@qq.com> Date: Sat, 21 Mar 2026 18:18:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=AD=A6=E4=B9=A1=20?= =?UTF-8?q?=E4=B8=89=E7=A7=8D=E7=9B=91=E6=B5=8B=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deploy/components/ControlModal.vue | 18 +- .../hisdata/SurvHisdataOrientwater.data.ts | 18 +- .../components/SurvHisdataOrientwaterForm.vue | 148 +++++----- .../SurvHisdataLivestockwater.api.ts | 72 +++++ .../SurvHisdataLivestockwater.data.ts | 148 ++++++++++ .../SurvHisdataLivestockwaterList.vue | 273 +++++++++++++++++ .../SurvHisdataLivestockwaterForm.vue | 199 +++++++++++++ .../SurvHisdataLivestockwaterModal.vue | 75 +++++ .../orient/SurvHisdataOrientwater.api.ts | 72 +++++ .../orient/SurvHisdataOrientwater.data.ts | 172 +++++++++++ .../orient/SurvHisdataOrientwaterList.vue | 275 ++++++++++++++++++ .../components/SurvHisdataOrientwaterForm.vue | 247 ++++++++++++++++ .../SurvHisdataOrientwaterModal.vue | 75 +++++ .../watershed/SurvHisdataOrientwater.api.ts | 72 +++++ .../watershed/SurvHisdataOrientwater.data.ts | 172 +++++++++++ .../watershed/SurvHisdataOrientwaterList.vue | 275 ++++++++++++++++++ .../components/SurvHisdataOrientwaterForm.vue | 247 ++++++++++++++++ .../SurvHisdataOrientwaterModal.vue | 75 +++++ 18 files changed, 2545 insertions(+), 88 deletions(-) create mode 100644 src/views/appmana/wuxiang/livestock/SurvHisdataLivestockwater.api.ts create mode 100644 src/views/appmana/wuxiang/livestock/SurvHisdataLivestockwater.data.ts create mode 100644 src/views/appmana/wuxiang/livestock/SurvHisdataLivestockwaterList.vue create mode 100644 src/views/appmana/wuxiang/livestock/components/SurvHisdataLivestockwaterForm.vue create mode 100644 src/views/appmana/wuxiang/livestock/components/SurvHisdataLivestockwaterModal.vue create mode 100644 src/views/appmana/wuxiang/orient/SurvHisdataOrientwater.api.ts create mode 100644 src/views/appmana/wuxiang/orient/SurvHisdataOrientwater.data.ts create mode 100644 src/views/appmana/wuxiang/orient/SurvHisdataOrientwaterList.vue create mode 100644 src/views/appmana/wuxiang/orient/components/SurvHisdataOrientwaterForm.vue create mode 100644 src/views/appmana/wuxiang/orient/components/SurvHisdataOrientwaterModal.vue create mode 100644 src/views/appmana/wuxiang/watershed/SurvHisdataOrientwater.api.ts create mode 100644 src/views/appmana/wuxiang/watershed/SurvHisdataOrientwater.data.ts create mode 100644 src/views/appmana/wuxiang/watershed/SurvHisdataOrientwaterList.vue create mode 100644 src/views/appmana/wuxiang/watershed/components/SurvHisdataOrientwaterForm.vue create mode 100644 src/views/appmana/wuxiang/watershed/components/SurvHisdataOrientwaterModal.vue diff --git a/src/views/appmana/deploy/components/ControlModal.vue b/src/views/appmana/deploy/components/ControlModal.vue index f9531cc..47145bc 100644 --- a/src/views/appmana/deploy/components/ControlModal.vue +++ b/src/views/appmana/deploy/components/ControlModal.vue @@ -7,20 +7,22 @@ :labelStyle="{ fontWeight: 'bold', textAlign: 'center' }" :contentStyle="{ textAlign: 'center' }" > - 停止 + + 停止 + - - - + + +
- + { if (res.code == 200) { formState.moduleList = res.result.moduleList; diff --git a/src/views/appmana/orientwater/hisdata/SurvHisdataOrientwater.data.ts b/src/views/appmana/orientwater/hisdata/SurvHisdataOrientwater.data.ts index 58123ec..18104f3 100644 --- a/src/views/appmana/orientwater/hisdata/SurvHisdataOrientwater.data.ts +++ b/src/views/appmana/orientwater/hisdata/SurvHisdataOrientwater.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", + align: 'center', dataIndex: 'deployCode', }, { title: '数据更新时间', - align: "center", + align: 'center', dataIndex: 'dataDateTime', }, // { @@ -26,18 +26,18 @@ export const columns: BasicColumn[] = [ // }, { title: '总磷(mg/L)', - align: "center", - dataIndex: 'dataWaterTp' + align: 'center', + dataIndex: 'dataWaterTpSy', }, { title: '总氮(mg/L)', - align: "center", - dataIndex: 'dataWaterTn' + align: 'center', + dataIndex: 'dataWaterTnSy', }, { title: '化学需氧量(mg/L)', - align: "center", - dataIndex: 'dataWaterCod' + align: 'center', + dataIndex: 'dataWaterCodSy', }, // { // title: '硝态氮(mg/L)', diff --git a/src/views/appmana/orientwater/hisdata/components/SurvHisdataOrientwaterForm.vue b/src/views/appmana/orientwater/hisdata/components/SurvHisdataOrientwaterForm.vue index 9bd3158..67212ba 100644 --- a/src/views/appmana/orientwater/hisdata/components/SurvHisdataOrientwaterForm.vue +++ b/src/views/appmana/orientwater/hisdata/components/SurvHisdataOrientwaterForm.vue @@ -23,78 +23,85 @@ --> - - + + - - + + - - - - - + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + +
+ + + + + + + + + + + + + + + + + 查询 + 重置 + + {{ toggleSearchStatus ? '收起' : '展开' }} + + + + + + +
+ + + + + + + + + + + + + + +
+ + + + + diff --git a/src/views/appmana/wuxiang/livestock/components/SurvHisdataLivestockwaterForm.vue b/src/views/appmana/wuxiang/livestock/components/SurvHisdataLivestockwaterForm.vue new file mode 100644 index 0000000..d83049c --- /dev/null +++ b/src/views/appmana/wuxiang/livestock/components/SurvHisdataLivestockwaterForm.vue @@ -0,0 +1,199 @@ + + + + + diff --git a/src/views/appmana/wuxiang/livestock/components/SurvHisdataLivestockwaterModal.vue b/src/views/appmana/wuxiang/livestock/components/SurvHisdataLivestockwaterModal.vue new file mode 100644 index 0000000..d6de60c --- /dev/null +++ b/src/views/appmana/wuxiang/livestock/components/SurvHisdataLivestockwaterModal.vue @@ -0,0 +1,75 @@ + + + + + diff --git a/src/views/appmana/wuxiang/orient/SurvHisdataOrientwater.api.ts b/src/views/appmana/wuxiang/orient/SurvHisdataOrientwater.api.ts new file mode 100644 index 0000000..eb01cc2 --- /dev/null +++ b/src/views/appmana/wuxiang/orient/SurvHisdataOrientwater.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/survHisdataOrientwater/list', + save='/appmana/survHisdataOrientwater/add', + edit='/appmana/survHisdataOrientwater/edit', + deleteOne = '/appmana/survHisdataOrientwater/delete', + deleteBatch = '/appmana/survHisdataOrientwater/deleteBatch', + importExcel = '/appmana/survHisdataOrientwater/importExcel', + exportXls = '/appmana/survHisdataOrientwater/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/wuxiang/orient/SurvHisdataOrientwater.data.ts b/src/views/appmana/wuxiang/orient/SurvHisdataOrientwater.data.ts new file mode 100644 index 0000000..c788e8a --- /dev/null +++ b/src/views/appmana/wuxiang/orient/SurvHisdataOrientwater.data.ts @@ -0,0 +1,172 @@ +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: 'dataWaterCodSy', + // }, + { + title: '硝态氮(mg/L)', + align: "center", + dataIndex: 'dataWaterNoSy' + }, + // { + // 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' + // }, + // { + // title: '转储时间', + // align: "center", + // dataIndex: 'transDate', + // }, +]; + +//查询数据 +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', + }, + { + label: '转储时间', + field: 'transDate', + component: 'DatePicker', + }, + // TODO 主键隐藏字段，目前写死为ID + { + label: '', + field: 'id', + component: 'Input', + show: false, + }, +]; diff --git a/src/views/appmana/wuxiang/orient/SurvHisdataOrientwaterList.vue b/src/views/appmana/wuxiang/orient/SurvHisdataOrientwaterList.vue new file mode 100644 index 0000000..23f4bda --- /dev/null +++ b/src/views/appmana/wuxiang/orient/SurvHisdataOrientwaterList.vue @@ -0,0 +1,275 @@ + + + + + diff --git a/src/views/appmana/wuxiang/orient/components/SurvHisdataOrientwaterForm.vue b/src/views/appmana/wuxiang/orient/components/SurvHisdataOrientwaterForm.vue new file mode 100644 index 0000000..4aa7126 --- /dev/null +++ b/src/views/appmana/wuxiang/orient/components/SurvHisdataOrientwaterForm.vue @@ -0,0 +1,247 @@ + + + + + diff --git a/src/views/appmana/wuxiang/orient/components/SurvHisdataOrientwaterModal.vue b/src/views/appmana/wuxiang/orient/components/SurvHisdataOrientwaterModal.vue new file mode 100644 index 0000000..f861981 --- /dev/null +++ b/src/views/appmana/wuxiang/orient/components/SurvHisdataOrientwaterModal.vue @@ -0,0 +1,75 @@ + + + + + diff --git a/src/views/appmana/wuxiang/watershed/SurvHisdataOrientwater.api.ts b/src/views/appmana/wuxiang/watershed/SurvHisdataOrientwater.api.ts new file mode 100644 index 0000000..eb01cc2 --- /dev/null +++ b/src/views/appmana/wuxiang/watershed/SurvHisdataOrientwater.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/survHisdataOrientwater/list', + save='/appmana/survHisdataOrientwater/add', + edit='/appmana/survHisdataOrientwater/edit', + deleteOne = '/appmana/survHisdataOrientwater/delete', + deleteBatch = '/appmana/survHisdataOrientwater/deleteBatch', + importExcel = '/appmana/survHisdataOrientwater/importExcel', + exportXls = '/appmana/survHisdataOrientwater/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/wuxiang/watershed/SurvHisdataOrientwater.data.ts b/src/views/appmana/wuxiang/watershed/SurvHisdataOrientwater.data.ts new file mode 100644 index 0000000..f17b63e --- /dev/null +++ b/src/views/appmana/wuxiang/watershed/SurvHisdataOrientwater.data.ts @@ -0,0 +1,172 @@ +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: 'dataWaterCodSy' + }, + // { + // 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' + // }, + // { + // title: '转储时间', + // align: "center", + // dataIndex: 'transDate', + // }, +]; + +//查询数据 +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', + }, + { + label: '转储时间', + field: 'transDate', + component: 'DatePicker', + }, + // TODO 主键隐藏字段，目前写死为ID + { + label: '', + field: 'id', + component: 'Input', + show: false, + }, +]; diff --git a/src/views/appmana/wuxiang/watershed/SurvHisdataOrientwaterList.vue b/src/views/appmana/wuxiang/watershed/SurvHisdataOrientwaterList.vue new file mode 100644 index 0000000..f811f22 --- /dev/null +++ b/src/views/appmana/wuxiang/watershed/SurvHisdataOrientwaterList.vue @@ -0,0 +1,275 @@ + + + + + diff --git a/src/views/appmana/wuxiang/watershed/components/SurvHisdataOrientwaterForm.vue b/src/views/appmana/wuxiang/watershed/components/SurvHisdataOrientwaterForm.vue new file mode 100644 index 0000000..912591c --- /dev/null +++ b/src/views/appmana/wuxiang/watershed/components/SurvHisdataOrientwaterForm.vue @@ -0,0 +1,247 @@ + + + + + diff --git a/src/views/appmana/wuxiang/watershed/components/SurvHisdataOrientwaterModal.vue b/src/views/appmana/wuxiang/watershed/components/SurvHisdataOrientwaterModal.vue new file mode 100644 index 0000000..f861981 --- /dev/null +++ b/src/views/appmana/wuxiang/watershed/components/SurvHisdataOrientwaterModal.vue @@ -0,0 +1,75 @@ + + + + + From 7b33296a78a6bf6c54c4c6a2ee3fd23216792fc6 Mon Sep 17 00:00:00 2001 From: zy <82248909@qq.com> Date: Sat, 21 Mar 2026 18:33:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=AD=A6=E4=B9=A1=20?= =?UTF-8?q?=E4=B8=89=E7=A7=8D=E7=9B=91=E6=B5=8B=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/appmana/wuxiang/orient/SurvHisdataOrientwaterList.vue | 2 +- .../appmana/wuxiang/watershed/SurvHisdataOrientwaterList.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/appmana/wuxiang/orient/SurvHisdataOrientwaterList.vue b/src/views/appmana/wuxiang/orient/SurvHisdataOrientwaterList.vue index 23f4bda..3dc270c 100644 --- a/src/views/appmana/wuxiang/orient/SurvHisdataOrientwaterList.vue +++ b/src/views/appmana/wuxiang/orient/SurvHisdataOrientwaterList.vue @@ -124,7 +124,7 @@ fixed: 'right', }, beforeFetch: (params) => { - queryParam.dataType = 'standard'; + queryParam.dataType = 'orient_no'; return Object.assign(params, queryParam); }, }, diff --git a/src/views/appmana/wuxiang/watershed/SurvHisdataOrientwaterList.vue b/src/views/appmana/wuxiang/watershed/SurvHisdataOrientwaterList.vue index f811f22..f9caa32 100644 --- a/src/views/appmana/wuxiang/watershed/SurvHisdataOrientwaterList.vue +++ b/src/views/appmana/wuxiang/watershed/SurvHisdataOrientwaterList.vue @@ -124,7 +124,7 @@ fixed: 'right', }, beforeFetch: (params) => { - queryParam.dataType = 'watershed'; + queryParam.dataType = 'standard'; return Object.assign(params, queryParam); }, },