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 0862a76..a728237 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonAssets/carbonAssetsDetail/index.vue
@@ -60,15 +60,18 @@
@@ -205,6 +208,7 @@
year.value = queryParams.value.year;
transactionType.value = queryParams.value.transactionType;
accountType.value = queryParams.value.accountType;
+ getTotalTable(queryParams.value.accountType);
mainRef.value?.nsTableRef.reload();
// getDetailList();
};
@@ -299,11 +303,11 @@
}));
});
formState.value = JSON.parse(JSON.stringify(record));
- if (formState.value.expenditure === 0) {
- formState.value.transactionQuantity = formState.value.income;
- } else {
- formState.value.transactionQuantity = formState.value.expenditure;
- }
+ // if (formState.value.expenditure === 0) {
+ // formState.value.transactionQuantity = formState.value.income;
+ // } else {
+ // formState.value.transactionQuantity = formState.value.expenditure;
+ // }
setTimeout(() => {
let selectDevice = ref([Number(formState.value.transactionType)]);
findParentIds(options.value, formState.value.transactionType, selectDevice.value);
@@ -523,11 +527,6 @@
}));
});
formState.value = JSON.parse(JSON.stringify(record));
- if (formState.value.expenditure === 0) {
- formState.value.transactionQuantity = formState.value.income;
- } else {
- formState.value.transactionQuantity = formState.value.expenditure;
- }
setTimeout(() => {
let selectDevice = ref([Number(formState.value.transactionType)]);
findParentIds(options.value, formState.value.transactionType, selectDevice.value);
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/config.ts b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/config.ts
index 25fdcf1..4b8d12d 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/config.ts
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/config.ts
@@ -167,7 +167,7 @@ export const formConfig = (disabled) => {
label: '已引用数',
field: 'numberOfReferences',
component: 'NsInput',
- show:disabled,
+ show: disabled,
componentProps: {
defaultValue: '',
disabled: true,
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
index bdfdf63..68b486a 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionFactorLibrary/index.vue
@@ -299,13 +299,7 @@
const x = 3;
const y = 2;
const z = 1;
- const genData: TreeProps['treeData'] = [
- {
- emissionName: '全部',
- key: '0-0',
- children: [],
- },
- ];
+ const genData: TreeProps['treeData'] = [];
const checkedTreeNodeKeys = ref();
const selectedKeys = ref();
@@ -532,7 +526,7 @@
const getOrgTree = () => {
fetch(carbonEmissionFactorLibrary.getCarbonFactorTree, getClassificationTree.value).then(
(res) => {
- gData.value[0].children = res.data;
+ gData.value = res.data;
// 找到匹配的节点数据
// const selectedNodes = [];
// checkedTreeNodeKeys.value.forEach(key => {
@@ -565,9 +559,6 @@
const onSelect = (selectedKey: string[], info: any) => {
if (selectedKey.length === 1) {
selectedKeys.value = selectedKey;
- }
- if (info.selected) {
- // showOperation.value = true;
editTreeNode.value = {
id: info.selectedNodes[0].id,
level: info.selectedNodes[0].level,
@@ -578,12 +569,16 @@
onSelectKeys.value = [info.selectedNodes[0].id];
emissionList.value = [...onSelectKeys.value, ...checkedIds.value];
mainRef.value?.nsTableRef.reload();
- } else {
- editTreeNode.value = {};
- onSelectKeys.value = [];
- emissionList.value = [...onSelectKeys.value, ...checkedIds.value];
- mainRef.value?.nsTableRef.reload();
}
+ // if (info.selected) {
+ // // showOperation.value = true;
+
+ // } else {
+ // editTreeNode.value = {};
+ // onSelectKeys.value = [];
+ // emissionList.value = [...onSelectKeys.value, ...checkedIds.value];
+ // mainRef.value?.nsTableRef.reload();
+ // }
};
const onSearch = () => {
@@ -1242,8 +1237,10 @@
flex-direction: column;
border-radius: 12px;
overflow: auto;
+ align-items: center;
:deep(.ant-tree) {
height: 90%;
+ width: 90%;
overflow: auto;
}
}
diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
index d259443..7eab9ce 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts
@@ -1,3 +1,5 @@
+import { quickCalculation, carbonEmissionFactorLibrary } from '/@/api/carbonEmissionFactorLibrary';
+import { ref } from 'vue';
// 能耗统计表表头
export const tableColumns = [
{
@@ -144,3 +146,107 @@ export const drawerColumns = [
dataIndex: 'dataSources',
},
];
+export const setFactorConfig = (orgId) => {
+ return ref({
+ api: carbonEmissionFactorLibrary.getTableList,
+ params: { orgId, pageNum: 1, pageSize: 9999, emissionList: [] },
+ treeConfig: {
+ header: {
+ icon: 'deviceType',
+ title: '排放分类',
+ },
+ params: { orgId},
+ dynamicParams: { emissionList: 'id[]' },
+ defaultExpandAll: true,
+ // checkable:true,
+ api: carbonEmissionFactorLibrary.getCarbonFactorTree,
+ fieldNames: { title: 'emissionName', key: 'id' },
+ formConfig: {
+ schemas: [
+ {
+ field: 'deviceType',
+ label: '设备名称',
+ component: 'NsInput',
+ autoSubmit: true,
+ componentProps: {
+ placeholder: '请输入关键字',
+ },
+ },
+ ],
+ },
+ },
+ rowSelection: { type: 'radio' },
+ columns: [
+ {
+ title: '序号',
+ textNumber: 2,
+ dataIndex: 'address',
+ customRender: (text: any) => {
+ return text.index + 1;
+ },
+ },
+ {
+ title: '名称',
+ dataIndex: 'emissionSources',
+ textNumber: 3,
+ },
+ {
+ title: '排放因子',
+ dataIndex: 'emissionFactors',
+ textNumber: 4,
+ textEllipsis: true,
+ },
+ {
+ title: '排放因子单位',
+ dataIndex: 'emissionFactorUnits',
+ width: 100,
+ textEllipsis: true,
+ },
+ {
+ title: '排放环节',
+ dataIndex: 'emissionProcess',
+ textWidth: 88,
+ textEllipsis: true,
+ },
+ {
+ title: '数据来源',
+ dataIndex: 'dataSources',
+ textNumber: 5,
+ textEllipsis: true,
+ },
+ ],
+ formConfig: {
+ schemas: [
+ {
+ field: 'emissionSources',
+ label: '排放源',
+ component: 'NsInput',
+ componentProps: {
+ placeholder: '请输入排放源',
+ maxLength: 20,
+ },
+ },
+ {
+ field: 'emissionProcess',
+ label: '排放环节',
+ component: 'NsSelectApi',
+ componentProps: {
+ placeholder: '请选择排放环节',
+ api: carbonEmissionFactorLibrary.gasAndDatabase,
+ resultField: 'data',
+ params: {
+ orgId: orgId.value,
+ type: 'emissionProcess',
+ },
+ immediate: true,
+ labelField: 'label',
+ valueField: 'value',
+ },
+ },
+ ],
+ params: {},
+ },
+ // pagination: { pageSizeOptions: false },
+ rowKey: 'id',
+ });
+};
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 2ef50c2..3e582e5 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/energyConsumption/index.vue
@@ -973,6 +973,7 @@
formState.value = {
orgId: orgId.value,
};
+ fileList.value = [];
formRef.value.resetFields();
};
// 点击上传凭证按钮
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 5350ea0..8f7add6 100644
--- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
+++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue
@@ -40,40 +40,11 @@
-
-
-
+
-
+
-
因子列表
@@ -117,8 +88,11 @@
-
+ -->
+ 选择因子
+
+
+
+
@@ -156,6 +139,7 @@
carbonEmissionFactorLibrary,
} from '/@/api/carbonEmissionFactorLibrary';
import { or } from '@vueuse/core';
+ import { setFactorConfig } from '../config';
defineOptions({
energyType: 'quickCalculation', // 与页面路由name一致缓存才可生效
components: {
@@ -499,6 +483,11 @@
},
});
};
+ const openVisible = ref(false);
+ const config = setFactorConfig(orgId.value);
+ const selectFactor = () => {
+ openVisible.value = true;
+ };
// 关闭新增抽屉
const onClose = () => {
visible.value = false;
@@ -611,6 +600,12 @@
:deep(.ant-table-container) {
padding: unset;
}
+ :deep(.ant-modal-header) {
+ border-bottom: 10px solid #f0f0f0 !important;
+ }
+ :deep(.ant-modal-footer) {
+ border-top: 10px solid #f0f0f0 !important;
+ }