diff --git a/hx-ai-intelligent/public/asset/file/energyConsumption.xlsx b/hx-ai-intelligent/public/asset/file/energyConsumption.xlsx new file mode 100644 index 0000000..2687e05 Binary files /dev/null and b/hx-ai-intelligent/public/asset/file/energyConsumption.xlsx differ diff --git a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts index a75e003..2f9c803 100644 --- a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts +++ b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts @@ -9,7 +9,8 @@ export enum carbonEmissionFactorLibrary { creat = '/carbon-smart/api/carbon/emission/type/creatOrUpdate', delTreeNode = '/carbon-smart/api/carbon/emission/type/del', move = '/carbon-smart/api/carbon/emission/type/move', - excel = '/carbon-smart/api/carbon/emission/factor/excel', + import = '/carbon-smart/api/carbon/emission/factor/import', + export = '/carbon-smart/api/carbon/emission/factor/export', // 单位管理 dictionaryUnitManagement = '/carbon-smart/client/dict/dictionaryUnitManagement', findOutermost = '/carbon-smart/client/dict/findOutermost', @@ -27,6 +28,8 @@ export enum energyConsumption { del = '/carbon-smart/api/carbon/stats/del', voucherDownloadList = '/carbon-smart/api/carbon/stats/voucherDownloadList', energyAcquisition = '/carbon-smart/api/carbon/stats/energyAcquisition', + import = '/carbon-smart/api/carbon/stats/import', + export = '/carbon-smart/api/carbon/stats/export', } // 碳排管理-碳排速算接口 export enum quickCalculation { diff --git a/hx-ai-intelligent/src/icon/carbonAssetsSearch-1.svg b/hx-ai-intelligent/src/icon/carbonAssetsSearch-1.svg deleted file mode 100644 index babbb9e..0000000 --- a/hx-ai-intelligent/src/icon/carbonAssetsSearch-1.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/hx-ai-intelligent/src/icon/carbonAssetsSearch-2.svg b/hx-ai-intelligent/src/icon/carbonAssetsSearch-2.svg deleted file mode 100644 index 2a1bcfa..0000000 --- a/hx-ai-intelligent/src/icon/carbonAssetsSearch-2.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/hx-ai-intelligent/src/icon/carbonAssetsSearch-3.svg b/hx-ai-intelligent/src/icon/carbonAssetsSearch-3.svg deleted file mode 100644 index 0ddbb21..0000000 --- a/hx-ai-intelligent/src/icon/carbonAssetsSearch-3.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/hx-ai-intelligent/src/icon/carbonAssetsToDetail-1.svg b/hx-ai-intelligent/src/icon/carbonAssetsToDetail-1.svg new file mode 100644 index 0000000..4acc848 --- /dev/null +++ b/hx-ai-intelligent/src/icon/carbonAssetsToDetail-1.svg @@ -0,0 +1,4 @@ + + + + diff --git a/hx-ai-intelligent/src/icon/carbonAssetsToDetail-2.svg b/hx-ai-intelligent/src/icon/carbonAssetsToDetail-2.svg new file mode 100644 index 0000000..cab1ccb --- /dev/null +++ b/hx-ai-intelligent/src/icon/carbonAssetsToDetail-2.svg @@ -0,0 +1,4 @@ + + + + diff --git a/hx-ai-intelligent/src/icon/carbonAssetsToDetail-3.svg b/hx-ai-intelligent/src/icon/carbonAssetsToDetail-3.svg new file mode 100644 index 0000000..5651733 --- /dev/null +++ b/hx-ai-intelligent/src/icon/carbonAssetsToDetail-3.svg @@ -0,0 +1,4 @@ + + + + diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/index.vue index 25d7b2a..a15dd8c 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/index.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/index.vue @@ -9,13 +9,16 @@
{{ nationwide.valuation }}
-
+
+
+ + 交易明细 +
+
@@ -56,13 +59,16 @@ />
地方碳账户估值（CNY）
{{ place.valuation }}
-
+
+
+ + 交易明细 +
+
@@ -103,13 +109,16 @@ />
CCER资产估值（CNY）
{{ ccer.valuation }}
-
+
+
+ + 交易明细 +
+
@@ -259,7 +268,7 @@ display: flex; align-items: center; .moneyImg { - width: 20%; + width: 18%; display: flex; justify-content: center; } @@ -275,7 +284,7 @@ vertical-align: top; } .moneyTotal { - width: 35%; + width: 33%; display: flex; justify-content: center; opacity: 1; @@ -285,10 +294,17 @@ text-align: left; } .moneyDetail { - width: 10%; + width: 14%; display: flex; justify-content: center; cursor: pointer; + .detailClick { + border-radius: 4px; + padding: 3px; + > span { + font-size: 12px; + } + } } } .title { diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue index b4329eb..f2f6914 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue @@ -125,12 +125,14 @@ :body-style="{ paddingBottom: '80px' }" :footer-style="{ textAlign: 'right' }" destroyOnClose - title="单位管理" @close="closeUnitManag"> -
+
+
单位管理
新增分组 新增单位
+
- - - --> - - - - + + -->
能耗统计
- +