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

Reviewed-on: #7

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

.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

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

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

src/api/parking/instructiondelivery/liftingrod/index.ts

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

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

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

src/views/Home/Index.vue

@@ -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
+                <CountTo class="text-20px" :start-val="0" :end-val="totalSate.project" :duration="2600" />
-                  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
+                <CountTo class="text-20px" :start-val="0" :end-val="totalSate.todo" :duration="2600" />
-                  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
+                <CountTo class="text-20px" :start-val="0" :end-val="totalSate.access" :duration="2600" />
-                  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: 100%; margin: 8px 0; text-align: center;" shadow="never"> -->
-    <el-card style="width: 420px;text-align: center;cursor: pointer;" shadow="hover" @click="goToXXLJob">任务调度中心</el-card>
+    <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,17 +74,9 @@
             </el-link>
           </div>
         </template>
-        <el-skeleton :loading="loading" animated>
+<el-skeleton :loading="loading" animated>
   <el-row>
-            <el-col
+    <el-col v-for="(item, index) in projects" :key="`card-${index}`" :xl="8" :lg="8" :md="8" :sm="24" :xs="24">
-              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" />
@@ -98,10 +90,10 @@
       </el-card>
     </el-col>
   </el-row>
-        </el-skeleton>
+</el-skeleton>
-      </el-card>
+</el-card>
 
-      <el-card shadow="never" class="mt-8px">
+<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">
@@ -120,9 +112,9 @@
       </el-col>
     </el-row>
   </el-skeleton>
-      </el-card>
+</el-card>
-    </el-col>
+</el-col>
-    <el-col :xl="8" :lg="8" :md="24" :sm="24" :xs="24" class="mb-8px">
+<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">
@@ -170,47 +162,48 @@
       </div>
     </el-skeleton>
   </el-card>
-    </el-col>
+</el-col>
-  </el-row> -->
+</el-row> -->
 </template>
 <script lang="ts" setup>
-import { set } from 'lodash-es'
+  import { set } from 'lodash-es'
-import { EChartsOption } from 'echarts'
+  import { EChartsOption } from 'echarts'
-import { formatTime } from '@/utils'
+  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'
+  defineOptions({ name: 'Home' })
-import { useWatermark } from '@/hooks/web/useWatermark'
-import type { WorkplaceTotal, Project, Notice, Shortcut } from './types'
-import { pieOptions, barOptions } from './echarts-data'
 
-defineOptions({ name: 'Home' })
+  const luduViewImage = ref(luduView);
-
+  const { t } = useI18n()
-const { t } = useI18n()
+  const userStore = useUserStore()
-const userStore = useUserStore()
+  const { setWatermark } = useWatermark()
-const { setWatermark } = useWatermark()
+  const loading = ref(true)
-const loading = ref(true)
+  const avatar = userStore.getUser.avatar
-const avatar = userStore.getUser.avatar
+  const username = userStore.getUser.nickname
-const username = userStore.getUser.nickname
+  const pieOptionsData = reactive<EChartsOption>(pieOptions) as EChartsOption
-const pieOptionsData = reactive<EChartsOption>(pieOptions) as EChartsOption
+  // 获取统计数
-// 获取统计数
+  let totalSate = reactive<WorkplaceTotal>({
-let totalSate = reactive<WorkplaceTotal>({
     project: 0,
     access: 0,
     todo: 0
-})
+  })
 
-const getCount = async () => {
+  const getCount = async () => {
     const data = {
       project: 40,
       access: 2340,
       todo: 10
     }
     totalSate = Object.assign(totalSate, data)
-}
+  }
 
-// 获取项目数
+  // 获取项目数
-let projects = reactive<Project[]>([])
+  let projects = reactive<Project[]>([])
-const getProject = async () => {
+  const getProject = async () => {
     const data = [
       {
         name: 'ruoyi-vue-pro',
@@ -256,11 +249,11 @@ const getProject = async () => {
       }
     ]
     projects = Object.assign(projects, data)
-}
+  }
 
-// 获取通知公告
+  // 获取通知公告
-let notice = reactive<Notice[]>([])
+  let notice = reactive<Notice[]>([])
-const getNotice = async () => {
+  const getNotice = async () => {
     const data = [
       {
         title: '系统支持 JDK 8/17/21，Vue 2/3',
@@ -288,12 +281,12 @@ const getNotice = async () => {
       }
     ]
     notice = Object.assign(notice, data)
-}
+  }
 
-// 获取快捷入口
+  // 获取快捷入口
-let shortcut = reactive<Shortcut[]>([])
+  let shortcut = reactive<Shortcut[]>([])
 
-const getShortcut = async () => {
+  const getShortcut = async () => {
     const data = [
       {
         name: 'Github',
@@ -327,10 +320,10 @@ const getShortcut = async () => {
       }
     ]
     shortcut = Object.assign(shortcut, data)
-}
+  }
 
-// 用户来源
+  // 用户来源
-const getUserAccessSource = async () => {
+  const getUserAccessSource = async () => {
     const data = [
       { value: 335, name: 'analysis.directAccess' },
       { value: 310, name: 'analysis.mailMarketing' },
@@ -349,11 +342,11 @@ const getUserAccessSource = async () => {
         value: v.value
       }
     })
-}
+  }
-const barOptionsData = reactive<EChartsOption>(barOptions) as EChartsOption
+  const barOptionsData = reactive<EChartsOption>(barOptions) as EChartsOption
 
-// 周活跃量
+  // 周活跃量
-const getWeeklyUserActivity = async () => {
+  const getWeeklyUserActivity = async () => {
     const data = [
       { value: 13253, name: 'analysis.monday' },
       { value: 34235, name: 'analysis.tuesday' },
@@ -375,9 +368,9 @@ const getWeeklyUserActivity = async () => {
         type: 'bar'
       }
     ])
-}
+  }
 
-const getAllApi = async () => {
+  const getAllApi = async () => {
     await Promise.all([
       getCount(),
       getProject(),
@@ -387,10 +380,22 @@ const getAllApi = async () => {
       getWeeklyUserActivity()
     ])
     loading.value = false
-}
+  }
 
-const goToXXLJob = async () => {
+  const goToXXLJob = async () => {
-  window.open('http://127.0.0.1:9090/xxl-job-admin/');
+    window.open('http://121.36.203.133/xxl-job-admin/');
-}
+  }
-getAllApi()
+  getAllApi()
 </script>
+<style scoped>
+  .image-container {
+    width: 100%;
+    display: flex;
+    justify-content: center;
+  }
+
+  .el-image img {
+    width: 100%;
+    height: auto;
+  }
+</style>

src/views/parking/bookcar/BookCarForm.vue

@@ -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) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+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>

src/views/parking/bookcar/index.vue

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

src/views/parking/instructiondelivery/liftingrod/LiftingRodForm.vue

@@ -1,18 +1,17 @@
 <template>
   <Dialog :title="dialogTitle" v-model="dialogVisible">
-    <el-form
+    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="100px" v-loading="formLoading">
-      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,33 +20,34 @@
   </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 { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
+  const message = useMessage() // 消息弹窗
 
-const dialogVisible = ref(false) // 弹窗的是否展示
+  const dialogVisible = ref(false) // 弹窗的是否展示
-const dialogTitle = ref('') // 弹窗的标题
+  const dialogTitle = ref('') // 弹窗的标题
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+  const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
+  const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formData = ref({
+  const formData = ref({
     id: undefined,
     parkNumber: undefined,
     passagewayId: undefined,
-})
+    status: undefined,
-const formRules = reactive({
+  })
+  const formRules = reactive({
     parkNumber: [{ required: true, message: '停车场编号不能为空', trigger: 'blur' }],
     passagewayId: [{ required: true, message: '通道Id不能为空', trigger: 'blur' }],
-})
+  })
-const formRef = ref() // 表单 Ref
+  const formRef = ref() // 表单 Ref
 
-/** 打开弹窗 */
+  /** 打开弹窗 */
-const open = async (type: string, id?: number) => {
+  const open = async (type: string, id?: number) => {
     dialogVisible.value = true
-  dialogTitle.value = t('action.' + type)
+    dialogTitle.value = type == 'upload' ? "下发指令" : t('action.' + type)
     formType.value = type
     resetForm()
     // 修改时，设置数据
@@ -59,12 +59,12 @@ const open = async (type: string, id?: number) => {
         formLoading.value = false
       }
     }
-}
+  }
-defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+  defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
-/** 提交表单 */
+  /** 提交表单 */
-const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+  const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
-const submitForm = async () => {
+  const submitForm = async () => {
     // 校验表单
     await formRef.value.validate()
     // 提交请求
@@ -73,7 +73,7 @@ const submitForm = async () => {
       const data = formData.value as unknown as LiftingRodVO
       if (formType.value === 'create') {
         await LiftingRodApi.createLiftingRod(data)
-      message.success(t('common.createSuccess'))
+        message.success('下发成功')
       } else {
         await LiftingRodApi.updateLiftingRod(data)
         message.success(t('common.updateSuccess'))
@@ -84,15 +84,16 @@ const submitForm = async () => {
     } finally {
       formLoading.value = false
     }
-}
+  }
 
-/** 重置表单 */
+  /** 重置表单 */
-const resetForm = () => {
+  const resetForm = () => {
     formData.value = {
       id: undefined,
       parkNumber: undefined,
       passagewayId: undefined,
+      status: undefined,
     }
     formRef.value?.resetFields()
-}
+  }
 </script>

src/views/parking/instructiondelivery/liftingrod/index.vue

@@ -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) // 导出的加载中