From 0107cccb7df689172eca5d1a00fdc23561af3bf6 Mon Sep 17 00:00:00 2001 From: wangqiujuan0808 <578331299@qq.com> Date: Tue, 13 May 2025 10:36:38 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/web-ele/src/views/driver/device.vue | 15 ++++++++++--- apps/web-ele/src/views/template/add.vue | 5 ----- apps/web-ele/src/views/template/addPoint.vue | 4 ---- apps/web-ele/src/views/template/edit.vue | 4 ---- apps/web-ele/src/views/template/editPoint.vue | 4 ---- apps/web-ele/src/views/template/index.vue | 12 ++++++++--- apps/web-ele/src/views/template/point.vue | 21 ++++++++++++++++--- 7 files changed, 39 insertions(+), 26 deletions(-) diff --git a/apps/web-ele/src/views/driver/device.vue b/apps/web-ele/src/views/driver/device.vue index 707b2db..76ca222 100644 --- a/apps/web-ele/src/views/driver/device.vue +++ b/apps/web-ele/src/views/driver/device.vue @@ -33,11 +33,20 @@ const gridOptions: VxeGridProps = { width: 240, }, ], + proxyConfig: { + ajax: { + query:() => { + return { + items: getDeviceData(), + }; + }, + }, + }, exportConfig: {}, toolbarConfig: { custom: true, export: true, - refresh: false, + refresh: true, zoom: true, }, pagerConfig: { @@ -112,7 +121,7 @@ function showConfirm(rowId: Number) { const ret = await cdcmDriverAPI({ id: rowId }, req.DeviceDelete); if (ret.data.code === 0) { ElMessage.success(ret.data.data); - getDeviceData(); + tableApi.reload(); } else { ElMessage.error(ret.data.data || ret.data.msg); } @@ -142,7 +151,7 @@ async function getDeviceData() { 新增 - + 刷新当前页面 diff --git a/apps/web-ele/src/views/template/add.vue b/apps/web-ele/src/views/template/add.vue index 8afc786..75e9fcf 100644 --- a/apps/web-ele/src/views/template/add.vue +++ b/apps/web-ele/src/views/template/add.vue @@ -8,10 +8,6 @@ import { cdcmTemplateAPI } from '#/cdcm/api/api.js'; import req from '#/cdcm/api/req_code'; import { useStaticConfigStore } from '#/store'; -const emit = defineEmits<{ - submit: [event: any]; -}>(); - const [Modal, modalApi] = useVbenModal(); const template_types = useStaticConfigStore().support_template_types; @@ -81,7 +77,6 @@ async function onSubmit(values: Record) { if (ret.data.code === 0) { ElMessage.success(ret.data.data); modalApi.close(); - emit('submit'); } else { ElMessage.error(ret.data.data || ret.data.msg); } diff --git a/apps/web-ele/src/views/template/addPoint.vue b/apps/web-ele/src/views/template/addPoint.vue index 1dd4cdb..b7fffa0 100644 --- a/apps/web-ele/src/views/template/addPoint.vue +++ b/apps/web-ele/src/views/template/addPoint.vue @@ -8,9 +8,6 @@ import { cdcmTemplateAPI } from '#/cdcm/api/api.js'; import req from '#/cdcm/api/req_code'; import { useStaticConfigStore } from '#/store'; -const emit = defineEmits<{ - submit: [event: any]; -}>(); const get_register_types = () => { return [ { @@ -239,7 +236,6 @@ async function onSubmit(values: Record) { if (ret.data.code === 0) { ElMessage.success(ret.data.data); modalApi.close(); - emit('submit'); } else { ElMessage.error(ret.data.data || ret.data.msg); } diff --git a/apps/web-ele/src/views/template/edit.vue b/apps/web-ele/src/views/template/edit.vue index d8721f5..52f19ac 100644 --- a/apps/web-ele/src/views/template/edit.vue +++ b/apps/web-ele/src/views/template/edit.vue @@ -15,9 +15,6 @@ interface DataType { }; } -const emit = defineEmits<{ - submit: [event: any]; -}>(); const [TemplateForm, formApi] = useVbenForm({ // 所有表单项共用,可单独在表单内覆盖 @@ -64,7 +61,6 @@ async function onSubmit(values: Record) { if (ret.data.code === 0) { ElMessage.success(ret.data.data); modalApi.close(); - emit('submit'); } else { ElMessage.error(ret.data.data || ret.data.msg); } diff --git a/apps/web-ele/src/views/template/editPoint.vue b/apps/web-ele/src/views/template/editPoint.vue index ad907e0..813f470 100644 --- a/apps/web-ele/src/views/template/editPoint.vue +++ b/apps/web-ele/src/views/template/editPoint.vue @@ -8,9 +8,6 @@ import { cdcmTemplateAPI } from '#/cdcm/api/api.js'; import req from '#/cdcm/api/req_code'; import { useStaticConfigStore } from '#/store'; -const emit = defineEmits<{ - submit: [event: any]; -}>(); const get_register_types = () => { return [ { @@ -251,7 +248,6 @@ async function onSubmit(values: Record) { if (ret.data.code === 0) { ElMessage.success(ret.data.data); modalApi.close(); - emit('submit'); } else { ElMessage.error(ret.data.data || ret.data.msg); } diff --git a/apps/web-ele/src/views/template/index.vue b/apps/web-ele/src/views/template/index.vue index 48bb167..66ccfc8 100644 --- a/apps/web-ele/src/views/template/index.vue +++ b/apps/web-ele/src/views/template/index.vue @@ -19,10 +19,16 @@ const [addModal, addApi] = useVbenModal({ const [editModal, editApi] = useVbenModal({ connectedComponent: Edit, + onclose: () => { + tableApi.reload(); + }, }); const [pointModal, pointApi] = useVbenDrawer({ connectedComponent: Point, + onclose: () => { + tableApi.reload(); + }, }); interface TemplateType { @@ -147,8 +153,8 @@ const btn_point = (row: TemplateType) => { - - - + + + diff --git a/apps/web-ele/src/views/template/point.vue b/apps/web-ele/src/views/template/point.vue index 11c6b13..cdb7382 100644 --- a/apps/web-ele/src/views/template/point.vue +++ b/apps/web-ele/src/views/template/point.vue @@ -60,11 +60,20 @@ const gridOptions: VxeGridProps = { width: 240, }, ], + proxyConfig: { + ajax: { + query:() => { + return { + items: getPointData(), + }; + }, + }, + }, exportConfig: {}, toolbarConfig: { custom: true, export: true, - refresh: false, + refresh: true, zoom: true, }, pagerConfig: { @@ -92,9 +101,15 @@ const [Drawer, drawerApi] = useVbenDrawer({ }); const [addPointModal, addApi] = useVbenModal({ connectedComponent: AddPoint, + onclose: () => { + tableApi.reload(); + }, }); const [editPointModal, editApi] = useVbenModal({ connectedComponent: EditPoint, + onclose: () => { + tableApi.reload(); + }, }); // 编辑 @@ -118,7 +133,7 @@ function showConfirm(rowId: Number) { const ret = await cdcmTemplateAPI({ id: rowId }, req.PointDelete); if (ret.data.code === 0) { ElMessage.success(ret.data.data); - getPointData(); + tableApi.reload(); } else { ElMessage.error(ret.data.data || ret.data.msg); } @@ -147,7 +162,7 @@ async function getPointData() { 新增 - + 刷新当前页面