From 3fa365520097d149004f37e526781201d7e64ce6 Mon Sep 17 00:00:00 2001 From: fks-yangshouda Date: Tue, 3 Sep 2024 17:02:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=91=E6=8E=A7=E4=B8=AD?= =?UTF-8?q?=E5=BF=83=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../public/asset/file/groupList.xlsx | Bin 0 -> 9459 bytes .../src/view/equipmentManage/group/config.ts | 6 +++--- .../group/editCarbonEquipment.vue | 3 +++ .../monitor/energyMonitor/graphGraph/index.vue | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 hx-ai-intelligent/public/asset/file/groupList.xlsx 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 0000000000000000000000000000000000000000..d36689629e0285947a9c3eae398f71a39e769ab9 GIT binary patch literal 9459 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 Irr*B(AEl|)W&i*H literal 0 HcmV?d00001 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 ` ${param.marker}${param.seriesName} ${param.value} ${unit}