Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp

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
+          title: '计算节点', // 弹窗title
-          templateName: 'whiteListUser', // 所使用的文件名称
+          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');
         },
       },
     ],

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;
+  }
 </style>

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 `<tr>
                           <td>${param.marker}${param.seriesName}</td>
                           <td style="text-align: right;">${param.value} ${unit}</td>