From ed8d86ab8b2623b7b6894eff384771f9cfca4df9 Mon Sep 17 00:00:00 2001 From: fks-xuxinyue <2822784518@qq.com> Date: Tue, 13 Aug 2024 13:22:13 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=EF=BC=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E9=A1=B5=E9=9D=A2UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../public/asset/file/emissionSource.xlsx | Bin 0 -> 9243 bytes .../src/api/carbonEmissionFactorLibrary.ts | 1 + .../carbonEmissionFactorLibrary/index.vue | 4 +- .../energyConsumption/index copy.vue | 952 ++++++++++++ .../energyConsumption/index.vue | 189 ++- .../quickCalculation/index.vue | 15 +- .../carbonInventoryCheck/fillInPage/index copy.vue | 1555 ++++++++++++++++++++ .../carbonInventoryCheck/fillInPage/index.vue | 185 ++- .../carbonPlanning/category/categoryDeatil.vue | 14 +- .../carbonPlanning/category/index.vue | 37 +- .../carbonEmissionManage/carbonPlanning/index.vue | 4 +- 11 files changed, 2829 insertions(+), 127 deletions(-) create mode 100644 hx-ai-intelligent/public/asset/file/emissionSource.xlsx create mode 100644 hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index copy.vue create mode 100644 hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index copy.vue diff --git a/hx-ai-intelligent/public/asset/file/emissionSource.xlsx b/hx-ai-intelligent/public/asset/file/emissionSource.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..67e42be5ee243c169b76e7b7bbb078897b8e9858 GIT binary patch literal 9243 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 literal 0 HcmV?d00001 diff --git a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts index 2fbfe1b..a75e003 100644 --- a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts +++ b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts @@ -26,6 +26,7 @@ export enum energyConsumption { update = '/carbon-smart/api/carbon/stats/update', del = '/carbon-smart/api/carbon/stats/del', voucherDownloadList = '/carbon-smart/api/carbon/stats/voucherDownloadList', + energyAcquisition = '/carbon-smart/api/carbon/stats/energyAcquisition', } // 碳排管理-碳排速算接口 export enum quickCalculation { diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue index 9be85b4..b4329eb 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue @@ -644,8 +644,8 @@ params: { orgId, }, - title: '设备信息', // 弹窗title - templateName: 'whiteListUser', // 所使用的文件名称 + title: '排放源', // 弹窗title + templateName: 'emissionSource', // 所使用的文件名称 indexName: '设备id', // 匹配类型字段 message: [ { label: '1、若必填项未填写,则不能进行导入操作' }, diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index copy.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index copy.vue new file mode 100644 index 0000000..715b3e8 --- /dev/null +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index copy.vue @@ -0,0 +1,952 @@ + + + + diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue index 3b2bc53..a0924ae 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue @@ -32,15 +32,10 @@ :model="data" ref="mainRef" :scroll="{ x: 1500, y: 350 }"> - @@ -60,18 +55,29 @@ :footer-style="{ textAlign: 'right' }" destroyOnClose @close="onClose"> +
能源种类
- + + + + + {{ item.cnValue }} + + + - + + +
能耗统计
+ + + +
凭证上传
+ + + + 上传 + + + -
+
-
-
排放源
- 返回 -
-
-
- - - -
- 新增 +
+
+ + + + +
-
-
+ + - + :pagination="false" + :scroll="{ x: 2000, y: 500 }"> -
-
-
- - - -
-
-
-
+ + +
+
+