Merge pull request 'xinwei' (#7) from xinwei into master

Reviewed-on: #7
This commit is contained in:
root 2024-10-29 16:59:10 +08:00
commit 75cb7343dc
15 changed files with 1049 additions and 436 deletions

View File

@ -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'

View File

@ -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

View File

@ -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 })
}
// 滑动或者点选验证

View File

@ -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 })
}
}

View File

@ -5,6 +5,7 @@ export interface LiftingRodVO {
id: number // id
parkNumber: string // 停车场编号
passagewayId: string // 通道Id
status: number // 状态
}
// 远程抬杠日志 API

Binary file not shown.

After

Width:  |  Height:  |  Size: 372 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 51 KiB

View File

@ -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 })

View File

@ -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'
}

View File

@ -22,32 +22,17 @@
<div class="h-70px flex items-center justify-end lt-sm:mt-10px">
<div class="px-8px text-right">
<div class="mb-16px text-14px text-gray-400">{{ t('workplace.project') }}</div>
<CountTo
class="text-20px"
:start-val="0"
:end-val="totalSate.project"
:duration="2600"
/>
<CountTo class="text-20px" :start-val="0" :end-val="totalSate.project" :duration="2600" />
</div>
<el-divider direction="vertical" />
<div class="px-8px text-right">
<div class="mb-16px text-14px text-gray-400">{{ t('workplace.toDo') }}</div>
<CountTo
class="text-20px"
:start-val="0"
:end-val="totalSate.todo"
:duration="2600"
/>
<CountTo class="text-20px" :start-val="0" :end-val="totalSate.todo" :duration="2600" />
</div>
<el-divider direction="vertical" border-style="dashed" />
<div class="px-8px text-right">
<div class="mb-16px text-14px text-gray-400">{{ t('workplace.access') }}</div>
<CountTo
class="text-20px"
:start-val="0"
:end-val="totalSate.access"
:duration="2600"
/>
<CountTo class="text-20px" :start-val="0" :end-val="totalSate.access" :duration="2600" />
</div>
</div>
</el-col>
@ -55,9 +40,24 @@
</el-skeleton>
</el-card>
</div>
<div class="flex flex-wrap gap-4" style="margin: 20px 0;">
<el-card style="width: 420px;text-align: center;cursor: pointer;" shadow="hover" @click="goToXXLJob">任务调度中心</el-card>
<!-- <el-card style="width: 100%; margin: 8px 0; text-align: center;" shadow="never"> -->
<div class="flex flex-wrap gap-4" style="float: right;">
<el-card
style="width: 170px;margin: 8px 0;text-align: center;color:#409eff; cursor: pointer;" shadow="hover"
@click="goToXXLJob">任务调度中心</el-card>
</div>
<!-- </el-card> -->
<!-- 新增的静态图片部分 -->
<div>
<!-- <el-card style="width: 100%; text-align: center;" shadow="never"> -->
<div style="overflow: hidden; margin: 8px 0;height: calc(100% - 2px);">
<el-image :src="luduViewImage" fit="contain" style="width: 99%; transform: translateY(-2px);" />
</div>
<!-- </el-card> -->
</div>
<!-- <el-row class="mt-8px" :gutter="8" justify="space-between">
<el-col :xl="16" :lg="16" :md="24" :sm="24" :xs="24" class="mb-8px">
<el-card shadow="never">
@ -74,323 +74,328 @@
</el-link>
</div>
</template>
<el-skeleton :loading="loading" animated>
<el-row>
<el-col
v-for="(item, index) in projects"
:key="`card-${index}`"
:xl="8"
:lg="8"
:md="8"
:sm="24"
:xs="24"
>
<el-card shadow="hover" class="mr-5px mt-5px">
<div class="flex items-center">
<Icon :icon="item.icon" :size="25" class="mr-8px" />
<span class="text-16px">{{ item.name }}</span>
</div>
<div class="mt-12px text-9px text-gray-400">{{ t(item.message) }}</div>
<div class="mt-12px flex justify-between text-12px text-gray-400">
<span>{{ item.personal }}</span>
<span>{{ formatTime(item.time, 'yyyy-MM-dd') }}</span>
</div>
</el-card>
</el-col>
</el-row>
</el-skeleton>
</el-card>
<el-card shadow="never" class="mt-8px">
<el-skeleton :loading="loading" animated>
<el-row :gutter="20" justify="space-between">
<el-col :xl="10" :lg="10" :md="24" :sm="24" :xs="24">
<el-card shadow="hover" class="mb-8px">
<el-skeleton :loading="loading" animated>
<Echart :options="pieOptionsData" :height="280" />
</el-skeleton>
</el-card>
</el-col>
<el-col :xl="14" :lg="14" :md="24" :sm="24" :xs="24">
<el-card shadow="hover" class="mb-8px">
<el-skeleton :loading="loading" animated>
<Echart :options="barOptionsData" :height="280" />
</el-skeleton>
</el-card>
</el-col>
</el-row>
</el-skeleton>
<el-skeleton :loading="loading" animated>
<el-row>
<el-col v-for="(item, index) in projects" :key="`card-${index}`" :xl="8" :lg="8" :md="8" :sm="24" :xs="24">
<el-card shadow="hover" class="mr-5px mt-5px">
<div class="flex items-center">
<Icon :icon="item.icon" :size="25" class="mr-8px" />
<span class="text-16px">{{ item.name }}</span>
</div>
<div class="mt-12px text-9px text-gray-400">{{ t(item.message) }}</div>
<div class="mt-12px flex justify-between text-12px text-gray-400">
<span>{{ item.personal }}</span>
<span>{{ formatTime(item.time, 'yyyy-MM-dd') }}</span>
</div>
</el-card>
</el-col>
<el-col :xl="8" :lg="8" :md="24" :sm="24" :xs="24" class="mb-8px">
<el-card shadow="never">
<template #header>
</el-row>
</el-skeleton>
</el-card>
<el-card shadow="never" class="mt-8px">
<el-skeleton :loading="loading" animated>
<el-row :gutter="20" justify="space-between">
<el-col :xl="10" :lg="10" :md="24" :sm="24" :xs="24">
<el-card shadow="hover" class="mb-8px">
<el-skeleton :loading="loading" animated>
<Echart :options="pieOptionsData" :height="280" />
</el-skeleton>
</el-card>
</el-col>
<el-col :xl="14" :lg="14" :md="24" :sm="24" :xs="24">
<el-card shadow="hover" class="mb-8px">
<el-skeleton :loading="loading" animated>
<Echart :options="barOptionsData" :height="280" />
</el-skeleton>
</el-card>
</el-col>
</el-row>
</el-skeleton>
</el-card>
</el-col>
<el-col :xl="8" :lg="8" :md="24" :sm="24" :xs="24" class="mb-8px">
<el-card shadow="never">
<template #header>
<div class="h-3 flex justify-between">
<span>{{ t('workplace.shortcutOperation') }}</span>
</div>
</template>
<el-skeleton :loading="loading" animated>
<el-row>
<el-col v-for="item in shortcut" :key="`team-${item.name}`" :span="8" class="mb-8px">
<div class="flex items-center">
<Icon :icon="item.icon" class="mr-8px" />
<el-link type="default" :underline="false" @click="setWatermark(item.name)">
{{ item.name }}
</el-link>
</div>
</el-col>
</el-row>
</el-skeleton>
</el-card>
<el-card shadow="never" class="mt-8px">
<template #header>
<el-skeleton :loading="loading" animated>
<el-row>
<el-col v-for="item in shortcut" :key="`team-${item.name}`" :span="8" class="mb-8px">
<div class="flex items-center">
<Icon :icon="item.icon" class="mr-8px" />
<el-link type="default" :underline="false" @click="setWatermark(item.name)">
{{ item.name }}
</el-link>
</div>
</el-col>
</el-row>
</el-skeleton>
</el-card>
<el-card shadow="never" class="mt-8px">
<template #header>
<div class="h-3 flex justify-between">
<span>{{ t('workplace.notice') }}</span>
<el-link type="primary" :underline="false">{{ t('action.more') }}</el-link>
</div>
</template>
<el-skeleton :loading="loading" animated>
<div v-for="(item, index) in notice" :key="`dynamics-${index}`">
<div class="flex items-center">
<el-avatar :src="avatar" :size="35" class="mr-16px">
<img src="@/assets/imgs/avatar.gif" alt="" />
</el-avatar>
<div>
<div class="text-14px">
<Highlight :keys="item.keys.map((v) => t(v))">
{{ item.type }} : {{ item.title }}
</Highlight>
</div>
<div class="mt-16px text-12px text-gray-400">
{{ formatTime(item.date, 'yyyy-MM-dd') }}
</div>
</div>
<el-skeleton :loading="loading" animated>
<div v-for="(item, index) in notice" :key="`dynamics-${index}`">
<div class="flex items-center">
<el-avatar :src="avatar" :size="35" class="mr-16px">
<img src="@/assets/imgs/avatar.gif" alt="" />
</el-avatar>
<div>
<div class="text-14px">
<Highlight :keys="item.keys.map((v) => t(v))">
{{ item.type }} : {{ item.title }}
</Highlight>
</div>
<div class="mt-16px text-12px text-gray-400">
{{ formatTime(item.date, 'yyyy-MM-dd') }}
</div>
<el-divider />
</div>
</el-skeleton>
</el-card>
</el-col>
</el-row> -->
</div>
<el-divider />
</div>
</el-skeleton>
</el-card>
</el-col>
</el-row> -->
</template>
<script lang="ts" setup>
import { set } from 'lodash-es'
import { EChartsOption } from 'echarts'
import { formatTime } from '@/utils'
import { set } from 'lodash-es'
import { EChartsOption } from 'echarts'
import { formatTime } from '@/utils'
import luduView from '@/assets/imgs/ludu_view.png'
import { useUserStore } from '@/store/modules/user'
import { useWatermark } from '@/hooks/web/useWatermark'
import type { WorkplaceTotal, Project, Notice, Shortcut } from './types'
import { pieOptions, barOptions } from './echarts-data'
import { useUserStore } from '@/store/modules/user'
import { useWatermark } from '@/hooks/web/useWatermark'
import type { WorkplaceTotal, Project, Notice, Shortcut } from './types'
import { pieOptions, barOptions } from './echarts-data'
defineOptions({ name: 'Home' })
defineOptions({ name: 'Home' })
const { t } = useI18n()
const userStore = useUserStore()
const { setWatermark } = useWatermark()
const loading = ref(true)
const avatar = userStore.getUser.avatar
const username = userStore.getUser.nickname
const pieOptionsData = reactive<EChartsOption>(pieOptions) as EChartsOption
//
let totalSate = reactive<WorkplaceTotal>({
project: 0,
access: 0,
todo: 0
})
const getCount = async () => {
const data = {
project: 40,
access: 2340,
todo: 10
}
totalSate = Object.assign(totalSate, data)
}
//
let projects = reactive<Project[]>([])
const getProject = async () => {
const data = [
{
name: 'ruoyi-vue-pro',
icon: 'akar-icons:github-fill',
message: 'https://github.com/YunaiV/ruoyi-vue-pro',
personal: 'Spring Boot 单体架构',
time: new Date()
},
{
name: 'yudao-ui-admin-vue3',
icon: 'logos:vue',
message: 'https://github.com/yudaocode/yudao-ui-admin-vue3',
personal: 'Vue3 + element-plus',
time: new Date()
},
{
name: 'yudao-ui-admin-vben',
icon: 'logos:vue',
message: 'https://github.com/yudaocode/yudao-ui-admin-vben',
personal: 'Vue3 + vben(antd)',
time: new Date()
},
{
name: 'yudao-cloud',
icon: 'akar-icons:github',
message: 'https://github.com/YunaiV/yudao-cloud',
personal: 'Spring Cloud 微服务架构',
time: new Date()
},
{
name: 'yudao-ui-mall-uniapp',
icon: 'logos:vue',
message: 'https://github.com/yudaocode/yudao-ui-admin-uniapp',
personal: 'Vue3 + uniapp',
time: new Date()
},
{
name: 'yudao-ui-admin-vue2',
icon: 'logos:vue',
message: 'https://github.com/yudaocode/yudao-ui-admin-vue2',
personal: 'Vue2 + element-ui',
time: new Date()
}
]
projects = Object.assign(projects, data)
}
//
let notice = reactive<Notice[]>([])
const getNotice = async () => {
const data = [
{
title: '系统支持 JDK 8/17/21Vue 2/3',
type: '通知',
keys: ['通知', '8', '17', '21', '2', '3'],
date: new Date()
},
{
title: '后端提供 Spring Boot 2.7/3.2 + Cloud 双架构',
type: '公告',
keys: ['公告', 'Boot', 'Cloud'],
date: new Date()
},
{
title: '全部开源,个人与企业可 100% 直接使用,无需授权',
type: '通知',
keys: ['通知', '无需授权'],
date: new Date()
},
{
title: '国内使用最广泛的快速开发平台,超 300+ 人贡献',
type: '公告',
keys: ['公告', '最广泛'],
date: new Date()
}
]
notice = Object.assign(notice, data)
}
//
let shortcut = reactive<Shortcut[]>([])
const getShortcut = async () => {
const data = [
{
name: 'Github',
icon: 'akar-icons:github-fill',
url: 'github.io'
},
{
name: 'Vue',
icon: 'logos:vue',
url: 'vuejs.org'
},
{
name: 'Vite',
icon: 'vscode-icons:file-type-vite',
url: 'https://vitejs.dev/'
},
{
name: 'Angular',
icon: 'logos:angular-icon',
url: 'github.io'
},
{
name: 'React',
icon: 'logos:react',
url: 'github.io'
},
{
name: 'Webpack',
icon: 'logos:webpack',
url: 'github.io'
}
]
shortcut = Object.assign(shortcut, data)
}
//
const getUserAccessSource = async () => {
const data = [
{ value: 335, name: 'analysis.directAccess' },
{ value: 310, name: 'analysis.mailMarketing' },
{ value: 234, name: 'analysis.allianceAdvertising' },
{ value: 135, name: 'analysis.videoAdvertising' },
{ value: 1548, name: 'analysis.searchEngines' }
]
set(
pieOptionsData,
'legend.data',
data.map((v) => t(v.name))
)
pieOptionsData!.series![0].data = data.map((v) => {
return {
name: t(v.name),
value: v.value
}
const luduViewImage = ref(luduView);
const { t } = useI18n()
const userStore = useUserStore()
const { setWatermark } = useWatermark()
const loading = ref(true)
const avatar = userStore.getUser.avatar
const username = userStore.getUser.nickname
const pieOptionsData = reactive<EChartsOption>(pieOptions) as EChartsOption
//
let totalSate = reactive<WorkplaceTotal>({
project: 0,
access: 0,
todo: 0
})
}
const barOptionsData = reactive<EChartsOption>(barOptions) as EChartsOption
//
const getWeeklyUserActivity = async () => {
const data = [
{ value: 13253, name: 'analysis.monday' },
{ value: 34235, name: 'analysis.tuesday' },
{ value: 26321, name: 'analysis.wednesday' },
{ value: 12340, name: 'analysis.thursday' },
{ value: 24643, name: 'analysis.friday' },
{ value: 1322, name: 'analysis.saturday' },
{ value: 1324, name: 'analysis.sunday' }
]
set(
barOptionsData,
'xAxis.data',
data.map((v) => t(v.name))
)
set(barOptionsData, 'series', [
{
name: t('analysis.activeQuantity'),
data: data.map((v) => v.value),
type: 'bar'
const getCount = async () => {
const data = {
project: 40,
access: 2340,
todo: 10
}
])
}
totalSate = Object.assign(totalSate, data)
}
const getAllApi = async () => {
await Promise.all([
getCount(),
getProject(),
getNotice(),
getShortcut(),
getUserAccessSource(),
getWeeklyUserActivity()
])
loading.value = false
}
//
let projects = reactive<Project[]>([])
const getProject = async () => {
const data = [
{
name: 'ruoyi-vue-pro',
icon: 'akar-icons:github-fill',
message: 'https://github.com/YunaiV/ruoyi-vue-pro',
personal: 'Spring Boot 单体架构',
time: new Date()
},
{
name: 'yudao-ui-admin-vue3',
icon: 'logos:vue',
message: 'https://github.com/yudaocode/yudao-ui-admin-vue3',
personal: 'Vue3 + element-plus',
time: new Date()
},
{
name: 'yudao-ui-admin-vben',
icon: 'logos:vue',
message: 'https://github.com/yudaocode/yudao-ui-admin-vben',
personal: 'Vue3 + vben(antd)',
time: new Date()
},
{
name: 'yudao-cloud',
icon: 'akar-icons:github',
message: 'https://github.com/YunaiV/yudao-cloud',
personal: 'Spring Cloud 微服务架构',
time: new Date()
},
{
name: 'yudao-ui-mall-uniapp',
icon: 'logos:vue',
message: 'https://github.com/yudaocode/yudao-ui-admin-uniapp',
personal: 'Vue3 + uniapp',
time: new Date()
},
{
name: 'yudao-ui-admin-vue2',
icon: 'logos:vue',
message: 'https://github.com/yudaocode/yudao-ui-admin-vue2',
personal: 'Vue2 + element-ui',
time: new Date()
}
]
projects = Object.assign(projects, data)
}
const goToXXLJob = async () => {
window.open('http://127.0.0.1:9090/xxl-job-admin/');
}
getAllApi()
//
let notice = reactive<Notice[]>([])
const getNotice = async () => {
const data = [
{
title: '系统支持 JDK 8/17/21Vue 2/3',
type: '通知',
keys: ['通知', '8', '17', '21', '2', '3'],
date: new Date()
},
{
title: '后端提供 Spring Boot 2.7/3.2 + Cloud 双架构',
type: '公告',
keys: ['公告', 'Boot', 'Cloud'],
date: new Date()
},
{
title: '全部开源,个人与企业可 100% 直接使用,无需授权',
type: '通知',
keys: ['通知', '无需授权'],
date: new Date()
},
{
title: '国内使用最广泛的快速开发平台,超 300+ 人贡献',
type: '公告',
keys: ['公告', '最广泛'],
date: new Date()
}
]
notice = Object.assign(notice, data)
}
//
let shortcut = reactive<Shortcut[]>([])
const getShortcut = async () => {
const data = [
{
name: 'Github',
icon: 'akar-icons:github-fill',
url: 'github.io'
},
{
name: 'Vue',
icon: 'logos:vue',
url: 'vuejs.org'
},
{
name: 'Vite',
icon: 'vscode-icons:file-type-vite',
url: 'https://vitejs.dev/'
},
{
name: 'Angular',
icon: 'logos:angular-icon',
url: 'github.io'
},
{
name: 'React',
icon: 'logos:react',
url: 'github.io'
},
{
name: 'Webpack',
icon: 'logos:webpack',
url: 'github.io'
}
]
shortcut = Object.assign(shortcut, data)
}
//
const getUserAccessSource = async () => {
const data = [
{ value: 335, name: 'analysis.directAccess' },
{ value: 310, name: 'analysis.mailMarketing' },
{ value: 234, name: 'analysis.allianceAdvertising' },
{ value: 135, name: 'analysis.videoAdvertising' },
{ value: 1548, name: 'analysis.searchEngines' }
]
set(
pieOptionsData,
'legend.data',
data.map((v) => t(v.name))
)
pieOptionsData!.series![0].data = data.map((v) => {
return {
name: t(v.name),
value: v.value
}
})
}
const barOptionsData = reactive<EChartsOption>(barOptions) as EChartsOption
//
const getWeeklyUserActivity = async () => {
const data = [
{ value: 13253, name: 'analysis.monday' },
{ value: 34235, name: 'analysis.tuesday' },
{ value: 26321, name: 'analysis.wednesday' },
{ value: 12340, name: 'analysis.thursday' },
{ value: 24643, name: 'analysis.friday' },
{ value: 1322, name: 'analysis.saturday' },
{ value: 1324, name: 'analysis.sunday' }
]
set(
barOptionsData,
'xAxis.data',
data.map((v) => t(v.name))
)
set(barOptionsData, 'series', [
{
name: t('analysis.activeQuantity'),
data: data.map((v) => v.value),
type: 'bar'
}
])
}
const getAllApi = async () => {
await Promise.all([
getCount(),
getProject(),
getNotice(),
getShortcut(),
getUserAccessSource(),
getWeeklyUserActivity()
])
loading.value = false
}
const goToXXLJob = async () => {
window.open('http://121.36.203.133/xxl-job-admin/');
}
getAllApi()
</script>
<style scoped>
.image-container {
width: 100%;
display: flex;
justify-content: center;
}
.el-image img {
width: 100%;
height: auto;
}
</style>

View File

@ -0,0 +1,189 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible">
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="100px"
v-loading="formLoading"
>
<el-form-item label="场库编号" prop="parkNumber">
<el-input v-model="formData.parkNumber" placeholder="请输入场库编号" />
</el-form-item>
<el-form-item label="预约车牌号" prop="plate">
<el-input v-model="formData.plate" placeholder="请输入预约车牌号" />
</el-form-item>
<el-form-item label="预约开始时间" prop="start">
<el-input v-model="formData.start" placeholder="请输入预约开始时间" />
</el-form-item>
<el-form-item label="预约结束时间" prop="end">
<el-input v-model="formData.end" placeholder="请输入预约结束时间" />
</el-form-item>
<el-form-item label="区域号" prop="areaId">
<el-input v-model="formData.areaId" placeholder="请输入区域号" />
</el-form-item>
<el-form-item label="操作" prop="flag">
<el-input v-model="formData.flag" placeholder="请输入操作" />
</el-form-item>
<el-form-item label="金额" prop="charge">
<el-input v-model="formData.charge" placeholder="请输入金额" />
</el-form-item>
<el-form-item label="预约订单号" prop="bookOrderId">
<el-input v-model="formData.bookOrderId" placeholder="请输入预约订单号" />
</el-form-item>
<el-form-item label="入场时间" prop="inTime">
<el-date-picker
v-model="formData.inTime"
type="date"
value-format="x"
placeholder="选择入场时间"
/>
</el-form-item>
<el-form-item label="下发场库时间" prop="downTime">
<el-date-picker
v-model="formData.downTime"
type="date"
value-format="x"
placeholder="选择下发场库时间"
/>
</el-form-item>
<el-form-item label="订单下单时间" prop="bookOrderTime">
<el-date-picker
v-model="formData.bookOrderTime"
type="date"
value-format="x"
placeholder="选择订单下单时间"
/>
</el-form-item>
<el-form-item label="准入开始时间" prop="letInStartTime">
<el-date-picker
v-model="formData.letInStartTime"
type="date"
value-format="x"
placeholder="选择准入开始时间"
/>
</el-form-item>
<el-form-item label="准入结束时间" prop="letInEndTime">
<el-date-picker
v-model="formData.letInEndTime"
type="date"
value-format="x"
placeholder="选择准入结束时间"
/>
</el-form-item>
<el-form-item label="备注" prop="memo">
<el-input v-model="formData.memo" placeholder="请输入备注" />
</el-form-item>
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
<el-button @click="dialogVisible = false"> </el-button>
</template>
</Dialog>
</template>
<script setup lang="ts">
import { BookCarApi, BookCarVO } from '@/api/parking/bookcar'
/** 预约车 表单 */
defineOptions({ name: 'BookCarForm' })
const { t } = useI18n() //
const message = useMessage() //
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const formLoading = ref(false) // 12
const formType = ref('') // create - update -
const formData = ref({
id: undefined,
parkNumber: undefined,
plate: undefined,
start: undefined,
end: undefined,
areaId: undefined,
flag: undefined,
charge: undefined,
bookOrderId: undefined,
inTime: undefined,
downTime: undefined,
bookOrderTime: undefined,
letInStartTime: undefined,
letInEndTime: undefined,
memo: undefined
})
const formRules = reactive({
parkNumber: [{ required: true, message: '场库编号不能为空', trigger: 'blur' }],
plate: [{ required: true, message: '预约车牌号不能为空', trigger: 'blur' }],
start: [{ required: true, message: '预约开始时间不能为空', trigger: 'blur' }],
end: [{ required: true, message: '预约结束时间不能为空', trigger: 'blur' }],
bookOrderId: [{ required: true, message: '预约订单号不能为空', trigger: 'blur' }],
bookOrderTime: [{ required: true, message: '订单下单时间不能为空', trigger: 'blur' }],
letInStartTime: [{ required: true, message: '准入开始时间不能为空', trigger: 'blur' }],
letInEndTime: [{ required: true, message: '准入结束时间不能为空', trigger: 'blur' }]
})
const formRef = ref() // Ref
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
resetForm()
//
if (id) {
formLoading.value = true
try {
formData.value = await BookCarApi.getBookCar(id)
} finally {
formLoading.value = false
}
}
}
defineExpose({ open }) // open
/** 提交表单 */
const emit = defineEmits(['success']) // success
const submitForm = async () => {
//
await formRef.value.validate()
//
formLoading.value = true
try {
const data = formData.value as unknown as BookCarVO
if (formType.value === 'create') {
await BookCarApi.createBookCar(data)
message.success(t('common.createSuccess'))
} else {
await BookCarApi.updateBookCar(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
//
emit('success')
} finally {
formLoading.value = false
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
parkNumber: undefined,
plate: undefined,
start: undefined,
end: undefined,
areaId: undefined,
flag: undefined,
charge: undefined,
bookOrderId: undefined,
inTime: undefined,
downTime: undefined,
bookOrderTime: undefined,
letInStartTime: undefined,
letInEndTime: undefined,
memo: undefined
}
formRef.value?.resetFields()
}
</script>

View File

@ -0,0 +1,340 @@
<template>
<ContentWrap>
<!-- 搜索工作栏 -->
<el-form
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="auto"
>
<el-form-item label="场库编号" prop="parkNumber">
<el-input
v-model="queryParams.parkNumber"
placeholder="请输入场库编号"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="预约车牌号" prop="plate">
<el-input
v-model="queryParams.plate"
placeholder="请输入预约车牌号"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<!-- <el-form-item label="预约开始时间" prop="start">
<el-input
v-model="queryParams.start"
placeholder="请输入预约开始时间"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="预约结束时间" prop="end">
<el-input
v-model="queryParams.end"
placeholder="请输入预约结束时间"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item> -->
<!-- <el-form-item label="区域号" prop="areaId">
<el-input
v-model="queryParams.areaId"
placeholder="请输入区域号"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item> -->
<el-form-item label="操作" prop="flag">
<el-input
v-model="queryParams.flag"
placeholder="请输入操作"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<!-- <el-form-item label="金额" prop="charge">
<el-input
v-model="queryParams.charge"
placeholder="请输入金额"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item> -->
<el-form-item label="预约订单号" prop="bookOrderId">
<el-input
v-model="queryParams.bookOrderId"
placeholder="请输入预约订单号"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<!-- <el-form-item label="入场时间" prop="inTime">
<el-date-picker
v-model="queryParams.inTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="下发场库时间" prop="downTime">
<el-date-picker
v-model="queryParams.downTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item> -->
<el-form-item label="订单下单时间" prop="bookOrderTime">
<el-date-picker
v-model="queryParams.bookOrderTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<!-- <el-form-item label="准入开始时间" prop="letInStartTime">
<el-date-picker
v-model="queryParams.letInStartTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item>
<el-form-item label="准入结束时间" prop="letInEndTime">
<el-date-picker
v-model="queryParams.letInEndTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item> -->
<el-form-item label="备注" prop="memo">
<el-input
v-model="queryParams.memo"
placeholder="请输入备注"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item>
<!-- <el-form-item label="创建时间" prop="createTime">
<el-date-picker
v-model="queryParams.createTime"
value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-240px"
/>
</el-form-item> -->
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<el-button
type="primary"
plain
@click="openForm('create')"
v-hasPermi="['parking:book-car:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
<el-button
type="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['parking:book-car:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column label="id" align="center" prop="id" />
<el-table-column label="场库编号" align="center" prop="parkNumber" />
<el-table-column label="预约车牌号" align="center" prop="plate" />
<el-table-column label="预约开始时间" align="center" prop="start" />
<el-table-column label="预约结束时间" align="center" prop="end" />
<el-table-column label="区域号" align="center" prop="areaId" />
<el-table-column label="操作" align="center" prop="flag" />
<el-table-column label="金额" align="center" prop="charge" />
<el-table-column label="预约订单号" align="center" prop="bookOrderId" />
<el-table-column label="入场时间" align="center" prop="inTime" />
<el-table-column label="下发场库时间" align="center" prop="downTime" />
<el-table-column label="订单下单时间" align="center" prop="bookOrderTime" />
<el-table-column label="准入开始时间" align="center" prop="letInStartTime" />
<el-table-column label="准入结束时间" align="center" prop="letInEndTime" />
<el-table-column label="备注" align="center" prop="memo" />
<el-table-column
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['parking:book-car:update']"
>
编辑
</el-button>
<el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['parking:book-car:delete']"
>
删除
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
<!-- 表单弹窗添加/修改 -->
<BookCarForm ref="formRef" @success="getList" />
</template>
<script setup lang="ts">
import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download'
import { BookCarApi, BookCarVO } from '@/api/parking/bookcar'
import BookCarForm from './BookCarForm.vue'
/** 预约车 列表 */
defineOptions({ name: 'BookCar' })
const message = useMessage() //
const { t } = useI18n() //
const loading = ref(true) //
const list = ref<BookCarVO[]>([]) //
const total = ref(0) //
const queryParams = reactive({
pageNo: 1,
pageSize: 10,
parkNumber: undefined,
plate: undefined,
start: undefined,
end: undefined,
areaId: undefined,
flag: undefined,
charge: undefined,
bookOrderId: undefined,
inTime: [],
downTime: [],
bookOrderTime: [],
letInStartTime: [],
letInEndTime: [],
memo: undefined,
createTime: []
})
const queryFormRef = ref() //
const exportLoading = ref(false) //
/** 查询列表 */
const getList = async () => {
loading.value = true
try {
const data = await BookCarApi.getBookCarPage(queryParams)
list.value = data.list
total.value = data.total
} finally {
loading.value = false
}
}
/** 搜索按钮操作 */
const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
/** 重置按钮操作 */
const resetQuery = () => {
queryFormRef.value.resetFields()
handleQuery()
}
/** 添加/修改操作 */
const formRef = ref()
const openForm = (type: string, id?: number) => {
formRef.value.open(type, id)
}
/** 删除按钮操作 */
const handleDelete = async (id: number) => {
try {
//
await message.delConfirm()
//
await BookCarApi.deleteBookCar(id)
message.success(t('common.delSuccess'))
//
await getList()
} catch {}
}
/** 导出按钮操作 */
const handleExport = async () => {
try {
//
await message.exportConfirm()
//
exportLoading.value = true
const data = await BookCarApi.exportBookCar(queryParams)
download.excel(data, '预约车.xls')
} catch {
} finally {
exportLoading.value = false
}
}
/** 初始化 **/
onMounted(() => {
getList()
})
</script>

View File

@ -1,18 +1,17 @@
<template>
<Dialog :title="dialogTitle" v-model="dialogVisible">
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="100px"
v-loading="formLoading"
>
<el-form ref="formRef" :model="formData" :rules="formRules" label-width="100px" v-loading="formLoading">
<el-form-item label="停车场编号" prop="parkNumber">
<el-input v-model="formData.parkNumber" placeholder="请输入停车场编号" />
</el-form-item>
<el-form-item label="通道Id" prop="passagewayId">
<el-input v-model="formData.passagewayId" placeholder="请输入通道Id" />
</el-form-item>
<!-- <el-form-item label="状态" prop="status">
<el-radio-group v-model="formData.status">
<el-radio label="1">请选择字典生成</el-radio>
</el-radio-group>
</el-form-item> -->
</el-form>
<template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button>
@ -21,78 +20,80 @@
</Dialog>
</template>
<script setup lang="ts">
import { LiftingRodApi, LiftingRodVO } from '@/api/parking/instructiondelivery/liftingrod'
import { LiftingRodApi, LiftingRodVO } from '@/api/parking/instructiondelivery/liftingrod'
/** 远程抬杠日志 表单 */
defineOptions({ name: 'LiftingRodForm' })
/** 远程抬杠日志 表单 */
defineOptions({ name: 'LiftingRodForm' })
const { t } = useI18n() //
const message = useMessage() //
const { t } = useI18n() //
const message = useMessage() //
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const formLoading = ref(false) // 12
const formType = ref('') // create - update -
const formData = ref({
id: undefined,
parkNumber: undefined,
passagewayId: undefined,
})
const formRules = reactive({
parkNumber: [{ required: true, message: '停车场编号不能为空', trigger: 'blur' }],
passagewayId: [{ required: true, message: '通道Id不能为空', trigger: 'blur' }],
})
const formRef = ref() // Ref
const dialogVisible = ref(false) //
const dialogTitle = ref('') //
const formLoading = ref(false) // 12
const formType = ref('') // create - update -
const formData = ref({
id: undefined,
parkNumber: undefined,
passagewayId: undefined,
status: undefined,
})
const formRules = reactive({
parkNumber: [{ required: true, message: '停车场编号不能为空', trigger: 'blur' }],
passagewayId: [{ required: true, message: '通道Id不能为空', trigger: 'blur' }],
})
const formRef = ref() // Ref
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
dialogVisible.value = true
dialogTitle.value = t('action.' + type)
formType.value = type
resetForm()
//
if (id) {
/** 打开弹窗 */
const open = async (type: string, id?: number) => {
dialogVisible.value = true
dialogTitle.value = type == 'upload' ? "下发指令" : t('action.' + type)
formType.value = type
resetForm()
//
if (id) {
formLoading.value = true
try {
formData.value = await LiftingRodApi.getLiftingRod(id)
} finally {
formLoading.value = false
}
}
}
defineExpose({ open }) // open
/** 提交表单 */
const emit = defineEmits(['success']) // success
const submitForm = async () => {
//
await formRef.value.validate()
//
formLoading.value = true
try {
formData.value = await LiftingRodApi.getLiftingRod(id)
const data = formData.value as unknown as LiftingRodVO
if (formType.value === 'create') {
await LiftingRodApi.createLiftingRod(data)
message.success('下发成功')
} else {
await LiftingRodApi.updateLiftingRod(data)
message.success(t('common.updateSuccess'))
}
dialogVisible.value = false
//
emit('success')
} finally {
formLoading.value = false
}
}
}
defineExpose({ open }) // open
/** 提交表单 */
const emit = defineEmits(['success']) // success
const submitForm = async () => {
//
await formRef.value.validate()
//
formLoading.value = true
try {
const data = formData.value as unknown as LiftingRodVO
if (formType.value === 'create') {
await LiftingRodApi.createLiftingRod(data)
message.success(t('common.createSuccess'))
} else {
await LiftingRodApi.updateLiftingRod(data)
message.success(t('common.updateSuccess'))
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
parkNumber: undefined,
passagewayId: undefined,
status: undefined,
}
dialogVisible.value = false
//
emit('success')
} finally {
formLoading.value = false
formRef.value?.resetFields()
}
}
/** 重置表单 */
const resetForm = () => {
formData.value = {
id: undefined,
parkNumber: undefined,
passagewayId: undefined,
}
formRef.value?.resetFields()
}
</script>

View File

@ -37,16 +37,26 @@
class="!w-240px"
/>
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="请选择状态"
clearable
class="!w-240px"
>
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
<el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<el-button
type="primary"
plain
@click="openForm('create')"
@click="openForm('upload')"
v-hasPermi="['parking:lifting-rod:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> 新增
<Icon icon="ep:plus" class="mr-5px" /> 下发指令
</el-button>
<el-button
type="success"
@ -74,6 +84,12 @@
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="状态" align="center" prop="status" >
<template #default="scope">
<dict-tag :type="DICT_TYPE.LIFTINGROD_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="操作" align="center">
<template #default="scope">
<el-button
@ -113,6 +129,7 @@ import { dateFormatter } from '@/utils/formatTime'
import download from '@/utils/download'
import { LiftingRodApi, LiftingRodVO } from '@/api/parking/instructiondelivery/liftingrod'
import LiftingRodForm from './LiftingRodForm.vue'
import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
/** 远程抬杠日志 列表 */
defineOptions({ name: 'LiftingRod' })
@ -129,6 +146,7 @@ const queryParams = reactive({
parkNumber: undefined,
passagewayId: undefined,
createTime: [],
status: undefined,
})
const queryFormRef = ref() //
const exportLoading = ref(false) //

0
test.txt Normal file
View File