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

Reviewed-on: http://120.46.37.243:3000/lundu/ludu-admin-vue3/pulls/7

.env

@@ -2,7 +2,7 @@
 VITE_APP_TITLE=智慧轮渡大数据平台
 
 # 项目本地运行端口号
-VITE_PORT=82
+VITE_PORT=80
 
 
 # open 运行 npm run dev 时自动打开浏览器

src/api/infra/jobLog/index.ts

@@ -12,6 +12,7 @@ export interface JobLogVO {
   duration: string
   status: number
   createTime: string
+  result: string
 }
 
 // 任务日志列表

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

src/api/parking/appearancerecord/index.ts

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

src/api/parking/channel/index.ts

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

src/api/parking/chargeinformation/index.ts

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

src/api/parking/entryrecord/index.ts

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

src/components/DocAlert/index.vue

@@ -1,9 +1,10 @@
 <template>
-  <el-alert v-if="getEnable()" type="success" show-icon>
+  <!-- <el-alert v-if="getEnable()" type="success" show-icon>
     <template #title>
       <div @click="goToUrl">{{ '【' + title + '】文档地址：' + url }}</div>
     </template>
-  </el-alert>
+  </el-alert> -->
+  <div></div>
 </template>
 <script setup lang="tsx">
 import { propTypes } from '@/utils/propTypes'

src/locales/zh-CN.ts

@@ -151,6 +151,7 @@ export default {
   },
   router: {
     login: '登录',
+    logout: '登出',
     socialLogin: '社交登录',
     home: '首页',
     analysis: '分析页',

src/permission.ts

@@ -53,7 +53,8 @@ const whiteList = [
   '/auth-redirect',
   '/bind',
   '/register',
-  '/oauthLogin/gitee'
+  '/oauthLogin/gitee',
+  '/logout'
 ]
 
 // 路由加载前

src/router/modules/remaining.ts

@@ -184,9 +184,19 @@ const remainingRouter: AppRouteRecordRaw[] = [
       noTagsView: true
     }
   },
+  {
+    path: '/logout',
+    component: () => import('@/views/Login/Logout.vue'),
+    name: 'Logout',
+    meta: {
+      hidden: true,
+      title: t('router.logout'),
+      noTagsView: true
+    }
+  },
   {
     path: '/sso',
-    component: () => import('@/views/Login/Login.vue'),
+    component: () => import('@/views/Login/components/SSOLoginCustom.vue'),
     name: 'SSOLogin',
     meta: {
       hidden: true,

src/utils/auth.ts

@@ -20,12 +20,14 @@ export const getRefreshToken = () => {
 
 // 设置token
 export const setToken = (token: TokenType) => {
+  document.cookie = "LUNDU_LOGIN=true; max-age=1800; path=/"; // 设置cookie登录状态
   wsCache.set(RefreshTokenKey, token.refreshToken)
   wsCache.set(AccessTokenKey, token.accessToken)
 }
 
 // 删除token
 export const removeToken = () => {
+  document.cookie = "LUNDU_LOGIN=false; max-age=0; path=/"; // 清除cookie登录状态
   wsCache.delete(AccessTokenKey)
   wsCache.delete(RefreshTokenKey)
 }

src/utils/dict.ts

@@ -212,5 +212,7 @@ export enum DICT_TYPE {
   ERP_STOCK_RECORD_BIZ_TYPE = 'erp_stock_record_biz_type', // 库存明细的业务类型
 
   // ========== TICKET - 票务系统模块  ==========
-  ASSET_STATUS_TYPE = 'asset_status_type'
+  ASSET_STATUS_TYPE = 'asset_status_type', // 设备状态
+  TRANSACTION_TYPE_NO = 'transaction_type_no', // 交易类型（订单类型）
+  CERTIFICATE_TYPE = 'certificate_type' // 证件类型
 }

src/views/Home/Index.vue

@@ -55,7 +55,9 @@
       </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>
+  </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">
@@ -387,5 +389,8 @@ const getAllApi = async () => {
   loading.value = false
 }
 
+const goToXXLJob = async () => {
+  window.open('http://127.0.0.1:9090/xxl-job-admin/');
+}
 getAllApi()
 </script>

src/views/Login/Login.vue

@@ -1,12 +1,7 @@
 <template>
-  <div
+  <div :class="prefixCls" class="relative h-[100%] lt-md:px-10px lt-sm:px-10px lt-xl:px-10px lt-xl:px-10px">
-    :class="prefixCls"
-    class="relative h-[100%] lt-md:px-10px lt-sm:px-10px lt-xl:px-10px lt-xl:px-10px"
-  >
     <div class="relative mx-auto h-full flex">
-      <div
+      <div :class="`${prefixCls}__left flex-1 bg-gray-500 bg-opacity-20 relative p-30px lt-xl:hidden`">
-        :class="`${prefixCls}__left flex-1 bg-gray-500 bg-opacity-20 relative p-30px lt-xl:hidden`"
-      >
         <!-- 左上角的 logo + 系统标题 -->
         <div class="relative flex items-center text-white">
           <!-- <img alt="" class="mr-10px h-48px w-48px" src="@/assets/imgs/logo.png" /> -->
@@ -14,11 +9,7 @@
         </div>
         <!-- 左边的背景图 + 欢迎语 -->
         <div class="h-[calc(100%-60px)] flex items-center justify-center">
-          <TransitionGroup
+          <TransitionGroup appear enter-active-class="animate__animated animate__bounceInLeft" tag="div">
-            appear
-            enter-active-class="animate__animated animate__bounceInLeft"
-            tag="div"
-          >
             <img key="1" alt="" class="w-350px" src="@/assets/svgs/login-box-bg.svg" />
             <div key="2" class="text-3xl text-white" style="text-align: center;">{{ t('login.welcome') }}</div>
             <!-- <div key="3" class="mt-5 text-14px font-normal text-white">
@@ -29,9 +20,7 @@
       </div>
       <div class="relative flex-1 p-30px dark:bg-[var(--login-bg-color)] lt-sm:p-10px">
         <!-- 右上角的主题、语言选择 -->
-        <div
+        <div class="flex items-center justify-between text-white at-2xl:justify-end at-xl:justify-end">
-          class="flex items-center justify-between text-white at-2xl:justify-end at-xl:justify-end"
-        >
           <div class="flex items-center at-2xl:hidden at-xl:hidden">
             <!-- <img alt="" class="mr-10px h-48px w-48px" src="@/assets/imgs/logo.png" /> -->
             <span class="text-20px font-bold">{{ underlineToHump(appStore.getTitle) }}</span>
@@ -44,8 +33,7 @@
         <!-- 右边的登录界面 -->
         <Transition appear enter-active-class="animate__animated animate__bounceInRight">
           <div
-            class="m-auto h-full w-[100%] flex items-center at-2xl:max-w-500px at-lg:max-w-500px at-md:max-w-500px at-xl:max-w-500px"
+            class="m-auto h-full w-[100%] flex items-center at-2xl:max-w-500px at-lg:max-w-500px at-md:max-w-500px at-xl:max-w-500px">
-          >
             <!-- 账号登录 -->
             <LoginForm class="m-auto h-auto p-20px lt-xl:(rounded-3xl light:bg-white)" />
             <!-- 手机登录 -->
@@ -63,42 +51,42 @@
   </div>
 </template>
 <script lang="ts" setup>
-import { underlineToHump } from '@/utils'
+  import { underlineToHump } from '@/utils'
 
-import { useDesign } from '@/hooks/web/useDesign'
+  import { useDesign } from '@/hooks/web/useDesign'
-import { useAppStore } from '@/store/modules/app'
+  import { useAppStore } from '@/store/modules/app'
-import { ThemeSwitch } from '@/layout/components/ThemeSwitch'
+  import { ThemeSwitch } from '@/layout/components/ThemeSwitch'
-import { LocaleDropdown } from '@/layout/components/LocaleDropdown'
+  import { LocaleDropdown } from '@/layout/components/LocaleDropdown'
 
-import { LoginForm, MobileForm, QrCodeForm, RegisterForm, SSOLoginVue } from './components'
+  import { LoginForm, MobileForm, QrCodeForm, RegisterForm, SSOLoginVue } from './components'
 
-defineOptions({ name: 'Login' })
+  defineOptions({ name: 'Login' })
 
-const { t } = useI18n()
+  const { t } = useI18n()
-const appStore = useAppStore()
+  const appStore = useAppStore()
-const { getPrefixCls } = useDesign()
+  const { getPrefixCls } = useDesign()
-const prefixCls = getPrefixCls('login')
+  const prefixCls = getPrefixCls('login')
 </script>
 
 <style lang="scss" scoped>
-$prefix-cls: #{$namespace}-login;
+  $prefix-cls: #{$namespace}-login;
 
-.#{$prefix-cls} {
+  .#{$prefix-cls} {
-  overflow: auto;
+    overflow: auto;
 
-  &__left {
+    &__left {
-    &::before {
+      &::before {
-      position: absolute;
+        position: absolute;
-      top: 0;
+        top: 0;
-      left: 0;
+        left: 0;
-      z-index: -1;
+        z-index: -1;
-      width: 100%;
+        width: 100%;
-      height: 100%;
+        height: 100%;
-      background-image: url('@/assets/svgs/login-bg.svg');
+        background-image: url('@/assets/svgs/login-bg.svg');
-      background-position: center;
+        background-position: center;
-      background-repeat: no-repeat;
+        background-repeat: no-repeat;
-      content: '';
+        content: '';
+      }
     }
   }
-}
 </style>

src/views/Login/Logout.vue

@@ -0,0 +1,26 @@
+<template>
+  <div v-if="false">正在退出登录......</div>
+</template>
+<script lang="ts" setup>
+  import { ElLoading } from 'element-plus'
+  
+  import { useUserStore } from '@/store/modules/user'
+  import { useTagsViewStore } from '@/store/modules/tagsView'
+  const { replace } = useRouter()
+  const loading = ElLoading.service({
+    lock: true,
+    text: '',
+    background: 'rgba(0, 0, 0, 0.7)',
+  })
+  const loginOut = async () => {
+    try {
+      await useUserStore().loginOut()
+      useTagsViewStore().delAllViews()
+      replace('/login?redirect=/index')
+      loading.close()
+    } catch { }
+  }
+  loginOut()
+
+</script>
+<style lang="scss" scoped></style>

src/views/Login/components/SSOLoginCustom.vue

@@ -0,0 +1,200 @@
+<template>
+  <div v-show="false" class="form-cont">
+    <!-- 应用名 -->
+    <LoginFormTitle style="width: 100%" />
+    <el-tabs class="form" style="float: none" value="uname">
+      <el-tab-pane :label="client.name" name="uname" />
+    </el-tabs>
+    <div>
+      <el-form :model="formData" class="login-form">
+        <!-- 授权范围的选择 -->
+        此第三方应用请求获得以下权限：
+        <el-form-item prop="scopes">
+          <el-checkbox-group v-model="formData.scopes">
+            <el-checkbox
+              v-for="scope in queryParams.scopes"
+              :key="scope"
+              :label="scope"
+              style="display: block; margin-bottom: -10px"
+            >
+              {{ formatScope(scope) }}
+            </el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+        <!-- 下方的登录按钮 -->
+        <el-form-item class="w-1/1">
+          <el-button
+            :loading="formLoading"
+            class="w-6/10"
+            type="primary"
+            @click.prevent="handleAuthorize(true)"
+          >
+            <span v-if="!formLoading">同意授权</span>
+            <span v-else>授 权 中...</span>
+          </el-button>
+          <el-button class="w-3/10" @click.prevent="handleAuthorize(false)">拒绝</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+  </div>
+</template>
+<script lang="ts" setup>
+import LoginFormTitle from './LoginFormTitle.vue'
+import * as OAuth2Api from '@/api/login/oauth2'
+import { LoginStateEnum, useLoginState } from './useLogin'
+import type { RouteLocationNormalizedLoaded } from 'vue-router'
+
+defineOptions({ name: 'SSOLogin' })
+
+const route = useRoute() // 路由
+const { currentRoute } = useRouter() // 路由
+const { getLoginState, setLoginState } = useLoginState()
+
+const client = ref({
+  // 客户端信息
+  name: '',
+  logo: ''
+})
+interface queryType {
+  responseType: string
+  clientId: string
+  redirectUri: string
+  state: string
+  scopes: string[]
+}
+const queryParams = reactive<queryType>({
+  // URL 上的 client_id、scope 等参数
+  responseType: '',
+  clientId: '',
+  redirectUri: '',
+  state: '',
+  scopes: [] // 优先从 query 参数获取；如果未传递，从后端获取
+})
+const ssoVisible = computed(() => unref(getLoginState) === LoginStateEnum.SSO) // 是否展示 SSO 登录的表单
+interface formType {
+  scopes: string[]
+}
+const formData = reactive<formType>({
+  scopes: [] // 已选中的 scope 数组
+})
+const formLoading = ref(false) // 表单是否提交中
+
+/** 初始化授权信息 */
+const init = async () => {
+  // 防止在没有登录的情况下循环弹窗
+  if (typeof route.query.client_id === 'undefined') return
+  // 解析参数
+  // 例如说【自动授权不通过】：client_id=default&redirect_uri=https%3A%2F%2Fwww.iocoder.cn&response_type=code&scope=user.read%20user.write
+  // 例如说【自动授权通过】：client_id=default&redirect_uri=https%3A%2F%2Fwww.iocoder.cn&response_type=code&scope=user.read
+  queryParams.responseType = route.query.response_type as string
+  queryParams.clientId = route.query.client_id as string
+  queryParams.redirectUri = route.query.redirect_uri as string
+  queryParams.state = route.query.state as string
+  if (route.query.scope) {
+    queryParams.scopes = (route.query.scope as string).split(' ')
+  }
+
+  // 如果有 scope 参数，先执行一次自动授权，看看是否之前都授权过了。
+  if (queryParams.scopes.length > 0) {
+    const data = await doAuthorize(true, queryParams.scopes, [])
+    if (data) {
+      location.href = data
+      return
+    }
+  }
+
+  // 获取授权页的基本信息
+  const data = await OAuth2Api.getAuthorize(queryParams.clientId)
+  client.value = data.client
+  // 解析 scope
+  let scopes
+  // 1.1 如果 params.scope 非空，则过滤下返回的 scopes
+  if (queryParams.scopes.length > 0) {
+    scopes = []
+    for (const scope of data.scopes) {
+      if (queryParams.scopes.indexOf(scope.key) >= 0) {
+        scopes.push(scope)
+      }
+    }
+    // 1.2 如果 params.scope 为空，则使用返回的 scopes 设置它
+  } else {
+    scopes = data.scopes
+    for (const scope of scopes) {
+      queryParams.scopes.push(scope.key)
+    }
+  }
+  // 生成已选中的 checkedScopes
+  for (const scope of scopes) {
+    if (scope.value) {
+      formData.scopes.push(scope.key)
+    }
+  }
+}
+
+/** 处理授权的提交 */
+const handleAuthorize = async (approved) => {
+  // 计算 checkedScopes + uncheckedScopes
+  let checkedScopes
+  let uncheckedScopes
+  if (approved) {
+    // 同意授权，强制选择全部权限
+    checkedScopes = queryParams.scopes
+    uncheckedScopes = queryParams.scopes.filter((item) => checkedScopes.indexOf(item) === -1)
+  } else {
+    // 拒绝，则都是取消
+    checkedScopes = []
+    uncheckedScopes = queryParams.scopes
+  }
+  // 提交授权的请求
+  formLoading.value = true
+  try {
+    const data = await doAuthorize(false, checkedScopes, uncheckedScopes)
+    if (!data) {
+      return
+    }
+    location.href = data
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 调用授权 API 接口 */
+const doAuthorize = (autoApprove, checkedScopes, uncheckedScopes) => {
+  return OAuth2Api.authorize(
+    queryParams.responseType,
+    queryParams.clientId,
+    queryParams.redirectUri,
+    queryParams.state,
+    autoApprove,
+    checkedScopes,
+    uncheckedScopes
+  )
+}
+
+/** 格式化 scope 文本 */
+const formatScope = (scope) => {
+  // 格式化 scope 授权范围，方便用户理解。
+  // 这里仅仅是一个 demo，可以考虑录入到字典数据中，例如说字典类型 "system_oauth2_scope"，它的每个 scope 都是一条字典数据。
+  switch (scope) {
+    case 'user.read':
+      return '访问你的个人信息'
+    case 'user.write':
+      return '修改你的个人信息'
+    default:
+      return scope
+  }
+}
+
+/** 监听当前路由为 SSOLogin 时，进行数据的初始化 */
+watch(
+  () => currentRoute.value,
+  async (route: RouteLocationNormalizedLoaded) => {
+    if (route.name === 'SSOLogin') {
+      setLoginState(LoginStateEnum.SSO)
+      await init()
+      handleAuthorize(true)
+    }
+  },
+  { immediate: true }
+)
+</script>

src/views/infra/job/logger/JobLogDetail.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog v-model="dialogVisible" title="任务详细" width="700px">
+  <Dialog v-model="dialogVisible" title="任务详细" width="900px">
     <el-descriptions :column="1" border>
       <el-descriptions-item label="日志编号" min-width="60">
         {{ detailData.id }}
@@ -13,20 +13,20 @@
       <el-descriptions-item label="处理器的参数">
         {{ detailData.handlerParam }}
       </el-descriptions-item>
-      <el-descriptions-item label="第几次执行">
+      <!-- <el-descriptions-item label="第几次执行">
         {{ detailData.executeIndex }}
-      </el-descriptions-item>
+      </el-descriptions-item> -->
       <el-descriptions-item label="执行时间">
         {{ formatDate(detailData.beginTime) + ' ~ ' + formatDate(detailData.endTime) }}
       </el-descriptions-item>
       <el-descriptions-item label="执行时长">
-        {{ detailData.duration + ' 毫秒' }}
+        {{ detailData.duration == null? '无' : detailData.duration + ' 毫秒' }}
       </el-descriptions-item>
       <el-descriptions-item label="任务状态">
         <dict-tag :type="DICT_TYPE.INFRA_JOB_LOG_STATUS" :value="detailData.status" />
       </el-descriptions-item>
-      <el-descriptions-item label="执行结果">
+      <el-descriptions-item label="执行结果" >
-        {{ detailData.duration + ' result' }}
+        {{ detailData.result }}
       </el-descriptions-item>
     </el-descriptions>
   </Dialog>

src/views/infra/job/logger/index.vue

@@ -88,7 +88,7 @@
       </el-table-column>
       <el-table-column label="执行时长" align="center" prop="duration">
         <template #default="scope">
-          <span>{{ scope.row.duration + ' 毫秒' }}</span>
+          <span>{{ scope.row.duration ==null? '无': scope.row.duration + ' 毫秒' }}</span>
         </template>
       </el-table-column>
       <el-table-column label="任务状态" align="center" prop="status">

src/views/parking/accessrecordpicture/AccessRecordPictureForm.vue

@@ -10,20 +10,14 @@
       <el-form-item label="场库编号" prop="parkNumber">
         <el-input v-model="formData.parkNumber" placeholder="请输入场库编号" />
       </el-form-item>
-      <el-form-item label="数据条数" prop="size">
+      <el-form-item label="图片名称" prop="imageName">
-        <el-input v-model="formData.size" placeholder="请输入数据条数" />
+        <el-input v-model="formData.imageName" placeholder="请输入图片名称" />
       </el-form-item>
-      <el-form-item label="通道 Id" prop="passagewayId">
+      <el-form-item label="图片内容" prop="image">
-        <el-input v-model="formData.passagewayId" placeholder="请输入通道 Id" />
+        <UploadImg v-model="formData.image" />
       </el-form-item>
-      <el-form-item label="通道名称" prop="passagewayName">
+      <el-form-item label="图片来源地址" prop="imgAddress">
-        <el-input v-model="formData.passagewayName" placeholder="请输入通道名称" />
+        <el-input v-model="formData.imgAddress" placeholder="请输入图片来源地址" />
-      </el-form-item>
-      <el-form-item label="源区域 Id" prop="sourceAreaId">
-        <el-input v-model="formData.sourceAreaId" placeholder="请输入源区域 Id" />
-      </el-form-item>
-      <el-form-item label="目标区域 Id" prop="targetAreaId">
-        <el-input v-model="formData.targetAreaId" placeholder="请输入目标区域 Id" />
       </el-form-item>
     </el-form>
     <template #footer>
@@ -33,10 +27,10 @@
   </Dialog>
 </template>
 <script setup lang="ts">
-import { InformationApi, InformationVO } from '@/api/parking/channel'
+import { AccessRecordPictureApi, AccessRecordPictureVO } from '@/api/parking/accessrecordpicture'
 
-/** 通道信息 表单 */
+/** 进出记录图片 表单 */
-defineOptions({ name: 'InformationForm' })
+defineOptions({ name: 'AccessRecordPictureForm' })
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
@@ -48,13 +42,14 @@ const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
   id: undefined,
   parkNumber: undefined,
-  size: undefined,
+  imageName: undefined,
-  passagewayId: undefined,
+  image: undefined,
-  passagewayName: undefined,
+  imgAddress: undefined,
-  sourceAreaId: undefined,
-  targetAreaId: undefined,
 })
 const formRules = reactive({
+  parkNumber: [{ required: true, message: '场库编号不能为空', trigger: 'blur' }],
+  imageName: [{ required: true, message: '图片名称不能为空', trigger: 'blur' }],
+  image: [{ required: true, message: '图片内容不能为空', trigger: 'blur' }],
 })
 const formRef = ref() // 表单 Ref
 
@@ -68,7 +63,7 @@ const open = async (type: string, id?: number) => {
   if (id) {
     formLoading.value = true
     try {
-      formData.value = await InformationApi.getInformation(id)
+      formData.value = await AccessRecordPictureApi.getAccessRecordPicture(id)
     } finally {
       formLoading.value = false
     }
@@ -84,12 +79,12 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    const data = formData.value as unknown as InformationVO
+    const data = formData.value as unknown as AccessRecordPictureVO
     if (formType.value === 'create') {
-      await InformationApi.createInformation(data)
+      await AccessRecordPictureApi.createAccessRecordPicture(data)
       message.success(t('common.createSuccess'))
     } else {
-      await InformationApi.updateInformation(data)
+      await AccessRecordPictureApi.updateAccessRecordPicture(data)
       message.success(t('common.updateSuccess'))
     }
     dialogVisible.value = false
@@ -105,11 +100,9 @@ const resetForm = () => {
   formData.value = {
     id: undefined,
     parkNumber: undefined,
-    size: undefined,
+    imageName: undefined,
-    passagewayId: undefined,
+    image: undefined,
-    passagewayName: undefined,
+    imgAddress: undefined,
-    sourceAreaId: undefined,
-    targetAreaId: undefined,
   }
   formRef.value?.resetFields()
 }

src/views/parking/accessrecordpicture/index.vue

@@ -17,46 +17,19 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="数据条数" prop="size">
+      <el-form-item label="图片名称" prop="imageName">
         <el-input
-          v-model="queryParams.size"
+          v-model="queryParams.imageName"
-          placeholder="请输入数据条数"
+          placeholder="请输入图片名称"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="通道 Id" prop="passagewayId">
+      <el-form-item label="图片来源地址" prop="imgAddress">
         <el-input
-          v-model="queryParams.passagewayId"
+          v-model="queryParams.imgAddress"
-          placeholder="请输入通道 Id"
+          placeholder="请输入图片来源地址"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="通道名称" prop="passagewayName">
-        <el-input
-          v-model="queryParams.passagewayName"
-          placeholder="请输入通道名称"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="源区域 Id" prop="sourceAreaId">
-        <el-input
-          v-model="queryParams.sourceAreaId"
-          placeholder="请输入源区域 Id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="目标区域 Id" prop="targetAreaId">
-        <el-input
-          v-model="queryParams.targetAreaId"
-          placeholder="请输入目标区域 Id"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
@@ -80,7 +53,7 @@
           type="primary"
           plain
           @click="openForm('create')"
-          v-hasPermi="['channel:information:create']"
+          v-hasPermi="['parking:access-record-picture:create']"
         >
           <Icon icon="ep:plus" class="mr-5px" /> 新增
         </el-button>
@@ -89,7 +62,7 @@
           plain
           @click="handleExport"
           :loading="exportLoading"
-          v-hasPermi="['channel:information:export']"
+          v-hasPermi="['parking:access-record-picture:export']"
         >
           <Icon icon="ep:download" class="mr-5px" /> 导出
         </el-button>
@@ -102,11 +75,9 @@
     <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="size" />
+      <el-table-column label="图片名称" align="center" prop="imageName" />
-      <el-table-column label="通道 Id" align="center" prop="passagewayId" />
+      <el-table-column label="图片内容" align="center" prop="image" />
-      <el-table-column label="通道名称" align="center" prop="passagewayName" />
+      <el-table-column label="图片来源地址" align="center" prop="imgAddress" />
-      <el-table-column label="源区域 Id" align="center" prop="sourceAreaId" />
-      <el-table-column label="目标区域 Id" align="center" prop="targetAreaId" />
       <el-table-column
         label="创建时间"
         align="center"
@@ -120,7 +91,7 @@
             link
             type="primary"
             @click="openForm('update', scope.row.id)"
-            v-hasPermi="['channel:information:update']"
+            v-hasPermi="['parking:access-record-picture:update']"
           >
             编辑
           </el-button>
@@ -128,7 +99,7 @@
             link
             type="danger"
             @click="handleDelete(scope.row.id)"
-            v-hasPermi="['channel:information:delete']"
+            v-hasPermi="['parking:access-record-picture:delete']"
           >
             删除
           </el-button>
@@ -145,33 +116,31 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <InformationForm ref="formRef" @success="getList" />
+  <AccessRecordPictureForm ref="formRef" @success="getList" />
 </template>
 
 <script setup lang="ts">
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
-import { InformationApi, InformationVO } from '@/api/parking/channel'
+import { AccessRecordPictureApi, AccessRecordPictureVO } from '@/api/parking/accessrecordpicture'
-import InformationForm from './InformationForm.vue'
+import AccessRecordPictureForm from './AccessRecordPictureForm.vue'
 
-/** 通道信息 列表 */
+/** 进出记录图片 列表 */
-defineOptions({ name: 'ChannelInformation' })
+defineOptions({ name: 'AccessRecordPicture' })
 
 const message = useMessage() // 消息弹窗
 const { t } = useI18n() // 国际化
 
 const loading = ref(true) // 列表的加载中
-const list = ref<InformationVO[]>([]) // 列表的数据
+const list = ref<AccessRecordPictureVO[]>([]) // 列表的数据
 const total = ref(0) // 列表的总页数
 const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   parkNumber: undefined,
-  size: undefined,
+  imageName: undefined,
-  passagewayId: undefined,
+  image: undefined,
-  passagewayName: undefined,
+  imgAddress: undefined,
-  sourceAreaId: undefined,
-  targetAreaId: undefined,
   createTime: [],
 })
 const queryFormRef = ref() // 搜索的表单
@@ -181,7 +150,7 @@ const exportLoading = ref(false) // 导出的加载中
 const getList = async () => {
   loading.value = true
   try {
-    const data = await InformationApi.getInformationPage(queryParams)
+    const data = await AccessRecordPictureApi.getAccessRecordPicturePage(queryParams)
     list.value = data.list
     total.value = data.total
   } finally {
@@ -213,7 +182,7 @@ const handleDelete = async (id: number) => {
     // 删除的二次确认
     await message.delConfirm()
     // 发起删除
-    await InformationApi.deleteInformation(id)
+    await AccessRecordPictureApi.deleteAccessRecordPicture(id)
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getList()
@@ -227,8 +196,8 @@ const handleExport = async () => {
     await message.exportConfirm()
     // 发起导出
     exportLoading.value = true
-    const data = await InformationApi.exportInformation(queryParams)
+    const data = await AccessRecordPictureApi.exportAccessRecordPicture(queryParams)
-    download.excel(data, '通道信息.xls')
+    download.excel(data, '进出记录图片.xls')
   } catch {
   } finally {
     exportLoading.value = false

src/views/parking/appearancerecord/RecordForm.vue

@@ -1,360 +0,0 @@
-<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="size">
-        <el-input v-model="formData.size" placeholder="请输入数据条数" />
-      </el-form-item>
-      <el-form-item label="入场记录编号" prop="orderId">
-        <el-input v-model="formData.orderId" placeholder="请输入入场记录编号" />
-      </el-form-item>
-      <el-form-item label="操作员 Id" prop="operatorId">
-        <el-input v-model="formData.operatorId" placeholder="请输入操作员 Id" />
-      </el-form-item>
-      <el-form-item label="操作员姓名" prop="operatorName">
-        <el-input v-model="formData.operatorName" 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="plateColor">
-        <el-input v-model="formData.plateColor" placeholder="请输入车牌颜色" />
-      </el-form-item>
-      <el-form-item label="无牌车票号" prop="ticketCode">
-        <el-input v-model="formData.ticketCode" placeholder="请输入无牌车票号" />
-      </el-form-item>
-      <el-form-item label="车类型" prop="carType">
-        <el-select v-model="formData.carType" placeholder="请选择车类型">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="车牌识别可信度" prop="confidence">
-        <el-input v-model="formData.confidence" placeholder="请输入车牌识别可信度" />
-      </el-form-item>
-      <el-form-item label="证件号码" prop="idCard">
-        <el-input v-model="formData.idCard" 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="outTime">
-        <el-date-picker
-          v-model="formData.outTime"
-          type="date"
-          value-format="x"
-          placeholder="选择出场时间"
-        />
-      </el-form-item>
-      <el-form-item label="入场图片名" prop="inImage">
-        <UploadImg v-model="formData.inImage" />
-      </el-form-item>
-      <el-form-item label="出场图片名" prop="outImage">
-        <UploadImg v-model="formData.outImage" />
-      </el-form-item>
-      <el-form-item label="入口通道名称" prop="inChannel">
-        <el-input v-model="formData.inChannel" placeholder="请输入入口通道名称" />
-      </el-form-item>
-      <el-form-item label="出口通道名称" prop="outChannel">
-        <el-input v-model="formData.outChannel" placeholder="请输入出口通道名称" />
-      </el-form-item>
-      <el-form-item label="抬杆模式" prop="openGateMode">
-        <el-input v-model="formData.openGateMode" placeholder="请输入抬杆模式" />
-      </el-form-item>
-      <el-form-item label="匹配模式" prop="matchMode">
-        <el-input v-model="formData.matchMode" 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="onLineCharge">
-        <el-input v-model="formData.onLineCharge" placeholder="请输入线上总收费" />
-      </el-form-item>
-      <el-form-item label="线下总收费" prop="offLineCharge">
-        <el-input v-model="formData.offLineCharge" placeholder="请输入线下总收费" />
-      </el-form-item>
-      <el-form-item label="线上线下金额和时间优惠累计抵扣值" prop="profitChargeTotal">
-        <el-input v-model="formData.profitChargeTotal" placeholder="请输入线上线下金额和时间优惠累计抵扣值" />
-      </el-form-item>
-      <el-form-item label="线上累计优惠金额总面值" prop="onLineProfitChargeNum">
-        <el-input v-model="formData.onLineProfitChargeNum" placeholder="请输入线上累计优惠金额总面值" />
-      </el-form-item>
-      <el-form-item label="线上累计优惠金额总抵扣值" prop="onLineProfitChargeValue">
-        <el-input v-model="formData.onLineProfitChargeValue" placeholder="请输入线上累计优惠金额总抵扣值" />
-      </el-form-item>
-      <el-form-item label="线下累计优惠金额总面值" prop="offLineProfitChargeNum">
-        <el-input v-model="formData.offLineProfitChargeNum" placeholder="请输入线下累计优惠金额总面值" />
-      </el-form-item>
-      <el-form-item label="线下累计优惠金额总抵扣值" prop="offLineProfitChargeValue">
-        <el-input v-model="formData.offLineProfitChargeValue" placeholder="请输入线下累计优惠金额总抵扣值" />
-      </el-form-item>
-      <el-form-item label="线上累计优惠时间" prop="onLineProfitTimeNum">
-        <el-input v-model="formData.onLineProfitTimeNum" placeholder="请输入线上累计优惠时间" />
-      </el-form-item>
-      <el-form-item label="线上累计优惠时间总抵扣值" prop="onLineProfitTimeValue">
-        <el-input v-model="formData.onLineProfitTimeValue" placeholder="请输入线上累计优惠时间总抵扣值" />
-      </el-form-item>
-      <el-form-item label="线下累计优惠时间" prop="offLineProfitTimeNum">
-        <el-input v-model="formData.offLineProfitTimeNum" placeholder="请输入线下累计优惠时间" />
-      </el-form-item>
-      <el-form-item label="线下累计优惠时间总抵扣值" prop="offLineProfitTimeValue">
-        <el-input v-model="formData.offLineProfitTimeValue" placeholder="请输入线下累计优惠时间总抵扣值" />
-      </el-form-item>
-      <el-form-item label="支付订单号" prop="payNo">
-        <el-input v-model="formData.payNo" placeholder="请输入支付订单号" />
-      </el-form-item>
-      <el-form-item label="结算时间" prop="getTime">
-        <el-date-picker
-          v-model="formData.getTime"
-          type="date"
-          value-format="x"
-          placeholder="选择结算时间"
-        />
-      </el-form-item>
-      <el-form-item label="支付金额" prop="payCharge">
-        <el-input v-model="formData.payCharge" placeholder="请输入支付金额" />
-      </el-form-item>
-      <el-form-item label="支付类型" prop="payKind">
-        <el-input v-model="formData.payKind" placeholder="请输入支付类型" />
-      </el-form-item>
-      <el-form-item label="支付渠道" prop="payChannel">
-        <el-input v-model="formData.payChannel" placeholder="请输入支付渠道" />
-      </el-form-item>
-      <el-form-item label="备注" prop="memo">
-        <el-input v-model="formData.memo" placeholder="请输入备注" />
-      </el-form-item>
-      <el-form-item label="优惠码" prop="profitCode">
-        <el-input v-model="formData.profitCode" placeholder="请输入优惠码" />
-      </el-form-item>
-      <el-form-item label="优惠下发时间" prop="getproTime">
-        <el-date-picker
-          v-model="formData.getproTime"
-          type="date"
-          value-format="x"
-          placeholder="选择优惠下发时间"
-        />
-      </el-form-item>
-      <el-form-item label="优惠时间" prop="profitTime">
-        <el-date-picker
-          v-model="formData.profitTime"
-          type="date"
-          value-format="x"
-          placeholder="选择优惠时间"
-        />
-      </el-form-item>
-      <el-form-item label="优惠金额面值" prop="profitCharge">
-        <el-input v-model="formData.profitCharge" placeholder="请输入优惠金额面值" />
-      </el-form-item>
-      <el-form-item label="生效金额" prop="profitChargeValue">
-        <el-input v-model="formData.profitChargeValue" placeholder="请输入生效金额" />
-      </el-form-item>
-      <el-form-item label="备注" prop="profitmemo">
-        <el-input v-model="formData.profitmemo" placeholder="请输入备注" />
-      </el-form-item>
-      <el-form-item label="区域 id" prop="areaId">
-        <el-input v-model="formData.areaId" placeholder="请输入区域 id" />
-      </el-form-item>
-      <el-form-item label="区域名称" prop="areaName">
-        <el-input v-model="formData.areaName" placeholder="请输入区域名称" />
-      </el-form-item>
-      <el-form-item label="车位编号" prop="placeNumber">
-        <el-input v-model="formData.placeNumber" placeholder="请输入车位编号" />
-      </el-form-item>
-      <el-form-item label="备注信息" prop="placememo">
-        <el-input v-model="formData.placememo" placeholder="请输入备注信息" />
-      </el-form-item>
-      <el-form-item label="时间" prop="costTime">
-        <el-date-picker
-          v-model="formData.costTime"
-          type="date"
-          value-format="x"
-          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 { RecordApi, RecordVO } from '@/api/parking/appearancerecord'
-
-/** 出场记录 表单 */
-defineOptions({ name: 'RecordForm' })
-
-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,
-  size: undefined,
-  orderId: undefined,
-  operatorId: undefined,
-  operatorName: undefined,
-  invoiceNo: undefined,
-  plate: undefined,
-  plateColor: undefined,
-  ticketCode: undefined,
-  carType: undefined,
-  confidence: undefined,
-  idCard: undefined,
-  inTime: undefined,
-  outTime: undefined,
-  inImage: undefined,
-  outImage: undefined,
-  inChannel: undefined,
-  outChannel: undefined,
-  openGateMode: undefined,
-  matchMode: undefined,
-  charge: undefined,
-  onLineCharge: undefined,
-  offLineCharge: undefined,
-  profitChargeTotal: undefined,
-  onLineProfitChargeNum: undefined,
-  onLineProfitChargeValue: undefined,
-  offLineProfitChargeNum: undefined,
-  offLineProfitChargeValue: undefined,
-  onLineProfitTimeNum: undefined,
-  onLineProfitTimeValue: undefined,
-  offLineProfitTimeNum: undefined,
-  offLineProfitTimeValue: undefined,
-  payNo: undefined,
-  getTime: undefined,
-  payCharge: undefined,
-  payKind: undefined,
-  payChannel: undefined,
-  memo: undefined,
-  profitCode: undefined,
-  getproTime: undefined,
-  profitTime: undefined,
-  profitCharge: undefined,
-  profitChargeValue: undefined,
-  profitmemo: undefined,
-  areaId: undefined,
-  areaName: undefined,
-  placeNumber: undefined,
-  placememo: undefined,
-  costTime: undefined,
-})
-const formRules = reactive({
-})
-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 RecordApi.getRecord(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 RecordVO
-    if (formType.value === 'create') {
-      await RecordApi.createRecord(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await RecordApi.updateRecord(data)
-      message.success(t('common.updateSuccess'))
-    }
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
-  }
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    id: undefined,
-    parkNumber: undefined,
-    size: undefined,
-    orderId: undefined,
-    operatorId: undefined,
-    operatorName: undefined,
-    invoiceNo: undefined,
-    plate: undefined,
-    plateColor: undefined,
-    ticketCode: undefined,
-    carType: undefined,
-    confidence: undefined,
-    idCard: undefined,
-    inTime: undefined,
-    outTime: undefined,
-    inImage: undefined,
-    outImage: undefined,
-    inChannel: undefined,
-    outChannel: undefined,
-    openGateMode: undefined,
-    matchMode: undefined,
-    charge: undefined,
-    onLineCharge: undefined,
-    offLineCharge: undefined,
-    profitChargeTotal: undefined,
-    onLineProfitChargeNum: undefined,
-    onLineProfitChargeValue: undefined,
-    offLineProfitChargeNum: undefined,
-    offLineProfitChargeValue: undefined,
-    onLineProfitTimeNum: undefined,
-    onLineProfitTimeValue: undefined,
-    offLineProfitTimeNum: undefined,
-    offLineProfitTimeValue: undefined,
-    payNo: undefined,
-    getTime: undefined,
-    payCharge: undefined,
-    payKind: undefined,
-    payChannel: undefined,
-    memo: undefined,
-    profitCode: undefined,
-    getproTime: undefined,
-    profitTime: undefined,
-    profitCharge: undefined,
-    profitChargeValue: undefined,
-    profitmemo: undefined,
-    areaId: undefined,
-    areaName: undefined,
-    placeNumber: undefined,
-    placememo: undefined,
-    costTime: undefined,
-  }
-  formRef.value?.resetFields()
-}
-</script>

src/views/parking/appearancerecord/index.vue

@@ -1,700 +0,0 @@
-<template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
-      <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="size">
-        <el-input
-          v-model="queryParams.size"
-          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 label="入场记录编号" prop="orderId">
-        <el-input
-          v-model="queryParams.orderId"
-          placeholder="请输入入场记录编号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="操作员 Id" prop="operatorId">
-        <el-input
-          v-model="queryParams.operatorId"
-          placeholder="请输入操作员 Id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="操作员姓名" prop="operatorName">
-        <el-input
-          v-model="queryParams.operatorName"
-          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="plateColor">
-        <el-input
-          v-model="queryParams.plateColor"
-          placeholder="请输入车牌颜色"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="无牌车票号" prop="ticketCode">
-        <el-input
-          v-model="queryParams.ticketCode"
-          placeholder="请输入无牌车票号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="车类型" prop="carType">
-        <el-select
-          v-model="queryParams.carType"
-          placeholder="请选择车类型"
-          clearable
-          class="!w-240px"
-        >
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="车牌识别可信度" prop="confidence">
-        <el-input
-          v-model="queryParams.confidence"
-          placeholder="请输入车牌识别可信度"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="证件号码" prop="idCard">
-        <el-input
-          v-model="queryParams.idCard"
-          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="outTime">
-        <el-date-picker
-          v-model="queryParams.outTime"
-          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="inChannel">
-        <el-input
-          v-model="queryParams.inChannel"
-          placeholder="请输入入口通道名称"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="出口通道名称" prop="outChannel">
-        <el-input
-          v-model="queryParams.outChannel"
-          placeholder="请输入出口通道名称"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="抬杆模式" prop="openGateMode">
-        <el-input
-          v-model="queryParams.openGateMode"
-          placeholder="请输入抬杆模式"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="匹配模式" prop="matchMode">
-        <el-input
-          v-model="queryParams.matchMode"
-          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="onLineCharge">
-        <el-input
-          v-model="queryParams.onLineCharge"
-          placeholder="请输入线上总收费"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="线下总收费" prop="offLineCharge">
-        <el-input
-          v-model="queryParams.offLineCharge"
-          placeholder="请输入线下总收费"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="线上线下金额和时间优惠累计抵扣值" prop="profitChargeTotal">
-        <el-input
-          v-model="queryParams.profitChargeTotal"
-          placeholder="请输入线上线下金额和时间优惠累计抵扣值"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="线上累计优惠金额总面值" prop="onLineProfitChargeNum">
-        <el-input
-          v-model="queryParams.onLineProfitChargeNum"
-          placeholder="请输入线上累计优惠金额总面值"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="线上累计优惠金额总抵扣值" prop="onLineProfitChargeValue">
-        <el-input
-          v-model="queryParams.onLineProfitChargeValue"
-          placeholder="请输入线上累计优惠金额总抵扣值"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="线下累计优惠金额总面值" prop="offLineProfitChargeNum">
-        <el-input
-          v-model="queryParams.offLineProfitChargeNum"
-          placeholder="请输入线下累计优惠金额总面值"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="线下累计优惠金额总抵扣值" prop="offLineProfitChargeValue">
-        <el-input
-          v-model="queryParams.offLineProfitChargeValue"
-          placeholder="请输入线下累计优惠金额总抵扣值"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="线上累计优惠时间" prop="onLineProfitTimeNum">
-        <el-input
-          v-model="queryParams.onLineProfitTimeNum"
-          placeholder="请输入线上累计优惠时间"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="线上累计优惠时间总抵扣值" prop="onLineProfitTimeValue">
-        <el-input
-          v-model="queryParams.onLineProfitTimeValue"
-          placeholder="请输入线上累计优惠时间总抵扣值"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="线下累计优惠时间" prop="offLineProfitTimeNum">
-        <el-input
-          v-model="queryParams.offLineProfitTimeNum"
-          placeholder="请输入线下累计优惠时间"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="线下累计优惠时间总抵扣值" prop="offLineProfitTimeValue">
-        <el-input
-          v-model="queryParams.offLineProfitTimeValue"
-          placeholder="请输入线下累计优惠时间总抵扣值"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="支付订单号" prop="payNo">
-        <el-input
-          v-model="queryParams.payNo"
-          placeholder="请输入支付订单号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="结算时间" prop="getTime">
-        <el-date-picker
-          v-model="queryParams.getTime"
-          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="payCharge">
-        <el-input
-          v-model="queryParams.payCharge"
-          placeholder="请输入支付金额"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="支付类型" prop="payKind">
-        <el-input
-          v-model="queryParams.payKind"
-          placeholder="请输入支付类型"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="支付渠道" prop="payChannel">
-        <el-input
-          v-model="queryParams.payChannel"
-          placeholder="请输入支付渠道"
-          clearable
-          @keyup.enter="handleQuery"
-          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="profitCode">
-        <el-input
-          v-model="queryParams.profitCode"
-          placeholder="请输入优惠码"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="优惠下发时间" prop="getproTime">
-        <el-date-picker
-          v-model="queryParams.getproTime"
-          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="profitTime">
-        <el-date-picker
-          v-model="queryParams.profitTime"
-          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="profitCharge">
-        <el-input
-          v-model="queryParams.profitCharge"
-          placeholder="请输入优惠金额面值"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="生效金额" prop="profitChargeValue">
-        <el-input
-          v-model="queryParams.profitChargeValue"
-          placeholder="请输入生效金额"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="备注" prop="profitmemo">
-        <el-input
-          v-model="queryParams.profitmemo"
-          placeholder="请输入备注"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="区域 id" prop="areaId">
-        <el-input
-          v-model="queryParams.areaId"
-          placeholder="请输入区域 id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="区域名称" prop="areaName">
-        <el-input
-          v-model="queryParams.areaName"
-          placeholder="请输入区域名称"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="车位编号" prop="placeNumber">
-        <el-input
-          v-model="queryParams.placeNumber"
-          placeholder="请输入车位编号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="备注信息" prop="placememo">
-        <el-input
-          v-model="queryParams.placememo"
-          placeholder="请输入备注信息"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="时间" prop="costTime">
-        <el-date-picker
-          v-model="queryParams.costTime"
-          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="['appearance:record:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
-        </el-button>
-        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['appearance:record: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="size" />
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column label="入场记录编号" align="center" prop="orderId" />
-      <el-table-column label="操作员 Id" align="center" prop="operatorId" />
-      <el-table-column label="操作员姓名" align="center" prop="operatorName" />
-      <el-table-column label="发票号码" align="center" prop="invoiceNo" />
-      <el-table-column label="车牌" align="center" prop="plate" />
-      <el-table-column label="车牌颜色" align="center" prop="plateColor" />
-      <el-table-column label="无牌车票号" align="center" prop="ticketCode" />
-      <el-table-column label="车类型" align="center" prop="carType" />
-      <el-table-column label="车牌识别可信度" align="center" prop="confidence" />
-      <el-table-column label="证件号码" align="center" prop="idCard" />
-      <el-table-column label="入场时间" align="center" prop="inTime" />
-      <el-table-column label="出场时间" align="center" prop="outTime" />
-      <el-table-column label="入场图片名" align="center" prop="inImage" />
-      <el-table-column label="出场图片名" align="center" prop="outImage" />
-      <el-table-column label="入口通道名称" align="center" prop="inChannel" />
-      <el-table-column label="出口通道名称" align="center" prop="outChannel" />
-      <el-table-column label="抬杆模式" align="center" prop="openGateMode" />
-      <el-table-column label="匹配模式" align="center" prop="matchMode" />
-      <el-table-column label="总停车费" align="center" prop="charge" />
-      <el-table-column label="线上总收费" align="center" prop="onLineCharge" />
-      <el-table-column label="线下总收费" align="center" prop="offLineCharge" />
-      <el-table-column label="线上线下金额和时间优惠累计抵扣值" align="center" prop="profitChargeTotal" />
-      <el-table-column label="线上累计优惠金额总面值" align="center" prop="onLineProfitChargeNum" />
-      <el-table-column label="线上累计优惠金额总抵扣值" align="center" prop="onLineProfitChargeValue" />
-      <el-table-column label="线下累计优惠金额总面值" align="center" prop="offLineProfitChargeNum" />
-      <el-table-column label="线下累计优惠金额总抵扣值" align="center" prop="offLineProfitChargeValue" />
-      <el-table-column label="线上累计优惠时间" align="center" prop="onLineProfitTimeNum" />
-      <el-table-column label="线上累计优惠时间总抵扣值" align="center" prop="onLineProfitTimeValue" />
-      <el-table-column label="线下累计优惠时间" align="center" prop="offLineProfitTimeNum" />
-      <el-table-column label="线下累计优惠时间总抵扣值" align="center" prop="offLineProfitTimeValue" />
-      <el-table-column label="支付订单号" align="center" prop="payNo" />
-      <el-table-column label="结算时间" align="center" prop="getTime" />
-      <el-table-column label="支付金额" align="center" prop="payCharge" />
-      <el-table-column label="支付类型" align="center" prop="payKind" />
-      <el-table-column label="支付渠道" align="center" prop="payChannel" />
-      <el-table-column label="备注" align="center" prop="memo" />
-      <el-table-column label="优惠码" align="center" prop="profitCode" />
-      <el-table-column label="优惠下发时间" align="center" prop="getproTime" />
-      <el-table-column label="优惠时间" align="center" prop="profitTime" />
-      <el-table-column label="优惠金额面值" align="center" prop="profitCharge" />
-      <el-table-column label="生效金额" align="center" prop="profitChargeValue" />
-      <el-table-column label="备注" align="center" prop="profitmemo" />
-      <el-table-column label="区域 id" align="center" prop="areaId" />
-      <el-table-column label="区域名称" align="center" prop="areaName" />
-      <el-table-column label="车位编号" align="center" prop="placeNumber" />
-      <el-table-column label="备注信息" align="center" prop="placememo" />
-      <el-table-column label="时间" align="center" prop="costTime" />
-      <el-table-column label="操作" align="center" width="150px">
-        <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['appearance:record:update']"
-          >
-            编辑
-          </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['appearance:record: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>
-
-  <!-- 表单弹窗：添加/修改 -->
-  <RecordForm ref="formRef" @success="getList" />
-</template>
-
-<script setup lang="ts">
-import { dateFormatter } from '@/utils/formatTime'
-import download from '@/utils/download'
-import { RecordApi, RecordVO } from '@/api/parking/appearancerecord'
-import RecordForm from './RecordForm.vue'
-
-/** 出场记录 列表 */
-defineOptions({ name: 'AppearanceRecord' })
-
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-
-const loading = ref(true) // 列表的加载中
-const list = ref<RecordVO[]>([]) // 列表的数据
-const total = ref(0) // 列表的总页数
-const queryParams = reactive({
-  pageNo: 1,
-  pageSize: 10,
-  parkNumber: undefined,
-  size: undefined,
-  createTime: [],
-  orderId: undefined,
-  operatorId: undefined,
-  operatorName: undefined,
-  plate: undefined,
-  plateColor: undefined,
-  ticketCode: undefined,
-  carType: undefined,
-  confidence: undefined,
-  idCard: undefined,
-  inTime: [],
-  outTime: [],
-  inImage: undefined,
-  outImage: undefined,
-  inChannel: undefined,
-  outChannel: undefined,
-  openGateMode: undefined,
-  matchMode: undefined,
-  charge: undefined,
-  onLineCharge: undefined,
-  offLineCharge: undefined,
-  profitChargeTotal: undefined,
-  onLineProfitChargeNum: undefined,
-  onLineProfitChargeValue: undefined,
-  offLineProfitChargeNum: undefined,
-  offLineProfitChargeValue: undefined,
-  onLineProfitTimeNum: undefined,
-  onLineProfitTimeValue: undefined,
-  offLineProfitTimeNum: undefined,
-  offLineProfitTimeValue: undefined,
-  payNo: undefined,
-  getTime: [],
-  payCharge: undefined,
-  payKind: undefined,
-  payChannel: undefined,
-  memo: undefined,
-  profitCode: undefined,
-  getproTime: [],
-  profitTime: [],
-  profitCharge: undefined,
-  profitChargeValue: undefined,
-  profitmemo: undefined,
-  areaId: undefined,
-  areaName: undefined,
-  placeNumber: undefined,
-  placememo: undefined,
-  costTime: [],
-})
-const queryFormRef = ref() // 搜索的表单
-const exportLoading = ref(false) // 导出的加载中
-
-/** 查询列表 */
-const getList = async () => {
-  loading.value = true
-  try {
-    const data = await RecordApi.getRecordPage(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 RecordApi.deleteRecord(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-/** 导出按钮操作 */
-const handleExport = async () => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await RecordApi.exportRecord(queryParams)
-    download.excel(data, '出场记录.xls')
-  } catch {
-  } finally {
-    exportLoading.value = false
-  }
-}
-
-/** 初始化 **/
-onMounted(() => {
-  getList()
-})
-</script>

src/views/parking/chargeinformation/InformationForm.vue

@@ -1,203 +0,0 @@
-<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="size">
-        <el-input v-model="formData.size" 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="inTime">
-        <el-date-picker
-          v-model="formData.inTime"
-          type="date"
-          value-format="x"
-          placeholder="选择入场时间"
-        />
-      </el-form-item>
-      <el-form-item label="结算时间" prop="outTime">
-        <el-date-picker
-          v-model="formData.outTime"
-          type="date"
-          value-format="x"
-          placeholder="选择结算时间"
-        />
-      </el-form-item>
-      <el-form-item label="入场通道" prop="inChannel">
-        <el-input v-model="formData.inChannel" placeholder="请输入入场通道" />
-      </el-form-item>
-      <el-form-item label="出场通道" prop="outChannel">
-        <el-input v-model="formData.outChannel" placeholder="请输入出场通道" />
-      </el-form-item>
-      <el-form-item label="支付类型" prop="payKind">
-        <el-input v-model="formData.payKind" placeholder="请输入支付类型" />
-      </el-form-item>
-      <el-form-item label="支付渠道" prop="payChannel">
-        <el-input v-model="formData.payChannel" placeholder="请输入支付渠道" />
-      </el-form-item>
-      <el-form-item label="入场订单号" prop="orderId">
-        <el-input v-model="formData.orderId" placeholder="请输入入场订单号" />
-      </el-form-item>
-      <el-form-item label="车辆类型" prop="carType">
-        <el-select v-model="formData.carType" placeholder="请选择车辆类型">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="支付订单号" prop="payNo">
-        <el-input v-model="formData.payNo" placeholder="请输入支付订单号" />
-      </el-form-item>
-      <el-form-item label="备注" prop="memo">
-        <el-input v-model="formData.memo" 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="realCharge">
-        <el-input v-model="formData.realCharge" placeholder="请输入实收金额" />
-      </el-form-item>
-      <el-form-item label="优惠金额" prop="couponCharge">
-        <el-input v-model="formData.couponCharge" placeholder="请输入优惠金额" />
-      </el-form-item>
-      <el-form-item label="区域 ID" prop="areaId">
-        <el-input v-model="formData.areaId" placeholder="请输入区域 ID" />
-      </el-form-item>
-      <el-form-item label="操作员名称" prop="operatorName">
-        <el-input v-model="formData.operatorName" placeholder="请输入操作员名称" />
-      </el-form-item>
-      <el-form-item label="操作员联系电话" prop="operatorTelphone">
-        <el-input v-model="formData.operatorTelphone" placeholder="请输入操作员联系电话" />
-      </el-form-item>
-      <el-form-item label="支付订单号" prop="outTradeNo">
-        <el-input v-model="formData.outTradeNo" placeholder="请输入支付订单号" />
-      </el-form-item>
-      <el-form-item label="车牌颜色" prop="plateColor">
-        <el-input v-model="formData.plateColor" 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 { InformationApi, InformationVO } from '@/api/parking/chargeinformation'
-
-/** 收费信息 表单 */
-defineOptions({ name: 'InformationForm' })
-
-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,
-  size: undefined,
-  plate: undefined,
-  inTime: undefined,
-  outTime: undefined,
-  inChannel: undefined,
-  outChannel: undefined,
-  payKind: undefined,
-  payChannel: undefined,
-  orderId: undefined,
-  carType: undefined,
-  payNo: undefined,
-  memo: undefined,
-  charge: undefined,
-  realCharge: undefined,
-  couponCharge: undefined,
-  areaId: undefined,
-  operatorName: undefined,
-  operatorTelphone: undefined,
-  outTradeNo: undefined,
-  plateColor: undefined,
-})
-const formRules = reactive({
-})
-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 InformationApi.getInformation(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 InformationVO
-    if (formType.value === 'create') {
-      await InformationApi.createInformation(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await InformationApi.updateInformation(data)
-      message.success(t('common.updateSuccess'))
-    }
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
-  }
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    id: undefined,
-    parkNumber: undefined,
-    size: undefined,
-    plate: undefined,
-    inTime: undefined,
-    outTime: undefined,
-    inChannel: undefined,
-    outChannel: undefined,
-    payKind: undefined,
-    payChannel: undefined,
-    orderId: undefined,
-    carType: undefined,
-    payNo: undefined,
-    memo: undefined,
-    charge: undefined,
-    realCharge: undefined,
-    couponCharge: undefined,
-    areaId: undefined,
-    operatorName: undefined,
-    operatorTelphone: undefined,
-    outTradeNo: undefined,
-    plateColor: undefined,
-  }
-  formRef.value?.resetFields()
-}
-</script>

src/views/parking/chargeinformation/index.vue

@@ -1,412 +0,0 @@
-<template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
-      <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="size">
-        <el-input
-          v-model="queryParams.size"
-          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="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="outTime">
-        <el-date-picker
-          v-model="queryParams.outTime"
-          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="inChannel">
-        <el-input
-          v-model="queryParams.inChannel"
-          placeholder="请输入入场通道"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="出场通道" prop="outChannel">
-        <el-input
-          v-model="queryParams.outChannel"
-          placeholder="请输入出场通道"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="支付类型" prop="payKind">
-        <el-input
-          v-model="queryParams.payKind"
-          placeholder="请输入支付类型"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="支付渠道" prop="payChannel">
-        <el-input
-          v-model="queryParams.payChannel"
-          placeholder="请输入支付渠道"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="入场订单号" prop="orderId">
-        <el-input
-          v-model="queryParams.orderId"
-          placeholder="请输入入场订单号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="车辆类型" prop="carType">
-        <el-select
-          v-model="queryParams.carType"
-          placeholder="请选择车辆类型"
-          clearable
-          class="!w-240px"
-        >
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="支付订单号" prop="payNo">
-        <el-input
-          v-model="queryParams.payNo"
-          placeholder="请输入支付订单号"
-          clearable
-          @keyup.enter="handleQuery"
-          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="charge">
-        <el-input
-          v-model="queryParams.charge"
-          placeholder="请输入应缴金额"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="实收金额" prop="realCharge">
-        <el-input
-          v-model="queryParams.realCharge"
-          placeholder="请输入实收金额"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="优惠金额" prop="couponCharge">
-        <el-input
-          v-model="queryParams.couponCharge"
-          placeholder="请输入优惠金额"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="区域 ID" prop="areaId">
-        <el-input
-          v-model="queryParams.areaId"
-          placeholder="请输入区域 ID"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="操作员名称" prop="operatorName">
-        <el-input
-          v-model="queryParams.operatorName"
-          placeholder="请输入操作员名称"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="操作员联系电话" prop="operatorTelphone">
-        <el-input
-          v-model="queryParams.operatorTelphone"
-          placeholder="请输入操作员联系电话"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="支付订单号" prop="outTradeNo">
-        <el-input
-          v-model="queryParams.outTradeNo"
-          placeholder="请输入支付订单号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="车牌颜色" prop="plateColor">
-        <el-input
-          v-model="queryParams.plateColor"
-          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="['charge:information:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
-        </el-button>
-        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['charge:information: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="size" />
-      <el-table-column label="车牌号" align="center" prop="plate" />
-      <el-table-column label="入场时间" align="center" prop="inTime" />
-      <el-table-column label="结算时间" align="center" prop="outTime" />
-      <el-table-column label="入场通道" align="center" prop="inChannel" />
-      <el-table-column label="出场通道" align="center" prop="outChannel" />
-      <el-table-column label="支付类型" align="center" prop="payKind" />
-      <el-table-column label="支付渠道" align="center" prop="payChannel" />
-      <el-table-column label="入场订单号" align="center" prop="orderId" />
-      <el-table-column label="车辆类型" align="center" prop="carType" />
-      <el-table-column label="支付订单号" align="center" prop="payNo" />
-      <el-table-column label="备注" align="center" prop="memo" />
-      <el-table-column label="应缴金额" align="center" prop="charge" />
-      <el-table-column label="实收金额" align="center" prop="realCharge" />
-      <el-table-column label="优惠金额" align="center" prop="couponCharge" />
-      <el-table-column label="区域 ID" align="center" prop="areaId" />
-      <el-table-column label="操作员名称" align="center" prop="operatorName" />
-      <el-table-column label="操作员联系电话" align="center" prop="operatorTelphone" />
-      <el-table-column label="支付订单号" align="center" prop="outTradeNo" />
-      <el-table-column label="车牌颜色" align="center" prop="plateColor" />
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column label="操作" align="center" width="150px">
-        <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['charge:information:update']"
-          >
-            编辑
-          </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['charge:information: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>
-
-  <!-- 表单弹窗：添加/修改 -->
-  <InformationForm ref="formRef" @success="getList" />
-</template>
-
-<script setup lang="ts">
-import { dateFormatter } from '@/utils/formatTime'
-import download from '@/utils/download'
-import { InformationApi, InformationVO } from '@/api/parking/chargeinformation'
-import InformationForm from './InformationForm.vue'
-
-/** 收费信息 列表 */
-defineOptions({ name: 'ChargeInformation' })
-
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-
-const loading = ref(true) // 列表的加载中
-const list = ref<InformationVO[]>([]) // 列表的数据
-const total = ref(0) // 列表的总页数
-const queryParams = reactive({
-  pageNo: 1,
-  pageSize: 10,
-  parkNumber: undefined,
-  size: undefined,
-  plate: undefined,
-  inTime: [],
-  outTime: [],
-  inChannel: undefined,
-  outChannel: undefined,
-  payKind: undefined,
-  payChannel: undefined,
-  orderId: undefined,
-  carType: undefined,
-  payNo: undefined,
-  memo: undefined,
-  charge: undefined,
-  realCharge: undefined,
-  couponCharge: undefined,
-  areaId: undefined,
-  operatorName: undefined,
-  operatorTelphone: undefined,
-  outTradeNo: undefined,
-  plateColor: undefined,
-  createTime: [],
-})
-const queryFormRef = ref() // 搜索的表单
-const exportLoading = ref(false) // 导出的加载中
-
-/** 查询列表 */
-const getList = async () => {
-  loading.value = true
-  try {
-    const data = await InformationApi.getInformationPage(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 InformationApi.deleteInformation(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-/** 导出按钮操作 */
-const handleExport = async () => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await InformationApi.exportInformation(queryParams)
-    download.excel(data, '收费信息.xls')
-  } catch {
-  } finally {
-    exportLoading.value = false
-  }
-}
-
-/** 初始化 **/
-onMounted(() => {
-  getList()
-})
-</script>

src/views/parking/entryrecord/EntryRecordForm.vue

@@ -1,224 +0,0 @@
-<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="size">
-        <el-input v-model="formData.size" 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="ticketCode">
-        <el-input v-model="formData.ticketCode" placeholder="请输入无牌车票号" />
-      </el-form-item>
-      <el-form-item label="车牌颜色" prop="plateColor">
-        <el-input v-model="formData.plateColor" 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="inChannel">
-        <el-input v-model="formData.inChannel" placeholder="请输入入场通道名称" />
-      </el-form-item>
-      <el-form-item label="入场图片名" prop="inImage">
-        <UploadImg v-model="formData.inImage" />
-      </el-form-item>
-      <el-form-item label="入场记录编号" prop="orderId">
-        <el-input v-model="formData.orderId" placeholder="请输入入场记录编号" />
-      </el-form-item>
-      <el-form-item label="访问事由" prop="visitReason">
-        <el-input v-model="formData.visitReason" placeholder="请输入访问事由" />
-      </el-form-item>
-      <el-form-item label="放行类型" prop="openGateMode">
-        <el-input v-model="formData.openGateMode" placeholder="请输入放行类型" />
-      </el-form-item>
-      <el-form-item label="匹配模式" prop="matchMode">
-        <el-input v-model="formData.matchMode" placeholder="请输入匹配模式" />
-      </el-form-item>
-      <el-form-item label="证件号码" prop="idCard">
-        <el-input v-model="formData.idCard" placeholder="请输入证件号码" />
-      </el-form-item>
-      <el-form-item label="车牌识别可信度" prop="confidence">
-        <el-input v-model="formData.confidence" placeholder="请输入车牌识别可信度" />
-      </el-form-item>
-      <el-form-item label="车类型" prop="carType">
-        <el-select v-model="formData.carType" placeholder="请选择车类型">
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="证件号码" prop="userIdCard">
-        <el-input v-model="formData.userIdCard" placeholder="请输入证件号码" />
-      </el-form-item>
-      <el-form-item label="车主姓名" prop="userName">
-        <el-input v-model="formData.userName" placeholder="请输入车主姓名" />
-      </el-form-item>
-      <el-form-item label="联系电话" prop="phone">
-        <el-input v-model="formData.phone" placeholder="请输入联系电话" />
-      </el-form-item>
-      <el-form-item label="地址" prop="address">
-        <el-input v-model="formData.address" placeholder="请输入地址" />
-      </el-form-item>
-      <el-form-item label="区域 id" prop="areaId">
-        <el-input v-model="formData.areaId" placeholder="请输入区域 id" />
-      </el-form-item>
-      <el-form-item label="区域名称" prop="areaName">
-        <el-input v-model="formData.areaName" placeholder="请输入区域名称" />
-      </el-form-item>
-      <el-form-item label="车位编号" prop="placeNumber">
-        <el-input v-model="formData.placeNumber" placeholder="请输入车位编号" />
-      </el-form-item>
-      <el-form-item label="备注信息" prop="memo">
-        <el-input v-model="formData.memo" placeholder="请输入备注信息" />
-      </el-form-item>
-      <el-form-item label="是否开闸" prop="barriorOpen">
-        <el-input v-model="formData.barriorOpen" placeholder="请输入是否开闸" />
-      </el-form-item>
-      <el-form-item label="开闸耗时" prop="costTime">
-        <el-date-picker
-          v-model="formData.costTime"
-          type="date"
-          value-format="x"
-          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 { EntryRecordApi, EntryRecordVO } from '@/api/parking/entryrecord'
-
-/** 入场记录 表单 */
-defineOptions({ name: 'EntryRecordForm' })
-
-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,
-  size: undefined,
-  plate: undefined,
-  ticketCode: undefined,
-  plateColor: undefined,
-  inTime: undefined,
-  inChannel: undefined,
-  inImage: undefined,
-  orderId: undefined,
-  visitReason: undefined,
-  openGateMode: undefined,
-  matchMode: undefined,
-  idCard: undefined,
-  confidence: undefined,
-  carType: undefined,
-  userIdCard: undefined,
-  userName: undefined,
-  phone: undefined,
-  address: undefined,
-  areaId: undefined,
-  areaName: undefined,
-  placeNumber: undefined,
-  memo: undefined,
-  barriorOpen: undefined,
-  costTime: undefined,
-})
-const formRules = reactive({
-  phone: [{ 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 EntryRecordApi.getEntryRecord(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 EntryRecordVO
-    if (formType.value === 'create') {
-      await EntryRecordApi.createEntryRecord(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await EntryRecordApi.updateEntryRecord(data)
-      message.success(t('common.updateSuccess'))
-    }
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
-  }
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
-    id: undefined,
-    parkNumber: undefined,
-    size: undefined,
-    plate: undefined,
-    ticketCode: undefined,
-    plateColor: undefined,
-    inTime: undefined,
-    inChannel: undefined,
-    inImage: undefined,
-    orderId: undefined,
-    visitReason: undefined,
-    openGateMode: undefined,
-    matchMode: undefined,
-    idCard: undefined,
-    confidence: undefined,
-    carType: undefined,
-    userIdCard: undefined,
-    userName: undefined,
-    phone: undefined,
-    address: undefined,
-    areaId: undefined,
-    areaName: undefined,
-    placeNumber: undefined,
-    memo: undefined,
-    barriorOpen: undefined,
-    costTime: undefined,
-  }
-  formRef.value?.resetFields()
-}
-</script>

src/views/parking/entryrecord/index.vue

@@ -1,447 +0,0 @@
-<template>
-  <ContentWrap>
-    <!-- 搜索工作栏 -->
-    <el-form
-      class="-mb-15px"
-      :model="queryParams"
-      ref="queryFormRef"
-      :inline="true"
-      label-width="68px"
-    >
-      <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="size">
-        <el-input
-          v-model="queryParams.size"
-          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="ticketCode">
-        <el-input
-          v-model="queryParams.ticketCode"
-          placeholder="请输入无牌车票号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="车牌颜色" prop="plateColor">
-        <el-input
-          v-model="queryParams.plateColor"
-          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="inChannel">
-        <el-input
-          v-model="queryParams.inChannel"
-          placeholder="请输入入场通道名称"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="入场记录编号" prop="orderId">
-        <el-input
-          v-model="queryParams.orderId"
-          placeholder="请输入入场记录编号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="访问事由" prop="visitReason">
-        <el-input
-          v-model="queryParams.visitReason"
-          placeholder="请输入访问事由"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="放行类型" prop="openGateMode">
-        <el-input
-          v-model="queryParams.openGateMode"
-          placeholder="请输入放行类型"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="匹配模式" prop="matchMode">
-        <el-input
-          v-model="queryParams.matchMode"
-          placeholder="请输入匹配模式"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="证件号码" prop="idCard">
-        <el-input
-          v-model="queryParams.idCard"
-          placeholder="请输入证件号码"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="车牌识别可信度" prop="confidence">
-        <el-input
-          v-model="queryParams.confidence"
-          placeholder="请输入车牌识别可信度"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="车类型" prop="carType">
-        <el-select
-          v-model="queryParams.carType"
-          placeholder="请选择车类型"
-          clearable
-          class="!w-240px"
-        >
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="证件号码" prop="userIdCard">
-        <el-input
-          v-model="queryParams.userIdCard"
-          placeholder="请输入证件号码"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="车主姓名" prop="userName">
-        <el-input
-          v-model="queryParams.userName"
-          placeholder="请输入车主姓名"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="联系电话" prop="phone">
-        <el-input
-          v-model="queryParams.phone"
-          placeholder="请输入联系电话"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="地址" prop="address">
-        <el-input
-          v-model="queryParams.address"
-          placeholder="请输入地址"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="区域 id" prop="areaId">
-        <el-input
-          v-model="queryParams.areaId"
-          placeholder="请输入区域 id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="区域名称" prop="areaName">
-        <el-input
-          v-model="queryParams.areaName"
-          placeholder="请输入区域名称"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="车位编号" prop="placeNumber">
-        <el-input
-          v-model="queryParams.placeNumber"
-          placeholder="请输入车位编号"
-          clearable
-          @keyup.enter="handleQuery"
-          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="barriorOpen">
-        <el-input
-          v-model="queryParams.barriorOpen"
-          placeholder="请输入是否开闸"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="开闸耗时" prop="costTime">
-        <el-date-picker
-          v-model="queryParams.costTime"
-          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="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:entry-record:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
-        </el-button>
-        <el-button
-          type="success"
-          plain
-          @click="handleExport"
-          :loading="exportLoading"
-          v-hasPermi="['parking:entry-record: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="size" />
-      <el-table-column label="车牌" align="center" prop="plate" />
-      <el-table-column label="无牌车票号" align="center" prop="ticketCode" />
-      <el-table-column label="车牌颜色" align="center" prop="plateColor" />
-      <el-table-column label="入场时间" align="center" prop="inTime" />
-      <el-table-column label="入场通道名称" align="center" prop="inChannel" />
-      <el-table-column label="入场图片名" align="center" prop="inImage" />
-      <el-table-column label="入场记录编号" align="center" prop="orderId" />
-      <el-table-column label="访问事由" align="center" prop="visitReason" />
-      <el-table-column label="放行类型" align="center" prop="openGateMode" />
-      <el-table-column label="匹配模式" align="center" prop="matchMode" />
-      <el-table-column label="证件号码" align="center" prop="idCard" />
-      <el-table-column label="车牌识别可信度" align="center" prop="confidence" />
-      <el-table-column label="车类型" align="center" prop="carType" />
-      <el-table-column label="证件号码" align="center" prop="userIdCard" />
-      <el-table-column label="车主姓名" align="center" prop="userName" />
-      <el-table-column label="联系电话" align="center" prop="phone" />
-      <el-table-column label="地址" align="center" prop="address" />
-      <el-table-column label="区域 id" align="center" prop="areaId" />
-      <el-table-column label="区域名称" align="center" prop="areaName" />
-      <el-table-column label="车位编号" align="center" prop="placeNumber" />
-      <el-table-column label="备注信息" align="center" prop="memo" />
-      <el-table-column label="是否开闸" align="center" prop="barriorOpen" />
-      <el-table-column label="开闸耗时" align="center" prop="costTime" />
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-      <el-table-column label="操作" align="center" width="150px">
-        <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['parking:entry-record:update']"
-          >
-            编辑
-          </el-button>
-          <el-button
-            link
-            type="danger"
-            @click="handleDelete(scope.row.id)"
-            v-hasPermi="['parking:entry-record: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>
-
-  <!-- 表单弹窗：添加/修改 -->
-  <EntryRecordForm ref="formRef" @success="getList" />
-</template>
-
-<script setup lang="ts">
-import { dateFormatter } from '@/utils/formatTime'
-import download from '@/utils/download'
-import { EntryRecordApi, EntryRecordVO } from '@/api/parking/entryrecord'
-import EntryRecordForm from './EntryRecordForm.vue'
-
-/** 入场记录 列表 */
-defineOptions({ name: 'EntryRecord' })
-
-const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-
-const loading = ref(true) // 列表的加载中
-const list = ref<EntryRecordVO[]>([]) // 列表的数据
-const total = ref(0) // 列表的总页数
-const queryParams = reactive({
-  pageNo: 1,
-  pageSize: 10,
-  parkNumber: undefined,
-  size: undefined,
-  plate: undefined,
-  ticketCode: undefined,
-  plateColor: undefined,
-  inTime: [],
-  inChannel: undefined,
-  inImage: undefined,
-  orderId: undefined,
-  visitReason: undefined,
-  openGateMode: undefined,
-  matchMode: undefined,
-  idCard: undefined,
-  confidence: undefined,
-  carType: undefined,
-  userIdCard: undefined,
-  userName: undefined,
-  phone: undefined,
-  address: undefined,
-  areaId: undefined,
-  areaName: undefined,
-  placeNumber: undefined,
-  memo: undefined,
-  barriorOpen: undefined,
-  costTime: [],
-  createTime: [],
-})
-const queryFormRef = ref() // 搜索的表单
-const exportLoading = ref(false) // 导出的加载中
-
-/** 查询列表 */
-const getList = async () => {
-  loading.value = true
-  try {
-    const data = await EntryRecordApi.getEntryRecordPage(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 EntryRecordApi.deleteEntryRecord(id)
-    message.success(t('common.delSuccess'))
-    // 刷新列表
-    await getList()
-  } catch {}
-}
-
-/** 导出按钮操作 */
-const handleExport = async () => {
-  try {
-    // 导出的二次确认
-    await message.exportConfirm()
-    // 发起导出
-    exportLoading.value = true
-    const data = await EntryRecordApi.exportEntryRecord(queryParams)
-    download.excel(data, '入场记录.xls')
-  } catch {
-  } finally {
-    exportLoading.value = false
-  }
-}
-
-/** 初始化 **/
-onMounted(() => {
-  getList()
-})
-</script>

src/views/ticket/checkticket/index.vue

@@ -46,11 +46,11 @@
           class="!w-240px"
         />
       </el-form-item>
-      <!--
+      
       <el-form-item label="检票日期" prop="checkticketdate">
         <el-date-picker
           v-model="queryParams.checkticketdate"
-          value-format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYYMMDD"
           type="daterange"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
@@ -58,18 +58,18 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="检票时间" prop="checktickettime">
+      <!-- <el-form-item label="检票时间" prop="checktickettime">
         <el-date-picker
           v-model="queryParams.checktickettime"
-          value-format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYYMMDD"
           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-form-item label="人数" prop="personcount">
         <el-input
           v-model="queryParams.personcount"
@@ -148,7 +148,7 @@
       <el-table-column label="人数" align="center" prop="personcount" />
       <el-table-column label="订单明细ID" align="center" prop="sdshipping" />
       <el-table-column label="票ID" align="center" prop="ticket" />
-      <el-table-column label="销售特征名称（票种名称）" align="center" prop="salepropetyvaluename" />
+      <!-- <el-table-column label="销售特征名称（票种名称）" align="center" prop="salepropetyvaluename" /> -->
       <el-table-column label="操作" align="center">
         <template #default="scope">
           <el-button

src/views/ticket/saledata/SaleDataForm.vue

@@ -1,12 +1,6 @@
 <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="数据id" prop="dataId">
         <el-input v-model="formData.dataId" placeholder="请输入数据id" />
       </el-form-item>
@@ -17,7 +11,11 @@
         <el-input v-model="formData.certificateno" placeholder="请输入证件号" />
       </el-form-item>
       <el-form-item label="证件类别" prop="certificatetype">
-        <el-input v-model="formData.certificatetype" placeholder="请输入证件类别" />
+        <el-select v-model="formData.certificatetype" placeholder="请输入证件类别" clearable>
+          <el-option 
+            v-for="dict in getStrDictOptions(DICT_TYPE.CERTIFICATE_TYPE)" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
+        </el-select>
       </el-form-item>
       <el-form-item label="产品ID" prop="item">
         <el-input v-model="formData.item" placeholder="请输入产品ID" />
@@ -38,26 +36,21 @@
         <el-input v-model="formData.quantity" placeholder="请输入数量" />
       </el-form-item>
       <el-form-item label="销售日期" prop="sddate">
-        <el-date-picker
+        <el-date-picker v-model="formData.sddate" type="date" value-format="x" placeholder="选择销售日期" />
-          v-model="formData.sddate"
-          type="date"
-          value-format="x"
-          placeholder="选择销售日期"
-        />
       </el-form-item>
       <el-form-item label="订单号" prop="sdno">
         <el-input v-model="formData.sdno" placeholder="请输入订单号" />
       </el-form-item>
       <el-form-item label="销售时间" prop="sdtime">
-        <el-date-picker
+        <el-date-picker v-model="formData.sdtime" type="date" value-format="x" placeholder="选择销售时间" />
-          v-model="formData.sdtime"
-          type="date"
-          value-format="x"
-          placeholder="选择销售时间"
-        />
       </el-form-item>
+
       <el-form-item label="交易类别（订单类型）" prop="transactiontypeno">
-        <el-input v-model="formData.transactiontypeno" placeholder="请输入交易类别（订单类型）" />
+        <el-select v-model="formData.transactiontypeno" placeholder="请选择交易类别（订单类型）" clearable>
+          <el-option 
+            v-for="dict in getStrDictOptions(DICT_TYPE.TRANSACTION_TYPE_NO)" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
+        </el-select>
       </el-form-item>
       <el-form-item label="销售特征名称（票种名称）" prop="salepropetyvaluename">
         <el-input v-model="formData.salepropetyvaluename" placeholder="请输入销售特征名称（票种名称）" />
@@ -70,84 +63,19 @@
   </Dialog>
 </template>
 <script setup lang="ts">
-import { SaleDataApi, SaleDataVO } from '@/api/ticket/saledata'
+  import { SaleDataApi, SaleDataVO } from '@/api/ticket/saledata'
+  import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
+  /** 售票 表单 */
+  defineOptions({ name: 'SaleDataForm' })
 
-/** 售票 表单 */
+  const { t } = useI18n() // 国际化
-defineOptions({ name: 'SaleDataForm' })
+  const message = useMessage() // 消息弹窗
 
-const { t } = useI18n() // 国际化
+  const dialogVisible = ref(false) // 弹窗的是否展示
-const message = useMessage() // 消息弹窗
+  const dialogTitle = ref('') // 弹窗的标题
-
+  const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const dialogVisible = ref(false) // 弹窗的是否展示
+  const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const dialogTitle = ref('') // 弹窗的标题
+  const formData = ref({
-const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
-const formType = ref('') // 表单的类型：create - 新增；update - 修改
-const formData = ref({
-  dataId: undefined,
-  amount: undefined,
-  certificateno: undefined,
-  certificatetype: undefined,
-  item: undefined,
-  itemname: undefined,
-  itemtype: undefined,
-  itemtypename: undefined,
-  productbatchno: undefined,
-  quantity: undefined,
-  sddate: undefined,
-  sdno: undefined,
-  sdtime: undefined,
-  transactiontypeno: undefined,
-  salepropetyvaluename: undefined,
-})
-const formRules = reactive({
-})
-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 SaleDataApi.getSaleData(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 SaleDataVO
-    if (formType.value === 'create') {
-      await SaleDataApi.createSaleData(data)
-      message.success(t('common.createSuccess'))
-    } else {
-      await SaleDataApi.updateSaleData(data)
-      message.success(t('common.updateSuccess'))
-    }
-    dialogVisible.value = false
-    // 发送操作成功的事件
-    emit('success')
-  } finally {
-    formLoading.value = false
-  }
-}
-
-/** 重置表单 */
-const resetForm = () => {
-  formData.value = {
     dataId: undefined,
     amount: undefined,
     certificateno: undefined,
@@ -163,7 +91,72 @@ const resetForm = () => {
     sdtime: undefined,
     transactiontypeno: undefined,
     salepropetyvaluename: undefined,
+  })
+  const formRules = reactive({
+  })
+  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 SaleDataApi.getSaleData(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 SaleDataVO
+      if (formType.value === 'create') {
+        await SaleDataApi.createSaleData(data)
+        message.success(t('common.createSuccess'))
+      } else {
+        await SaleDataApi.updateSaleData(data)
+        message.success(t('common.updateSuccess'))
+      }
+      dialogVisible.value = false
+      // 发送操作成功的事件
+      emit('success')
+    } finally {
+      formLoading.value = false
+    }
+  }
+
+  /** 重置表单 */
+  const resetForm = () => {
+    formData.value = {
+      dataId: undefined,
+      amount: undefined,
+      certificateno: undefined,
+      certificatetype: undefined,
+      item: undefined,
+      itemname: undefined,
+      itemtype: undefined,
+      itemtypename: undefined,
+      productbatchno: undefined,
+      quantity: undefined,
+      sddate: undefined,
+      sdno: undefined,
+      sdtime: undefined,
+      transactiontypeno: undefined,
+      salepropetyvaluename: undefined,
+    }
+    formRef.value?.resetFields()
   }
-  formRef.value?.resetFields()
-}
 </script>

src/views/ticket/saledata/index.vue

@@ -28,7 +28,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="金额" prop="amount">
+      <!-- <el-form-item label="金额" prop="amount">
         <el-input
           v-model="queryParams.amount"
           placeholder="请输入金额"
@@ -36,7 +36,7 @@
           @keyup.enter="handleQuery"
           class="!w-240px"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="证件号" prop="certificateno">
         <el-input
           v-model="queryParams.certificateno"
@@ -113,10 +113,11 @@
           class="!w-240px"
         />
       </el-form-item>
+      -->
       <el-form-item label="销售日期" prop="sddate">
         <el-date-picker
           v-model="queryParams.sddate"
-          value-format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYYMMDD"
           type="daterange"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
@@ -124,7 +125,6 @@
           class="!w-240px"
         />
       </el-form-item>
-      -->
       <el-form-item label="订单号" prop="sdno">
         <el-input
           v-model="queryParams.sdno"
@@ -198,7 +198,11 @@
       <el-table-column label="数据ID" align="center" prop="dataId" />
       <el-table-column label="金额" align="center" prop="amount" />
       <el-table-column label="证件号" align="center" prop="certificateno" />
-      <el-table-column label="证件类别" align="center" prop="certificatetype" />
+      <el-table-column label="证件类别" align="center" prop="certificatetype">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.CERTIFICATE_TYPE" :value="scope.row.certificatetype" />
+        </template>
+      </el-table-column>
       <el-table-column label="产品ID" align="center" prop="item" />
       <el-table-column label="产品名称" align="center" prop="itemname" />
       <el-table-column label="产品类型ID" align="center" prop="itemtype" />
@@ -208,7 +212,11 @@
       <el-table-column label="销售日期" align="center" prop="sddate" />
       <el-table-column label="订单号" align="center" prop="sdno" />
       <el-table-column label="销售时间" align="center" prop="sdtime" />
-      <el-table-column label="交易类别（订单类型）" align="center" prop="transactiontypeno" />
+      <el-table-column label="交易类别（订单类型）" align="center" prop="transactiontypeno">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.TRANSACTION_TYPE_NO" :value="scope.row.transactiontypeno" />
+        </template>
+      </el-table-column>
       <el-table-column label="销售特征名称（票种名称）" align="center" prop="salepropetyvaluename" />
       <el-table-column label="操作" align="center">
         <template #default="scope">
@@ -248,6 +256,7 @@
 import download from '@/utils/download'
 import { SaleDataApi, SaleDataVO } from '@/api/ticket/saledata'
 import SaleDataForm from './SaleDataForm.vue'
+import { DICT_TYPE } from '@/utils/dict'
 
 /** 售票 列表 */
 defineOptions({ name: 'SaleData' })