diff --git a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts
index 7783915..aaad9c2 100644
--- a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts
+++ b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts
@@ -11,6 +11,9 @@ export enum carbonEmissionFactorLibrary {
// 单位管理
dictionaryUnitManagement = '/carbon-smart/api/carbon/emission/factor/dictionaryUnitManagement',
findOutermost = '/carbon-smart/api/carbon/emission/factor/findOutermost',
+ createDictionary = '/carbon-smart/api/carbon/emission/factor/createDictionary',
+ updateDictionary = '/carbon-smart/api/carbon/emission/factor/updateDictionary',
+ delDictionary = '/carbon-smart/api/carbon/emission/factor/delDictionary',
}
// 碳排管理-碳排统计接口
export enum energyConsumption {
@@ -20,4 +23,12 @@ export enum energyConsumption {
creat = '/carbon-smart/api/carbon/stats/creat',
update = '/carbon-smart/api/carbon/stats/update',
del = '/carbon-smart/api/carbon/stats/del',
+}
+// 碳排管理-碳排速算接口
+export enum quickCalculation {
+ carbonQuickTree = '/carbon-smart/api/carbon/energy/correlation/carbonQuickTree',
+ queryCarbonEmissionPage = '/carbon-smart/api/carbon/energy/correlation/queryCarbonEmissionPage',
+ creat = '/carbon-smart/api/carbon/energy/correlation/creat',
+ update = '/carbon-smart/api/carbon/energy/correlation/update',
+ del = '/carbon-smart/api/carbon/energy/correlation/del',
}
\ No newline at end of file
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
index 94b132f..cf05dbf 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
@@ -46,18 +46,18 @@
{{ data.emissionName }}
-
-
-
-
编辑
-
新增子节点
-
上移
-
下移
-
删除
-
+
+
+
+
+ 编辑
+ 新增子节点
+ 上移
+ 下移
+ 删除
+
-
-
+
@@ -107,61 +107,89 @@
title="单位管理"
@close="closeUnitManag">
+ class="draggable-tree"
+ block-node>
{{ data.cnValue }}
-
-
-
-
编辑
-
新增子节点
-
上移
-
下移
-
删除
-
-
-
-
+
取消
- 确定
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.cnValue }}
+
+
+
+
+
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
index 09b276d..6c8fd15 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
@@ -87,36 +87,56 @@ export const columns = [
},
{
title: '因子值',
- dataIndex: 'energyType',
+ dataIndex: 'emissionFactors',
},
{
title: '计量单位',
- className: 'unit',
- dataIndex: 'unit',
+ className: 'carbonEmissionSuffix',
+ dataIndex: 'carbonEmissionSuffix',
},
{
title: '更新时间',
- className: 'unit',
- dataIndex: 'unit',
+ className: 'updateTime',
+ dataIndex: 'updateTime',
},
{
title: '启用时间',
- className: 'unit',
- dataIndex: 'unit',
+ className: 'startTime ',
+ dataIndex: 'startTime ',
},
{
title: '结束时间',
- className: 'unit',
- dataIndex: 'unit',
+ className: 'endTime',
+ dataIndex: 'endTime',
},
{
title: '数据来源',
- className: 'unit',
- dataIndex: 'unit',
+ className: 'dataSources',
+ dataIndex: 'dataSources',
},
{
title: '操作',
key: 'action',
width: 130
},
+];
+export const drawerColumns = [
+ {
+ title: '名称',
+ dataIndex: 'emissionSources',
+ },
+ {
+ title: '因子值',
+ dataIndex: 'emissionFactors',
+ },
+ {
+ title: '排放环节',
+ className: 'emissionProcess',
+ dataIndex: 'emissionProcess',
+ },
+ {
+ title: '数据来源',
+ className: 'dataSources',
+ dataIndex: 'dataSources',
+ },
];
\ No newline at end of file
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 0e88f8d..7026fdb 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
@@ -181,6 +181,7 @@
const queryParams = ref({
pageNum: 1,
pageSize: 10,
+ orgId: orgId.value,
})
const isRequired = ref(false);
const visible = ref(false);
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index copy.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index copy.vue
deleted file mode 100644
index 81d30db..0000000
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index copy.vue
+++ /dev/null
@@ -1,401 +0,0 @@
-
-
-
-
-
-
-
- 排放分类
-
-
-
-
-
- {{ emissionName.substring(0, emissionName.indexOf(selectTreeDataValue)) }}
- {{ selectTreeDataValue }}
- {{ emissionName.substring(emissionName.indexOf(selectTreeDataValue) + selectTreeDataValue.length) }}
-
- {{ emissionName }}
-
-
-
-
-
-
-
-
-
-
-
-
-
- 取消
- 确定
-
-
-
-
-
-
-
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
index f9df2af..4c6d60c 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
@@ -17,19 +17,22 @@
-
-
- {{ title.substring(0, title.indexOf(searchValue)) }}
+
+
+ {{ data.energyType.substring(0, data.energyType.indexOf(searchValue)) }}
{{ searchValue }}
- {{ title.substring(title.indexOf(searchValue) + searchValue.length) }}
+ {{ data.energyType.substring(data.energyType.indexOf(searchValue) + searchValue.length) }}
- {{ title }}
+ {{ data.energyType }}
@@ -66,7 +69,7 @@
@change="onChange" />
-
-
-
-
-
-
-
-
-
-
-
-
- 是
- 否
-
-
-
-
-
- {{ item.cnValue }}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
取消
确定
@@ -118,11 +120,12 @@