From ee99ba7340b8b97d5b167c050ec3f3d9e6edc24d Mon Sep 17 00:00:00 2001
From: fks-xuxinyue <2822784518@qq.com>
Date: Tue, 23 Jul 2024 15:15:05 +0800
Subject: [PATCH] taskid:099 remark:'commit'
---
.../src/api/carbonEmissionFactorLibrary.ts | 9 +
.../carbonEmissionFactorLibrary/index.vue | 3 +-
.../energyConsumption/index.vue | 1 -
.../carbonInventoryCheck/fillInPage/index.vue | 333 +++++++++++++++------
4 files changed, 255 insertions(+), 91 deletions(-)
diff --git a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts
index edae9fa..57e28ca 100644
--- a/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts
+++ b/hx-ai-intelligent/src/api/carbonEmissionFactorLibrary.ts
@@ -42,4 +42,13 @@ export enum carbonInventoryCheck {
createOrUpdate = '/carbon-smart/api/carbon/report/createOrUpdate',
findById = '/carbon-smart/api/carbon/report/findById',
delete = '/carbon-smart/api/carbon/report/delete',
+ // 填报页面接口
+ // 最左侧碳盘查报告树
+ getCategoryTree = '/carbon-smart/api/carbon/inventory/contact/getCategoryTree',
+ updateCategoryTree = '/carbon-smart/api/carbon/inventory/contact/update',
+ // 排放源中左侧树
+ getInventoryTree = '/carbon-smart/api/carbon/inventory/getInventoryTree',
+ create = '/carbon-smart/api/carbon/inventory/create',
+ update = '/carbon-smart/api/carbon/inventory/update',
+ del = '/carbon-smart/api/carbon/inventory/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 874ac97..d52c081 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
@@ -562,7 +562,6 @@
});
opMap.value.fuc = (formData: any) => {
formData.emissionType = formData.emissionType[formData.emissionType.length - 1]
- debugger
return http.post(carbonEmissionFactorLibrary.creatOrUpdate, formData).then(() => {
mainRef.value?.nsTableRef.reload();
visible.value = false;
@@ -602,7 +601,7 @@
name: 'userAdd',
handle: () => {
unitManagement.value = true,
- fetch(carbonEmissionFactorLibrary.findOutermost).then((res) => {
+ fetch(carbonEmissionFactorLibrary.findOutermost,{grp:'MEASUREMENT_UNIT'}).then((res) => {
groupData.value = res.data
});
getUnitTree()
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 256c5cb..15a471c 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
@@ -487,7 +487,6 @@
label: child.cnValue
})) : []
}));
- debugger
});
// 获取自动采集节点的数据
fetch(group.queryDeviceGroupTree, { energyType: 'ELECTRICITY_USAGE',orgId: orgId.value }).then((res) => {
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
index f0d78a1..fcf8e50 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
@@ -19,21 +19,25 @@