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 0000000..67e42be Binary files /dev/null and b/hx-ai-intelligent/public/asset/file/emissionSource.xlsx differ 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 }"> -
-
-
- - - -
-
-
-
+ + +
+
+