From 14e00ae08f295b5d6844a7df7411d57bdccd3bc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E4=BA=91=E9=B9=8F?= Date: Mon, 13 Jan 2025 17:45:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E6=95=B0=E6=8D=AE=EF=BC=9A?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2=20=E5=AE=9E=E6=97=B6?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=9A=E6=B7=BB=E5=8A=A0=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E6=B5=8B=E7=82=B9=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/backend/historyData/request.ts | 57 ++ .../backend/equipment/airBlower/index.vue | 21 +- .../src/views/backend/historyData/index.vue | 964 ++++++++++++++++++ .../src/views/backend/historyData/type.ts | 10 + 4 files changed, 1048 insertions(+), 4 deletions(-) create mode 100644 ui/dasadmin/src/api/backend/historyData/request.ts create mode 100644 ui/dasadmin/src/views/backend/historyData/index.vue create mode 100644 ui/dasadmin/src/views/backend/historyData/type.ts diff --git a/ui/dasadmin/src/api/backend/historyData/request.ts b/ui/dasadmin/src/api/backend/historyData/request.ts new file mode 100644 index 00000000..1411e4b3 --- /dev/null +++ b/ui/dasadmin/src/api/backend/historyData/request.ts @@ -0,0 +1,57 @@ +import createAxios from '/@/utils/axios' + +export const getTemplateListReq = (data: { category: '历史数据' & string; pageNum: number; pageSize: number }) => { + return createAxios< + never, + Promise<{ + code: number + msg: string + data: { + total: number + rows: { id: string; category: '历史数据' & string; template: string }[] + code: number + msg: string + } + success: boolean + }> + >({ + url: '/api/page/report/template/getList', + method: 'post', + data, + }) +} + +export const addTemplateListReq = (data: { category: '历史数据' & string; template: string }) => { + return createAxios< + never, + Promise<{ + code: number + msg: string + data: { + id: string + category: '历史数据' & string + template: string + }[] + success: boolean + }> + >({ + url: '/api/page/report/template/add', + method: 'post', + data, + }) +} + +export const delTemplateListReq = (data: { id: string }) => { + return createAxios< + never, + Promise<{ + code: number + msg: string + success: boolean + }> + >({ + url: '/api/page/report/template/del', + method: 'post', + data, + }) +} \ No newline at end of file diff --git a/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue b/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue index 746a13f5..fbc938cf 100644 --- a/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue +++ b/ui/dasadmin/src/views/backend/equipment/airBlower/index.vue @@ -237,6 +237,7 @@ import { getRealValueListReq } from '/@/api/backend/deviceModel/request' import SelectPoint from '/@/views/backend/equipment/airBlower/selectPoint.vue' import RealDataChart from '/@/views/backend/equipment/airBlower/realDataChart.vue' import { permission } from '/@/utils/directive' +import { table } from 'console' const vPermission = permission() const router = useRouter() @@ -423,7 +424,7 @@ const defaultColumn: TableColumnType[] = [ width: 100, }, ] -const dynamicColumn: TableColumnType[] = [ +let dynamicColumn: TableColumnType[] = [ { label: '风速 (m/s)', prop: 'iwindspeed', @@ -523,6 +524,17 @@ const dynamicColumn: TableColumnType[] = [ }, ] const tableColumn = ref([...defaultColumn, ...dynamicColumn]) +const getSaveColumn = () => { + const saveColumn = localStorage.getItem('airBlowerTableColumnList') + console.log(saveColumn,'saveColumn'); + + if (saveColumn) { + tableColumn.value = JSON.parse(saveColumn) + console.log(tableColumn.value,'tableColumn.value'); + dynamicColumn = tableColumn.value.slice(4) + } +} +getSaveColumn() const tableRef = ref() const tableData = ref([]) @@ -611,7 +623,7 @@ const getTableData = () => { } }) .catch((err) => { - ElMessage.error(err) + // ElMessage.error(err) }) } @@ -702,9 +714,10 @@ const selectPointDialogRef = ref() const selectPointVisible = ref(false) const defaultAttr = computed(() => { return dynamicColumn.map((item) => { + tableColumn.value.length return { attributeName: item.label.split(' ')[0], - unit: item.label.split(' ')[1] ?? '', + unit:item.label.split(' ')[1] ?? '', attributeCode: item.prop as string, } }) @@ -728,7 +741,7 @@ const saveSelectPoint = () => { } }) tableColumn.value = [...defaultColumn, ...addCoulmn] - + localStorage.setItem('airBlowerTableColumnList', JSON.stringify(tableColumn.value)) getTableData() selectPointVisible.value = false ElMessage.success('选择成功') diff --git a/ui/dasadmin/src/views/backend/historyData/index.vue b/ui/dasadmin/src/views/backend/historyData/index.vue new file mode 100644 index 00000000..3d77eabf --- /dev/null +++ b/ui/dasadmin/src/views/backend/historyData/index.vue @@ -0,0 +1,964 @@ + + + + + diff --git a/ui/dasadmin/src/views/backend/historyData/type.ts b/ui/dasadmin/src/views/backend/historyData/type.ts new file mode 100644 index 00000000..4c1a7598 --- /dev/null +++ b/ui/dasadmin/src/views/backend/historyData/type.ts @@ -0,0 +1,10 @@ +export type selectData = + { + id: string + attributeName: string + attributeCode: string + interpolation: boolean + average: boolean + max: boolean + min: boolean + }