diff --git a/.vscode/settings.json b/.vscode/settings.json index f38c427..d50a67d 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -203,7 +203,7 @@ ], "i18n-ally.pathMatcher": "{locale}/{namespace}.{ext}", "i18n-ally.enabledParsers": ["json"], - "i18n-ally.sourceLanguage": "en", + "i18n-ally.sourceLanguage": "zh-CN", "i18n-ally.displayLanguage": "zh-CN", "i18n-ally.enabledFrameworks": ["vue", "react"], "i18n-ally.keystyle": "nested", diff --git a/apps/web-ele/src/api/core/cdcm.ts b/apps/web-ele/src/api/core/cdcm.ts index a44cbb3..d70f003 100644 --- a/apps/web-ele/src/api/core/cdcm.ts +++ b/apps/web-ele/src/api/core/cdcm.ts @@ -17,10 +17,14 @@ export namespace AuthApi { /** 登录接口返回值 */ export interface LoginResult { - support_driver_types?: string[]; - support_point_access_types?: string[]; - support_point_types?: string[]; - support_template_types?: string[]; + data: { + data: { + support_driver_types?: string[]; + support_point_access_types?: string[]; + support_point_types?: string[]; + support_template_types?: string[]; + }; + }; } export interface RefreshTokenResult { @@ -33,9 +37,7 @@ export namespace AuthApi { * 登录 */ export async function loginApi(data: AuthApi.LoginParams) { - return cdcmRequestClient.post('/auth/login', data, { - responseReturn: 'data', - }); + return cdcmRequestClient.post('/auth/login', data); } /** @@ -44,5 +46,3 @@ export async function loginApi(data: AuthApi.LoginParams) { export async function logoutApi() { return cdcmRequestClient.post('/auth/logout', {}); } - -// 通用请求函数 diff --git a/apps/web-ele/src/api/core/template.ts b/apps/web-ele/src/api/core/template.ts new file mode 100644 index 0000000..7838c1f --- /dev/null +++ b/apps/web-ele/src/api/core/template.ts @@ -0,0 +1,28 @@ +import { cdcmRequestClient } from '#/api/request'; +import { useTokenStore } from '#/store'; + +const token = useTokenStore().token; + +export namespace TemplateApi { + /** 分页查询模板请求体 */ + export interface TemplateQueryPageRequest { + page_num: number; + page_size: number; + template_type?: string; + } +} + +/** + * 查询所有模板 + */ +export async function TemplateQueryPage( + data: TemplateApi.TemplateQueryPageRequest, +) { + return cdcmRequestClient.post('/template', data, { + responseReturn: 'data', + headers: { + cdcm: token, + action: 52_011, + }, + }); +} diff --git a/apps/web-ele/src/api/request.ts b/apps/web-ele/src/api/request.ts index 8dbca1e..6dbe648 100644 --- a/apps/web-ele/src/api/request.ts +++ b/apps/web-ele/src/api/request.ts @@ -133,7 +133,7 @@ function createCDCMRequestClient( // 响应拦截器:自动更新 token client.addResponseInterceptor({ - fulfilled: async (response) => { + fulfilled: (response) => { const token = response.headers?.token; if (token) { // 如果响应头中有新 token,自动更新 store diff --git a/apps/web-ele/src/store/auth.ts b/apps/web-ele/src/store/auth.ts index d627018..88bf59e 100644 --- a/apps/web-ele/src/store/auth.ts +++ b/apps/web-ele/src/store/auth.ts @@ -38,9 +38,9 @@ export const useAuthStore = defineStore('auth', () => { userInfo.roles = ['admin']; try { loginLoading.value = true; - + const { data } = await loginApi(params); // 保存静态配置 - staticConfigStore.setConfig(await loginApi(params)); + staticConfigStore.setConfig(data); // console.log('staticConfigStore', staticConfigStore.support_driver_types); // const { accessToken } = await loginApi(params); diff --git a/apps/web-ele/src/store/token.ts b/apps/web-ele/src/store/token.ts index c608fd7..d992001 100644 --- a/apps/web-ele/src/store/token.ts +++ b/apps/web-ele/src/store/token.ts @@ -25,10 +25,11 @@ export const useStaticConfigStore = defineStore('static_config', { }), actions: { setConfig(data: AuthApi.LoginResult) { - this.support_template_types = data.support_template_types ?? []; - this.support_driver_types = data.support_driver_types ?? []; - this.support_point_types = data.support_point_types ?? []; - this.support_point_access_types = data.support_point_access_types ?? []; + this.support_template_types = data.data.support_template_types ?? []; + this.support_driver_types = data.data.support_driver_types ?? []; + this.support_point_types = data.data.support_point_types ?? []; + this.support_point_access_types = + data.data.support_point_access_types ?? []; }, }, }); diff --git a/apps/web-ele/src/views/template/add.vue b/apps/web-ele/src/views/template/add.vue new file mode 100644 index 0000000..3825849 --- /dev/null +++ b/apps/web-ele/src/views/template/add.vue @@ -0,0 +1,80 @@ + + + diff --git a/apps/web-ele/src/views/template/edit.vue b/apps/web-ele/src/views/template/edit.vue new file mode 100644 index 0000000..4e00753 --- /dev/null +++ b/apps/web-ele/src/views/template/edit.vue @@ -0,0 +1,77 @@ + + + diff --git a/apps/web-ele/src/views/template/index.vue b/apps/web-ele/src/views/template/index.vue index 9f552b0..43d818d 100644 --- a/apps/web-ele/src/views/template/index.vue +++ b/apps/web-ele/src/views/template/index.vue @@ -1,3 +1,146 @@ + + diff --git a/apps/web-ele/src/views/template/point.vue b/apps/web-ele/src/views/template/point.vue new file mode 100644 index 0000000..f979ce4 --- /dev/null +++ b/apps/web-ele/src/views/template/point.vue @@ -0,0 +1,101 @@ + + +