diff --git a/.env b/.env index b2ad9951..14cc6a8e 100644 --- a/.env +++ b/.env @@ -2,7 +2,7 @@ VITE_APP_TITLE=智慧轮渡大数据平台 # 项目本地运行端口号 -VITE_PORT=82 +VITE_PORT=80 # open 运行 npm run dev 时自动打开浏览器 diff --git a/src/api/infra/jobLog/index.ts b/src/api/infra/jobLog/index.ts index dc80f1d9..ed54761c 100644 --- a/src/api/infra/jobLog/index.ts +++ b/src/api/infra/jobLog/index.ts @@ -12,6 +12,7 @@ export interface JobLogVO { duration: string status: number createTime: string + result: string } // 任务日志列表 diff --git a/src/api/parking/accessrecordpicture/index.ts b/src/api/parking/accessrecordpicture/index.ts new file mode 100644 index 00000000..74725e0b --- /dev/null +++ b/src/api/parking/accessrecordpicture/index.ts @@ -0,0 +1,43 @@ +import request from '@/config/axios' + +// 进出记录图片 VO +export interface AccessRecordPictureVO { + id: number // id + parkNumber: string // 场库编号 + imageName: string // 图片名称 + image: string // 图片内容 + imgAddress: string // 图片来源地址 +} + +// 进出记录图片 API +export const AccessRecordPictureApi = { + // 查询进出记录图片分页 + getAccessRecordPicturePage: async (params: any) => { + return await request.get({ url: `/parking/access-record-picture/page`, params }) + }, + + // 查询进出记录图片详情 + getAccessRecordPicture: async (id: number) => { + return await request.get({ url: `/parking/access-record-picture/get?id=` + id }) + }, + + // 新增进出记录图片 + createAccessRecordPicture: async (data: AccessRecordPictureVO) => { + return await request.post({ url: `/parking/access-record-picture/create`, data }) + }, + + // 修改进出记录图片 + updateAccessRecordPicture: async (data: AccessRecordPictureVO) => { + return await request.put({ url: `/parking/access-record-picture/update`, data }) + }, + + // 删除进出记录图片 + deleteAccessRecordPicture: async (id: number) => { + return await request.delete({ url: `/parking/access-record-picture/delete?id=` + id }) + }, + + // 导出进出记录图片 Excel + exportAccessRecordPicture: async (params) => { + return await request.download({ url: `/parking/access-record-picture/export-excel`, params }) + }, +} \ No newline at end of file diff --git a/src/api/parking/appearancerecord/index.ts b/src/api/parking/appearancerecord/index.ts deleted file mode 100644 index 403cdd11..00000000 --- a/src/api/parking/appearancerecord/index.ts +++ /dev/null @@ -1,88 +0,0 @@ -import request from '@/config/axios' - -// 出场记录 VO -export interface RecordVO { - id: number // id - parkNumber: string // 停车场编号 - size: number // 数据条数 - orderId: string // 入场记录编号 - operatorId: string // 操作员 Id - operatorName: string // 操作员姓名 - invoiceNo: string // 发票号码 - plate: string // 车牌 - plateColor: string // 车牌颜色 - ticketCode: string // 无牌车票号 - carType: string // 车类型 - confidence: number // 车牌识别可信度 - idCard: string // 证件号码 - inTime: string // 入场时间 - outTime: string // 出场时间 - inImage: string // 入场图片名 - outImage: string // 出场图片名 - inChannel: string // 入口通道名称 - outChannel: string // 出口通道名称 - openGateMode: string // 抬杆模式 - matchMode: string // 匹配模式 - charge: string // 总停车费 - onLineCharge: string // 线上总收费 - offLineCharge: string // 线下总收费 - profitChargeTotal: string // 线上线下金额和时间优惠累计抵扣值 - onLineProfitChargeNum: string // 线上累计优惠金额总面值 - onLineProfitChargeValue: string // 线上累计优惠金额总抵扣值 - offLineProfitChargeNum: string // 线下累计优惠金额总面值 - offLineProfitChargeValue: string // 线下累计优惠金额总抵扣值 - onLineProfitTimeNum: string // 线上累计优惠时间 - onLineProfitTimeValue: string // 线上累计优惠时间总抵扣值 - offLineProfitTimeNum: string // 线下累计优惠时间 - offLineProfitTimeValue: string // 线下累计优惠时间总抵扣值 - payNo: string // 支付订单号 - getTime: string // 结算时间 - payCharge: string // 支付金额 - payKind: string // 支付类型 - payChannel: string // 支付渠道 - memo: string // 备注 - profitCode: string // 优惠码 - getproTime: string // 优惠下发时间 - profitTime: string // 优惠时间 - profitCharge: string // 优惠金额面值 - profitChargeValue: string // 生效金额 - profitmemo: string // 备注 - areaId: string // 区域 id - areaName: string // 区域名称 - placeNumber: string // 车位编号 - placememo: string // 备注信息 - costTime: string // 时间 -} - -// 出场记录 API -export const RecordApi = { - // 查询出场记录分页 - getRecordPage: async (params: any) => { - return await request.get({ url: `/parking/appearancerecord/page`, params }) - }, - - // 查询出场记录详情 - getRecord: async (id: number) => { - return await request.get({ url: `/parking/appearancerecord/get?id=` + id }) - }, - - // 新增出场记录 - createRecord: async (data: RecordVO) => { - return await request.post({ url: `/parking/appearancerecord/create`, data }) - }, - - // 修改出场记录 - updateRecord: async (data: RecordVO) => { - return await request.put({ url: `/parking/appearancerecord/update`, data }) - }, - - // 删除出场记录 - deleteRecord: async (id: number) => { - return await request.delete({ url: `/parking/appearancerecord/delete?id=` + id }) - }, - - // 导出出场记录 Excel - exportRecord: async (params) => { - return await request.download({ url: `/parking/appearancerecord/export-excel`, params }) - }, -} diff --git a/src/api/parking/channel/index.ts b/src/api/parking/channel/index.ts deleted file mode 100644 index 3d3d110f..00000000 --- a/src/api/parking/channel/index.ts +++ /dev/null @@ -1,45 +0,0 @@ -import request from '@/config/axios' - -// 通道信息 VO -export interface InformationVO { - id: number // id - parkNumber: string // 场库编号 - size: number // 数据条数 - passagewayId: string // 通道 Id - passagewayName: string // 通道名称 - sourceAreaId: string // 源区域 Id - targetAreaId: string // 目标区域 Id -} - -// 通道信息 API -export const InformationApi = { - // 查询通道信息分页 - getInformationPage: async (params: any) => { - return await request.get({ url: `/parking/channel/page`, params }) - }, - - // 查询通道信息详情 - getInformation: async (id: number) => { - return await request.get({ url: `/parking/channel/get?id=` + id }) - }, - - // 新增通道信息 - createInformation: async (data: InformationVO) => { - return await request.post({ url: `/parking/channel/create`, data }) - }, - - // 修改通道信息 - updateInformation: async (data: InformationVO) => { - return await request.put({ url: `/parking/channel/update`, data }) - }, - - // 删除通道信息 - deleteInformation: async (id: number) => { - return await request.delete({ url: `/parking/channel/delete?id=` + id }) - }, - - // 导出通道信息 Excel - exportInformation: async (params) => { - return await request.download({ url: `/parking/channel/export-excel`, params }) - }, -} diff --git a/src/api/parking/chargeinformation/index.ts b/src/api/parking/chargeinformation/index.ts deleted file mode 100644 index cc697425..00000000 --- a/src/api/parking/chargeinformation/index.ts +++ /dev/null @@ -1,60 +0,0 @@ -import request from '@/config/axios' - -// 收费信息 VO -export interface InformationVO { - id: number // id - parkNumber: string // 场库编号 - size: number // 收费信息数量 - plate: string // 车牌号 - inTime: string // 入场时间 - outTime: string // 结算时间 - inChannel: string // 入场通道 - outChannel: string // 出场通道 - payKind: string // 支付类型 - payChannel: string // 支付渠道 - orderId: string // 入场订单号 - carType: string // 车辆类型 - payNo: string // 支付订单号 - memo: string // 备注 - charge: string // 应缴金额 - realCharge: string // 实收金额 - couponCharge: string // 优惠金额 - areaId: string // 区域 ID - operatorName: string // 操作员名称 - operatorTelphone: string // 操作员联系电话 - outTradeNo: string // 支付订单号 - plateColor: string // 车牌颜色 -} - -// 收费信息 API -export const InformationApi = { - // 查询收费信息分页 - getInformationPage: async (params: any) => { - return await request.get({ url: `/parking/chargeinformation/page`, params }) - }, - - // 查询收费信息详情 - getInformation: async (id: number) => { - return await request.get({ url: `/parking/chargeinformation/get?id=` + id }) - }, - - // 新增收费信息 - createInformation: async (data: InformationVO) => { - return await request.post({ url: `/parking/chargeinformation/create`, data }) - }, - - // 修改收费信息 - updateInformation: async (data: InformationVO) => { - return await request.put({ url: `/parking/chargeinformation/update`, data }) - }, - - // 删除收费信息 - deleteInformation: async (id: number) => { - return await request.delete({ url: `/parking/chargeinformation/delete?id=` + id }) - }, - - // 导出收费信息 Excel - exportInformation: async (params) => { - return await request.download({ url: `/parking/chargeinformation/export-excel`, params }) - }, -} diff --git a/src/api/parking/entryrecord/index.ts b/src/api/parking/entryrecord/index.ts deleted file mode 100644 index 6c1101c5..00000000 --- a/src/api/parking/entryrecord/index.ts +++ /dev/null @@ -1,64 +0,0 @@ -import request from '@/config/axios' - -// 入场记录 VO -export interface EntryRecordVO { - id: number // id - parkNumber: string // 停车场编号 - size: number // 数据条数 - plate: string // 车牌 - ticketCode: string // 无牌车票号 - plateColor: string // 车牌颜色 - inTime: string // 入场时间 - inChannel: string // 入场通道名称 - inImage: string // 入场图片名 - orderId: string // 入场记录编号 - visitReason: string // 访问事由 - openGateMode: string // 放行类型 - matchMode: string // 匹配模式 - idCard: string // 证件号码 - confidence: number // 车牌识别可信度 - carType: string // 车类型 - userIdCard: string // 证件号码 - userName: string // 车主姓名 - phone: string // 联系电话 - address: string // 地址 - areaId: string // 区域 id - areaName: string // 区域名称 - placeNumber: string // 车位编号 - memo: string // 备注信息 - barriorOpen: string // 是否开闸 - costTime: string // 开闸耗时 -} - -// 入场记录 API -export const EntryRecordApi = { - // 查询入场记录分页 - getEntryRecordPage: async (params: any) => { - return await request.get({ url: `/parking/entry-record/page`, params }) - }, - - // 查询入场记录详情 - getEntryRecord: async (id: number) => { - return await request.get({ url: `/parking/entry-record/get?id=` + id }) - }, - - // 新增入场记录 - createEntryRecord: async (data: EntryRecordVO) => { - return await request.post({ url: `/parking/entry-record/create`, data }) - }, - - // 修改入场记录 - updateEntryRecord: async (data: EntryRecordVO) => { - return await request.put({ url: `/parking/entry-record/update`, data }) - }, - - // 删除入场记录 - deleteEntryRecord: async (id: number) => { - return await request.delete({ url: `/parking/entry-record/delete?id=` + id }) - }, - - // 导出入场记录 Excel - exportEntryRecord: async (params) => { - return await request.download({ url: `/parking/entry-record/export-excel`, params }) - }, -} \ No newline at end of file diff --git a/src/components/DocAlert/index.vue b/src/components/DocAlert/index.vue index 0073266c..0c74a770 100644 --- a/src/components/DocAlert/index.vue +++ b/src/components/DocAlert/index.vue @@ -1,9 +1,10 @@ diff --git a/src/views/Login/Login.vue b/src/views/Login/Login.vue index 75a5aa23..7b125988 100644 --- a/src/views/Login/Login.vue +++ b/src/views/Login/Login.vue @@ -1,12 +1,7 @@ diff --git a/src/views/Login/Logout.vue b/src/views/Login/Logout.vue new file mode 100644 index 00000000..fc2be454 --- /dev/null +++ b/src/views/Login/Logout.vue @@ -0,0 +1,26 @@ + + + \ No newline at end of file diff --git a/src/views/Login/components/SSOLoginCustom.vue b/src/views/Login/components/SSOLoginCustom.vue new file mode 100644 index 00000000..3036ac46 --- /dev/null +++ b/src/views/Login/components/SSOLoginCustom.vue @@ -0,0 +1,200 @@ + + diff --git a/src/views/infra/job/logger/JobLogDetail.vue b/src/views/infra/job/logger/JobLogDetail.vue index 1a84e4e8..3bec9cca 100644 --- a/src/views/infra/job/logger/JobLogDetail.vue +++ b/src/views/infra/job/logger/JobLogDetail.vue @@ -1,5 +1,5 @@ + \ No newline at end of file diff --git a/src/views/parking/appearancerecord/RecordForm.vue b/src/views/parking/appearancerecord/RecordForm.vue deleted file mode 100644 index fcba569e..00000000 --- a/src/views/parking/appearancerecord/RecordForm.vue +++ /dev/null @@ -1,360 +0,0 @@ - - diff --git a/src/views/parking/appearancerecord/index.vue b/src/views/parking/appearancerecord/index.vue deleted file mode 100644 index 0e2421b1..00000000 --- a/src/views/parking/appearancerecord/index.vue +++ /dev/null @@ -1,700 +0,0 @@ - - - diff --git a/src/views/parking/chargeinformation/InformationForm.vue b/src/views/parking/chargeinformation/InformationForm.vue deleted file mode 100644 index f1a70c76..00000000 --- a/src/views/parking/chargeinformation/InformationForm.vue +++ /dev/null @@ -1,203 +0,0 @@ - - diff --git a/src/views/parking/chargeinformation/index.vue b/src/views/parking/chargeinformation/index.vue deleted file mode 100644 index 7c2bc920..00000000 --- a/src/views/parking/chargeinformation/index.vue +++ /dev/null @@ -1,412 +0,0 @@ - - - diff --git a/src/views/parking/entryrecord/EntryRecordForm.vue b/src/views/parking/entryrecord/EntryRecordForm.vue deleted file mode 100644 index f682909d..00000000 --- a/src/views/parking/entryrecord/EntryRecordForm.vue +++ /dev/null @@ -1,224 +0,0 @@ - - \ No newline at end of file diff --git a/src/views/parking/entryrecord/index.vue b/src/views/parking/entryrecord/index.vue deleted file mode 100644 index d0a05f49..00000000 --- a/src/views/parking/entryrecord/index.vue +++ /dev/null @@ -1,447 +0,0 @@ - - - diff --git a/src/views/ticket/checkticket/index.vue b/src/views/ticket/checkticket/index.vue index f4464891..ec6689aa 100644 --- a/src/views/ticket/checkticket/index.vue +++ b/src/views/ticket/checkticket/index.vue @@ -46,11 +46,11 @@ class="!w-240px" /> - + \ No newline at end of file diff --git a/src/views/ticket/saledata/index.vue b/src/views/ticket/saledata/index.vue index 5fc9fe9c..8e9db462 100644 --- a/src/views/ticket/saledata/index.vue +++ b/src/views/ticket/saledata/index.vue @@ -28,7 +28,7 @@ class="!w-240px" /> - + + --> - --> -