From 3bdaded6ac33538c3f0d2716f2220dda4011952f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Tue, 10 Dec 2024 14:32:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8A=BD=E5=8F=96=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dashboard/Analysis/index.vue | 2 +- .../heating/extract/DataExtractConfigList.vue | 34 +-- .../components/DataExtractConfigForm.vue | 279 +++++++++++++++-- .../station/DataExtractStaionList.vue | 287 ++++++++++++++++++ .../station/DataExtractStation.api.ts | 76 +++++ .../station/DataExtractStation.data.ts | 142 +++++++++ .../station/DataExtractStationModal.vue | 63 ++++ .../station/extract/StationExtract.api.ts | 16 + .../station/extract/StationExtract.data.ts | 81 +++++ .../station/extract/StationExtractListOne.vue | 142 +++++++++ .../station/extract/StationExtractListTwo.vue | 120 ++++++++ .../station/extract/StationExtractModal.vue | 66 ++++ .../station/extracted/StationExtracted.api.ts | 16 + .../extracted/StationExtracted.data.ts | 81 +++++ .../extracted/StationExtractedListOne.vue | 142 +++++++++ .../extracted/StationExtractedListTwo.vue | 120 ++++++++ .../extracted/StationExtractedModal.vue | 66 ++++ .../heating/heatanalysis/HeatanalysisList.vue | 7 +- src/views/home/home.vue | 2 +- 19 files changed, 1688 insertions(+), 54 deletions(-) create mode 100644 src/views/heating/extract/components/station/DataExtractStaionList.vue create mode 100644 src/views/heating/extract/components/station/DataExtractStation.api.ts create mode 100644 src/views/heating/extract/components/station/DataExtractStation.data.ts create mode 100644 src/views/heating/extract/components/station/DataExtractStationModal.vue create mode 100644 src/views/heating/extract/components/station/extract/StationExtract.api.ts create mode 100644 src/views/heating/extract/components/station/extract/StationExtract.data.ts create mode 100644 src/views/heating/extract/components/station/extract/StationExtractListOne.vue create mode 100644 src/views/heating/extract/components/station/extract/StationExtractListTwo.vue create mode 100644 src/views/heating/extract/components/station/extract/StationExtractModal.vue create mode 100644 src/views/heating/extract/components/station/extracted/StationExtracted.api.ts create mode 100644 src/views/heating/extract/components/station/extracted/StationExtracted.data.ts create mode 100644 src/views/heating/extract/components/station/extracted/StationExtractedListOne.vue create mode 100644 src/views/heating/extract/components/station/extracted/StationExtractedListTwo.vue create mode 100644 src/views/heating/extract/components/station/extracted/StationExtractedModal.vue diff --git a/src/views/dashboard/Analysis/index.vue b/src/views/dashboard/Analysis/index.vue index f432fa2..0391550 100644 --- a/src/views/dashboard/Analysis/index.vue +++ b/src/views/dashboard/Analysis/index.vue @@ -132,7 +132,7 @@ + + diff --git a/src/views/heating/extract/components/station/DataExtractStation.api.ts b/src/views/heating/extract/components/station/DataExtractStation.api.ts new file mode 100644 index 0000000..4378eef --- /dev/null +++ b/src/views/heating/extract/components/station/DataExtractStation.api.ts @@ -0,0 +1,76 @@ +import {defHttp} from '/@/utils/http/axios'; +import { useMessage } from "/@/hooks/web/useMessage"; + +const { createConfirm } = useMessage(); + +enum Api { + list = '/heating/heatanalysis/page', + save='/heating/heatanalysis/add', + edit='/heating/heatanalysis/edit', + deleteOne = '/heating/heatanalysis/delete', + deleteBatch = '/heating/heatanalysis/deleteBatch', + importExcel = '/heating/heatanalysis/importExcel', + exportXls = '/heating/heatanalysis/exportXls', + companylist = '/heating/thermalcompany/list', + heatsourcelist = '/heating/heatsource/list', + heatsourcestationlist = '/heating/heatsourcestation/list', +} +/** + * 导出apif + * @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}); + +export const companylist = (params) => + defHttp.get({url: Api.companylist, params}); + +export const heatsourcelist = (params) => + defHttp.get({url: Api.heatsourcelist, params}); + +export const heatsourcestationlist = (params) => + defHttp.get({url: Api.heatsourcestationlist, params}); + +/** + * 删除单个 + */ +export const deleteOne = (params,handleSuccess) => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); +} +/** + * 批量删除 + * @param params + */ +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 + */ +export const saveOrUpdate = (params, isUpdate) => { + let url = isUpdate ? Api.edit : Api.save; + return defHttp.post({url: url, params}); +} diff --git a/src/views/heating/extract/components/station/DataExtractStation.data.ts b/src/views/heating/extract/components/station/DataExtractStation.data.ts new file mode 100644 index 0000000..9d3d0dd --- /dev/null +++ b/src/views/heating/extract/components/station/DataExtractStation.data.ts @@ -0,0 +1,142 @@ +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: 'SIM', + align: "center", + dataIndex: 'sim', + width:120, + ellipsis: false + }, + { + title: '热力公司', + align: "center", + dataIndex: 'view001Name', + width:140, + ellipsis: false + }, + { + title: '热源站', + align: "center", + dataIndex: 'view002Name', + ellipsis: false + }, + { + title: '换热站', + align: "center", + dataIndex: 'view004Name', + ellipsis: false + }, + { + title: '数据时间', + align: "center", + dataIndex: 'datatime', + ellipsis: false + }, + { + title:'一次网', + width:100, + children:[ + { + title: '供水温度', + align:"center", + width:120, + dataIndex: 'view005' + }, + { + title: '回水温度', + align:"center", + width:120, + dataIndex: 'view006' + }, + // { + // title: '供水压力', + // align:"center", + // width:120, + // dataIndex: 'view007' + // }, + // { + // title: '回水压力', + // align:"center", + // width:120, + // dataIndex: 'view008' + // } + ]}, + { + title:'二次网', + width:100, + children:[ + { + title: '供水温度', + align:"center", + width:120, + dataIndex: 'view009' + }, + { + title: '回水温度', + align:"center", + width:120, + dataIndex: 'view010' + }, + // { + // title: '供水压力', + // align:"center", + // width:120, + // dataIndex: 'view011' + // }, + // { + // title: '回水压力', + // align:"center", + // width:120, + // dataIndex: 'view012' + // } + ]}, + { + title: '上报类型', + align: "center", + dataIndex: 'reportType', + width:120, + ellipsis: false, + // customRender: ({ record }) =>{ + // if(record.reportType == 1){ + // return '上报' + // }else{ + // return '模拟' + // } + // }, + slots: { customRender: 'reportType' }, + }, + { + title: '已抽取', + align: "center", + dataIndex: 'isExtract', + width:120, + ellipsis: false, + // customRender: ({ record }) =>{ + // if(record.isExtract == 1){ + // return '是' + // }else{ + // return '否' + // } + // }, + slots: { customRender: 'isExtract' }, + }, + { + title: '被抽取', + align: "center", + dataIndex: 'isExtracted', + width:120, + ellipsis: false, + // customRender: ({ record }) =>{ + // if(record.isExtracted > 0){ + // return '是' + // }else{ + // return '否' + // } + // }, + slots: { customRender: 'isExtracted' }, + }, +]; diff --git a/src/views/heating/extract/components/station/DataExtractStationModal.vue b/src/views/heating/extract/components/station/DataExtractStationModal.vue new file mode 100644 index 0000000..422f202 --- /dev/null +++ b/src/views/heating/extract/components/station/DataExtractStationModal.vue @@ -0,0 +1,63 @@ + + + + + diff --git a/src/views/heating/extract/components/station/extract/StationExtract.api.ts b/src/views/heating/extract/components/station/extract/StationExtract.api.ts new file mode 100644 index 0000000..9a22732 --- /dev/null +++ b/src/views/heating/extract/components/station/extract/StationExtract.api.ts @@ -0,0 +1,16 @@ +import {defHttp} from '/@/utils/http/axios'; + +enum Api { + list1 = '/heating/heatanalysis/onePage', + list2 = '/heating/heatanalysis/twoPage', +} + +/** + * 列表接口 + * @param params + */ +export const list1 = (params) => + defHttp.get({url: Api.list1, params}); + +export const list2 = (params) => + defHttp.get({url: Api.list2, params}); diff --git a/src/views/heating/extract/components/station/extract/StationExtract.data.ts b/src/views/heating/extract/components/station/extract/StationExtract.data.ts new file mode 100644 index 0000000..ed9a1f2 --- /dev/null +++ b/src/views/heating/extract/components/station/extract/StationExtract.data.ts @@ -0,0 +1,81 @@ +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: 'SIM', + align: "center", + dataIndex: 'sim', + width:120, + ellipsis: false + }, + { + title: '热力公司', + align: "center", + dataIndex: 'view001Name', + width:140, + ellipsis: false + }, + { + title: '热源站', + align: "center", + dataIndex: 'view002Name', + ellipsis: false + }, + { + title: '换热站', + align: "center", + dataIndex: 'view004Name', + ellipsis: false + }, + { + title: '数据时间', + align: "center", + dataIndex: 'datatime', + ellipsis: false + }, + { + title:'一次网', + width:100, + children:[ + { + title: '供水温度', + align:"center", + width:120, + dataIndex: 'view005' + }, + { + title: '回水温度', + align:"center", + width:120, + dataIndex: 'view006' + }, + ]}, + { + title:'二次网', + width:100, + children:[ + { + title: '供水温度', + align:"center", + width:120, + dataIndex: 'view009' + }, + { + title: '回水温度', + align:"center", + width:120, + dataIndex: 'view010' + }, + ]}, + { + title: '上报类型', + align: "center", + dataIndex: 'reportType', + width:120, + ellipsis: false, + slots: { customRender: 'reportType' }, + }, +]; diff --git a/src/views/heating/extract/components/station/extract/StationExtractListOne.vue b/src/views/heating/extract/components/station/extract/StationExtractListOne.vue new file mode 100644 index 0000000..f766c87 --- /dev/null +++ b/src/views/heating/extract/components/station/extract/StationExtractListOne.vue @@ -0,0 +1,142 @@ + + + + + diff --git a/src/views/heating/extract/components/station/extract/StationExtractListTwo.vue b/src/views/heating/extract/components/station/extract/StationExtractListTwo.vue new file mode 100644 index 0000000..f3809bf --- /dev/null +++ b/src/views/heating/extract/components/station/extract/StationExtractListTwo.vue @@ -0,0 +1,120 @@ + + + + + diff --git a/src/views/heating/extract/components/station/extract/StationExtractModal.vue b/src/views/heating/extract/components/station/extract/StationExtractModal.vue new file mode 100644 index 0000000..c4ee640 --- /dev/null +++ b/src/views/heating/extract/components/station/extract/StationExtractModal.vue @@ -0,0 +1,66 @@ + + + + + diff --git a/src/views/heating/extract/components/station/extracted/StationExtracted.api.ts b/src/views/heating/extract/components/station/extracted/StationExtracted.api.ts new file mode 100644 index 0000000..9477fae --- /dev/null +++ b/src/views/heating/extract/components/station/extracted/StationExtracted.api.ts @@ -0,0 +1,16 @@ +import {defHttp} from '/@/utils/http/axios'; + +enum Api { + list1 = '/heating/heatanalysis/extractedOnePage', + list2 = '/heating/heatanalysis/extractedTwoPage', +} + +/** + * 列表接口 + * @param params + */ +export const list1 = (params) => + defHttp.get({url: Api.list1, params}); + +export const list2 = (params) => + defHttp.get({url: Api.list2, params}); diff --git a/src/views/heating/extract/components/station/extracted/StationExtracted.data.ts b/src/views/heating/extract/components/station/extracted/StationExtracted.data.ts new file mode 100644 index 0000000..ed9a1f2 --- /dev/null +++ b/src/views/heating/extract/components/station/extracted/StationExtracted.data.ts @@ -0,0 +1,81 @@ +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: 'SIM', + align: "center", + dataIndex: 'sim', + width:120, + ellipsis: false + }, + { + title: '热力公司', + align: "center", + dataIndex: 'view001Name', + width:140, + ellipsis: false + }, + { + title: '热源站', + align: "center", + dataIndex: 'view002Name', + ellipsis: false + }, + { + title: '换热站', + align: "center", + dataIndex: 'view004Name', + ellipsis: false + }, + { + title: '数据时间', + align: "center", + dataIndex: 'datatime', + ellipsis: false + }, + { + title:'一次网', + width:100, + children:[ + { + title: '供水温度', + align:"center", + width:120, + dataIndex: 'view005' + }, + { + title: '回水温度', + align:"center", + width:120, + dataIndex: 'view006' + }, + ]}, + { + title:'二次网', + width:100, + children:[ + { + title: '供水温度', + align:"center", + width:120, + dataIndex: 'view009' + }, + { + title: '回水温度', + align:"center", + width:120, + dataIndex: 'view010' + }, + ]}, + { + title: '上报类型', + align: "center", + dataIndex: 'reportType', + width:120, + ellipsis: false, + slots: { customRender: 'reportType' }, + }, +]; diff --git a/src/views/heating/extract/components/station/extracted/StationExtractedListOne.vue b/src/views/heating/extract/components/station/extracted/StationExtractedListOne.vue new file mode 100644 index 0000000..ca3284b --- /dev/null +++ b/src/views/heating/extract/components/station/extracted/StationExtractedListOne.vue @@ -0,0 +1,142 @@ + + + + + diff --git a/src/views/heating/extract/components/station/extracted/StationExtractedListTwo.vue b/src/views/heating/extract/components/station/extracted/StationExtractedListTwo.vue new file mode 100644 index 0000000..a6ede48 --- /dev/null +++ b/src/views/heating/extract/components/station/extracted/StationExtractedListTwo.vue @@ -0,0 +1,120 @@ + + + + + diff --git a/src/views/heating/extract/components/station/extracted/StationExtractedModal.vue b/src/views/heating/extract/components/station/extracted/StationExtractedModal.vue new file mode 100644 index 0000000..f1a56ea --- /dev/null +++ b/src/views/heating/extract/components/station/extracted/StationExtractedModal.vue @@ -0,0 +1,66 @@ + + + + + diff --git a/src/views/heating/heatanalysis/HeatanalysisList.vue b/src/views/heating/heatanalysis/HeatanalysisList.vue index c8c9abb..8b05940 100644 --- a/src/views/heating/heatanalysis/HeatanalysisList.vue +++ b/src/views/heating/heatanalysis/HeatanalysisList.vue @@ -82,12 +82,7 @@ import {ref, reactive, onMounted} from 'vue'; import { BasicTable, useTable, TableAction } from '/@/components/Table'; import { useListPage } from '/@/hooks/system/useListPage'; import { columns } from './Heatanalysis.data'; -import { list } from './Heatanalysis.api'; -import { - companylist, - heatsourcelist, - heatsourcestationlist -} from "@/views/heating1/Heatanalysis.api"; +import { list, companylist, heatsourcelist, heatsourcestationlist } from './Heatanalysis.api'; const queryParam = ref({}); const toggleSearchStatus = ref(false); diff --git a/src/views/home/home.vue b/src/views/home/home.vue index 26bf845..8a52046 100644 --- a/src/views/home/home.vue +++ b/src/views/home/home.vue @@ -134,7 +134,7 @@