From ea25c22383e285d9053bc55f15a43dcd85cd6f12 Mon Sep 17 00:00:00 2001 From: fks-xuxinyue <2822784518@qq.com> Date: Fri, 2 Aug 2024 15:11:57 +0800 Subject: [PATCH] taskid:282 remark:'commit' --- .../src/api/carbonEmissionFactorLibrary.ts | 8 + .../carbonAssets/carbonAssetsDetail/index.vue | 57 ++---- .../carbonAssetsDetail/index2.vue | 53 ----- .../carbonEmissions/index.vue | 1 + .../carbonPlanning/all/index.vue | 8 +- .../category/categoryDeatil.vue | 184 ++++++++++++++++-- .../carbonPlanning/category/index.vue | 115 +++++++---- .../carbonPlanning/index.vue | 56 +++++- 8 files changed, 324 insertions(+), 158 deletions(-) delete mode 100644 hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index2.vue diff --git a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts index 3583af0..8358746 100644 --- a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts +++ b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts @@ -74,4 +74,12 @@ export enum carbonAssets { export enum uploadPic { uploadfiles = '/carbon-smart/api/common/file/uploadfiles', select = '/carbon-smart/api/common/file/select', + uploadfile = '/carbon-smart/api/common/file/uploadfile', +} +// 碳规划 +export enum carbonPlanning { + // 全部 + // 详情 + searchListByYear = '/carbon-smart/api/carbon/planning/searchListByYear', + searchListByMonth = '/carbon-smart/api/carbon/planning/searchListByMonth', } diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index.vue index 26938d9..1a63a0c 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index.vue @@ -172,7 +172,6 @@ - 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 a5b9204..3872240 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue @@ -54,6 +54,7 @@ // 年份选择改变触发 const changeYearData = () => { + debugger queryParams.value.year = selectYear.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 0aacc7a..73250c2 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/all/index.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonPlanning/all/index.vue @@ -27,7 +27,7 @@