From 1990fd11e61c04b5b9435ad0e7ad51a2d568cfc4 Mon Sep 17 00:00:00 2001 From: fks-xuxinyue <2822784518@qq.com> Date: Mon, 5 Aug 2024 15:20:16 +0800 Subject: [PATCH] taskid:282,remark:'commit' --- .../src/api/carbonEmissionFactorLibrary.ts | 4 + .../carbonEmissions/index.vue | 1 - .../carbonEmissionStatistics/index.vue | 1 + .../carbonPlanning/all/index.vue | 248 +++++++++++---------- .../carbonPlanning/category/index.vue | 117 ++++++++-- .../carbonEmissionManage/carbonPlanning/index.vue | 36 +-- 6 files changed, 262 insertions(+), 145 deletions(-) diff --git a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts index 8358746..fe5380d 100644 --- a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts +++ b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts @@ -79,7 +79,11 @@ export enum uploadPic { // 碳规划 export enum carbonPlanning { // 全部 + whole = '/carbon-smart/api/carbon/planning/whole', // 详情 searchListByYear = '/carbon-smart/api/carbon/planning/searchListByYear', searchListByMonth = '/carbon-smart/api/carbon/planning/searchListByMonth', + yearAndMonthAchievement = '/carbon-smart/api/carbon/planning/yearAndMonthAchievement', + annualElectricityConsumption = '/carbon-smart/api/carbon/planning/annualElectricityConsumption', + electricityUsageBackThen = '/carbon-smart/api/carbon/planning/electricityUsageBackThen', } diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue index 3872240..a5b9204 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue @@ -54,7 +54,6 @@ // 年份选择改变触发 const changeYearData = () => { - debugger queryParams.value.year = selectYear.value; getTableList(); }; diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/index.vue index 76f48a0..94da7c9 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/index.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/index.vue @@ -37,6 +37,7 @@ energyConsumptionRef.value.mainRef.nsTableRef.reload(); } } else if (key === '2') { + debugger if (carbonEmissionsRef.value) { carbonEmissionsRef.value.getTableList(); // 调用子组件的方法 } diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/all/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/all/index.vue index 73250c2..14f7fd2 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/all/index.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/all/index.vue @@ -3,8 +3,18 @@