From 69bae8de3ab8b73da6ee610a013d609ed80b0d28 Mon Sep 17 00:00:00 2001 From: zhuangdashia Date: Mon, 18 Aug 2025 12:55:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=B8=85=E5=8D=95=EF=BC=9A?= =?UTF-8?q?=E5=8F=96=E6=9A=96=E8=B4=B9=20=E5=89=8D=E7=AB=AF++?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/router/elegant/imports.ts | 1 + .../src/router/elegant/routes.ts | 9 + .../src/router/elegant/transform.ts | 1 + .../src/typings/api/mps.import-heat.api.d.ts | 77 +++++ .../src/typings/elegant-router.d.ts | 2 + .../src/views/mps/import-heat/index.vue | 321 ++++++++++++++++++ .../modules/import-heat-import-modal.vue | 176 ++++++++++ .../modules/import-heat-operate-drawer.vue | 179 ++++++++++ .../modules/import-heat-search.vue | 106 ++++++ .../market/modules/market-operate-drawer.vue | 16 +- cds-fontend-2025.V1/vite.config.ts | 6 +- 11 files changed, 885 insertions(+), 9 deletions(-) create mode 100644 cds-fontend-2025.V1/src/typings/api/mps.import-heat.api.d.ts create mode 100644 cds-fontend-2025.V1/src/views/mps/import-heat/index.vue create mode 100644 cds-fontend-2025.V1/src/views/mps/import-heat/modules/import-heat-import-modal.vue create mode 100644 cds-fontend-2025.V1/src/views/mps/import-heat/modules/import-heat-operate-drawer.vue create mode 100644 cds-fontend-2025.V1/src/views/mps/import-heat/modules/import-heat-search.vue diff --git a/cds-fontend-2025.V1/src/router/elegant/imports.ts b/cds-fontend-2025.V1/src/router/elegant/imports.ts index d11c648..c971711 100644 --- a/cds-fontend-2025.V1/src/router/elegant/imports.ts +++ b/cds-fontend-2025.V1/src/router/elegant/imports.ts @@ -31,6 +31,7 @@ export const views: Record Promise import("@/views/monitor/logininfor/index.vue"), monitor_online: () => import("@/views/monitor/online/index.vue"), monitor_operlog: () => import("@/views/monitor/operlog/index.vue"), + "mps_import-heat": () => import("@/views/mps/import-heat/index.vue"), "mps_manual-pricing": () => import("@/views/mps/manual-pricing/index.vue"), "mps_market-yxzetgrb": () => import("@/views/mps/market-yxzetgrb/index.vue"), mps_market: () => import("@/views/mps/market/index.vue"), diff --git a/cds-fontend-2025.V1/src/router/elegant/routes.ts b/cds-fontend-2025.V1/src/router/elegant/routes.ts index ce6b483..f9c5440 100644 --- a/cds-fontend-2025.V1/src/router/elegant/routes.ts +++ b/cds-fontend-2025.V1/src/router/elegant/routes.ts @@ -189,6 +189,15 @@ export const generatedRoutes: GeneratedRoute[] = [ i18nKey: 'route.mps' }, children: [ + { + name: 'mps_import-heat', + path: '/mps/import-heat', + component: 'view.mps_import-heat', + meta: { + title: 'mps_import-heat', + i18nKey: 'route.mps_import-heat' + } + }, { name: 'mps_manual-pricing', path: '/mps/manual-pricing', diff --git a/cds-fontend-2025.V1/src/router/elegant/transform.ts b/cds-fontend-2025.V1/src/router/elegant/transform.ts index 088683d..3b6ca4a 100644 --- a/cds-fontend-2025.V1/src/router/elegant/transform.ts +++ b/cds-fontend-2025.V1/src/router/elegant/transform.ts @@ -185,6 +185,7 @@ const routeMap: RouteMap = { "monitor_online": "/monitor/online", "monitor_operlog": "/monitor/operlog", "mps": "/mps", + "mps_import-heat": "/mps/import-heat", "mps_manual-pricing": "/mps/manual-pricing", "mps_market": "/mps/market", "mps_market-yxzetgrb": "/mps/market-yxzetgrb", diff --git a/cds-fontend-2025.V1/src/typings/api/mps.import-heat.api.d.ts b/cds-fontend-2025.V1/src/typings/api/mps.import-heat.api.d.ts new file mode 100644 index 0000000..48f8a0b --- /dev/null +++ b/cds-fontend-2025.V1/src/typings/api/mps.import-heat.api.d.ts @@ -0,0 +1,77 @@ + +/** + * Namespace Api + * + * All backend api type + */ +declare namespace Api { + + /** + * namespace Mps + * + * backend api module: "Mps" + */ + namespace Mps { + /** import heat */ + type ImportHeat = Common.CommonRecord<{ + /** 主键 */ + id: CommonType.IdType; + /** 用户编码 */ + userCode: string; + /** 用户地址 */ + userAddress: string; + /** 费用类别 */ + feeType: string; + /** 缴费金额 */ + paymentAmount: number; + /** 加热器金额 */ + heaterAmount: number; + /** 缴费日期 */ + paymentDate: string; + /** 流水号 */ + transactionId: CommonType.IdType; + /** 订单状态 */ + orderStatus: string; + /** 计价月份 */ + importTime: string; + /** 租户编号 */ + tenantId: CommonType.IdType; + }>; + + /** import heat search params */ + type ImportHeatSearchParams = CommonType.RecordNullable< + Pick< + Api.Mps.ImportHeat, + | 'userCode' + | 'userAddress' + | 'feeType' + | 'paymentAmount' + | 'heaterAmount' + | 'paymentDate' + | 'transactionId' + | 'orderStatus' + | 'importTime' + > & + Api.Common.CommonSearchParams + >; + + /** import heat operate params */ + type ImportHeatOperateParams = CommonType.RecordNullable< + Pick< + Api.Mps.ImportHeat, + | 'userCode' + | 'userAddress' + | 'feeType' + | 'paymentAmount' + | 'heaterAmount' + | 'paymentDate' + | 'transactionId' + | 'orderStatus' + | 'importTime' + > + >; + + /** import heat list */ + type ImportHeatList = Api.Common.PaginatingQueryRecord; + } +} diff --git a/cds-fontend-2025.V1/src/typings/elegant-router.d.ts b/cds-fontend-2025.V1/src/typings/elegant-router.d.ts index 076edcd..cc0991b 100644 --- a/cds-fontend-2025.V1/src/typings/elegant-router.d.ts +++ b/cds-fontend-2025.V1/src/typings/elegant-router.d.ts @@ -39,6 +39,7 @@ declare module "@elegant-router/types" { "monitor_online": "/monitor/online"; "monitor_operlog": "/monitor/operlog"; "mps": "/mps"; + "mps_import-heat": "/mps/import-heat"; "mps_manual-pricing": "/mps/manual-pricing"; "mps_market": "/mps/market"; "mps_market-yxzetgrb": "/mps/market-yxzetgrb"; @@ -151,6 +152,7 @@ declare module "@elegant-router/types" { | "monitor_logininfor" | "monitor_online" | "monitor_operlog" + | "mps_import-heat" | "mps_manual-pricing" | "mps_market-yxzetgrb" | "mps_market" diff --git a/cds-fontend-2025.V1/src/views/mps/import-heat/index.vue b/cds-fontend-2025.V1/src/views/mps/import-heat/index.vue new file mode 100644 index 0000000..8888fc5 --- /dev/null +++ b/cds-fontend-2025.V1/src/views/mps/import-heat/index.vue @@ -0,0 +1,321 @@ + + + + + diff --git a/cds-fontend-2025.V1/src/views/mps/import-heat/modules/import-heat-import-modal.vue b/cds-fontend-2025.V1/src/views/mps/import-heat/modules/import-heat-import-modal.vue new file mode 100644 index 0000000..4e47f07 --- /dev/null +++ b/cds-fontend-2025.V1/src/views/mps/import-heat/modules/import-heat-import-modal.vue @@ -0,0 +1,176 @@ +[[[ + +]]] + + + + diff --git a/cds-fontend-2025.V1/src/views/mps/import-heat/modules/import-heat-operate-drawer.vue b/cds-fontend-2025.V1/src/views/mps/import-heat/modules/import-heat-operate-drawer.vue new file mode 100644 index 0000000..0814e8f --- /dev/null +++ b/cds-fontend-2025.V1/src/views/mps/import-heat/modules/import-heat-operate-drawer.vue @@ -0,0 +1,179 @@ + + + + + diff --git a/cds-fontend-2025.V1/src/views/mps/import-heat/modules/import-heat-search.vue b/cds-fontend-2025.V1/src/views/mps/import-heat/modules/import-heat-search.vue new file mode 100644 index 0000000..fa53cab --- /dev/null +++ b/cds-fontend-2025.V1/src/views/mps/import-heat/modules/import-heat-search.vue @@ -0,0 +1,106 @@ + + + + + diff --git a/cds-fontend-2025.V1/src/views/mps/market/modules/market-operate-drawer.vue b/cds-fontend-2025.V1/src/views/mps/market/modules/market-operate-drawer.vue index fff09de..abc6c83 100644 --- a/cds-fontend-2025.V1/src/views/mps/market/modules/market-operate-drawer.vue +++ b/cds-fontend-2025.V1/src/views/mps/market/modules/market-operate-drawer.vue @@ -448,14 +448,14 @@ watch(visible, () => { - - - + + + + + + + + diff --git a/cds-fontend-2025.V1/vite.config.ts b/cds-fontend-2025.V1/vite.config.ts index 45c2f97..dffa446 100644 --- a/cds-fontend-2025.V1/vite.config.ts +++ b/cds-fontend-2025.V1/vite.config.ts @@ -27,7 +27,11 @@ export default defineConfig(configEnv => { } } }, - plugins: setupVitePlugins(viteEnv, buildTime), + plugins: setupVitePlugins({ + ...viteEnv, + VITE_DEVTOOLS_LAUNCH_EDITOR: 'D:\\soft\\jb\\IntelliJ IDEA Ultimate\\bin\\idea64.exe' // Windows系统 + // 或 Mac系统: '/Applications/IntelliJ IDEA.app/Contents/MacOS/idea' + }, buildTime), define: { BUILD_TIME: JSON.stringify(buildTime) },