diff --git a/env/.env b/env/.env index 2ffd67c..f623f4b 100644 --- a/env/.env +++ b/env/.env @@ -30,4 +30,7 @@ VITE_AUTH_MODE = 'single' VITE_COPY_NATIVE_RES_ENABLE = false # sm2加密key -VITE_SM2_KEY = '04f5084ee12767d932f293508e30e3b0100185042ec0f061dedaf92b793b93f79fd6179d5e47e25b7aec98e00cf90dd56df1f8191012537187e7bbfd2d1de299fc' \ No newline at end of file +VITE_SM2_KEY = '04f5084ee12767d932f293508e30e3b0100185042ec0f061dedaf92b793b93f79fd6179d5e47e25b7aec98e00cf90dd56df1f8191012537187e7bbfd2d1de299fc' + +# 高德地图key +VITE_AMAP_KEY = '1f8f159583f28dfba6eb06deb55e3b56' \ No newline at end of file diff --git a/src/App.vue b/src/App.vue index de2a340..ae126ef 100644 --- a/src/App.vue +++ b/src/App.vue @@ -18,6 +18,7 @@ onShow((options) => { else { navigateToInterceptor.invoke({ url: '/' }) } + // appStore.autoLogin() }) onHide(() => { diff --git a/src/api/centerControl.ts b/src/api/centerControl.ts new file mode 100644 index 0000000..13eb6dc --- /dev/null +++ b/src/api/centerControl.ts @@ -0,0 +1,8 @@ +import { http } from '@/http/http' + +/** + * 校验SN或BikeCode + */ +export function checkSnOrBikeCodeAPI(query: { ecuSn: string, bikeCode: string }) { + return http.get('/operations/ebikeEcuInfo/checkSnOrBikeCode', query) +} diff --git a/src/api/login.ts b/src/api/login.ts index a0862cb..7117e80 100644 --- a/src/api/login.ts +++ b/src/api/login.ts @@ -1,4 +1,4 @@ -import type { IAuthLoginRes, ICaptcha, IDoubleTokenRes, IUpdateInfo, IUpdatePassword, IUserInfoRes } from './types/login' +import type { IAuthLoginRes, ICaptcha, IDoubleTokenRes, IUpdateInfo, IUpdatePassword } from './types/login' import { http } from '@/http/http' /** @@ -34,17 +34,17 @@ export function refreshToken(refreshToken: string) { } /** - * 获取用户信息 + * 获取当前登陆账号详情 */ export function getUserInfo() { - return http.get('/user/info') + return http.get('/staff/ebikeOperatorStaff/getStaffInfo') } /** * 退出登录 */ export function logout() { - return http.get('/auth/logout') + return http.get('/staff/ebikeOperatorStaff/logout') } /** diff --git a/src/api/types/centerControl.ts b/src/api/types/centerControl.ts new file mode 100644 index 0000000..e69de29 diff --git a/src/pages-sub/centerControl/testControl/components/executionList.vue b/src/pages-sub/centerControl/testControl/components/executionList.vue new file mode 100644 index 0000000..74b76a8 --- /dev/null +++ b/src/pages-sub/centerControl/testControl/components/executionList.vue @@ -0,0 +1,162 @@ + + + + + diff --git a/src/pages-sub/centerControl/testControl/components/scanByTest.vue b/src/pages-sub/centerControl/testControl/components/scanByTest.vue new file mode 100644 index 0000000..dbe8610 --- /dev/null +++ b/src/pages-sub/centerControl/testControl/components/scanByTest.vue @@ -0,0 +1,124 @@ + + + + + diff --git a/src/pages-sub/centerControl/testControl/testControl.vue b/src/pages-sub/centerControl/testControl/testControl.vue new file mode 100644 index 0000000..a0c96e7 --- /dev/null +++ b/src/pages-sub/centerControl/testControl/testControl.vue @@ -0,0 +1,40 @@ + + + + + diff --git a/src/pages-sub/setting/index.vue b/src/pages-sub/setting/index.vue new file mode 100644 index 0000000..6e9f1d7 --- /dev/null +++ b/src/pages-sub/setting/index.vue @@ -0,0 +1,54 @@ + + + + + diff --git a/src/pages-sub/warehouse/wholebind/wholebind.vue b/src/pages-sub/warehouse/wholebind/wholebind.vue index 194195f..992774a 100644 --- a/src/pages-sub/warehouse/wholebind/wholebind.vue +++ b/src/pages-sub/warehouse/wholebind/wholebind.vue @@ -69,7 +69,7 @@ const rules = { // 扫码获取车辆编号 function codeScan(type: string) { scanCode({ - isBikeCode: type === 'ecuCode', + isSN: type === 'ecuCode', success: (res: any) => { console.log(res) diff --git a/src/pages/home/home.vue b/src/pages/home/home.vue new file mode 100644 index 0000000..68dedda --- /dev/null +++ b/src/pages/home/home.vue @@ -0,0 +1,191 @@ + + + + + diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue deleted file mode 100644 index 358b80d..0000000 --- a/src/pages/index/index.vue +++ /dev/null @@ -1,113 +0,0 @@ - - - diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue index 79305fc..780a3fb 100644 --- a/src/pages/login/login.vue +++ b/src/pages/login/login.vue @@ -1,5 +1,5 @@