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

2024-05-28 11:09:59 +08:00
parent de08945d49 ddb046d2d3
commit 0db3da2362
6 changed files with 63 additions and 72 deletions
--- a/hx-ai-intelligent/src/config/app.config.ts
+++ b/hx-ai-intelligent/src/config/app.config.ts
@@ -37,13 +37,7 @@ export const appConfig = {
    },
  },
  timeout: 60 * 1000,
-  userLoginApi: () => {
-    return {
-      code: 200,
-      success: true,
-      data: { userToken: 123123123 },
-    };
-  },
+  userLoginApi: '/carbon-smart/user/login',
  userResourceApi: () => {
    return { data: mockResource.menus };
  },
--- a/hx-ai-intelligent/src/view/equipmentManage/ledger/config.ts
+++ b/hx-ai-intelligent/src/view/equipmentManage/ledger/config.ts
@@ -7,9 +7,10 @@ export const tableConfig = {
  // api: '/carbon_emission/device/getDeviceList',
  api: origanizemanage.list,
  treeConfig: {
-    dynamicParams: { abc: 'title', key: 'key' },
    defaultExpandAll: true,
-    treeData: data,
+    api: () => {
+      return Promise.resolve(data);
+    },
  },
  params: {
    page: 0,