diff --git a/hx-ai-intelligent/public/asset/file/energyConsumption.xlsx b/hx-ai-intelligent/public/asset/file/energyConsumption.xlsx
index 2687e05..a9eae6e 100644
Binary files a/hx-ai-intelligent/public/asset/file/energyConsumption.xlsx and b/hx-ai-intelligent/public/asset/file/energyConsumption.xlsx differ
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index.vue
index d2c5c2e..0862a76 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index.vue
@@ -73,9 +73,10 @@
-
+ {{ text || '-' }}
+
@@ -391,6 +392,7 @@
api: carbonAssets.import, // 导入接口名
params: {
orgId,
+ year,
},
title: '碳资产', // 弹窗title
templateName: 'carbonAssets', // 所使用的文件名称
@@ -413,6 +415,7 @@
pageSize: 999,
year: queryParams.value.year,
ids: selectedRowKeys.value,
+ accountType: props.parentId,
});
const config = {
responseType: 'blob',
@@ -674,6 +677,7 @@
.validate()
.then(() => {
console.log('values', formState, toRaw(formState));
+ formState.value.orgId = orgId.value;
if (formState.value.transactionType) {
formState.value.transactionType = formState.value.transactionType.join(',').split(',')[1];
}
@@ -699,7 +703,8 @@
message.success('操作成功!');
visible.value = false;
delIds.value = [];
- getDetailList();
+ // getDetailList();
+ mainRef.value?.nsTableRef.reload();
getTotalTable();
})
.catch((error) => {
@@ -709,7 +714,8 @@
message.success('操作成功!');
visible.value = false;
delIds.value = [];
- getDetailList();
+ // getDetailList();
+ mainRef.value?.nsTableRef.reload();
}
});
})
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/index.vue
index a15dd8c..b73b0d7 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/index.vue
@@ -2,26 +2,27 @@
-
+
全国碳账户估值(CNY)
{{
nationwide.valuation
}}
-
+
-
交易明细
+
交易明细
-
+
全国碳账户余额
@@ -29,23 +30,23 @@
{{ nationwide.opening }}
期初余额(tCO2)
-
+
{{ nationwide.income }}
-
+
增加(tCO2)
-
+
{{ nationwide.expenditure }}
-
+
减少(tCO2)
-
+
{{ nationwide.period }}
期末余额(tCO2)
@@ -55,23 +56,26 @@
地方碳账户估值(CNY)
{{ place.valuation }}
-
+
-
交易明细
+
交易明细
-
+
地方碳账户余额
@@ -79,23 +83,23 @@
{{ place.opening }}
期初余额(tCO2)
-
+
{{ place.income }}
-
+
增加(tCO2)
-
+
{{ place.expenditure }}
-
+
减少(tCO2)
-
+
{{ place.period }}
期末余额(tCO2)
@@ -105,23 +109,26 @@
CCER资产估值(CNY)
{{ ccer.valuation }}
-
-
+
+
-
交易明细
+
交易明细
-
+
全国碳账户余额
@@ -129,23 +136,23 @@
{{ ccer.opening }}
期初余额(tCO2)
-
+
{{ ccer.income }}
-
+
增加(tCO2)
-
+
{{ ccer.expenditure }}
-
+
减少(tCO2)
-
+
{{ ccer.period }}
期末余额(tCO2)
@@ -155,15 +162,15 @@
碳资产总估值(CNY)
{{ whole.whole }}
@@ -172,12 +179,12 @@
{{ whole.nationwide }}
全国碳账户资产估值
-
+
{{ whole.place }}
地方碳账户资产估值
-
+
{{ whole.ccer }}
CCER碳资产估值
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
index 773d362..bdfdf63 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
@@ -38,41 +38,37 @@
-
- {{
- data.emissionName.substring(0, data.emissionName.indexOf(selectTreeDataValue))
- }}
- {{ selectTreeDataValue }}
- {{
- data.emissionName.substring(
- data.emissionName.indexOf(selectTreeDataValue) + selectTreeDataValue.length,
- )
- }}
-
- {{ data.emissionName }}
+ {{ data.emissionName }}
- 编辑
- 新增子节点
- 上移编辑
+ 新增子节点
+
+ 上移
+
下移
+ 下移
+
+ 删除
- 删除
@@ -311,6 +307,7 @@
},
];
const checkedTreeNodeKeys = ref
();
+ const selectedKeys = ref();
// const generateData = (_level: number, _preKey?: string, _tns?: TreeProps['treeData']) => {
// const preKey = _preKey || '0';
@@ -565,7 +562,10 @@
// 被选中的树节点
const editTreeNode = ref({});
const onSelectKeys = ref([]);
- const onSelect = (selectedKeys: string[], info: any) => {
+ const onSelect = (selectedKey: string[], info: any) => {
+ if (selectedKey.length === 1) {
+ selectedKeys.value = selectedKey;
+ }
if (info.selected) {
// showOperation.value = true;
editTreeNode.value = {
@@ -575,7 +575,7 @@
sortNumber: info.selectedNodes[0].sortNumber,
parentEmissionId: info.selectedNodes[0].parentEmissionId,
};
- onSelectKeys.value.push(info.selectedNodes[0].id);
+ onSelectKeys.value = [info.selectedNodes[0].id];
emissionList.value = [...onSelectKeys.value, ...checkedIds.value];
mainRef.value?.nsTableRef.reload();
} else {
@@ -766,49 +766,60 @@
columns: [
{
title: 'id',
+ width: 50,
customRender: (text: any) => {
return text.index + 1;
},
},
{
title: '排放源',
+ width: 100,
dataIndex: 'emissionSources',
},
{
title: '排放类型',
+ width: 100,
dataIndex: 'emissionTypeColumn',
},
{
title: '排放气体',
+ width: 100,
dataIndex: 'emissionGas',
},
{
title: '排放环节',
+ width: 100,
dataIndex: 'emissionProcess',
},
{
title: '排放因子',
+ width: 100,
dataIndex: 'emissionFactors',
},
{
title: '排放因子单位',
+ width: 100,
dataIndex: 'emissionFactorUnits',
},
{
title: '数据来源',
+ width: 100,
dataIndex: 'dataSources',
},
{
title: '数据库',
+ width: 100,
dataIndex: 'carbonDatabase',
},
{
title: '参考文献',
+ width: 100,
dataIndex: 'bibliography',
ellipsis: true,
},
{
title: '引用数量',
+ width: 100,
dataIndex: 'numberOfReferences',
},
],
@@ -1224,13 +1235,17 @@
}
.treePart {
width: 70%;
- height: 100%;
+ height: calc(100% - 5vh);
display: flex;
border: 1px solid #bfbfbf;
margin-left: 10%;
flex-direction: column;
border-radius: 12px;
overflow: auto;
+ :deep(.ant-tree) {
+ height: 90%;
+ overflow: auto;
+ }
}
.actionMore {
display: none;
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue
index c113322..4022831 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/carbonEmissions/index.vue
@@ -5,7 +5,7 @@
:data-source="data"
:bordered="true"
:pagination="false"
- :scroll="{ x: 2000, y: 480 }">
+ :scroll="{ x: 1700, y: 480 }">
@@ -14,14 +14,14 @@
-
+ @change="onChange" /> -->
diff --git a/lib/component/form/input/textarea.vue b/lib/component/form/input/textarea.vue
index 89ad0fb..3fb0e0d 100644
--- a/lib/component/form/input/textarea.vue
+++ b/lib/component/form/input/textarea.vue
@@ -1,11 +1,22 @@
-
+