@@ -187,7 +239,7 @@
total.value = res.data.total;
});
};
- // getDetailList();
+ getDetailList();
const columns = [
{
title: '序号',
@@ -326,129 +378,6 @@
},
});
};
-
- const mainRef = ref();
- const tableConfig = ref({
- title: '数据库',
- api: carbonAssets.carbonDetailsList,
- params: {
- orgId,
- },
- headerActions: [
- {
- label: '新增',
- name: 'userAdd',
- type: 'primary',
- handle: () => {
- },
- },
- {
- label: '导入',
- type: 'primary',
- name: 'carbonEmissionFactorLibraryImport',
- extra: {
- api: carbonEmissionFactorLibrary.import, // 导入接口名
- params: {
- orgId,
- },
- title: '排放源', // 弹窗title
- templateName: 'emissionSource', // 所使用的文件名称
- indexName: '设备id', // 匹配类型字段
- message: [
- { label: '1、若必填项未填写,则不能进行导入操作' },
- { label: `2、当重复时,则更新数据。` },
- { label: '3、数据将从模版的第五行进行导入。' },
- { label: '4、文件导入勿超过5MB。' },
- ],
- },
- },
- {
- label: '导出',
- type: 'primary',
- handle: () => {
- },
- },
- {
- label: '批量删除',
- type: 'primary',
- name: 'userBatchDel',
- dynamicDisabled: (data: any) => {
- return data.list.length === 0;
- },
- confirm: true,
- isReload: true,
- isClearCheck: true,
- api: carbonEmissionFactorLibrary.del,
- dynamicParams: { ids: 'id[]' },
- },
- ],
- columns: [
- {
- title: '序号',
- customRender: (text: any) => {
- return text.index + 1;
- },
- },
- {
- title: '资产类别',
- dataIndex: 'accountType',
- },
- {
- title: '交易方式',
- dataIndex: 'transactionTypeName',
- },
- {
- title: '交易日期',
- dataIndex: 'transactionDate',
- sorter: (a, b) => a.transactionDate - b.transactionDate,
- },
- {
- title: '本期收入(tCO2)',
- dataIndex: 'income',
- sorter: (a, b) => a.income - b.income,
- },
- {
- title: '本期支出(tCO2)',
- dataIndex: 'expenditure',
- sorter: (a, b) => a.expenditure - b.expenditure,
- },
- {
- title: '发生金额(¥)',
- dataIndex: 'amountIncurredValue',
- },
- {
- title: '交易对象',
- dataIndex: 'tradingPartner',
- },
- {
- title: '更新人',
- dataIndex: 'updateUser',
- },
- {
- title: '更新时间',
- dataIndex: 'updateTime',
- },
- ],
- columnActions: {
- title: '操作',
- actions: [
- {
- label: '编辑',
- name: 'userEdit',
- handle: (record: any) => {},
- },
- {
- label: '删除',
- name: 'userDelete',
- dynamicParams: { ids: 'id[]' },
- confirm: true,
- isReload: true,
- api: carbonEmissionFactorLibrary.del,
- },
- ],
- },
- rowKey: 'id',
- });
// 分页器
const onChange = (pageNumber: number, size: number) => {
queryParams.value.pageNum = pageNumber;
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/config.ts b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/config.ts
index 8d88d3c..25fdcf1 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/config.ts
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/config.ts
@@ -15,7 +15,7 @@ export const formConfig = (disabled) => {
component: 'NsInput',
componentProps: {
placeholder: '请输入排放源',
- maxLength: 20,
+ maxLength: 5,
},
rules: [
{
@@ -92,7 +92,7 @@ export const formConfig = (disabled) => {
component: 'NsInput',
componentProps: {
placeholder: '请输入排放环节',
- maxLength: 20,
+ maxLength: 5,
},
rules: [
{
@@ -107,7 +107,7 @@ export const formConfig = (disabled) => {
component: 'NsInputNumber',
componentProps: {
placeholder: '请输入排放因子值',
- maxLength: 20,
+ maxLength: 5,
},
rules: [
{
@@ -154,7 +154,7 @@ export const formConfig = (disabled) => {
component: 'NsInput',
componentProps: {
placeholder: '请输入碳排后缀',
- maxLength: 20,
+ maxLength: 10,
},
rules: [
{
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
index e09c09b..773d362 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
@@ -27,6 +27,7 @@
:tree-data="gData"
:checkedKeys="checkedTreeNodeKeys"
:selectedKeys="selectedKeys"
+ :show-line="{ showLeafIcon: false }"
@dragenter="onDragEnter"
@drop="onDrop"
@check="checkTreeNode"
@@ -164,6 +165,7 @@
:expanded-keys="unitExpandedKeys"
:selectedKeys="unitSelectedKeys"
:tree-data="unitTreeData"
+ :show-line="{ showLeafIcon: false }"
v-if="unitTreeData && unitTreeData.length > 0"
class="draggable-tree"
block-node>
@@ -198,7 +200,11 @@
-
+
@@ -211,7 +217,11 @@
-
+
{
+ // Check if the pressed key is a space
+ if (event.code === 'Space') {
+ event.preventDefault();
+ }
+ };
const unitOrGroupOk = () => {
unitFormRef.value
.validate()
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
index 6f69329..42621d2 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
@@ -76,7 +76,7 @@ export const tableColumns = [
{
title: '操作',
key: 'action',
- width: 130
+ width: 130,
},
];
// 碳排速算表表头
@@ -119,7 +119,7 @@ export const columns = [
{
title: '操作',
key: 'action',
- width: 130
+ width: 130,
},
];
// 碳排速算新增页中表头
@@ -131,6 +131,7 @@ export const drawerColumns = [
{
title: '因子值',
dataIndex: 'emissionFactors',
+ key: 'emissionFactors',
},
{
title: '排放环节',
@@ -142,4 +143,4 @@ export const drawerColumns = [
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 b4bd901..3454b15 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
@@ -22,7 +22,11 @@
:label-col="labelCol"
:wrapper-col="wrapperCol">
-
+
@@ -250,6 +254,12 @@
isComputeCarbon: [{ required: true, message: '请选择是否计算碳排', trigger: 'change' }],
unit: [{ required: true, message: '请选择计量单位', trigger: 'change' }],
};
+ const handleKeyDown = (event: KeyboardEvent) => {
+ // Check if the pressed key is a space
+ if (event.code === 'Space') {
+ event.preventDefault();
+ }
+ };
// 排放类型的变量
const emissionTypeDic = ref();
// 计量单位的变量
@@ -259,15 +269,15 @@
// 年份选择改变触发
const changeYearData = () => {
queryParams.value.year = selectYear.value;
- getTableList();
+ // getTableList();
};
const mainRef = ref();
const year = selectYear.value.format('YYYY');
const tableConfig = ref({
title: '能耗统计',
api: energyConsumption.pageList,
- rowSelection: null,
params: queryParams.value,
+ rowSelection: null,
headerActions: [
{
label: '新增',
@@ -690,10 +700,10 @@
field: 'year',
label: '年份',
component: 'NsDatePicker',
+ defaultValue: selectYear.value.format('YYYY'),
componentProps: {
picker: 'year',
valueFormat: 'YYYY',
- defaultValue: selectYear.value.format('YYYY'),
},
},
],
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 9d62f58..5350ea0 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
@@ -130,6 +130,11 @@
type: 'radio',
}"
:pagination="false">
+
+
+ {{ record.emissionFactors + record.emissionFactorUnits }}
+
+
取消
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/config.ts b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/config.ts
index c076d88..10ff27d 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/config.ts
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/config.ts
@@ -29,6 +29,7 @@ export const drawerColumns = [
{
title: '因子值',
dataIndex: 'emissionFactors',
+ key: 'emissionFactors',
},
{
title: '排放环节',
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 5bea682..8f7d450 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue
@@ -27,7 +27,7 @@