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

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 };
   },

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,

hx-ai-intelligent/vite.config.ts

@@ -11,5 +11,9 @@ const proxy = {
     target: 'http://140.210.143.1:14492',
     changeOrigin: true,
   },
+  '/carbon-smart': {
+    target: 'http://192.168.100.115:8224/api',
+    changeOrigin: true,
+  },
 };
 export default configFun({ dirname, proxy, serviceMode: 'saas', baseDir: '../' });