From 5685ee91362597b2ca73d28911acb22ba433dd8e Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Wed, 1 Jul 2026 18:39:25 +0800
Subject: [PATCH] 11

---
 src/api/car/carPark.ts                        |  59 +++++-
 src/utils/dispose.ts                          |  17 ++
 .../car/carPark/components/currentCarPark.vue | 107 ++++++++++
 .../car/carPark/components/historyCarPark.vue |  93 +++++++++
 .../car/carPark/components/statusCarPark.vue  |  92 ++++++++
 src/views/car/carPark/index.vue               | 197 ++++++++++--------
 src/views/car/carRecord/index.vue             |   6 -
 src/views/car/carTimes/index.vue              |  17 +-
 8 files changed, 483 insertions(+), 105 deletions(-)
 create mode 100644 src/views/car/carPark/components/currentCarPark.vue
 create mode 100644 src/views/car/carPark/components/historyCarPark.vue
 create mode 100644 src/views/car/carPark/components/statusCarPark.vue

diff --git a/src/api/car/carPark.ts b/src/api/car/carPark.ts
index f01a963..6f8fcf4 100644
--- a/src/api/car/carPark.ts
+++ b/src/api/car/carPark.ts
@@ -1,13 +1,50 @@
-import request from "/@/utils/request"
+import request from "/@/utils/request";
 
 export function fetchList(data: any) {
-    return request({
-        url: '/admin/car/car-park/page',
-        method: 'post',
-        params: {
-            current: data.current,
-            size: data.size,
-        },
-        data,
-    })
-}
\ No newline at end of file
+  return request({
+    url: "/admin/car/car-park/page",
+    method: "post",
+    params: {
+      current: data.current,
+      size: data.size,
+    },
+    data,
+  });
+}
+
+export function fetchListV2(data: any) {
+  return request({
+    url: "/admin/car/car-park/v2/page",
+    method: "post",
+    params: {
+      current: data.current,
+      size: data.size,
+    },
+    data,
+  });
+}
+
+// 在册车辆或者军车在位状态
+export function getCarHistoryPage(data: any) {
+  return request({
+    url: "/admin/car/car-park/v2/history",
+    method: "post",
+    params: {
+      current: data.current,
+      size: data.size,
+    },
+    data,
+  });
+}
+
+export function getCarParkingStatusPage(data: any) {
+  return request({
+    url: "/admin/car/car-park/v2/status/page",
+    method: "post",
+    params: {
+      current: data.current,
+      size: data.size,
+    },
+    data,
+  });
+}
diff --git a/src/utils/dispose.ts b/src/utils/dispose.ts
index 34775c1..de8fa8a 100644
--- a/src/utils/dispose.ts
+++ b/src/utils/dispose.ts
@@ -18,6 +18,7 @@ function parseDate(input: string) {
 }
 
 export function timeDiff(enterTime: string, exitTime: string) {
+  if (!enterTime || !exitTime) return "";
   const enter = parseDate(enterTime);
   const exit = parseDate(exitTime);
   let diff = exit.getTime() - enter.getTime();
@@ -36,6 +37,22 @@ export function timeDiff(enterTime: string, exitTime: string) {
   return `${diffHours}小时${diffMinutes}分钟`;
 }
 
+export function timeDiffBySeconds(seconds: number | string) {
+  const safeSeconds = Math.max(0, Number(seconds) || 0);
+  const totalMinutes = Math.floor(safeSeconds / 60);
+  const totalHours = Math.floor(totalMinutes / 60);
+  const diffMinutes = totalMinutes % 60;
+  const diffDays = Math.floor(totalHours / 24);
+  const diffHours = totalHours % 24;
+  if (diffDays > 0) {
+    if (diffMinutes === 0) return `${diffDays}天${diffHours}小时`;
+    return `${diffDays}天${diffHours}小时${diffMinutes}分钟`;
+  }
+  if (diffHours === 0) return `${diffMinutes}分钟`;
+  if (diffMinutes === 0) return `${diffHours}小时`;
+  return `${diffHours}小时${diffMinutes}分钟`;
+}
+
 /**
  * 设备通道能力位图（32 位，从右到左为第 1 位至第 32 位）
  * - 输入：支持以下任意格式
diff --git a/src/views/car/carPark/components/currentCarPark.vue b/src/views/car/carPark/components/currentCarPark.vue
new file mode 100644
index 0000000..d95f18f
--- /dev/null
+++ b/src/views/car/carPark/components/currentCarPark.vue
@@ -0,0 +1,107 @@
+<template>
+    <el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
+        :header-cell-style="tableStyle.headerCellStyle" @selection-change="selectionChangHandle"
+        @sort-change="sortChangeHandle">
+        <el-table-column type="selection" width="40" align="center" />
+        <el-table-column type="index" label="#" width="80" />
+        <el-table-column label="姓名" min-width="100">
+            <template #default="{ row }">
+                <span class="color-danger" v-if="!row.personName">
+                    <span v-if="row.isInnerCar == '1'">未登录姓名</span>
+                    <span v-else>外部车辆</span>
+                </span>
+                <span v-else>{{ row.personName }}</span>
+            </template>
+        </el-table-column>
+        <el-table-column prop="carNum" label="车牌号" min-width="120" />
+        <el-table-column label="入场时间" min-width="180">
+            <template #default="{ row }">
+                <span> {{ row.enterTime }}</span>
+            </template>
+        </el-table-column>
+        <el-table-column label="停留时间" min-width="120">
+            <template #default="{ row }">
+                <span v-if="row.enterTime">{{ timeDiffBySeconds(row.parkingTimeSecond) }}</span>
+                <span v-else class="color-danger">未出场</span>
+            </template>
+        </el-table-column>
+        <el-table-column label="描述" min-width="200">
+            <template #default="{ row }">
+                <span>{{ row.remark }}</span>
+            </template>
+        </el-table-column>
+        <el-table-column label="操作" width="150" fixed="right">
+            <template #default="{ row }">
+                <el-button icon="List" text type="primary" @click="doHistory(row)">
+                    过车记录
+                </el-button>
+            </template>
+        </el-table-column>
+    </el-table>
+    <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+</template>
+
+<script setup lang="ts" name="CurrentCarPark">
+import { BasicTableProps, useTable } from "/@/hooks/table";
+import * as carParkApi from "/@/api/car/carPark";
+import { useDict } from '/@/hooks/dict';
+import { timeDiffBySeconds } from '/@/utils/dispose';
+
+
+const router = useRouter();
+
+// 定义查询字典
+const { yes_no_type } = useDict("yes_no_type")
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+    createdIsNeed: false,
+    queryForm: {},
+    pageList: carParkApi.fetchListV2
+})
+
+
+
+//  table hook
+const {
+    getDataList,
+    currentChangeHandle,
+    sizeChangeHandle,
+    sortChangeHandle,
+    downBlobFile,
+    tableStyle
+} = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+    state.queryForm = {}
+    // 清空多选
+    selectObjs.value = []
+    getDataList()
+}
+
+const query = (queryForm: any) => {
+    state.queryForm = { ...queryForm }
+    getDataList()
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+    selectObjs.value = objs.map(({ id }) => id);
+    multiple.value = !objs.length;
+};
+
+const doHistory = (row: any) => {
+    const data = {
+        carNum: row.carNum,
+    }
+    router.push({ path: "/car/carRecord/index", query: { data: JSON.stringify(data) } });
+}
+
+defineExpose({
+    query,
+    resetQuery
+})
+</script>
\ No newline at end of file
diff --git a/src/views/car/carPark/components/historyCarPark.vue b/src/views/car/carPark/components/historyCarPark.vue
new file mode 100644
index 0000000..3aa3435
--- /dev/null
+++ b/src/views/car/carPark/components/historyCarPark.vue
@@ -0,0 +1,93 @@
+<template>
+    <el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
+        :header-cell-style="tableStyle.headerCellStyle" @selection-change="selectionChangHandle"
+        @sort-change="sortChangeHandle">
+        <el-table-column type="selection" width="40" align="center" />
+        <el-table-column type="index" label="#" width="80" />
+        <el-table-column label="姓名" min-width="100">
+            <template #default="{ row }">
+                <span class="color-danger" v-if="!row.personName">
+                    <span v-if="row.isInnerCar == '1'">未登录姓名</span>
+                    <span v-else>外部车辆</span>
+                </span>
+                <span v-else>{{ row.personName }}</span>
+            </template>
+        </el-table-column>
+        <el-table-column prop="carNum" label="车牌号" min-width="120" />
+        <el-table-column label="入场时间" min-width="180">
+            <template #default="{ row }">
+                <span> {{ row.enterTime }}</span>
+            </template>
+        </el-table-column>
+        <el-table-column label="出场时间" min-width="180">
+            <template #default="{ row }">
+                <span> {{ row.leaveTime }}</span>
+            </template>
+        </el-table-column>
+        <el-table-column label="停留时间" min-width="120">
+            <template #default="{ row }">
+                <span v-if="row.enterTime">{{ timeDiff(row.enterTime, row.leaveTime) }}</span>
+                <span v-else class="color-danger">未出场</span>
+            </template>
+        </el-table-column>
+        <el-table-column label="描述" min-width="200">
+            <template #default="{ row }">
+                <span>{{ row.remark }}</span>
+            </template>
+        </el-table-column>
+    </el-table>
+    <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+</template>
+
+<script setup lang="ts" name="CurrentCarPark">
+import { BasicTableProps, useTable } from "/@/hooks/table";
+import * as carParkApi from "/@/api/car/carPark";
+import { useDict } from '/@/hooks/dict';
+import { timeDiff } from '/@/utils/dispose';
+
+// 定义查询字典
+const { yes_no_type } = useDict("yes_no_type")
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+    createdIsNeed: false,
+    queryForm: {},
+    pageList: carParkApi.getCarHistoryPage
+})
+
+//  table hook
+const {
+    getDataList,
+    currentChangeHandle,
+    sizeChangeHandle,
+    sortChangeHandle,
+    downBlobFile,
+    tableStyle
+} = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+    state.queryForm = {}
+    // 清空多选
+    selectObjs.value = []
+    getDataList()
+}
+
+const query = (queryForm: any) => {
+    state.queryForm = { ...queryForm }
+    getDataList()
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+    selectObjs.value = objs.map(({ id }) => id);
+    multiple.value = !objs.length;
+};
+
+defineExpose({
+    query,
+    resetQuery
+})
+</script>
\ No newline at end of file
diff --git a/src/views/car/carPark/components/statusCarPark.vue b/src/views/car/carPark/components/statusCarPark.vue
new file mode 100644
index 0000000..a3570cd
--- /dev/null
+++ b/src/views/car/carPark/components/statusCarPark.vue
@@ -0,0 +1,92 @@
+<template>
+    <el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
+        :header-cell-style="tableStyle.headerCellStyle" @selection-change="selectionChangHandle"
+        @sort-change="sortChangeHandle">
+        <el-table-column type="selection" width="40" align="center" />
+        <el-table-column type="index" label="#" width="80" />
+        <el-table-column label="姓名" min-width="100">
+            <template #default="{ row }">
+                <span class="color-danger" v-if="!row.personName">
+                    <span v-if="row.isInnerCar == '1'">未登录姓名</span>
+                    <span v-else>外部车辆</span>
+                </span>
+                <span v-else>{{ row.personName }}</span>
+            </template>
+        </el-table-column>
+        <el-table-column prop="carNum" label="车牌号" min-width="120" />
+        <el-table-column label="入场时间" min-width="180">
+            <template #default="{ row }">
+                <span> {{ row.enterTime }}</span>
+            </template>
+        </el-table-column>
+        <el-table-column label="出场时间" min-width="180">
+            <template #default="{ row }">
+                <span> {{ row.leaveTime }}</span>
+            </template>
+        </el-table-column>
+        <el-table-column label="车辆是否在场" min-width="120">
+            <template #default="{ row }">
+                <span v-if="row.currentInside == '1'">在场</span>
+                <span v-else class="color-danger">未在场</span>
+            </template>
+        </el-table-column>
+        <el-table-column label="描述" min-width="200">
+            <template #default="{ row }">
+                <span>{{ row.remark }}</span>
+            </template>
+        </el-table-column>
+    </el-table>
+    <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+</template>
+
+<script setup lang="ts" name="StatusCarPark">
+import { BasicTableProps, useTable } from "/@/hooks/table";
+import * as carParkApi from "/@/api/car/carPark";
+import { useDict } from '/@/hooks/dict';
+
+// 定义查询字典
+const { yes_no_type } = useDict("yes_no_type")
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+    createdIsNeed: false,
+    queryForm: {},
+    pageList: carParkApi.getCarParkingStatusPage
+})
+
+//  table hook
+const {
+    getDataList,
+    currentChangeHandle,
+    sizeChangeHandle,
+    sortChangeHandle,
+    downBlobFile,
+    tableStyle
+} = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+    state.queryForm = {}
+    // 清空多选
+    selectObjs.value = []
+    getDataList()
+}
+
+const query = (queryForm: any) => {
+    state.queryForm = { ...queryForm }
+    getDataList()
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+    selectObjs.value = objs.map(({ id }) => id);
+    multiple.value = !objs.length;
+};
+
+defineExpose({
+    query,
+    resetQuery
+})
+</script>
\ No newline at end of file
diff --git a/src/views/car/carPark/index.vue b/src/views/car/carPark/index.vue
index 8a7ad79..6150cc4 100644
--- a/src/views/car/carPark/index.vue
+++ b/src/views/car/carPark/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="layout-padding">
-        <div class="layout-padding-auto layout-padding-view">
-            <el-row shadow="hover" v-show="showSearch" class="ml10">
+        <div class="layout-padding-auto layout-padding-view flex flex-col">
+            <el-row shadow="hover" class="ml10">
                 <el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
                     <el-form-item style="width: 300px;" label="车牌号" prop="carNum">
                         <el-input v-model="state.queryForm.carNum" placeholder="请输入车牌号" />
@@ -9,18 +9,15 @@
                     <el-form-item style="width: 250px;" label="是否军车" prop="isArmyCar">
                         <dict-select v-model="state.queryForm.isArmyCar" :options="yes_no_type" placeholder="请选择" />
                     </el-form-item>
+                    <el-form-item v-if="state.currentTab === 'STATUS'" style="width: 250px;" label="是否在位"
+                        prop="currentInside">
+                        <dict-select v-model="state.queryForm.currentInside" :options="yes_no_type" placeholder="请选择" />
+                    </el-form-item>
                     <el-form-item style="width: 300px;" label="是否为内部车辆" prop="isInner">
                         <dict-select v-model="state.queryForm.isInner" :options="yes_no_type" placeholder="请选择" />
                     </el-form-item>
-                    <el-form-item style="width: 300px;" label="是否在场" prop="isEnter">
-                        <dict-select v-model="state.queryForm.isEnter" :options="yes_no_type" placeholder="请选择" />
-                    </el-form-item>
-                    <el-form-item style="width: 450px;" label="入场时间" prop="inTimeList">
-                        <el-date-picker v-model="state.queryForm.inTimeList" value-format="YYYY-MM-DD HH:mm:ss"
-                            type="datetimerange" />
-                    </el-form-item>
-                    <el-form-item style="width: 450px;" label="出场时间" prop="outTimeList">
-                        <el-date-picker v-model="state.queryForm.outTimeList" value-format="YYYY-MM-DD HH:mm:ss"
+                    <el-form-item style="width: 450px;" label="入场时间" prop="capTimeList">
+                        <el-date-picker v-model="state.queryForm.capTimeList" value-format="YYYY-MM-DD HH:mm:ss"
                             type="datetimerange" />
                     </el-form-item>
                     <el-form-item>
@@ -31,75 +28,127 @@
                     </el-form-item>
                 </el-form>
             </el-row>
-            <el-row>
-            </el-row>
-            <el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
-                :header-cell-style="tableStyle.headerCellStyle" @selection-change="selectionChangHandle"
-                @sort-change="sortChangeHandle">
-                <el-table-column type="selection" width="40" align="center" />
-                <el-table-column type="index" label="#" width="80" />
-                <el-table-column label="姓名" min-width="100">
-                    <template #default="{ row }">
-                        <span class="color-danger" v-if="!row.person">外部车辆</span>
-                        <span v-else>{{ row.person.name }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column prop="carNum" label="车牌号" min-width="120" />
-                <el-table-column label="入场时间" min-width="180">
-                    <template #default="{ row }">
-                        <span> {{ row.inTime }}</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="出场时间" min-width="180">
-                    <template #default="{ row }">
-                        <span v-if="row.outTime"> {{ row.outTime }}</span>
-                        <span class="color-danger" v-else>未出场</span>
-                    </template>
-                </el-table-column>
-                <el-table-column label="停留时间" min-width="120">
-                    <template #default="{ row }">
-                        <span v-if="row.inTime && row.outTime">{{ timeDiff(row.inTime, row.outTime) }}</span>
-                        <span v-else class="color-danger">未出场</span>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle"
-                v-bind="state.pagination" />
+            <el-tabs v-model="state.currentTab" class="demo-tabs">
+                <el-tab-pane v-for="(v, i) in data.tabs" :key="v.name" :label="v.label" :name="v.name" />
+            </el-tabs>
+            <div class="flex-1 overflow-y-scroll px-8">
+                <div class="w-full" v-show="state.currentTab === 'PARK'">
+                    <CurrentCarPark ref="currentCarParkRef" />
+                </div>
+                <div class="w-full" v-show="state.currentTab === 'STATUS'">
+                    <StatusCarPark ref="statusCarParkRef" />
+                </div>
+                <div class="w-full" v-show="state.currentTab === 'RECORD'">
+                    <HistoryCarPark ref="historyCarParkRef" />
+                </div>
+            </div>
         </div>
-
     </div>
 </template>
 
 <script setup lang="ts" name="systemCarManage">
-import { BasicTableProps, useTable } from "/@/hooks/table";
-import * as carParkApi from "/@/api/car/carPark";
-import { useMessage, useMessageBox } from "/@/hooks/message";
 import { useDict } from '/@/hooks/dict';
 import { usePanel } from "/@/stores/panel"
-import { timeDiff } from '/@/utils/dispose';
+
+const CurrentCarPark = defineAsyncComponent(() => import("./components/currentCarPark.vue"));
+const HistoryCarPark = defineAsyncComponent(() => import("./components/historyCarPark.vue"));
+const StatusCarPark = defineAsyncComponent(() => import("./components/statusCarPark.vue"));
 
 const storesPanel = usePanel()
 
 // 定义查询字典
 const { yes_no_type } = useDict("yes_no_type")
 
-// 搜索变量
+const data = {
+    tabs: [
+        {
+            label: "停车场信息",
+            name: "PARK",
+        },
+        {
+            label: "车辆在位状态",
+            name: "STATUS",
+        },
+        {
+            label: "停车记录",
+            name: "RECORD",
+        },
+    ]
+}
 const queryRef = ref()
-const showSearch = ref(true)
-// 多选变量
-const selectObjs = ref([]) as any
-const multiple = ref(true)
-
-const state: BasicTableProps = reactive<BasicTableProps>({
-    queryForm: {},
-    pageList: carParkApi.fetchList
+const currentCarParkRef = ref()
+const statusCarParkRef = ref()
+const historyCarParkRef = ref()
+const state = reactive<any>({
+    currentTab: data.tabs[0].name,
+    queryForm: {}
 })
 
+watch(
+    [() => state.currentTab, () => currentCarParkRef.value, () => statusCarParkRef.value, () => historyCarParkRef.value],
+    ([newTab]) => {
+        let activeRef
+        switch (newTab) {
+            case 'PARK':
+                activeRef = currentCarParkRef.value
+                break
+            case 'STATUS':
+                activeRef = statusCarParkRef.value
+                break
+            case 'RECORD':
+                activeRef = historyCarParkRef.value
+                break
+        }
+        if (!activeRef?.query) return
+        nextTick(() => {
+            getDataList()
+        })
+    },
+    {
+        immediate: true,
+    }
+)
+
+const getDataList = () => {
+    switch (state.currentTab) {
+        case 'PARK':
+            currentCarParkRef.value?.query?.(state.queryForm)
+            break
+        case 'RECORD':
+            historyCarParkRef.value?.query?.(state.queryForm)
+            break
+        case 'STATUS':
+            statusCarParkRef.value?.query?.(state.queryForm)
+            break
+    }
+}
+
+// 清空搜索条件
+const resetQuery = () => {
+    // 清空搜索条件
+    queryRef.value?.resetFields()
+    switch (state.currentTab) {
+        case 'PARK':
+            currentCarParkRef.value?.resetQuery?.()
+            break
+        case 'RECORD':
+            historyCarParkRef.value?.resetQuery?.()
+            break
+        case 'STATUS':
+            statusCarParkRef.value?.resetQuery?.()
+            break
+    }
+}
+
 onBeforeMount(() => {
     const query: any = useRoute().query
     if (query && query.action == 'panel') {
         if (query.params) {
-            Object.assign(state.queryForm, JSON.parse(query.params))
+            const params = JSON.parse(query.params)
+            Object.assign(state.queryForm, params)
+            if (params && params.currentTab) {
+                state.currentTab = params.currentTab
+            }
             getDataList()
         }
         storesPanel.openFromPanel()
@@ -112,30 +161,4 @@ onBeforeUnmount(() => {
         storesPanel.closeFromPanel()
     }
 })
-
-//  table hook
-const {
-    getDataList,
-    currentChangeHandle,
-    sizeChangeHandle,
-    sortChangeHandle,
-    downBlobFile,
-    tableStyle
-} = useTable(state)
-
-// 清空搜索条件
-const resetQuery = () => {
-    // 清空搜索条件
-    queryRef.value?.resetFields()
-    // 清空多选
-    selectObjs.value = []
-    getDataList()
-}
-
-// 多选事件
-const selectionChangHandle = (objs: { id: string }[]) => {
-    selectObjs.value = objs.map(({ id }) => id);
-    multiple.value = !objs.length;
-};
-
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/car/carRecord/index.vue b/src/views/car/carRecord/index.vue
index 6dce55d..2663f0b 100644
--- a/src/views/car/carRecord/index.vue
+++ b/src/views/car/carRecord/index.vue
@@ -201,12 +201,6 @@ onBeforeUnmount(() => {
   }
 })
 
-
-// 导出excel
-const exportExcel = () => {
-  downBlobFile('/car/carRecord/export', Object.assign(state.queryForm, { ids: selectObjs }), 'carRecord.xlsx')
-}
-
 // 多选事件
 const selectionChangHandle = (objs: { id: string }[]) => {
   selectObjs.value = objs.map(({ id }) => id);
diff --git a/src/views/car/carTimes/index.vue b/src/views/car/carTimes/index.vue
index 0868d76..b57801e 100644
--- a/src/views/car/carTimes/index.vue
+++ b/src/views/car/carTimes/index.vue
@@ -7,6 +7,12 @@
                     <el-form-item style="width: 250px;" label="车牌号" prop="carNum">
                         <el-input v-model="state.queryForm.carNum" placeholder="请输入车牌号" />
                     </el-form-item>
+                    <el-form-item style="width: 250px;" label="是否军车" prop="isArmyCar">
+                        <dict-select v-model="state.queryForm.isArmyCar" :options="yes_no_type" placeholder="请选择" />
+                    </el-form-item>
+                    <el-form-item style="width: 250px;" label="是否为内部车辆" prop="isInner">
+                        <dict-select v-model="state.queryForm.isInner" :options="yes_no_type" placeholder="请选择" />
+                    </el-form-item>
                     <el-form-item>
                         <el-button icon="search" type="primary" @click="getDataList">
                             {{ $t('common.queryBtn') }}
@@ -26,6 +32,15 @@
                 @sort-change="sortChangeHandle" show-summary :summary-method="getSummaries">
                 <el-table-column v-if="false" type="selection" width="40" align="center" />
                 <el-table-column type="index" label="#" width="80" align="center" />
+                <el-table-column label="姓名" min-width="100">
+                    <template #default="{ row }">
+                        <span class="color-danger" v-if="!row.personName">
+                            <span v-if="row.isInnerCar == '1'">未登录姓名</span>
+                            <span v-else>外部车辆</span>
+                        </span>
+                        <span v-else>{{ row.personName }}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column v-if="false" label="车辆信息">
                     <el-table-column prop="carOwnerId" min-width="100" label="车主id" />
                     <el-table-column prop="ownerType" min-width="100" label="车辆类型" />
@@ -82,7 +97,7 @@ const selectObjs = ref([]) as any
 const multiple = ref(true)
 
 // 定义查询字典
-const { dh_enter_Mode, car_alarm_type } = useDict('dh_enter_Mode', "car_alarm_type");
+const { yes_no_type } = useDict('yes_no_type');
 
 const state: BasicTableProps = reactive<BasicTableProps>({
     queryForm: {},