diff --git a/.env b/.env index fad912c..dc10f1a 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ VITE_BASE_API = '/remoteServer/admin-api/' -VITE_BASE_API_SYSTEM = '/remote/admin-api/system/' +VITE_BASE_API_SYSTEM = '/remoteServer/admin-api/system/' VITE_SHOW_ONLINE_DEVICE = true VITE_BASE_URL = 'http://43.140.245.32:48089' \ No newline at end of file diff --git a/src/api/server/axiosInstance.ts b/src/api/server/axiosInstance.ts index 040c83e..63737ba 100644 --- a/src/api/server/axiosInstance.ts +++ b/src/api/server/axiosInstance.ts @@ -67,7 +67,7 @@ const createAxiosInstance = (module: APIConfigKeys, config: Config) => { (config: InternalAxiosRequestConfig): InternalAxiosRequestConfig => { // config.headers.Authorization = basicHeader.token() // config.headers['tenant-id'] = basicHeader.tenant() - if (config.url?.includes('/login')) { + if (config.url?.includes('auth')) { config.headers['tenant-id'] = '1' } diff --git a/src/views/engineering/config/index.vue b/src/views/engineering/config/index.vue index 7e4a77c..df17db7 100644 --- a/src/views/engineering/config/index.vue +++ b/src/views/engineering/config/index.vue @@ -306,12 +306,10 @@ async function loadDeviceList() { const pageLoading = ref(true) onMounted(async () => { - if (!isCreate.value) { - await loadChannelList() - await loadDeviceList() - await loadCategoryList() - pageLoading.value = false - } + await loadChannelList() + await loadDeviceList() + await loadCategoryList() + pageLoading.value = false })