diff --git a/hx-ai-intelligent/src/config/app.config.ts b/hx-ai-intelligent/src/config/app.config.ts index 37b6975..0007f22 100644 --- 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 }; }, diff --git a/hx-ai-intelligent/src/view/equipmentManage/ledger/config.ts b/hx-ai-intelligent/src/view/equipmentManage/ledger/config.ts index d05dc97..e0f7412 100644 --- 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, diff --git a/hx-ai-intelligent/vite.config.ts b/hx-ai-intelligent/vite.config.ts index 51781aa..46cfc6e 100644 --- a/hx-ai-intelligent/vite.config.ts +++ b/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: '../' }); diff --git a/lib/component/table/table.vue b/lib/component/table/table.vue index 38e8b26..a01bbb1 100644 --- a/lib/component/table/table.vue +++ b/lib/component/table/table.vue @@ -15,7 +15,7 @@
- +
diff --git a/lib/component/tree/tree-api.vue b/lib/component/tree/tree-api.vue index 979d4f7..3e42bbf 100644 --- a/lib/component/tree/tree-api.vue +++ b/lib/component/tree/tree-api.vue @@ -1,72 +1,64 @@ - diff --git a/lib/saas/view/system/login.vue b/lib/saas/view/system/login.vue index 66a2cff..963c546 100644 --- a/lib/saas/view/system/login.vue +++ b/lib/saas/view/system/login.vue @@ -85,7 +85,7 @@ } if (userName.value !== '' && password.value !== '') { errorShow.value = false; - let data = JSON.stringify({ userName: userName.value, password: password.value }); + let data = JSON.stringify({ accountNo: userName.value, password: password.value }); // Cookies.set('nervsid', 'mockdata'); // router.replace({ name: 'root' }); @@ -95,7 +95,7 @@ const res = await configStore.userLogin(JSON.parse(data)); if (res.success) { if (res.data?.userToken) { - Cookies.set('nervsid', res.data?.userToken); + Cookies.set('token', res.data?.userToken); } const info = await configStore.userInfo(); info.success