diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts index aa287fb..e14f1ee 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/config.ts @@ -178,7 +178,7 @@ export const setFactorConfig = (orgId, treeId, tableId) => { }, rowSelection: { type: 'radio', - selectedRowKeys: tableId, + selectedRowKeys: tableId ? tableId : [''], }, columns: [ { diff --git a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/index.vue b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/index.vue index 76f48a0..a2823cf 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/index.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/index.vue @@ -47,3 +47,23 @@ } }; + 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 e5525e9..e4f35f5 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonEmissionStatistics/quickCalculation/index.vue @@ -35,8 +35,10 @@ data.energyType.substring(data.energyType.indexOf(searchValue) + searchValue.length) }} --> - {{ truncatedName(data.energyType + data.code) }} - {{ truncatedName(data.energyType) }} + + {{ truncatedName(data.energyType + data.code) }} + + {{ truncatedName(data.energyType) }} @@ -228,8 +230,10 @@ autoExpandParent.value = false; }; const truncatedName = (name) => { - if (name.length > 8) { - return name.substring(0, 8) + '...'; + if (name) { + if (name.length > 8) { + return name.substring(0, 8) + '...'; + } } return name; }; @@ -511,12 +515,14 @@ const config = setFactorConfig(orgId.value, treeId.value, tableId.value); const selectFactor = () => { openVisible.value = true; - nextTick(() => { - setFactorRef.value.nsTableRef.params.emissionList = treeId.value; - setFactorRef.value.nsTableRef.treeElRef.selectedKeys = treeId.value; - setFactorRef.value.nsTableRef.rowSelection.selectedRowKeys = tableId.value; - setFactorRef.value.nsTableRef.reload(); - }); + if (treeId.value.length > 0) { + nextTick(() => { + setFactorRef.value.nsTableRef.params.emissionList = treeId.value; + setFactorRef.value.nsTableRef.treeElRef.selectedKeys = treeId.value; + setFactorRef.value.nsTableRef.rowSelection.selectedRowKeys = tableId.value; + setFactorRef.value.nsTableRef.reload(); + }); + } }; const btnClick = () => { let selectRowKeys = setFactorRef.value?.nsTableRef.tableState.selectedRowKeys; @@ -585,6 +591,7 @@ box-shadow: 0px 2px 20px rgb(69 123 234 / 20%); :deep(.ns-table-main) { border-radius: 8px !important; + margin-top: unset !important; } } :deep(.ant-table-container) { 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 e630eee..d5915da 100644 --- a/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue +++ b/hx-ai-intelligent/src/view/carbonEmissionManage/carbonInventoryCheck/fillInPage/index.vue @@ -128,6 +128,16 @@ --> +
+ +
- +
@@ -191,37 +191,45 @@ columns: [ { title: '序号', + width: 50, customRender: (text: any) => { return text.index + 1; }, }, { title: '企业名称', + width: 130, dataIndex: 'enterpriseName', }, { title: '报告名称', + width: 100, dataIndex: 'reportName', }, { title: '报告年度', + width: 70, dataIndex: 'reportYear', }, { title: '适用标准', + width: 100, dataIndex: 'genericStandard', }, { title: '更新人', + width: 100, dataIndex: 'updateUser', }, { title: '更新时间', + width: 100, dataIndex: 'updateTime', }, ], columnActions: { title: '操作', + width: 100, actions: [ { label: '编辑',