diff --git a/hx-ai-intelligent/public/asset/file/groupList.xlsx b/hx-ai-intelligent/public/asset/file/groupList.xlsx new file mode 100644 index 0000000..d366896 Binary files /dev/null and b/hx-ai-intelligent/public/asset/file/groupList.xlsx differ diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/config.ts b/hx-ai-intelligent/src/view/equipmentManage/group/config.ts index 523aa0b..77a8be2 100644 --- a/hx-ai-intelligent/src/view/equipmentManage/group/config.ts +++ b/hx-ai-intelligent/src/view/equipmentManage/group/config.ts @@ -346,8 +346,8 @@ export const tableConfig = (el, elGroup, elFormula, defaultParams) => { api: group.importGroup, // 导入接口名 // dynamicParams: { defaultParams: defaultParams }, params: defaultParams.value, - title: '设备信息', // 弹窗title - templateName: 'whiteListUser', // 所使用的文件名称 + title: '计算节点', // 弹窗title + templateName: 'groupList', // 所使用的文件名称 indexName: '设备id', // 匹配类型字段 message: [ { label: '1、若必填项未填写,则不能进行导入操作' }, @@ -364,7 +364,7 @@ export const tableConfig = (el, elGroup, elFormula, defaultParams) => { type: 'primary', handle: () => { // http.get('/asset/file/whiteListUser.xlsx'); - doWnload('/hx-ai-intelligent/asset/file/whiteListUser.xlsx'); + doWnload('/hx-ai-intelligent/asset/file/groupList.xlsx'); }, }, ], diff --git a/hx-ai-intelligent/src/view/equipmentManage/group/editCarbonEquipment.vue b/hx-ai-intelligent/src/view/equipmentManage/group/editCarbonEquipment.vue index 2ccf6db..79ac962 100644 --- a/hx-ai-intelligent/src/view/equipmentManage/group/editCarbonEquipment.vue +++ b/hx-ai-intelligent/src/view/equipmentManage/group/editCarbonEquipment.vue @@ -158,4 +158,7 @@ ::v-deep .ant-table-pagination.ant-pagination { margin: 26px 0 !important; /* 根据需要调整 padding 大小 */ } + :deep(.ns-list-table[data-v-64b9682f]:not(.ant-drawer-body > *):not(.ant-form > *)) { + background-color: #ffffff !important; + } diff --git a/hx-ai-intelligent/src/view/monitor/energyMonitor/graphGraph/index.vue b/hx-ai-intelligent/src/view/monitor/energyMonitor/graphGraph/index.vue index 3284fc0..f995434 100644 --- a/hx-ai-intelligent/src/view/monitor/energyMonitor/graphGraph/index.vue +++ b/hx-ai-intelligent/src/view/monitor/energyMonitor/graphGraph/index.vue @@ -116,7 +116,7 @@ const date = params[0].name; const values = params .map((param: any) => { - const unit = data.value.find((d) => d.date === date)?.unit || ''; + const unit = data.value[0]?.unit || ''; return `