diff --git a/.env.local b/.env.local index 005d2f0d..bd675c19 100644 --- a/.env.local +++ b/.env.local @@ -24,7 +24,7 @@ VITE_DROP_CONSOLE=false VITE_SOURCEMAP=false # 打包路径 -VITE_BASE_PATH=/ +VITE_BASE_PATH=/admin # 商城H5会员端域名 VITE_MALL_H5_DOMAIN='http://localhost:3000' diff --git a/.env.prod b/.env.prod index 842ba616..7ba06140 100644 --- a/.env.prod +++ b/.env.prod @@ -4,12 +4,12 @@ NODE_ENV=production VITE_DEV=false # 请求路径 -VITE_BASE_URL='http://localhost:48080' +VITE_BASE_URL='' # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持S3服务 VITE_UPLOAD_TYPE=server # 上传路径 -VITE_UPLOAD_URL='http://localhost:48080/admin-api/infra/file/upload' +VITE_UPLOAD_URL='http://mt.ptzykjgs.com/admin-api/infra/file/upload' # 接口地址 VITE_API_URL=/admin-api @@ -24,10 +24,13 @@ VITE_DROP_CONSOLE=true VITE_SOURCEMAP=false # 打包路径 -VITE_BASE_PATH=/ +VITE_BASE_PATH=/admin # 输出路径 -VITE_OUT_DIR=dist-prod +VITE_OUT_DIR=pc # 商城H5会员端域名 VITE_MALL_H5_DOMAIN='http://mall.yudao.iocoder.cn' + +# 验证码的开关 +VITE_APP_CAPTCHA_ENABLE=false diff --git a/src/api/login/index.ts b/src/api/login/index.ts index ef86563b..c68e28ed 100644 --- a/src/api/login/index.ts +++ b/src/api/login/index.ts @@ -72,7 +72,7 @@ export const socialAuthRedirect = (type: number, redirectUri: string) => { } // 获取验证图片以及 token export const getCode = (data) => { - return request.postOriginal({ url: 'system/captcha/get', data }) + // return request.postOriginal({ url: 'system/captcha/get', data }) } // 滑动或者点选验证 diff --git a/src/api/parking/bookcar/index.ts b/src/api/parking/bookcar/index.ts new file mode 100644 index 00000000..ac077046 --- /dev/null +++ b/src/api/parking/bookcar/index.ts @@ -0,0 +1,53 @@ +import request from '@/config/axios' + +// 预约车 VO +export interface BookCarVO { + id: number // id + parkNumber: string // 场库编号 + plate: string // 预约车牌号 + start: string // 预约开始时间 + end: string // 预约结束时间 + areaId: string // 区域号 + flag: string // 操作 + charge: string // 金额 + bookOrderId: string // 预约订单号 + inTime: string // 入场时间 + downTime: string // 下发场库时间 + bookOrderTime: string // 订单下单时间 + letInStartTime: string // 准入开始时间 + letInEndTime: string // 准入结束时间 + memo: string // 备注 +} + +// 预约车 API +export const BookCarApi = { + // 查询预约车分页 + getBookCarPage: async (params: any) => { + return await request.get({ url: `/parking/book-car/page`, params }) + }, + + // 查询预约车详情 + getBookCar: async (id: number) => { + return await request.get({ url: `/parking/book-car/get?id=` + id }) + }, + + // 新增预约车 + createBookCar: async (data: BookCarVO) => { + return await request.post({ url: `/parking/book-car/create`, data }) + }, + + // 修改预约车 + updateBookCar: async (data: BookCarVO) => { + return await request.put({ url: `/parking/book-car/update`, data }) + }, + + // 删除预约车 + deleteBookCar: async (id: number) => { + return await request.delete({ url: `/parking/book-car/delete?id=` + id }) + }, + + // 导出预约车 Excel + exportBookCar: async (params) => { + return await request.download({ url: `/parking/book-car/export-excel`, params }) + } +} \ No newline at end of file diff --git a/src/api/parking/instructiondelivery/liftingrod/index.ts b/src/api/parking/instructiondelivery/liftingrod/index.ts index c366916d..fa6134a3 100644 --- a/src/api/parking/instructiondelivery/liftingrod/index.ts +++ b/src/api/parking/instructiondelivery/liftingrod/index.ts @@ -1,41 +1,42 @@ -import request from '@/config/axios' - -// 远程抬杠日志 VO -export interface LiftingRodVO { - id: number // id - parkNumber: string // 停车场编号 - passagewayId: string // 通道Id -} - -// 远程抬杠日志 API -export const LiftingRodApi = { - // 查询远程抬杠日志分页 - getLiftingRodPage: async (params: any) => { - return await request.get({ url: `/parking/lifting-rod/page`, params }) - }, - - // 查询远程抬杠日志详情 - getLiftingRod: async (id: number) => { - return await request.get({ url: `/parking/lifting-rod/get?id=` + id }) - }, - - // 新增远程抬杠日志 - createLiftingRod: async (data: LiftingRodVO) => { - return await request.post({ url: `/parking/lifting-rod/create`, data }) - }, - - // 修改远程抬杠日志 - updateLiftingRod: async (data: LiftingRodVO) => { - return await request.put({ url: `/parking/lifting-rod/update`, data }) - }, - - // 删除远程抬杠日志 - deleteLiftingRod: async (id: number) => { - return await request.delete({ url: `/parking/lifting-rod/delete?id=` + id }) - }, - - // 导出远程抬杠日志 Excel - exportLiftingRod: async (params) => { - return await request.download({ url: `/parking/lifting-rod/export-excel`, params }) - }, -} \ No newline at end of file +import request from '@/config/axios' + +// 远程抬杠日志 VO +export interface LiftingRodVO { + id: number // id + parkNumber: string // 停车场编号 + passagewayId: string // 通道Id + status: number // 状态 +} + +// 远程抬杠日志 API +export const LiftingRodApi = { + // 查询远程抬杠日志分页 + getLiftingRodPage: async (params: any) => { + return await request.get({ url: `/parking/lifting-rod/page`, params }) + }, + + // 查询远程抬杠日志详情 + getLiftingRod: async (id: number) => { + return await request.get({ url: `/parking/lifting-rod/get?id=` + id }) + }, + + // 新增远程抬杠日志 + createLiftingRod: async (data: LiftingRodVO) => { + return await request.post({ url: `/parking/lifting-rod/create`, data }) + }, + + // 修改远程抬杠日志 + updateLiftingRod: async (data: LiftingRodVO) => { + return await request.put({ url: `/parking/lifting-rod/update`, data }) + }, + + // 删除远程抬杠日志 + deleteLiftingRod: async (id: number) => { + return await request.delete({ url: `/parking/lifting-rod/delete?id=` + id }) + }, + + // 导出远程抬杠日志 Excel + exportLiftingRod: async (params) => { + return await request.download({ url: `/parking/lifting-rod/export-excel`, params }) + }, +} diff --git a/src/assets/imgs/ludu_view.png b/src/assets/imgs/ludu_view.png new file mode 100644 index 00000000..a35645ad Binary files /dev/null and b/src/assets/imgs/ludu_view.png differ diff --git a/src/assets/imgs/ludu_view2.jpg b/src/assets/imgs/ludu_view2.jpg new file mode 100644 index 00000000..3c90d390 Binary files /dev/null and b/src/assets/imgs/ludu_view2.jpg differ diff --git a/src/router/index.ts b/src/router/index.ts index 8f66ca31..61299025 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -5,7 +5,7 @@ import remainingRouter from './modules/remaining' // 创建路由实例 const router = createRouter({ - history: createWebHistory(), // createWebHashHistory URL带#，createWebHistory URL不带# + history: createWebHistory("/admin"), // createWebHashHistory URL带#，createWebHistory URL不带# strict: true, routes: remainingRouter as RouteRecordRaw[], scrollBehavior: () => ({ left: 0, top: 0 }) diff --git a/src/utils/dict.ts b/src/utils/dict.ts index 320a5d27..4538cde6 100644 --- a/src/utils/dict.ts +++ b/src/utils/dict.ts @@ -228,5 +228,8 @@ export enum DICT_TYPE { // ========== TICKET - 票务系统模块 ========== ASSET_STATUS_TYPE = 'asset_status_type', // 设备状态 TRANSACTION_TYPE_NO = 'transaction_type_no', // 交易类型（订单类型） - CERTIFICATE_TYPE = 'certificate_type' // 证件类型 + CERTIFICATE_TYPE = 'certificate_type', // 证件类型 + + // ========== LIFT_ROD - 远程抬杠模块 ========== + LIFTINGROD_STATUS = 'liftingrod_status' } diff --git a/src/views/Home/Index.vue b/src/views/Home/Index.vue index 38a38562..a9e6c825 100644 --- a/src/views/Home/Index.vue +++ b/src/views/Home/Index.vue @@ -22,32 +22,17 @@
{{ t('workplace.project') }}
- +
{{ t('workplace.toDo') }}
- +
{{ t('workplace.access') }}
- +
@@ -55,9 +40,24 @@ -
- 任务调度中心 + +
+ 任务调度中心 +
+ + +
+ +
+ +
+
+ + + +
+ + + + + + --> + \ No newline at end of file diff --git a/src/views/parking/bookcar/BookCarForm.vue b/src/views/parking/bookcar/BookCarForm.vue new file mode 100644 index 00000000..04637d5d --- /dev/null +++ b/src/views/parking/bookcar/BookCarForm.vue @@ -0,0 +1,189 @@ + + \ No newline at end of file diff --git a/src/views/parking/bookcar/index.vue b/src/views/parking/bookcar/index.vue new file mode 100644 index 00000000..4fd30065 --- /dev/null +++ b/src/views/parking/bookcar/index.vue @@ -0,0 +1,340 @@ + + + \ No newline at end of file diff --git a/src/views/parking/instructiondelivery/liftingrod/LiftingRodForm.vue b/src/views/parking/instructiondelivery/liftingrod/LiftingRodForm.vue index 72b37b1e..5c2794bf 100644 --- a/src/views/parking/instructiondelivery/liftingrod/LiftingRodForm.vue +++ b/src/views/parking/instructiondelivery/liftingrod/LiftingRodForm.vue @@ -1,18 +1,17 @@