From e3b275304de5c5ec26d260236cddf29fdd49e164 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Mon, 7 Jul 2025 18:00:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=96=87=E7=AB=A0?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=B8=8D=E8=83=BD=E5=90=8C=E6=AD=A5=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E5=88=B0=E6=97=B6=E7=9A=84=E6=8E=92=E5=BA=8F=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E5=BC=82=E5=B8=B8=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   4 +-
 .gitignore                                    |   1 +
 src/api/hjm/hjmCar/model/index.ts             |   7 +
 src/api/hjm/hjmGpsLog/model/index.ts          |   1 +
 src/api/system/user/model/index.ts            |   2 +
 src/api/system/userRole/model/index.ts        |   1 +
 .../cms/cmsArticle/components/articleEdit.vue |  76 ++-
 src/views/cms/cmsArticle/index.vue            |  13 +-
 .../hjm/count/components/hjmFenceEdit.vue     | 306 +++++++++
 src/views/hjm/count/components/search.vue     |  42 ++
 src/views/hjm/count/index.vue                 | 150 +++++
 src/views/hjm/hjmCar/components/Extra.vue     |  69 +-
 .../hjm/hjmCar/components/hjmCarEdit.vue      | 561 ++++++++--------
 src/views/hjm/hjmCar/components/search.vue    | 598 +++++++++---------
 src/views/hjm/hjmCar/index.vue                |  37 +-
 src/views/hjm/hjmFence/index.vue              |   4 -
 src/views/hjm/hjmGpsLog/components/search.vue |  33 +-
 src/views/hjm/hjmGpsLog/index.vue             | 464 +++++++-------
 src/views/hjm/staff/index.vue                 |   2 +-
 src/views/hjm/userVerify/components/Extra.vue |  55 ++
 src/views/hjm/userVerify/index.vue            |   2 +-
 .../system/userVerify/components/search.vue   |   4 +-
 22 files changed, 1537 insertions(+), 895 deletions(-)
 create mode 100644 src/views/hjm/count/components/hjmFenceEdit.vue
 create mode 100644 src/views/hjm/count/components/search.vue
 create mode 100644 src/views/hjm/count/index.vue
 create mode 100644 src/views/hjm/userVerify/components/Extra.vue

diff --git a/.env.development b/.env.development
index e774d25..1704208 100644
--- a/.env.development
+++ b/.env.development
@@ -1,10 +1,10 @@
 VITE_APP_NAME=后台管理系统
 VITE_SOCKET_URL=wss://server.gxwebsoft.com
 VITE_SERVER_URL=https://server.gxwebsoft.com/api
-#VITE_API_URL=https://cms-api.websoft.top/api
+ VITE_API_URL=https://cms-api.websoft.top/api
 
 
 #VITE_SOCKET_URL=ws://127.0.0.1:9191
 #VITE_SERVER_URL=http://127.0.0.1:8000/api
-VITE_API_URL=http://127.0.0.1:9000/api
+#VITE_API_URL=http://127.0.0.1:9000/api
 #/booking/bookingItem
diff --git a/.gitignore b/.gitignore
index 5c5538a..13f4ac9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@ pnpm-debug.log*
 *.njsproj
 *.sln
 *.sw?
+node_modules
diff --git a/src/api/hjm/hjmCar/model/index.ts b/src/api/hjm/hjmCar/model/index.ts
index 3cfd34f..37820a6 100644
--- a/src/api/hjm/hjmCar/model/index.ts
+++ b/src/api/hjm/hjmCar/model/index.ts
@@ -27,6 +27,10 @@ export interface HjmCar {
   driverName?: string;
   // 操作员手机号
   driverPhone?: string;
+  // 安装人员
+  installerId?: number;
+  // 安装时间
+  installTime?: string;
   // 保险状态
   insuranceStatus?: string;
   // GPS设备编号
@@ -57,6 +61,8 @@ export interface HjmCar {
   userId?: number;
   // 认领状态
   claim?: number;
+  // 认领时间
+  claimTime?: string;
   // 绑定用户
   toUser?: string;
   // 排序(数字越小越靠前)
@@ -80,6 +86,7 @@ export interface HjmCarParam extends PageParam {
   id?: number;
   status?: number;
   organizationId?: number;
+  installerId?: number;
   organizationParentId?: number;
   keywords?: string;
 }
diff --git a/src/api/hjm/hjmGpsLog/model/index.ts b/src/api/hjm/hjmGpsLog/model/index.ts
index abcf75b..a22d413 100644
--- a/src/api/hjm/hjmGpsLog/model/index.ts
+++ b/src/api/hjm/hjmGpsLog/model/index.ts
@@ -29,5 +29,6 @@ export interface HjmGpsLog {
  */
 export interface HjmGpsLogParam extends PageParam {
   id?: number;
+  gpsNo?: string;
   keywords?: string;
 }
diff --git a/src/api/system/user/model/index.ts b/src/api/system/user/model/index.ts
index af53243..e7a09a6 100644
--- a/src/api/system/user/model/index.ts
+++ b/src/api/system/user/model/index.ts
@@ -125,6 +125,8 @@ export interface User {
   installed?: boolean;
   label?: string;
   value?: number;
+  // 关注数量
+  followers?: number;
 }
 
 /**
diff --git a/src/api/system/userRole/model/index.ts b/src/api/system/userRole/model/index.ts
index 34f10f1..6a04ca3 100644
--- a/src/api/system/userRole/model/index.ts
+++ b/src/api/system/userRole/model/index.ts
@@ -26,4 +26,5 @@ export interface UserRoleParam extends PageParam {
   keywords?: any;
   roleId?: number;
   userId?: number;
+  userIds?: any;
 }
diff --git a/src/views/cms/cmsArticle/components/articleEdit.vue b/src/views/cms/cmsArticle/components/articleEdit.vue
index b5bac80..76b3735 100644
--- a/src/views/cms/cmsArticle/components/articleEdit.vue
+++ b/src/views/cms/cmsArticle/components/articleEdit.vue
@@ -214,11 +214,7 @@
   import { ref, reactive, watch } from 'vue';
   import { Form, message } from 'ant-design-vue';
   import { assignObject, htmlToText, uuid } from 'ele-admin-pro';
-  import {
-    addCmsArticle,
-    getCmsArticle,
-    updateCmsArticle
-  } from '@/api/cms/cmsArticle';
+  import { addCmsArticle, updateCmsArticle } from '@/api/cms/cmsArticle';
   import { CmsArticle } from '@/api/cms/cmsArticle/model';
   import { useThemeStore } from '@/store/modules/theme';
   import { storeToRefs } from 'pinia';
@@ -321,7 +317,7 @@
     files: '',
     lang: locale.value || undefined,
     // 排序
-    sortNumber: 100,
+    sortNumber: undefined,
     // 备注
     comments: undefined,
     // 状态
@@ -478,6 +474,10 @@
     if (!formRef.value) {
       return;
     }
+    if (content.value == '') {
+      message.error('请输入文章内容');
+      return;
+    }
     formRef.value
       .validate()
       .then(() => {
@@ -529,43 +529,41 @@
         content.value = '';
         if (props.data) {
           loading.value = true;
+          const data = props.data;
           // 文章详情
-          getCmsArticle(Number(props.data?.articleId)).then((data) => {
-            assignObject(form, data);
-            if (data.content) {
-              content.value = data.content;
-            }
-
-            if (data.image) {
-              images.value.push({
+          assignObject(form, data);
+          if (data.content) {
+            content.value = data.content;
+          }
+          if (data.image) {
+            images.value.push({
+              uid: uuid(),
+              url: data.image,
+              status: 'done'
+            });
+          }
+          if (!data.source) {
+            form.source = undefined;
+          }
+          if (data.tags) {
+            form.tags = JSON.parse(form.tags);
+          } else {
+            form.tags = undefined;
+          }
+          if (data.editor) {
+            editor.value = data.editor;
+          }
+          if (data.files) {
+            const arr = JSON.parse(data.files);
+            arr.map((url: string) => {
+              files.value.push({
                 uid: uuid(),
-                url: data.image,
+                url: url,
                 status: 'done'
               });
-            }
-            if (!data.source) {
-              form.source = undefined;
-            }
-            if (data.tags) {
-              form.tags = JSON.parse(form.tags);
-            } else {
-              form.tags = undefined;
-            }
-            if (data.editor) {
-              editor.value = data.editor;
-            }
-            if (data.files) {
-              const arr = JSON.parse(data.files);
-              arr.map((url: string) => {
-                files.value.push({
-                  uid: uuid(),
-                  url: url,
-                  status: 'done'
-                });
-              });
-            }
-            loading.value = false;
-          });
+            });
+          }
+          loading.value = false;
 
           // assignObject(form, props.data);
           // 文章分类
diff --git a/src/views/cms/cmsArticle/index.vue b/src/views/cms/cmsArticle/index.vue
index c218eaf..59ff1c4 100644
--- a/src/views/cms/cmsArticle/index.vue
+++ b/src/views/cms/cmsArticle/index.vue
@@ -133,7 +133,7 @@ import {
   pageCmsArticle,
   removeCmsArticle,
   removeBatchCmsArticle,
-  updateCmsArticle
+  updateCmsArticle, getCmsArticle
 } from '@/api/cms/cmsArticle';
 import type {CmsArticle, CmsArticleParam} from '@/api/cms/cmsArticle/model';
 import {formatNumber} from 'ele-admin-pro/es';
@@ -142,8 +142,7 @@ import {toTreeData} from 'ele-admin-pro';
 import {toDateString} from 'ele-admin-pro';
 import {
   detail,
-  getPageTitle,
-  navTo
+  getPageTitle
 } from '@/utils/common';
 import {listCmsNavigation} from '@/api/cms/cmsNavigation';
 import {CmsNavigation} from '@/api/cms/cmsNavigation/model';
@@ -293,8 +292,11 @@ const reload = (where?: CmsArticleParam) => {
 };
 
 /* 打开编辑弹窗 */
-const openEdit = (row?: CmsArticle) => {
+const openEdit = async (row?: CmsArticle) => {
   current.value = row ?? null;
+  if(row?.articleId){
+    current.value = await getCmsArticle(row?.articleId);
+  }
   showEdit.value = true;
 };
 
@@ -408,8 +410,7 @@ if (!navigationList.value) {
         if (
           d.model == 'index' ||
           d.model == 'page' ||
-          d.model == 'order' ||
-          d.model == 'links'
+          d.model == 'order'
         ) {
           d.disabled = true;
         }
diff --git a/src/views/hjm/count/components/hjmFenceEdit.vue b/src/views/hjm/count/components/hjmFenceEdit.vue
new file mode 100644
index 0000000..5d3ae2d
--- /dev/null
+++ b/src/views/hjm/count/components/hjmFenceEdit.vue
@@ -0,0 +1,306 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑电子围栏' : '添加电子围栏'"
+    :body-style="{ paddingBottom: '28px' }"
+    @update:visible="updateVisible"
+    @ok="save"
+  >
+    <a-form
+      ref="formRef"
+      :model="form"
+      :rules="rules"
+      :label-col="styleResponsive ? { md: 4, sm: 5, xs: 24 } : { flex: '90px' }"
+      :wrapper-col="
+        styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
+      "
+    >
+      <a-form-item label="围栏名称" name="name">
+        <a-input
+          allow-clear
+          placeholder="请输入围栏名称"
+          v-model:value="form.name"
+        />
+      </a-form-item>
+      <!--      <a-form-item label="类型" name="type">-->
+      <!--        <a-radio-group v-model:value="form.type">-->
+      <!--          <a-radio :value="0">圆形</a-radio>-->
+      <!--          <a-radio :value="1">方形</a-radio>-->
+      <!--        </a-radio-group>-->
+      <!--      </a-form-item>-->
+<!--      <a-form-item label="经纬度" name="location">-->
+<!--        <div class="flex">-->
+<!--          <a-input-->
+<!--            allow-clear-->
+<!--            placeholder="请选取车辆所在位置"-->
+<!--            v-model:value="form.location"-->
+<!--          >-->
+<!--          </a-input>-->
+<!--        </div>-->
+<!--      </a-form-item>-->
+      <a-form-item label="轮廓" name="points">
+        <div class="flex">
+          <a-input
+            allow-clear
+            placeholder="请选取电子围栏的轮廓"
+            v-model:value="form.points"
+          >
+          </a-input>
+        </div>
+        <template #extra>
+          <p class="py-2">
+            <a class="text-blue-500" href="https://lbs.qq.com/dev/console/cloud/placeCloud/datamanage?table_id=0q3W4MrK1-_6Xag7V1" target="_blank">使用腾讯地图的工具绘制电子围栏</a>
+          </p>
+        </template>
+      </a-form-item>
+<!--      <a-form-item label="经度" name="longitude">-->
+<!--        <a-input-number-->
+<!--          allow-clear-->
+<!--          style="width: 120px"-->
+<!--          placeholder="请输入经度"-->
+<!--          v-model:value="form.longitude"-->
+<!--        />-->
+<!--      </a-form-item>-->
+<!--      <a-form-item label="纬度" name="latitude">-->
+<!--        <a-input-number-->
+<!--          allow-clear-->
+<!--          style="width: 120px"-->
+<!--          placeholder="请输入纬度"-->
+<!--          v-model:value="form.latitude"-->
+<!--        />-->
+<!--      </a-form-item>-->
+<!--      <a-form-item label="半径" name="district">-->
+<!--        <a-input-number-->
+<!--          allow-clear-->
+<!--          style="width: 120px"-->
+<!--          placeholder="请输入半径"-->
+<!--          v-model:value="form.district"-->
+<!--        />-->
+<!--      </a-form-item>-->
+      <!--      <a-form-item label="排序" name="sortNumber">-->
+      <!--        <a-input-number-->
+      <!--          :min="0"-->
+      <!--          :max="9999"-->
+      <!--          class="ele-fluid"-->
+      <!--          placeholder="请输入排序号"-->
+      <!--          v-model:value="form.sortNumber"-->
+      <!--        />-->
+      <!--      </a-form-item>-->
+      <a-form-item label="备注" name="comments">
+        <a-textarea
+          :rows="4"
+          :maxlength="200"
+          placeholder="请输入描述"
+          v-model:value="form.comments"
+        />
+      </a-form-item>
+    </a-form>
+    <!-- 地图位置选择弹窗 -->
+    <ele-map-picker
+      :need-city="true"
+      :dark-mode="darkMode"
+      v-model:visible="showMap"
+      :center="[108.374959, 22.767024]"
+      :search-type="1"
+      :zoom="12"
+      @done="onDone"
+    />
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+import {ref, reactive, watch} from 'vue';
+import {Form, message} from 'ant-design-vue';
+import {assignObject} from 'ele-admin-pro';
+import {addHjmFence, updateHjmFence} from '@/api/hjm/hjmFence';
+import {HjmFence} from '@/api/hjm/hjmFence/model';
+import {useThemeStore} from '@/store/modules/theme';
+import {storeToRefs} from 'pinia';
+import {CenterPoint} from "ele-admin-pro/es/ele-map-picker/types";
+import {ItemType} from 'ele-admin-pro/es/ele-image-upload/types';
+import {FormInstance} from 'ant-design-vue/es/form';
+
+// 是否是修改
+const isUpdate = ref(false);
+const useForm = Form.useForm;
+// 是否开启响应式布局
+const themeStore = useThemeStore();
+const {styleResponsive} = storeToRefs(themeStore);
+const {darkMode} = storeToRefs(themeStore);
+// 是否显示地图选择弹窗
+const showMap = ref(false);
+
+const props = defineProps<{
+  // 弹窗是否打开
+  visible: boolean;
+  // 修改回显的数据
+  data?: HjmFence | null;
+}>();
+
+const emit = defineEmits<{
+  (e: 'done'): void;
+  (e: 'update:visible', visible: boolean): void;
+}>();
+
+// 提交状态
+const loading = ref(false);
+// 是否显示最大化切换按钮
+const maxable = ref(true);
+// 表格选中数据
+const formRef = ref<FormInstance | null>(null);
+const images = ref<ItemType[]>([]);
+
+// 用户信息
+const form = reactive<HjmFence>({
+  id: undefined,
+  name: undefined,
+  type: undefined,
+  location: undefined,
+  longitude: undefined,
+  latitude: undefined,
+  district: undefined,
+  points: undefined,
+  tenantId: undefined,
+  createTime: undefined,
+  updateTime: undefined,
+  status: 0,
+  comments: '',
+  sortNumber: 100
+});
+
+/* 更新visible */
+const updateVisible = (value: boolean) => {
+  emit('update:visible', value);
+};
+
+// 表单验证规则
+const rules = reactive({
+  name: [
+    {
+      required: true,
+      type: 'string',
+      message: '请填写电子围栏名称',
+      trigger: 'blur'
+    }
+  ],
+  type: [
+    {
+      required: true,
+      type: 'number',
+      message: '请选择类型',
+      trigger: 'blur'
+    }
+  ],
+  location: [
+    {
+      required: true,
+      type: 'string',
+      message: '请填写经纬度',
+      trigger: 'blur'
+    }
+  ],
+  points: [
+    {
+      required: true,
+      type: 'string',
+      message: '请填写轮廓经纬度数组',
+      trigger: 'blur'
+    }
+  ],
+  longitude: [
+    {
+      required: true,
+      type: 'string',
+      message: '请填写经度',
+      trigger: 'blur'
+    }
+  ],
+  latitude: [
+    {
+      required: true,
+      type: 'string',
+      message: '请填写纬度',
+      trigger: 'blur'
+    }
+  ],
+  district: [
+    {
+      required: true,
+      type: 'string',
+      message: '请填写半径',
+      trigger: 'blur'
+    }
+  ]
+});
+
+/* 打开位置选择 */
+const openMapPicker = () => {
+  showMap.value = true;
+};
+
+/* 地图选择后回调 */
+const onDone = (location: CenterPoint) => {
+  if (location) {
+    console.log(location)
+    form.location = `${location.lat},${location.lng}`;
+    form.longitude = `${location.lng}`;
+    form.latitude = `${location.lat}`;
+    form.comments = `${location.address}`;
+    form.district = `1000`
+  }
+  showMap.value = false;
+};
+
+const {resetFields} = useForm(form, rules);
+
+/* 保存编辑 */
+const save = () => {
+  if (!formRef.value) {
+    return;
+  }
+  formRef.value
+    .validate()
+    .then(() => {
+      loading.value = true;
+      const formData = {
+        ...form
+      };
+      const saveOrUpdate = isUpdate.value ? updateHjmFence : addHjmFence;
+      saveOrUpdate(formData)
+        .then((msg) => {
+          loading.value = false;
+          message.success(msg);
+          updateVisible(false);
+          emit('done');
+        })
+        .catch((e) => {
+          loading.value = false;
+          message.error(e.message);
+        });
+    })
+    .catch(() => {
+    });
+};
+
+watch(
+  () => props.visible,
+  (visible) => {
+    if (visible) {
+      images.value = [];
+      if (props.data) {
+        assignObject(form, props.data);
+        isUpdate.value = true;
+      } else {
+        isUpdate.value = false;
+      }
+    } else {
+      resetFields();
+    }
+  },
+  {immediate: true}
+);
+</script>
diff --git a/src/views/hjm/count/components/search.vue b/src/views/hjm/count/components/search.vue
new file mode 100644
index 0000000..f7509dc
--- /dev/null
+++ b/src/views/hjm/count/components/search.vue
@@ -0,0 +1,42 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space :size="10" style="flex-wrap: wrap">
+    <a-button type="primary" class="ele-btn-icon" @click="add">
+      <template #icon>
+        <PlusOutlined />
+      </template>
+      <span>添加</span>
+    </a-button>
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import type { HjmFenceParam } from '@/api/hjm/hjmFence/model';
+  import { watch } from 'vue';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: HjmFenceParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>
diff --git a/src/views/hjm/count/index.vue b/src/views/hjm/count/index.vue
new file mode 100644
index 0000000..6baa8ee
--- /dev/null
+++ b/src/views/hjm/count/index.vue
@@ -0,0 +1,150 @@
+<template>
+  <a-page-header :title="getPageTitle()" @back="() => $router.go(-1)">
+    <a-card :bordered="false" :body-style="{ padding: '16px' }">
+      <ele-pro-table
+        ref="tableRef"
+        row-key="id"
+        :columns="columns"
+        :datasource="datasource"
+        :customRow="customRow"
+        tool-class="ele-toolbar-form"
+        class="sys-org-table"
+      >
+        <template #bodyCell="{ column, record }">
+          <template v-if="column.key === 'realName'">
+            <a-tooltip :title="`点击查询明细`"><a :href="`/website/car?installerId=${record.userId}`" class="cursor-pointer">{{ record.realName }}</a></a-tooltip>
+          </template>
+          <template v-if="column.key === 'followers'">
+            <a-tooltip :title="`点击更新`" class="cursor-pointer" @click="updateRowsByFollowers(record)">
+              <a-tag color="green">{{ record.followers }}</a-tag>
+            </a-tooltip>
+          </template>
+        </template>
+      </ele-pro-table>
+    </a-card>
+
+    <!-- 编辑弹窗 -->
+    <HjmFenceEdit v-model:visible="showEdit" :data="current" @done="reload"/>
+  </a-page-header>
+</template>
+
+<script lang="ts" setup>
+import {ref} from 'vue';
+import type {EleProTable} from 'ele-admin-pro';
+import {message} from 'ant-design-vue';
+import type {
+  DatasourceFunction,
+  ColumnItem
+} from 'ele-admin-pro/es/ele-pro-table/types';
+import HjmFenceEdit from './components/hjmFenceEdit.vue';
+import {getPageTitle} from "@/utils/common";
+import {pageUsers, updateUser} from "@/api/system/user";
+import {User, UserParam} from "@/api/system/user/model";
+import {pageHjmCar} from "@/api/hjm/hjmCar";
+
+// 表格实例
+const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+// 表格选中数据
+const selection = ref<User[]>([]);
+// 当前编辑数据
+const current = ref<User | null>(null);
+// 是否显示编辑弹窗
+const showEdit = ref(false);
+// 加载状态
+const loading = ref(true);
+
+// 表格数据源
+const datasource: DatasourceFunction = ({
+                                          page,
+                                          limit,
+                                          where,
+                                          orders
+                                        }) => {
+  where.organizationId = 440;
+  return pageUsers({
+    ...where,
+    ...orders,
+    page,
+    limit
+  });
+};
+
+// 表格列配置
+const columns = ref<ColumnItem[]>([
+  {
+    title: '用户ID',
+    dataIndex: 'userId',
+    key: 'userId',
+    width: 90
+  },
+  {
+    title: '姓名',
+    dataIndex: 'realName',
+    key: 'realName',
+    width: 180
+  },
+  {
+    title: '安装数量',
+    dataIndex: 'followers',
+    key: 'followers',
+    width: 180
+  }
+]);
+
+/* 搜索 */
+const reload = (where?: UserParam) => {
+  selection.value = [];
+  tableRef?.value?.reload({where: where});
+};
+
+/* 打开编辑弹窗 */
+const openEdit = (row?: User) => {
+  current.value = row ?? null;
+  showEdit.value = true;
+};
+
+const updateRowsByFollowers = (item: User) => {
+  pageHjmCar({
+    installerId: item.userId
+  }).then(res => {
+    updateUser({
+      ...item,
+      followers: res?.count
+    }).then(() => {
+      reload();
+      message.success('更新成功');
+    })
+  }).catch(() => {
+    message.error('更新失败');
+  })
+}
+
+/* 查询 */
+const query = () => {
+  loading.value = true;
+};
+
+/* 自定义行属性 */
+const customRow = (record: User) => {
+  return {
+    // 行点击事件
+    onClick: () => {
+      // console.log(record);
+    },
+    // 行双击事件
+    onDblclick: () => {
+      openEdit(record);
+    }
+  };
+};
+query();
+</script>
+
+<script lang="ts">
+export default {
+  name: 'HjmCarCount'
+};
+</script>
+
+<style lang="less" scoped></style>
diff --git a/src/views/hjm/hjmCar/components/Extra.vue b/src/views/hjm/hjmCar/components/Extra.vue
index 35fb5c7..ed37d61 100644
--- a/src/views/hjm/hjmCar/components/Extra.vue
+++ b/src/views/hjm/hjmCar/components/Extra.vue
@@ -1,41 +1,54 @@
 <!-- 搜索表单 -->
 <template>
-  <a-space style="flex-wrap: wrap" v-if="hasRole('superAdmin') || hasRole('admin') || hasRole('foundation')">
+  <a-space
+    style="flex-wrap: wrap"
+    v-if="hasRole('superAdmin') || hasRole('admin') || hasRole('foundation')"
+  >
     <a-button
       type="text"
-      v-if="hasAnyRole(['superAdmin','admin'])"
+      v-if="hasAnyRole(['superAdmin', 'admin'])"
       @click="openUrl('/fence')"
-    >电子围栏
-    </a-button
-    >
+      >电子围栏
+    </a-button>
+    <a-button
+      type="text"
+      v-if="hasAnyRole(['superAdmin', 'admin'])"
+      @click="openUrl('/hjm/count')"
+      >安装车辆统计
+    </a-button>
+    <a-button
+      type="text"
+      v-if="hasAnyRole(['superAdmin', 'admin'])"
+      @click="openUrl('/hjm/gps-log')"
+      >gps定位
+    </a-button>
   </a-space>
 </template>
 
 <script lang="ts" setup>
-import {watch, nextTick} from 'vue';
-import {CmsWebsite} from '@/api/cms/cmsWebsite/model';
-import {openUrl} from "@/utils/common";
-import {hasAnyRole, hasRole} from "@/utils/permission";
+  import { watch, nextTick } from 'vue';
+  import { CmsWebsite } from '@/api/cms/cmsWebsite/model';
+  import { openUrl } from '@/utils/common';
+  import { hasAnyRole, hasRole } from '@/utils/permission';
 
-const props = withDefaults(
-  defineProps<{
-    // 选中的角色
-    selection?: [];
-    website?: CmsWebsite;
-    count?: 0;
-  }>(),
-  {}
-);
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+      website?: CmsWebsite;
+      count?: 0;
+    }>(),
+    {}
+  );
 
-nextTick(() => {
-  if (localStorage.getItem('NotActive')) {
-    // IsActive.value = false
-  }
-})
+  nextTick(() => {
+    if (localStorage.getItem('NotActive')) {
+      // IsActive.value = false
+    }
+  });
 
-watch(
-  () => props.selection,
-  () => {
-  }
-);
+  watch(
+    () => props.selection,
+    () => {}
+  );
 </script>
diff --git a/src/views/hjm/hjmCar/components/hjmCarEdit.vue b/src/views/hjm/hjmCar/components/hjmCarEdit.vue
index 09103c0..b221725 100644
--- a/src/views/hjm/hjmCar/components/hjmCarEdit.vue
+++ b/src/views/hjm/hjmCar/components/hjmCarEdit.vue
@@ -19,9 +19,7 @@
         styleResponsive ? { md: 19, sm: 19, xs: 24 } : { flex: '1' }
       "
     >
-      <a-form-item
-        label="车辆图片"
-        name="image" v-if="isUpdate">
+      <a-form-item label="车辆图片" name="image" v-if="isUpdate">
         <SelectFile
           :placeholder="`请选择图片`"
           :limit="5"
@@ -67,8 +65,7 @@
             allow-clear
             placeholder="请选取车辆所在位置"
             v-model:value="form.location"
-          >
-          </a-input>
+          />
           <a-button
             class="ele-btn-icon"
             style="margin-left: 10px; width: 137px"
@@ -80,7 +77,7 @@
       </a-form-item>
       <a-form-item label="操作员" name="driver" v-if="isUpdate">
         {{ form.driver }} {{ form.driverPhone }}
-<!--        <a-select placeholder="选择绑定的操作员" :options="users" v-model:value="form.driver" @change="chooseDriverId" />-->
+        <!--        <a-select placeholder="选择绑定的操作员" :options="users" v-model:value="form.driver" @change="chooseDriverId" />-->
       </a-form-item>
       <a-form-item label="接收提醒" name="toUser">
         <a-input
@@ -127,302 +124,306 @@
 </template>
 
 <script lang="ts" setup>
-import {ref, reactive, watch} from 'vue';
-import {Form, message} from 'ant-design-vue';
-import {assignObject, uuid} from 'ele-admin-pro';
-import {addHjmCar, updateHjmCar} from '@/api/hjm/hjmCar';
-import {HjmCar} from '@/api/hjm/hjmCar/model';
-import {useThemeStore} from '@/store/modules/theme';
-import {storeToRefs} from 'pinia';
-import {ItemType} from 'ele-admin-pro/es/ele-image-upload/types';
-import {FormInstance} from 'ant-design-vue/es/form';
-import {FileRecord} from '@/api/system/file/model';
-import {AimOutlined} from "@ant-design/icons-vue";
-import {CenterPoint} from "ele-admin-pro/es/ele-map-picker/types";
-import OrgSelect from "@/views/system/user/components/org-select.vue";
-import {Organization} from "@/api/system/organization/model";
-import {User} from "@/api/system/user/model";
-import {pageUsers} from "@/api/system/user";
-import {listOrganizations} from "@/api/system/organization";
-import {toTreeData} from "ele-admin-pro/es";
-import {DictData} from "@/api/system/dict-data/model";
-import {HjmFence} from "@/api/hjm/hjmFence/model";
-
-// 是否是修改
-const isUpdate = ref(false);
-const useForm = Form.useForm;
-// 是否开启响应式布局
-const themeStore = useThemeStore();
-const {styleResponsive} = storeToRefs(themeStore);
-const { darkMode } = storeToRefs(themeStore);
+  import { ref, reactive, watch } from 'vue';
+  import { Form, message } from 'ant-design-vue';
+  import { assignObject, uuid } from 'ele-admin-pro';
+  import { addHjmCar, updateHjmCar } from '@/api/hjm/hjmCar';
+  import { HjmCar } from '@/api/hjm/hjmCar/model';
+  import { useThemeStore } from '@/store/modules/theme';
+  import { storeToRefs } from 'pinia';
+  import { ItemType } from 'ele-admin-pro/es/ele-image-upload/types';
+  import { FormInstance } from 'ant-design-vue/es/form';
+  import { FileRecord } from '@/api/system/file/model';
+  import { AimOutlined } from '@ant-design/icons-vue';
+  import { CenterPoint } from 'ele-admin-pro/es/ele-map-picker/types';
+  import OrgSelect from '@/views/system/user/components/org-select.vue';
+  import { Organization } from '@/api/system/organization/model';
+  import { User } from '@/api/system/user/model';
+  import { pageUsers } from '@/api/system/user';
+  import { listOrganizations } from '@/api/system/organization';
+  import { toTreeData } from 'ele-admin-pro/es';
+  import { DictData } from '@/api/system/dict-data/model';
+  import { HjmFence } from '@/api/hjm/hjmFence/model';
 
-const props = defineProps<{
-  // 弹窗是否打开
-  visible: boolean;
-  // 修改回显的数据
-  data?: HjmCar | null;
-}>();
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+  const { darkMode } = storeToRefs(themeStore);
 
-const emit = defineEmits<{
-  (e: 'done'): void;
-  (e: 'update:visible', visible: boolean): void;
-}>();
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: HjmCar | null;
+  }>();
 
-// 提交状态
-const loading = ref(false);
-// 是否显示最大化切换按钮
-const maxable = ref(true);
-// 表格选中数据
-const formRef = ref<FormInstance | null>(null);
-const images = ref<ItemType[]>([]);
-// 是否显示地图选择弹窗
-const showMap = ref(false);
-const users = ref<User[]>([])
-const organizationId = ref<number>()
-const organizations = ref<Organization[]>([]);
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
 
-// 用户信息
-const form = reactive<HjmCar>({
-  id: undefined,
-  name: undefined,
-  image: undefined,
-  type: undefined,
-  kuaidi: undefined,
-  kuaidiAdmin: undefined,
-  code: undefined,
-  driverId: undefined,
-  driver: undefined,
-  driverPhone: undefined,
-  insuranceStatus: undefined,
-  gpsNo: undefined,
-  fenceId: undefined,
-  fenceName: undefined,
-  fence: undefined,
-  location: undefined,
-  longitude: undefined,
-  latitude: undefined,
-  district: undefined,
-  address: undefined,
-  organizationId: undefined,
-  organizationParentId: undefined,
-  userId: undefined,
-  toUser: undefined,
-  comments: undefined,
-  status: 0,
-  deleted: undefined,
-  tenantId: undefined,
-  createTime: undefined,
-  sortNumber: 100
-});
+  // 提交状态
+  const loading = ref(false);
+  // 是否显示最大化切换按钮
+  const maxable = ref(true);
+  // 表格选中数据
+  const formRef = ref<FormInstance | null>(null);
+  const images = ref<ItemType[]>([]);
+  // 是否显示地图选择弹窗
+  const showMap = ref(false);
+  const users = ref<User[]>([]);
+  const organizationId = ref<number>();
+  const organizations = ref<Organization[]>([]);
 
-/* 更新visible */
-const updateVisible = (value: boolean) => {
-  emit('update:visible', value);
-};
+  // 用户信息
+  const form = reactive<HjmCar>({
+    id: undefined,
+    name: undefined,
+    image: undefined,
+    type: undefined,
+    kuaidi: undefined,
+    kuaidiAdmin: undefined,
+    code: undefined,
+    driverId: undefined,
+    driver: undefined,
+    driverPhone: undefined,
+    insuranceStatus: undefined,
+    gpsNo: undefined,
+    fenceId: undefined,
+    fenceName: undefined,
+    fence: undefined,
+    location: undefined,
+    longitude: undefined,
+    latitude: undefined,
+    district: undefined,
+    address: undefined,
+    organizationId: undefined,
+    organizationParentId: undefined,
+    userId: undefined,
+    toUser: undefined,
+    comments: undefined,
+    status: 0,
+    deleted: undefined,
+    tenantId: undefined,
+    createTime: undefined,
+    sortNumber: 100
+  });
 
-// 表单验证规则
-const rules = reactive({
-  organizationId: [
-    {
-      required: true,
-      type: 'number',
-      message: '请选择车辆所属站点',
-      trigger: 'blur'
-    }
-  ],
-  code: [
-    {
-      required: true,
-      type: 'string',
-      message: '请填写车辆编号',
-      trigger: 'blur'
-    }
-  ],
-  fenceName: [
-    {
-      required: true,
-      type: 'string',
-      message: '请选择电子围栏',
-      trigger: 'blur'
-    }
-  ],
-  insuranceStatus: [
-    {
-      required: true,
-      type: 'string',
-      message: '请选择保险状态',
-      trigger: 'blur'
-    }
-  ],
-  sortNumber: [
-    {
-      required: true,
-      type: 'number',
-      message: '请填写排序号',
-      trigger: 'blur'
-    }
-  ]
-  // driver: [
-  //   {
-  //     required: true,
-  //     type: 'any',
-  //     message: '请绑定操作员',
-  //     trigger: 'blur'
-  //   }
-  // ]
-});
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
 
-const chooseInsuranceStatus = (item: DictData) => {
-  form.insuranceStatus = item.dictDataCode;
-}
+  // 表单验证规则
+  const rules = reactive({
+    organizationId: [
+      {
+        required: true,
+        type: 'number',
+        message: '请选择车辆所属站点',
+        trigger: 'blur'
+      }
+    ],
+    code: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写车辆编号',
+        trigger: 'blur'
+      }
+    ],
+    fenceName: [
+      {
+        required: true,
+        type: 'string',
+        message: '请选择电子围栏',
+        trigger: 'blur'
+      }
+    ],
+    insuranceStatus: [
+      {
+        required: true,
+        type: 'string',
+        message: '请选择保险状态',
+        trigger: 'blur'
+      }
+    ],
+    sortNumber: [
+      {
+        required: true,
+        type: 'number',
+        message: '请填写排序号',
+        trigger: 'blur'
+      }
+    ]
+    // driver: [
+    //   {
+    //     required: true,
+    //     type: 'any',
+    //     message: '请绑定操作员',
+    //     trigger: 'blur'
+    //   }
+    // ]
+  });
 
-const updateFence = (item: HjmFence) => {
-  form.fenceName = item.name;
-  form.fenceId = item.id;
-}
+  const chooseInsuranceStatus = (item: DictData) => {
+    form.insuranceStatus = item.dictDataCode;
+  };
 
-/* 打开位置选择 */
-const openMapPicker = () => {
-  showMap.value = true;
-};
+  const updateFence = (item: HjmFence) => {
+    form.fenceName = item.name;
+    form.fenceId = item.id;
+  };
 
-/* 地图选择后回调 */
-const onDone = (location: CenterPoint) => {
-  if (location) {
-    console.log(location)
-    form.location = `${location.lat},${location.lng}`;
-    form.longitude = `${location.lng}`;
-    form.latitude = `${location.lat}`;
-    form.address = `${location.address}`;
-    form.district = `${location.city?.district}`
-  }
-  showMap.value = false;
-};
+  /* 打开位置选择 */
+  const openMapPicker = () => {
+    showMap.value = true;
+  };
 
-const onOrganization = (index: number) => {
-  form.driver = undefined;
-  users.value = []
-  organizations.value?.map(item => {
-    if(item.children?.map(d => {
-      const find = organizations.value?.find(i => i.organizationId == d.parentId);
-      if(find){
-        if(d.value == index){
-          form.code = `${find.organizationCode}${d.organizationCode}`
-          form.organizationParentId = find.organizationId;
-          form.organizationId = d.organizationId;
-          organizationId.value = find.organizationId;
-          getUsers()
-        }
-      }
-    }))
-    if(index == item.value){
-      form.kuaidi = item.organizationName
+  /* 地图选择后回调 */
+  const onDone = (location: CenterPoint) => {
+    if (location) {
+      console.log(location);
+      form.location = `${location.lat},${location.lng}`;
+      form.longitude = `${location.lng}`;
+      form.latitude = `${location.lat}`;
+      form.address = `${location.address}`;
+      form.district = `${location.city?.district}`;
     }
-  })
-}
+    showMap.value = false;
+  };
 
-const getUsers = () => {
-  pageUsers({organizationId: organizationId.value}).then(res => {
-    users.value = res?.list.map(d => {
-      d.label = d.realName || d.nickname;
-      d.value = d.userId;
-      return d;
-    }) || [];
-  })
-}
+  const onOrganization = (index: number) => {
+    form.driver = undefined;
+    users.value = [];
+    organizations.value?.map((item) => {
+      if (
+        item.children?.map((d) => {
+          const find = organizations.value?.find(
+            (i) => i.organizationId == d.parentId
+          );
+          if (find) {
+            if (d.value == index) {
+              form.code = `${find.organizationCode}${d.organizationCode}`;
+              form.organizationParentId = find.organizationId;
+              form.organizationId = d.organizationId;
+              organizationId.value = find.organizationId;
+              getUsers();
+            }
+          }
+        })
+      )
+        if (index == item.value) {
+          form.kuaidi = item.organizationName;
+        }
+    });
+  };
 
-const chooseImage = (data: FileRecord) => {
-  images.value.push({
-    uid: data.id,
-    url: data.path,
-    status: 'done'
-  });
-};
+  const getUsers = () => {
+    pageUsers({ organizationId: organizationId.value }).then((res) => {
+      users.value =
+        res?.list.map((d) => {
+          d.label = d.realName || d.nickname;
+          d.value = d.userId;
+          return d;
+        }) || [];
+    });
+  };
 
-const onDeleteItem = (index: number) => {
-  images.value.splice(index, 1);
-};
+  const chooseImage = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+  };
 
-const {resetFields} = useForm(form, rules);
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index, 1);
+  };
 
-/* 保存编辑 */
-const save = () => {
-  if (!formRef.value) {
-    return;
-  }
-  formRef.value
-    .validate()
-    .then(() => {
-      loading.value = true;
-      const formData = {
-        ...form,
-        image: JSON.stringify(images.value),
-      };
-      const saveOrUpdate = isUpdate.value ? updateHjmCar : addHjmCar;
-      saveOrUpdate(formData)
-        .then((msg) => {
-          loading.value = false;
-          message.success(msg);
-          updateVisible(false);
-          emit('done');
-        })
-        .catch((e) => {
-          loading.value = false;
-          message.error(e.message);
-        });
-    })
-    .catch(() => {
-    });
-};
+  const { resetFields } = useForm(form, rules);
 
-watch(
-  () => props.visible,
-  (visible) => {
-    if (visible) {
-      images.value = [];
-      // 加载机构
-      listOrganizations()
-        .then((list) => {
-          loading.value = false;
-          list.forEach((d) => {
-            d.key = d.organizationId;
-            d.value = d.organizationId;
-            d.title = d.organizationName;
-          });
-          organizations.value = toTreeData({
-            data: list,
-            idField: 'organizationId',
-            parentIdField: 'parentId'
+  /* 保存编辑 */
+  const save = () => {
+    if (!formRef.value) {
+      return;
+    }
+    formRef.value
+      .validate()
+      .then(() => {
+        loading.value = true;
+        const formData = {
+          ...form,
+          image: JSON.stringify(images.value)
+        };
+        const saveOrUpdate = isUpdate.value ? updateHjmCar : addHjmCar;
+        saveOrUpdate(formData)
+          .then((msg) => {
+            loading.value = false;
+            message.success(msg);
+            updateVisible(false);
+            emit('done');
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
           });
-        })
-        .catch((e) => {
-          loading.value = false;
-          message.error(e.message);
-        });
-      if (props.data) {
-        assignObject(form, props.data);
-        if (props.data.image) {
-          const arr = JSON.parse(props.data.image);
-          arr.map((item) => {
-            images.value.push({
-              uid: uuid(),
-              url: item.url,
-              status: 'done'
+      })
+      .catch(() => {});
+  };
+
+  watch(
+    () => props.visible,
+    (visible) => {
+      if (visible) {
+        images.value = [];
+        // 加载机构
+        listOrganizations()
+          .then((list) => {
+            loading.value = false;
+            list.forEach((d) => {
+              d.key = d.organizationId;
+              d.value = d.organizationId;
+              d.title = d.organizationName;
             });
+            organizations.value = toTreeData({
+              data: list,
+              idField: 'organizationId',
+              parentIdField: 'parentId'
+            });
+          })
+          .catch((e) => {
+            loading.value = false;
+            message.error(e.message);
           });
+        if (props.data) {
+          assignObject(form, props.data);
+          if (props.data.image) {
+            const arr = JSON.parse(props.data.image);
+            arr.map((item) => {
+              images.value.push({
+                uid: uuid(),
+                url: item.url,
+                status: 'done'
+              });
+            });
+          }
+          if (props.data.organizationParentId) {
+            organizationId.value = props.data.organizationParentId;
+            getUsers();
+          }
+          isUpdate.value = true;
+        } else {
+          isUpdate.value = false;
         }
-        if(props.data.organizationParentId){
-          organizationId.value = props.data.organizationParentId;
-          getUsers()
-        }
-        isUpdate.value = true;
       } else {
-        isUpdate.value = false;
+        resetFields();
       }
-    } else {
-      resetFields();
-    }
-  },
-  {immediate: true}
-);
+    },
+    { immediate: true }
+  );
 </script>
diff --git a/src/views/hjm/hjmCar/components/search.vue b/src/views/hjm/hjmCar/components/search.vue
index 0ca2c3c..671117d 100644
--- a/src/views/hjm/hjmCar/components/search.vue
+++ b/src/views/hjm/hjmCar/components/search.vue
@@ -3,7 +3,7 @@
   <a-space :size="10" style="flex-wrap: wrap">
     <a-button type="primary" class="ele-btn-icon" @click="add">
       <template #icon>
-        <PlusOutlined/>
+        <PlusOutlined />
       </template>
       <span>添加</span>
     </a-button>
@@ -15,7 +15,7 @@
       @click="removeBatch"
     >
       <template #icon>
-        <DeleteOutlined/>
+        <DeleteOutlined />
       </template>
       <span>批量删除</span>
     </a-button>
@@ -33,296 +33,325 @@
       v-model:value="where.keywords"
       @search="reload"
     />
-    <a-button type="text" :icon="h(UploadOutlined)"  @click="openImport">导入xls</a-button>
-    <a-button type="text" :icon="h(QrcodeOutlined)" @click="handleExport" :loading="exportLoading">导出二维码</a-button>
-<!--    <span class="text-red-500" v-if="where.organizationId">{{ where.organizationParentName }}(ID：{{where.organizationParentId}})</span>-->
-<!--    <span class="text-red-500" v-if="where.organizationId">{{ where }}(ID：{{where.organizationId}})</span>-->
+    <a-button type="text" :icon="h(UploadOutlined)" @click="openImport"
+      >导入xls</a-button
+    >
+    <a-button
+      type="text"
+      :icon="h(QrcodeOutlined)"
+      @click="handleExport"
+      :loading="exportLoading"
+      >导出二维码</a-button
+    >
+    <!--    <span class="text-red-500" v-if="where.organizationId">{{ where.organizationParentName }}(ID：{{where.organizationParentId}})</span>-->
+    <!--    <span class="text-red-500" v-if="where.organizationId">{{ where }}(ID：{{where.organizationId}})</span>-->
   </a-space>
 
   <!-- 导入弹窗 -->
-  <import v-model:visible="showImport" @done="reload"/>
+  <import v-model:visible="showImport" @done="reload" />
 </template>
 
 <script lang="ts" setup>
-import {PlusOutlined} from '@ant-design/icons-vue';
-import type {GradeParam} from '@/api/user/grade/model';
-import {watch, ref} from 'vue';
-import { h } from 'vue';
-import { UploadOutlined,QrcodeOutlined } from '@ant-design/icons-vue';
-import {message} from 'ant-design-vue';
-import useSearch from "@/utils/use-search";
-import {HjmCarParam, HjmCar} from "@/api/hjm/hjmCar/model";
-import {listHjmCar} from "@/api/hjm/hjmCar";
-import {Document, Packer, Paragraph, ImageRun, AlignmentType, Table, TableRow, TableCell, WidthType} from 'docx';
-import {saveAs} from 'file-saver';
-import QRCode from 'qrcode';
-import OrgSelect from "@/views/system/admin/components/org-select.vue";
-import type {Organization} from "@/api/system/organization/model";
-import Import from "./Import.vue";
-
-const props = withDefaults(
-  defineProps<{
-    // 选中的角色
-    selection?: [];
-    // 全部部门
-    organizationList: Organization[];
-  }>(),
-  {}
-);
-
-const emit = defineEmits<{
-  (e: 'search', where?: GradeParam): void;
-  (e: 'add'): void;
-  (e: 'remove'): void;
-  (e: 'batchMove'): void;
-}>();
-
-// 表单数据
-const {where} = useSearch<HjmCarParam>({
-  id: undefined,
-  keywords: '',
-  userId: undefined
-});
-
-// 导出加载状态
-const exportLoading = ref(false);
-const showImport = ref(false);
-
-// 新增
-const add = () => {
-  emit('add');
-};
-
-const reload = () => {
-  emit('search', where);
-};
-
-// 批量删除
-const removeBatch = () => {
-  emit('remove');
-};
-
-/* 打开编辑弹窗 */
-const openImport = () => {
-  showImport.value = true;
-};
-
-// 批量导出二维码到Word文档
-const handleExport = async () => {
-  try {
-    exportLoading.value = true;
-    message.loading('正在生成二维码文档，请稍候...', 0);
-
-    // 获取所有车辆数据
-    const carList = await listHjmCar(where);
-
-    if (!carList || carList.length === 0) {
-      message.error('没有车辆数据可导出');
-      return;
-    }
+  import { PlusOutlined } from '@ant-design/icons-vue';
+  import type { GradeParam } from '@/api/user/grade/model';
+  import { watch, ref } from 'vue';
+  import { h } from 'vue';
+  import { UploadOutlined, QrcodeOutlined } from '@ant-design/icons-vue';
+  import { message } from 'ant-design-vue';
+  import useSearch from '@/utils/use-search';
+  import { HjmCarParam, HjmCar } from '@/api/hjm/hjmCar/model';
+  import { listHjmCar } from '@/api/hjm/hjmCar';
+  import {
+    Document,
+    Packer,
+    Paragraph,
+    ImageRun,
+    AlignmentType,
+    Table,
+    TableRow,
+    TableCell,
+    WidthType
+  } from 'docx';
+  import { saveAs } from 'file-saver';
+  import QRCode from 'qrcode';
+  import OrgSelect from '@/views/system/admin/components/org-select.vue';
+  import type { Organization } from '@/api/system/organization/model';
+  import Import from './Import.vue';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+      // 全部部门
+      organizationList: Organization[];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: GradeParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 表单数据
+  const { where } = useSearch<HjmCarParam>({
+    id: undefined,
+    keywords: '',
+    userId: undefined
+  });
 
-    // 生成二维码图片
-    const qrCodeImages: { dataUrl: string; carInfo: HjmCar }[] = [];
+  // 导出加载状态
+  const exportLoading = ref(false);
+  const showImport = ref(false);
 
-    for (const car of carList) {
-      try {
-        // 生成二维码（使用车辆ID作为内容，与现有功能保持一致）
-        const qrCodeDataUrl = await QRCode.toDataURL(String(car.code), {
-          width: 200,
-          margin: 2,
-          color: {
-            dark: '#000000',
-            light: '#FFFFFF'
-          }
-        });
+  // 新增
+  const add = () => {
+    emit('add');
+  };
 
-        qrCodeImages.push({dataUrl: qrCodeDataUrl, carInfo: car});
-      } catch (error) {
-        console.error(`生成车辆 ${car.code} 的二维码失败:`, error);
-      }
-    }
+  const reload = () => {
+    emit('search', where);
+  };
 
-    if (qrCodeImages.length === 0) {
-      message.error('二维码生成失败');
-      return;
-    }
+  // 批量删除
+  const removeBatch = () => {
+    emit('remove');
+  };
 
-    // 尝试创建Word文档，如果失败则使用HTML方式
+  /* 打开编辑弹窗 */
+  const openImport = () => {
+    showImport.value = true;
+  };
+
+  // 批量导出二维码到Word文档
+  const handleExport = async () => {
     try {
-      await createWordDocument(qrCodeImages);
-      message.destroy();
-      message.success(`成功导出 ${qrCodeImages.length} 个车辆二维码`);
-    } catch (docError) {
-      console.warn('Word文档生成失败，使用HTML方式:', docError);
-      createHtmlDocument(qrCodeImages);
-      message.destroy();
-      message.success(`成功生成 ${qrCodeImages.length} 个车辆二维码（HTML格式，可直接打印）`);
-    }
+      exportLoading.value = true;
+      message.loading('正在生成二维码文档，请稍候...', 0);
 
-  } catch (error) {
-    console.error('导出失败:', error);
-    message.destroy();
-    message.error('导出失败，请重试');
-  } finally {
-    exportLoading.value = false;
-  }
-};
-
-// 创建Word文档
-const createWordDocument = async (qrCodeImages: { dataUrl: string; carInfo: HjmCar }[]) => {
-  const children: (Paragraph | Table)[] = [];
-
-  // 添加标题
-  children.push(
-    new Paragraph({
-      text: '车辆二维码清单',
-      alignment: AlignmentType.CENTER,
-      spacing: {after: 400}
-    })
-  );
+      // 获取所有车辆数据
+      const carList = await listHjmCar(where);
+
+      if (!carList || carList.length === 0) {
+        message.error('没有车辆数据可导出');
+        return;
+      }
 
-  // 每行放置3个二维码，保持适当间距
-  const itemsPerRow = 3;
-  const rows = Math.ceil(qrCodeImages.length / itemsPerRow);
-
-  for (let row = 0; row < rows; row++) {
-    const startIndex = row * itemsPerRow;
-    const endIndex = Math.min(startIndex + itemsPerRow, qrCodeImages.length);
-    const rowItems = qrCodeImages.slice(startIndex, endIndex);
-
-    // 创建表格行来放置二维码
-    const qrCodeCells: TableCell[] = [];
-    const infoCells: TableCell[] = [];
-
-    for (let i = 0; i < itemsPerRow; i++) {
-      if (i < rowItems.length) {
-        const item = rowItems[i];
-
-        // 将DataURL转换为Buffer
-        const base64Data = item.dataUrl.split(',')[1];
-        const binaryData = atob(base64Data);
-        const bytes = new Uint8Array(binaryData.length);
-        for (let j = 0; j < binaryData.length; j++) {
-          bytes[j] = binaryData.charCodeAt(j);
+      // 生成二维码图片
+      const qrCodeImages: { dataUrl: string; carInfo: HjmCar }[] = [];
+
+      for (const car of carList) {
+        try {
+          // 生成二维码（使用车辆ID作为内容，与现有功能保持一致）
+          const qrCodeDataUrl = await QRCode.toDataURL(String(car.code), {
+            width: 200,
+            margin: 2,
+            color: {
+              dark: '#000000',
+              light: '#FFFFFF'
+            }
+          });
+
+          qrCodeImages.push({ dataUrl: qrCodeDataUrl, carInfo: car });
+        } catch (error) {
+          console.error(`生成车辆 ${car.code} 的二维码失败:`, error);
         }
+      }
 
-        qrCodeCells.push(
-          new TableCell({
-            children: [
-              new Paragraph({
-                children: [
-                  // @ts-ignore
-                  new ImageRun({
-                    data: bytes,
-                    transformation: {
-                      width: 150,
-                      height: 150
-                    }
-                  })
-                ],
-                alignment: AlignmentType.CENTER
-              })
-            ],
-            width: {size: 33, type: WidthType.PERCENTAGE}
-          })
-        );
+      if (qrCodeImages.length === 0) {
+        message.error('二维码生成失败');
+        return;
+      }
 
-        infoCells.push(
-          new TableCell({
-            children: [
-              new Paragraph({
-                // text: `车辆编号: ${item.carInfo.code || '未设置'}`,
-                text: `${item.carInfo.code || '未设置'}`,
-                alignment: AlignmentType.CENTER
-              })
-            ],
-            width: {size: 33, type: WidthType.PERCENTAGE}
-          })
-        );
-      } else {
-        // 空单元格
-        qrCodeCells.push(
-          new TableCell({
-            children: [new Paragraph({text: ''})],
-            width: {size: 33, type: WidthType.PERCENTAGE}
-          })
-        );
-        infoCells.push(
-          new TableCell({
-            children: [new Paragraph({text: ''})],
-            width: {size: 33, type: WidthType.PERCENTAGE}
-          })
+      // 尝试创建Word文档，如果失败则使用HTML方式
+      try {
+        await createWordDocument(qrCodeImages);
+        message.destroy();
+        message.success(`成功导出 ${qrCodeImages.length} 个车辆二维码`);
+      } catch (docError) {
+        console.warn('Word文档生成失败，使用HTML方式:', docError);
+        createHtmlDocument(qrCodeImages);
+        message.destroy();
+        message.success(
+          `成功生成 ${qrCodeImages.length} 个车辆二维码（HTML格式，可直接打印）`
         );
       }
+    } catch (error) {
+      console.error('导出失败:', error);
+      message.destroy();
+      message.error('导出失败，请重试');
+    } finally {
+      exportLoading.value = false;
     }
+  };
 
-    // 添加表格
-    children.push(
-      new Table({
-        rows: [
-          new TableRow({
-            children: qrCodeCells
-          }),
-          new TableRow({
-            children: infoCells
-          })
-        ],
-        width: {size: 100, type: WidthType.PERCENTAGE}
-      })
-    );
+  // 创建Word文档
+  const createWordDocument = async (
+    qrCodeImages: { dataUrl: string; carInfo: HjmCar }[]
+  ) => {
+    const children: (Paragraph | Table)[] = [];
 
-    // 添加行间距
+    // 添加标题
     children.push(
       new Paragraph({
-        text: '',
-        spacing: {after: 400}
+        text: '车辆二维码清单',
+        alignment: AlignmentType.CENTER,
+        spacing: { after: 400 }
       })
     );
-  }
-
-  // 创建文档
-  const doc = new Document({
-    sections: [{
-      properties: {
-        page: {
-          size: {
-            orientation: 'portrait',
-            width: 11906, // A4宽度 (210mm)
-            height: 16838 // A4高度 (297mm)
-          },
-          margin: {
-            top: 1134,    // 2cm
-            right: 1134,  // 2cm
-            bottom: 1134, // 2cm
-            left: 1134    // 2cm
+
+    // 每行放置3个二维码，保持适当间距
+    const itemsPerRow = 3;
+    const rows = Math.ceil(qrCodeImages.length / itemsPerRow);
+
+    for (let row = 0; row < rows; row++) {
+      const startIndex = row * itemsPerRow;
+      const endIndex = Math.min(startIndex + itemsPerRow, qrCodeImages.length);
+      const rowItems = qrCodeImages.slice(startIndex, endIndex);
+
+      // 创建表格行来放置二维码
+      const qrCodeCells: TableCell[] = [];
+      const infoCells: TableCell[] = [];
+
+      for (let i = 0; i < itemsPerRow; i++) {
+        if (i < rowItems.length) {
+          const item = rowItems[i];
+
+          // 将DataURL转换为Buffer
+          const base64Data = item.dataUrl.split(',')[1];
+          const binaryData = atob(base64Data);
+          const bytes = new Uint8Array(binaryData.length);
+          for (let j = 0; j < binaryData.length; j++) {
+            bytes[j] = binaryData.charCodeAt(j);
           }
+
+          qrCodeCells.push(
+            new TableCell({
+              children: [
+                new Paragraph({
+                  children: [
+                    // @ts-ignore
+                    new ImageRun({
+                      data: bytes,
+                      transformation: {
+                        width: 150,
+                        height: 150
+                      }
+                    })
+                  ],
+                  alignment: AlignmentType.CENTER
+                })
+              ],
+              width: { size: 33, type: WidthType.PERCENTAGE }
+            })
+          );
+
+          infoCells.push(
+            new TableCell({
+              children: [
+                new Paragraph({
+                  // text: `车辆编号: ${item.carInfo.code || '未设置'}`,
+                  text: `${item.carInfo.code || '未设置'}`,
+                  alignment: AlignmentType.CENTER
+                })
+              ],
+              width: { size: 33, type: WidthType.PERCENTAGE }
+            })
+          );
+        } else {
+          // 空单元格
+          qrCodeCells.push(
+            new TableCell({
+              children: [new Paragraph({ text: '' })],
+              width: { size: 33, type: WidthType.PERCENTAGE }
+            })
+          );
+          infoCells.push(
+            new TableCell({
+              children: [new Paragraph({ text: '' })],
+              width: { size: 33, type: WidthType.PERCENTAGE }
+            })
+          );
         }
-      },
-      children
-    }]
-  });
+      }
+
+      // 添加表格
+      children.push(
+        new Table({
+          rows: [
+            new TableRow({
+              children: qrCodeCells
+            }),
+            new TableRow({
+              children: infoCells
+            })
+          ],
+          width: { size: 100, type: WidthType.PERCENTAGE }
+        })
+      );
+
+      // 添加行间距
+      children.push(
+        new Paragraph({
+          text: '',
+          spacing: { after: 400 }
+        })
+      );
+    }
 
-  // 生成并下载文档
-  try {
-    const buffer = await Packer.toBlob(doc);
-    const fileName = `车辆二维码清单_${new Date().toISOString().slice(0, 10)}.docx`;
-    saveAs(buffer, fileName);
-  } catch (error) {
-    console.error('文档生成失败:', error);
-    // 如果Packer.toBlob失败，尝试使用toBuffer
-    const buffer = await Packer.toBuffer(doc);
-    const blob = new Blob([buffer], {
-      type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
+    // 创建文档
+    const doc = new Document({
+      sections: [
+        {
+          properties: {
+            page: {
+              size: {
+                orientation: 'portrait',
+                width: 11906, // A4宽度 (210mm)
+                height: 16838 // A4高度 (297mm)
+              },
+              margin: {
+                top: 1134, // 2cm
+                right: 1134, // 2cm
+                bottom: 1134, // 2cm
+                left: 1134 // 2cm
+              }
+            }
+          },
+          children
+        }
+      ]
     });
-    const fileName = `车辆二维码清单_${new Date().toISOString().slice(0, 10)}.docx`;
-    saveAs(blob, fileName);
-  }
-};
-
-// 创建HTML文档（备用方案）
-const createHtmlDocument = (qrCodeImages: { dataUrl: string; carInfo: HjmCar }[]) => {
-  const itemsPerRow = 3;
-  let htmlContent = `
+
+    // 生成并下载文档
+    try {
+      const buffer = await Packer.toBlob(doc);
+      const fileName = `车辆二维码清单_${new Date()
+        .toISOString()
+        .slice(0, 10)}.docx`;
+      saveAs(buffer, fileName);
+    } catch (error) {
+      console.error('文档生成失败:', error);
+      // 如果Packer.toBlob失败，尝试使用toBuffer
+      const buffer = await Packer.toBuffer(doc);
+      const blob = new Blob([buffer], {
+        type: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
+      });
+      const fileName = `车辆二维码清单_${new Date()
+        .toISOString()
+        .slice(0, 10)}.docx`;
+      saveAs(blob, fileName);
+    }
+  };
+
+  // 创建HTML文档（备用方案）
+  const createHtmlDocument = (
+    qrCodeImages: { dataUrl: string; carInfo: HjmCar }[]
+  ) => {
+    const itemsPerRow = 3;
+    let htmlContent = `
       <!DOCTYPE html>
       <html>
       <head>
@@ -373,8 +402,8 @@ const createHtmlDocument = (qrCodeImages: { dataUrl: string; carInfo: HjmCar }[]
         <div class="qr-grid">
     `;
 
-  qrCodeImages.forEach((item) => {
-    htmlContent += `
+    qrCodeImages.forEach((item) => {
+      htmlContent += `
         <div class="qr-item">
           <img src="${item.dataUrl}" alt="QR Code" class="qr-code">
           <div class="qr-info">
@@ -383,9 +412,9 @@ const createHtmlDocument = (qrCodeImages: { dataUrl: string; carInfo: HjmCar }[]
           </div>
         </div>
       `;
-  });
+    });
 
-  htmlContent += `
+    htmlContent += `
         </div>
         <div class="no-print" style="text-align: center; margin-top: 30px;">
           <button onclick="window.print()" style="padding: 10px 20px; font-size: 16px;">打印文档</button>
@@ -395,22 +424,23 @@ const createHtmlDocument = (qrCodeImages: { dataUrl: string; carInfo: HjmCar }[]
       </html>
     `;
 
-  // 在新窗口中打开HTML文档
-  const newWindow = window.open('', '_blank');
-  if (newWindow) {
-    newWindow.document.write(htmlContent);
-    newWindow.document.close();
-  } else {
-    // 如果弹窗被阻止，创建下载链接
-    const blob = new Blob([htmlContent], {type: 'text/html;charset=utf-8'});
-    const fileName = `车辆二维码清单_${new Date().toISOString().slice(0, 10)}.html`;
-    saveAs(blob, fileName);
-  }
-};
-
-watch(
-  () => props.selection,
-  () => {
-  }
-);
+    // 在新窗口中打开HTML文档
+    const newWindow = window.open('', '_blank');
+    if (newWindow) {
+      newWindow.document.write(htmlContent);
+      newWindow.document.close();
+    } else {
+      // 如果弹窗被阻止，创建下载链接
+      const blob = new Blob([htmlContent], { type: 'text/html;charset=utf-8' });
+      const fileName = `车辆二维码清单_${new Date()
+        .toISOString()
+        .slice(0, 10)}.html`;
+      saveAs(blob, fileName);
+    }
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
 </script>
diff --git a/src/views/hjm/hjmCar/index.vue b/src/views/hjm/hjmCar/index.vue
index dab848f..06c01c4 100644
--- a/src/views/hjm/hjmCar/index.vue
+++ b/src/views/hjm/hjmCar/index.vue
@@ -43,13 +43,23 @@
 
           <template v-if="column.key === 'status'">
             <a-tag v-if="record.status === 0 && record.claim == 0" color="red">未安装</a-tag>
-            <a-tag v-if="record.claim === 0 && record.status == 1"  color="orange">已安装</a-tag>
-            <a-tag v-if="record.claim === 1 && record.status == 1" color="green" @click="updateStatus(record)">已认领</a-tag>
+            <a-tag v-if="record.claim === 0 && record.status == 1" color="orange">已安装</a-tag>
+            <a-tag v-if="record.claim === 1 && record.status == 1" color="green" @click="updateStatus(record)">已认领
+            </a-tag>
+          </template>
+          <template v-if="column.key === 'createTime'">
+            <a-space direction="vertical">
+              <a-tooltip title="创建时间">{{ record.createTime }}</a-tooltip>
+              <a-tooltip title="安装时间" class="text-orange-500">{{ record.installTime }}</a-tooltip>
+              <a-tooltip title="认领时间" class="text-green-500">{{ record.claimTime }}</a-tooltip>
+            </a-space>
           </template>
           <template v-if="column.key === 'action'">
             <div>
               <a @click="onShare(record)">二维码</a>
               <a-divider type="vertical"/>
+              <a @click="onGpsLog(record)">GPS</a>
+              <a-divider type="vertical"/>
               <a @click="openEdit(record)">修改</a>
               <a-divider type="vertical"/>
               <a-popconfirm
@@ -77,7 +87,6 @@ import {createVNode, ref, watch} from 'vue';
 import {message, Modal} from 'ant-design-vue';
 import {ExclamationCircleOutlined} from '@ant-design/icons-vue';
 import type {EleProTable} from 'ele-admin-pro';
-import {toDateString} from 'ele-admin-pro';
 import type {
   DatasourceFunction,
   ColumnItem
@@ -111,6 +120,8 @@ const loading = ref(true);
 const qrcode = ref<string>('');
 // 是否显示二维码
 const showQrcode = ref(false);
+// 安装人员ID
+const installerId = ref()
 
 // 树形数据
 const data = ref<Organization[]>([]);
@@ -130,6 +141,9 @@ const datasource: DatasourceFunction = ({
   if (filters) {
     where.status = filters.status;
   }
+  if (installerId.value) {
+    where.installerId = installerId.value;
+  }
   return pageHjmCar({
     ...where,
     ...orders,
@@ -218,14 +232,12 @@ const columns = ref<ColumnItem[]>([
     dataIndex: 'createTime',
     key: 'createTime',
     align: 'center',
-    sorter: true,
-    ellipsis: true,
-    customRender: ({text}) => toDateString(text, 'yyyy-MM-dd')
+    sorter: true
   },
   {
     title: '操作',
     key: 'action',
-    width: 180,
+    width: 220,
     fixed: 'right',
     align: 'center',
     hideInSetting: true
@@ -254,6 +266,10 @@ const onShare = (row?: HjmCar) => {
   showQrcode.value = true;
 }
 
+const onGpsLog = (row: HjmCar) => {
+  window.location.href = `/hjm/gps-log?no=${row?.gpsNo}`
+}
+
 const hideShare = () => {
   showQrcode.value = false;
 }
@@ -376,9 +392,12 @@ const customRow = (record: HjmCar) => {
 };
 
 watch(
-  () => router.currentRoute,
-  () => {
+  () => router.currentRoute.value.query,
+  (param) => {
     query();
+    if (param.installerId) {
+      installerId.value = param.installerId;
+    }
   },
   {immediate: true}
 );
diff --git a/src/views/hjm/hjmFence/index.vue b/src/views/hjm/hjmFence/index.vue
index 9323f6b..2b24f3f 100644
--- a/src/views/hjm/hjmFence/index.vue
+++ b/src/views/hjm/hjmFence/index.vue
@@ -1,8 +1,5 @@
 <template>
   <a-page-header :title="getPageTitle()" @back="() => $router.go(-1)">
-    <template #extra>
-      <Extra/>
-    </template>
     <a-card :bordered="false" :body-style="{ padding: '16px' }">
       <ele-pro-table
         ref="tableRef"
@@ -66,7 +63,6 @@ import HjmFenceEdit from './components/hjmFenceEdit.vue';
 import {pageHjmFence, removeHjmFence, removeBatchHjmFence} from '@/api/hjm/hjmFence';
 import type {HjmFence, HjmFenceParam} from '@/api/hjm/hjmFence/model';
 import {getPageTitle} from "@/utils/common";
-import Extra from "@/views/hjm/hjmCar/components/Extra.vue";
 
 // 表格实例
 const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
diff --git a/src/views/hjm/hjmGpsLog/components/search.vue b/src/views/hjm/hjmGpsLog/components/search.vue
index 82fea9d..339f305 100644
--- a/src/views/hjm/hjmGpsLog/components/search.vue
+++ b/src/views/hjm/hjmGpsLog/components/search.vue
@@ -1,38 +1,47 @@
 <!-- 搜索表单 -->
 <template>
   <a-space :size="10" style="flex-wrap: wrap">
-    <a-button type="primary" class="ele-btn-icon" @click="add">
-      <template #icon>
-        <PlusOutlined />
-      </template>
-      <span>添加</span>
-    </a-button>
+    <a-input-search
+      placeholder="请输入GPS编号"
+      style="width: 280px"
+      :disabled="gpsNo"
+      v-model:value="where.keywords"
+      @search="reload"
+    />
   </a-space>
 </template>
 
 <script lang="ts" setup>
-  import { PlusOutlined } from '@ant-design/icons-vue';
-  import type { GradeParam } from '@/api/user/grade/model';
+  import type { HjmGpsLogParam } from '@/api/hjm/hjmGpsLog/model';
   import { watch } from 'vue';
+  import useSearch from "@/utils/use-search";
 
   const props = withDefaults(
     defineProps<{
       // 选中的角色
       selection?: [];
+      gpsNo?: string;
     }>(),
     {}
   );
 
   const emit = defineEmits<{
-    (e: 'search', where?: GradeParam): void;
+    (e: 'search', where?: HjmGpsLogParam): void;
     (e: 'add'): void;
     (e: 'remove'): void;
     (e: 'batchMove'): void;
   }>();
 
-  // 新增
-  const add = () => {
-    emit('add');
+  // 表单数据
+  const { where } = useSearch<HjmGpsLogParam>({
+    id: undefined,
+    keywords: props.gpsNo,
+    userId: undefined
+  });
+
+  const reload = () => {
+    console.log(where,props.gpsNo)
+    emit('search', where);
   };
 
   watch(
diff --git a/src/views/hjm/hjmGpsLog/index.vue b/src/views/hjm/hjmGpsLog/index.vue
index 6479793..345d625 100644
--- a/src/views/hjm/hjmGpsLog/index.vue
+++ b/src/views/hjm/hjmGpsLog/index.vue
@@ -1,251 +1,261 @@
 <template>
-  <div class="page">
-    <div class="ele-body">
-      <a-card :bordered="false" :body-style="{ padding: '16px' }">
-        <ele-pro-table
-          ref="tableRef"
-          row-key="hjmGpsLogId"
-          :columns="columns"
-          :datasource="datasource"
-          :customRow="customRow"
-          tool-class="ele-toolbar-form"
-          class="sys-org-table"
-        >
-          <template #toolbar>
-            <search
-              @search="reload"
-              :selection="selection"
-              @add="openEdit"
-              @remove="removeBatch"
-              @batchMove="openMove"
-            />
+  <a-page-header :title="getPageTitle()" @back="() => $router.go(-1)">
+    <a-card :bordered="false" :body-style="{ padding: '16px' }">
+      <ele-pro-table
+        ref="tableRef"
+        row-key="hjmGpsLogId"
+        :columns="columns"
+        :datasource="datasource"
+        :customRow="customRow"
+        tool-class="ele-toolbar-form"
+        class="sys-org-table"
+      >
+        <template #toolbar>
+          <search
+            @search="reload"
+            :gpsNo="gpsNo"
+            :selection="selection"
+            @add="openEdit"
+            @remove="removeBatch"
+            @batchMove="openMove"
+          />
+        </template>
+        <template #bodyCell="{ column, record }">
+          <template v-if="column.key === 'image'">
+            <a-image :src="record.image" :width="50"/>
           </template>
-          <template #bodyCell="{ column, record }">
-            <template v-if="column.key === 'image'">
-              <a-image :src="record.image" :width="50" />
-            </template>
-            <template v-if="column.key === 'status'">
-              <a-tag v-if="record.status === 0" color="green">显示</a-tag>
-              <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
-            </template>
-            <template v-if="column.key === 'action'">
-              <a-space>
-                <a @click="openEdit(record)">修改</a>
-                <a-divider type="vertical" />
-                <a-popconfirm
-                  title="确定要删除此记录吗？"
-                  @confirm="remove(record)"
-                >
-                  <a class="ele-text-danger">删除</a>
-                </a-popconfirm>
-              </a-space>
-            </template>
+          <template v-if="column.key === 'status'">
+            <a-tag v-if="record.status === 0" color="green">显示</a-tag>
+            <a-tag v-if="record.status === 1" color="red">隐藏</a-tag>
           </template>
-        </ele-pro-table>
-      </a-card>
+          <template v-if="column.key === 'action'">
+            <a-space>
+              <a @click="openEdit(record)">修改</a>
+              <a-divider type="vertical"/>
+              <a-popconfirm
+                title="确定要删除此记录吗？"
+                @confirm="remove(record)"
+              >
+                <a class="ele-text-danger">删除</a>
+              </a-popconfirm>
+            </a-space>
+          </template>
+        </template>
+      </ele-pro-table>
+    </a-card>
 
-      <!-- 编辑弹窗 -->
-      <HjmGpsLogEdit v-model:visible="showEdit" :data="current" @done="reload" />
-    </div>
-  </div>
+    <!-- 编辑弹窗 -->
+    <HjmGpsLogEdit
+      v-model:visible="showEdit"
+      :data="current"
+      @done="reload"
+    />
+  </a-page-header>
 </template>
 
 <script lang="ts" setup>
-  import { createVNode, ref } from 'vue';
-  import { message, Modal } from 'ant-design-vue';
-  import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
-  import type { EleProTable } from 'ele-admin-pro';
-  import { toDateString } from 'ele-admin-pro';
-  import type {
-    DatasourceFunction,
-    ColumnItem
-  } from 'ele-admin-pro/es/ele-pro-table/types';
-  import Search from './components/search.vue';
-  import HjmGpsLogEdit from './components/hjmGpsLogEdit.vue';
-  import { pageHjmGpsLog, removeHjmGpsLog, removeBatchHjmGpsLog } from '@/api/hjm/hjmGpsLog';
-  import type { HjmGpsLog, HjmGpsLogParam } from '@/api/hjm/hjmGpsLog/model';
-
-  // 表格实例
-  const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
-
-  // 表格选中数据
-  const selection = ref<HjmGpsLog[]>([]);
-  // 当前编辑数据
-  const current = ref<HjmGpsLog | null>(null);
-  // 是否显示编辑弹窗
-  const showEdit = ref(false);
-  // 是否显示批量移动弹窗
-  const showMove = ref(false);
-  // 加载状态
-  const loading = ref(true);
-
-  // 表格数据源
-  const datasource: DatasourceFunction = ({
+import {createVNode, ref, watch} from 'vue';
+import {message, Modal} from 'ant-design-vue';
+import {ExclamationCircleOutlined} from '@ant-design/icons-vue';
+import type {EleProTable} from 'ele-admin-pro';
+import type {
+  DatasourceFunction,
+  ColumnItem
+} from 'ele-admin-pro/es/ele-pro-table/types';
+import Search from './components/search.vue';
+import HjmGpsLogEdit from './components/hjmGpsLogEdit.vue';
+import {
+  pageHjmGpsLog,
+  removeHjmGpsLog,
+  removeBatchHjmGpsLog
+} from '@/api/hjm/hjmGpsLog';
+import type {HjmGpsLog, HjmGpsLogParam} from '@/api/hjm/hjmGpsLog/model';
+import router from "@/router";
+import {getPageTitle} from "@/utils/common";
+
+// 表格实例
+const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
+
+// 表格选中数据
+const selection = ref<HjmGpsLog[]>([]);
+// 当前编辑数据
+const current = ref<HjmGpsLog | null>(null);
+// 是否显示编辑弹窗
+const showEdit = ref(false);
+// 是否显示批量移动弹窗
+const showMove = ref(false);
+// 加载状态
+const loading = ref(true);
+// 搜索参数
+const gpsNo = ref();
+
+// 表格数据源
+const datasource: DatasourceFunction = ({
+                                          page,
+                                          limit,
+                                          where,
+                                          orders,
+                                          filters
+                                        }) => {
+  if (filters) {
+    where.status = filters.status;
+  }
+  if (gpsNo.value) {
+    where.gpsNo = gpsNo.value;
+  }
+  return pageHjmGpsLog({
+    ...where,
+    ...orders,
     page,
-    limit,
-    where,
-    orders,
-    filters
-  }) => {
-    if (filters) {
-      where.status = filters.status;
-    }
-    return pageHjmGpsLog({
-      ...where,
-      ...orders,
-      page,
-      limit
-    });
-  };
+    limit
+  });
+};
 
-  // 表格列配置
-  const columns = ref<ColumnItem[]>([
-    {
-      title: '自增ID',
-      dataIndex: 'id',
-      key: 'id',
-      align: 'center',
-      width: 90,
-    },
-    {
-      title: '车辆ID',
-      dataIndex: 'carId',
-      key: 'carId',
-      align: 'center',
-    },
-    {
-      title: 'gps编号',
-      dataIndex: 'gpsNo',
-      key: 'gpsNo',
-      align: 'center',
-    },
-    {
-      title: '经度',
-      dataIndex: 'longitude',
-      key: 'longitude',
-      align: 'center',
-    },
-    {
-      title: '纬度',
-      dataIndex: 'latitude',
-      key: 'latitude',
-      align: 'center',
-    },
-    {
-      title: '备注',
-      dataIndex: 'comments',
-      key: 'comments',
-      align: 'center',
-    },
-    {
-      title: '状态, 0正常, 1冻结',
-      dataIndex: 'status',
-      key: 'status',
-      align: 'center',
-    },
-    {
-      title: '创建时间',
-      dataIndex: 'createTime',
-      key: 'createTime',
-      align: 'center',
-      sorter: true,
-      ellipsis: true,
-      customRender: ({ text }) => toDateString(text, 'yyyy-MM-dd')
-    },
-    {
-      title: '操作',
-      key: 'action',
-      width: 180,
-      fixed: 'right',
-      align: 'center',
-      hideInSetting: true
-    }
-  ]);
+// 表格列配置
+const columns = ref<ColumnItem[]>([
+  {
+    title: '自增ID',
+    dataIndex: 'id',
+    key: 'id',
+    align: 'center',
+    width: 90
+  },
+  {
+    title: 'gps编号',
+    dataIndex: 'gpsNo',
+    key: 'gpsNo',
+    align: 'center'
+  },
+  {
+    title: '经度',
+    dataIndex: 'longitude',
+    key: 'longitude',
+    align: 'center'
+  },
+  {
+    title: '纬度',
+    dataIndex: 'latitude',
+    key: 'latitude',
+    align: 'center'
+  },
+  {
+    title: '速度',
+    dataIndex: 'speed',
+    key: 'speed',
+    align: 'center'
+  },
+  {
+    title: '创建时间',
+    dataIndex: 'createTime',
+    key: 'createTime',
+    align: 'center',
+    sorter: true
+  },
+  {
+    title: '操作',
+    key: 'action',
+    width: 180,
+    fixed: 'right',
+    align: 'center',
+    hideInSetting: true
+  }
+]);
 
-  /* 搜索 */
-  const reload = (where?: HjmGpsLogParam) => {
-    selection.value = [];
-    tableRef?.value?.reload({ where: where });
-  };
+/* 搜索 */
+const reload = (where?: HjmGpsLogParam) => {
+  selection.value = [];
+  tableRef?.value?.reload({where: where});
+};
 
-  /* 打开编辑弹窗 */
-  const openEdit = (row?: HjmGpsLog) => {
-    current.value = row ?? null;
-    showEdit.value = true;
-  };
+/* 打开编辑弹窗 */
+const openEdit = (row?: HjmGpsLog) => {
+  current.value = row ?? null;
+  showEdit.value = true;
+};
 
-  /* 打开批量移动弹窗 */
-  const openMove = () => {
-    showMove.value = true;
-  };
+/* 打开批量移动弹窗 */
+const openMove = () => {
+  showMove.value = true;
+};
 
-  /* 删除单个 */
-  const remove = (row: HjmGpsLog) => {
-    const hide = message.loading('请求中..', 0);
-    removeHjmGpsLog(row.hjmGpsLogId)
-      .then((msg) => {
-        hide();
-        message.success(msg);
-        reload();
-      })
-      .catch((e) => {
-        hide();
-        message.error(e.message);
-      });
-  };
+/* 删除单个 */
+const remove = (row: HjmGpsLog) => {
+  const hide = message.loading('请求中..', 0);
+  removeHjmGpsLog(row.id)
+    .then((msg) => {
+      hide();
+      message.success(msg);
+      reload();
+    })
+    .catch((e) => {
+      hide();
+      message.error(e.message);
+    });
+};
 
-  /* 批量删除 */
-  const removeBatch = () => {
-    if (!selection.value.length) {
-      message.error('请至少选择一条数据');
-      return;
+/* 批量删除 */
+const removeBatch = () => {
+  if (!selection.value.length) {
+    message.error('请至少选择一条数据');
+    return;
+  }
+  Modal.confirm({
+    title: '提示',
+    content: '确定要删除选中的记录吗?',
+    icon: createVNode(ExclamationCircleOutlined),
+    maskClosable: true,
+    onOk: () => {
+      const hide = message.loading('请求中..', 0);
+      removeBatchHjmGpsLog(selection.value.map((d) => d.id))
+        .then((msg) => {
+          hide();
+          message.success(msg);
+          reload();
+        })
+        .catch((e) => {
+          hide();
+          message.error(e.message);
+        });
     }
-    Modal.confirm({
-      title: '提示',
-      content: '确定要删除选中的记录吗?',
-      icon: createVNode(ExclamationCircleOutlined),
-      maskClosable: true,
-      onOk: () => {
-        const hide = message.loading('请求中..', 0);
-        removeBatchHjmGpsLog(selection.value.map((d) => d.hjmGpsLogId))
-          .then((msg) => {
-            hide();
-            message.success(msg);
-            reload();
-          })
-          .catch((e) => {
-            hide();
-            message.error(e.message);
-          });
-      }
-    });
-  };
+  });
+};
 
-  /* 查询 */
-  const query = () => {
-    loading.value = true;
-  };
+/* 查询 */
+const query = () => {
+
+  loading.value = true;
+};
 
-  /* 自定义行属性 */
-  const customRow = (record: HjmGpsLog) => {
-    return {
-      // 行点击事件
-      onClick: () => {
-        // console.log(record);
-      },
-      // 行双击事件
-      onDblclick: () => {
-        openEdit(record);
-      }
-    };
+/* 自定义行属性 */
+const customRow = (record: HjmGpsLog) => {
+  return {
+    // 行点击事件
+    onClick: () => {
+      // console.log(record);
+    },
+    // 行双击事件
+    onDblclick: () => {
+      openEdit(record);
+    }
   };
-  query();
+};
+
+watch(
+  () => router.currentRoute.value.query,
+  (param) => {
+    query();
+    if (param.no) {
+      gpsNo.value = param.no;
+    }
+  },
+  {immediate: true}
+);
 </script>
 
 <script lang="ts">
-  export default {
-    name: 'HjmGpsLog'
-  };
+export default {
+  name: 'HjmGpsLog'
+};
 </script>
 
 <style lang="less" scoped></style>
diff --git a/src/views/hjm/staff/index.vue b/src/views/hjm/staff/index.vue
index a7f7c92..16a34e0 100644
--- a/src/views/hjm/staff/index.vue
+++ b/src/views/hjm/staff/index.vue
@@ -92,7 +92,7 @@ import {
 } from '@/api/system/organization';
 import type {Organization} from '@/api/system/organization/model';
 import {getPageTitle} from "@/utils/common";
-import Extra from "@/views/system/user/components/Extra.vue";
+import Extra from "@/views/hjm/userVerify/components/Extra.vue";
 
 // 加载状态
 const loading = ref(true);
diff --git a/src/views/hjm/userVerify/components/Extra.vue b/src/views/hjm/userVerify/components/Extra.vue
new file mode 100644
index 0000000..56181bd
--- /dev/null
+++ b/src/views/hjm/userVerify/components/Extra.vue
@@ -0,0 +1,55 @@
+<!-- 搜索表单 -->
+<template>
+  <a-space style="flex-wrap: wrap" v-if="hasRole('superAdmin') || hasRole('admin') || hasRole('foundation')">
+    <a-button
+      type="text"
+      v-if="hasPermission('sys:org:list')"
+      @click="openUrl('/staff')"
+    >人员管理
+    </a-button
+    >
+    <a-button
+      type="text"
+      v-if="hasPermission('sys:userVerify:list')"
+      @click="openUrl('/user-verify')"
+    >实名认证
+    </a-button
+    >
+    <a-button
+      type="text"
+      v-if="hasAnyRole(['superAdmin','admin'])"
+      @click="openUrl('/system/admin')"
+    >管理员列表
+    </a-button
+    >
+  </a-space>
+</template>
+
+<script lang="ts" setup>
+import {watch, nextTick} from 'vue';
+import {CmsWebsite} from '@/api/cms/cmsWebsite/model';
+import {openUrl} from "@/utils/common";
+import {hasAnyRole, hasPermission, hasRole} from "@/utils/permission";
+
+const props = withDefaults(
+  defineProps<{
+    // 选中的角色
+    selection?: [];
+    website?: CmsWebsite;
+    count?: 0;
+  }>(),
+  {}
+);
+
+nextTick(() => {
+  if (localStorage.getItem('NotActive')) {
+    // IsActive.value = false
+  }
+})
+
+watch(
+  () => props.selection,
+  () => {
+  }
+);
+</script>
diff --git a/src/views/hjm/userVerify/index.vue b/src/views/hjm/userVerify/index.vue
index a7868a0..2d5c1ca 100644
--- a/src/views/hjm/userVerify/index.vue
+++ b/src/views/hjm/userVerify/index.vue
@@ -67,7 +67,7 @@ import UserVerifyEdit from './components/userVerifyEdit.vue';
 import {pageUserVerify, removeUserVerify, removeBatchUserVerify} from '@/api/system/userVerify';
 import type {UserVerify, UserVerifyParam} from '@/api/system/userVerify/model';
 import {getPageTitle} from "@/utils/common";
-import Extra from "@/views/system/user/components/Extra.vue";
+import Extra from "./components/Extra.vue";
 
 // 表格实例
 const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
diff --git a/src/views/system/userVerify/components/search.vue b/src/views/system/userVerify/components/search.vue
index 869cea1..4194d41 100644
--- a/src/views/system/userVerify/components/search.vue
+++ b/src/views/system/userVerify/components/search.vue
@@ -8,8 +8,8 @@
 <!--      <span>添加</span>-->
 <!--    </a-button>-->
     <a-radio-group v-model:value="where.type">
-      <a-radio-button :value="0" @click="push(`/system/user-verify`)">个人</a-radio-button>
-      <a-radio-button :value="1" @click="push(`/system/user-verify2`)">企业</a-radio-button>
+      <a-radio-button :value="0" @click="push(`/user-verify`)">个人</a-radio-button>
+      <a-radio-button :value="1" @click="push(`/user-verify2`)">企业</a-radio-button>
     </a-radio-group>
     <a-input-search
       allow-clear