From 4c477b6a16cfefb7b837b40393f66321f8dac4b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Wed, 11 Jun 2025 13:57:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E9=BB=84=E4=BD=B3?=
 =?UTF-8?q?=E6=98=8E=E7=9A=84=E8=BD=A6=E8=BE=86=E6=89=B9=E9=87=8F=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/hjm/hjmCar/index.ts                   |  16 ++
 src/api/hjm/hjmCar/model/index.ts             |   2 +
 src/api/hjm/hjmGpsLog/index.ts                | 106 ++++++++
 src/api/hjm/hjmGpsLog/model/index.ts          |  33 +++
 src/views/hjm/hjmCar/components/Import.vue    |  82 ++++++
 src/views/hjm/hjmCar/components/search.vue    |  47 +++-
 src/views/hjm/hjmCar/index.vue                |  50 +++-
 src/views/hjm/hjmFence/index.vue              |   6 +
 .../hjmGpsLog/components/hjmGpsLogEdit.vue    | 210 +++++++++++++++
 src/views/hjm/hjmGpsLog/components/search.vue |  42 +++
 src/views/hjm/hjmGpsLog/index.vue             | 251 ++++++++++++++++++
 src/views/hjm/staff/index.vue                 |   2 +-
 src/views/system/admin/index.vue              |   4 -
 13 files changed, 842 insertions(+), 9 deletions(-)
 create mode 100644 src/api/hjm/hjmGpsLog/index.ts
 create mode 100644 src/api/hjm/hjmGpsLog/model/index.ts
 create mode 100644 src/views/hjm/hjmCar/components/Import.vue
 create mode 100644 src/views/hjm/hjmGpsLog/components/hjmGpsLogEdit.vue
 create mode 100644 src/views/hjm/hjmGpsLog/components/search.vue
 create mode 100644 src/views/hjm/hjmGpsLog/index.vue

diff --git a/src/api/hjm/hjmCar/index.ts b/src/api/hjm/hjmCar/index.ts
index c67aaf5..3279faf 100644
--- a/src/api/hjm/hjmCar/index.ts
+++ b/src/api/hjm/hjmCar/index.ts
@@ -104,3 +104,19 @@ export async function getHjmCar(id: number) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+/**
+ * 车辆批量导入
+ */
+export async function importHjmCar(file: File) {
+  const formData = new FormData();
+  formData.append('file', file);
+  const res = await request.post<ApiResult<unknown>>(
+    MODULES_API_URL + '/hjm/hjm-car/import',
+    formData
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
diff --git a/src/api/hjm/hjmCar/model/index.ts b/src/api/hjm/hjmCar/model/index.ts
index a3aa7f4..4ab9dcd 100644
--- a/src/api/hjm/hjmCar/model/index.ts
+++ b/src/api/hjm/hjmCar/model/index.ts
@@ -71,5 +71,7 @@ export interface HjmCar {
 export interface HjmCarParam extends PageParam {
   id?: number;
   status?: number;
+  organizationId?: number;
+  organizationParentId?: number;
   keywords?: string;
 }
diff --git a/src/api/hjm/hjmGpsLog/index.ts b/src/api/hjm/hjmGpsLog/index.ts
new file mode 100644
index 0000000..3e4dd25
--- /dev/null
+++ b/src/api/hjm/hjmGpsLog/index.ts
@@ -0,0 +1,106 @@
+import request from '@/utils/request';
+import type { ApiResult, PageResult } from '@/api';
+import type { HjmGpsLog, HjmGpsLogParam } from './model';
+import { MODULES_API_URL } from '@/config/setting';
+
+/**
+ * 分页查询黄家明_gps轨迹
+ */
+export async function pageHjmGpsLog(params: HjmGpsLogParam) {
+  const res = await request.get<ApiResult<PageResult<HjmGpsLog>>>(
+    MODULES_API_URL + '/hjm/hjm-gps-log/page',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 查询黄家明_gps轨迹列表
+ */
+export async function listHjmGpsLog(params?: HjmGpsLogParam) {
+  const res = await request.get<ApiResult<HjmGpsLog[]>>(
+    MODULES_API_URL + '/hjm/hjm-gps-log',
+    {
+      params
+    }
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 添加黄家明_gps轨迹
+ */
+export async function addHjmGpsLog(data: HjmGpsLog) {
+  const res = await request.post<ApiResult<unknown>>(
+    MODULES_API_URL + '/hjm/hjm-gps-log',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 修改黄家明_gps轨迹
+ */
+export async function updateHjmGpsLog(data: HjmGpsLog) {
+  const res = await request.put<ApiResult<unknown>>(
+    MODULES_API_URL + '/hjm/hjm-gps-log',
+    data
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 删除黄家明_gps轨迹
+ */
+export async function removeHjmGpsLog(id?: number) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/hjm/hjm-gps-log/' + id
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 批量删除黄家明_gps轨迹
+ */
+export async function removeBatchHjmGpsLog(data: (number | undefined)[]) {
+  const res = await request.delete<ApiResult<unknown>>(
+    MODULES_API_URL + '/hjm/hjm-gps-log/batch',
+    {
+      data
+    }
+  );
+  if (res.data.code === 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+/**
+ * 根据id查询黄家明_gps轨迹
+ */
+export async function getHjmGpsLog(id: number) {
+  const res = await request.get<ApiResult<HjmGpsLog>>(
+    MODULES_API_URL + '/hjm/hjm-gps-log/' + id
+  );
+  if (res.data.code === 0 && res.data.data) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
diff --git a/src/api/hjm/hjmGpsLog/model/index.ts b/src/api/hjm/hjmGpsLog/model/index.ts
new file mode 100644
index 0000000..abcf75b
--- /dev/null
+++ b/src/api/hjm/hjmGpsLog/model/index.ts
@@ -0,0 +1,33 @@
+import type { PageParam } from '@/api';
+
+/**
+ * 黄家明_gps轨迹
+ */
+export interface HjmGpsLog {
+  // 自增ID
+  id?: number;
+  // 车辆ID
+  carId?: number;
+  // gps编号
+  gpsNo?: string;
+  // 经度
+  longitude?: string;
+  // 纬度
+  latitude?: string;
+  // 备注
+  comments?: string;
+  // 状态, 0正常, 1冻结
+  status?: number;
+  // 租户id
+  tenantId?: number;
+  // 创建时间
+  createTime?: string;
+}
+
+/**
+ * 黄家明_gps轨迹搜索条件
+ */
+export interface HjmGpsLogParam extends PageParam {
+  id?: number;
+  keywords?: string;
+}
diff --git a/src/views/hjm/hjmCar/components/Import.vue b/src/views/hjm/hjmCar/components/Import.vue
new file mode 100644
index 0000000..26209a8
--- /dev/null
+++ b/src/views/hjm/hjmCar/components/Import.vue
@@ -0,0 +1,82 @@
+<!-- 用户导入弹窗 -->
+<template>
+  <ele-modal
+    :width="520"
+    :footer="null"
+    title="批量导入"
+    :visible="visible"
+    @update:visible="updateVisible"
+  >
+    <a-spin :spinning="loading">
+      <a-upload-dragger
+        accept=".xls,.xlsx"
+        :show-upload-list="false"
+        :customRequest="doUpload"
+        style="padding: 24px 0; margin-bottom: 16px"
+      >
+        <p class="ant-upload-drag-icon">
+          <cloud-upload-outlined />
+        </p>
+        <p class="ant-upload-hint">将文件拖到此处，或点击上传</p>
+      </a-upload-dragger>
+    </a-spin>
+    <div class="ele-text-center">
+      <a href="https://oss.wsdns.cn/20250611/6602b59c76f3488e8a5168ac60c246cb.xlsx" target="_blank">下载导入模板</a>
+    </div>
+  </ele-modal>
+</template>
+
+<script lang="ts" setup>
+  import { ref } from 'vue';
+  import { message } from 'ant-design-vue/es';
+  import { CloudUploadOutlined } from '@ant-design/icons-vue';
+  import {importHjmCar} from "@/api/hjm/hjmCar";
+
+  const emit = defineEmits<{
+    (e: 'done'): void;
+    (e: 'update:visible', visible: boolean): void;
+  }>();
+
+  defineProps<{
+    // 是否打开弹窗
+    visible: boolean;
+  }>();
+
+  // 导入请求状态
+  const loading = ref(false);
+
+  /* 上传 */
+  const doUpload = ({ file }) => {
+    if (
+      ![
+        'application/vnd.ms-excel',
+        'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+      ].includes(file.type)
+    ) {
+      message.error('只能选择 excel 文件');
+      return false;
+    }
+    if (file.size / 1024 / 1024 > 10) {
+      message.error('大小不能超过 10MB');
+      return false;
+    }
+    loading.value = true;
+    importHjmCar(file)
+      .then((msg) => {
+        loading.value = false;
+        message.success(msg);
+        updateVisible(false);
+        emit('done');
+      })
+      .catch((e) => {
+        loading.value = false;
+        message.error(e.message);
+      });
+    return false;
+  };
+
+  /* 更新 visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+</script>
diff --git a/src/views/hjm/hjmCar/components/search.vue b/src/views/hjm/hjmCar/components/search.vue
index 4a8abd2..4904c14 100644
--- a/src/views/hjm/hjmCar/components/search.vue
+++ b/src/views/hjm/hjmCar/components/search.vue
@@ -7,6 +7,25 @@
       </template>
       <span>添加</span>
     </a-button>
+    <a-button
+      danger
+      type="primary"
+      class="ele-btn-icon"
+      :disabled="selection?.length === 0"
+      @click="removeBatch"
+    >
+      <template #icon>
+        <DeleteOutlined/>
+      </template>
+      <span>批量删除</span>
+    </a-button>
+    <org-select
+      :data="organizationList"
+      placeholder="请选择所属机构"
+      style="width: 220px"
+      v-model:value="where.organizationId"
+      @change="reload"
+    />
     <a-input-search
       allow-clear
       placeholder="请输入车牌号"
@@ -14,14 +33,22 @@
       v-model:value="where.keywords"
       @search="reload"
     />
-    <a-button type="text" @click="handleExport" :loading="exportLoading">批量导出二维码</a-button>
+    <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"/>
 </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";
@@ -29,11 +56,16 @@ 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[];
   }>(),
   {}
 );
@@ -54,6 +86,7 @@ const {where} = useSearch<HjmCarParam>({
 
 // 导出加载状态
 const exportLoading = ref(false);
+const showImport = ref(false);
 
 // 新增
 const add = () => {
@@ -64,6 +97,16 @@ const reload = () => {
   emit('search', where);
 };
 
+// 批量删除
+const removeBatch = () => {
+  emit('remove');
+};
+
+/* 打开编辑弹窗 */
+const openImport = () => {
+  showImport.value = true;
+};
+
 // 批量导出二维码到Word文档
 const handleExport = async () => {
   try {
@@ -71,7 +114,7 @@ const handleExport = async () => {
     message.loading('正在生成二维码文档，请稍候...', 0);
 
     // 获取所有车辆数据
-    const carList = await listHjmCar({status: 1});
+    const carList = await listHjmCar(where);
 
     if (!carList || carList.length === 0) {
       message.error('没有车辆数据可导出');
diff --git a/src/views/hjm/hjmCar/index.vue b/src/views/hjm/hjmCar/index.vue
index 666e7b5..8b66b45 100644
--- a/src/views/hjm/hjmCar/index.vue
+++ b/src/views/hjm/hjmCar/index.vue
@@ -10,6 +10,7 @@
         :columns="columns"
         :datasource="datasource"
         :customRow="customRow"
+        v-model:selection="selection"
         tool-class="ele-toolbar-form"
         class="sys-org-table"
       >
@@ -18,6 +19,7 @@
             @search="reload"
             :selection="selection"
             @add="openEdit"
+            :organization-list="data"
             @remove="removeBatch"
             @batchMove="openMove"
           />
@@ -75,6 +77,7 @@ import type {
   ColumnItem
 } from 'ele-admin-pro/es/ele-pro-table/types';
 import Extra from './components/Extra.vue';
+import {toTreeData} from 'ele-admin-pro';
 import Search from './components/search.vue';
 import HjmCarEdit from './components/hjmCarEdit.vue';
 import {pageHjmCar, removeHjmCar, removeBatchHjmCar} from '@/api/hjm/hjmCar';
@@ -82,6 +85,8 @@ import type {HjmCar, HjmCarParam} from '@/api/hjm/hjmCar/model';
 import {getPageTitle} from "@/utils/common";
 import Qrcode from "./components/qrcode.vue";
 import router from "@/router";
+import {listOrganizations} from "@/api/system/organization";
+import {Organization} from "@/api/system/organization/model";
 
 // 表格实例
 const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
@@ -99,7 +104,14 @@ const loading = ref(true);
 // 二维码内容
 const qrcode = ref<number>();
 // 是否显示二维码
-const showQrcode = ref(false);// 树形数据
+const showQrcode = ref(false);
+
+// 树形数据
+const data = ref<Organization[]>([]);
+// 树展开的key
+const expandedRowKeys = ref<number[]>([]);
+// 树选中的key
+const selectedRowKeys = ref<number[]>([]);
 
 // 表格数据源
 const datasource: DatasourceFunction = ({
@@ -142,7 +154,7 @@ const columns = ref<ColumnItem[]>([
     align: 'center',
   },
   {
-    title: '站点',
+    title: '所属站点',
     dataIndex: 'organization',
     key: 'organization',
     align: 'center',
@@ -285,6 +297,40 @@ const removeBatch = () => {
 /* 查询 */
 const query = () => {
   loading.value = true;
+
+// 加载机构
+  listOrganizations()
+    .then((list) => {
+      loading.value = false;
+      const eks: number[] = [];
+      list.forEach((d) => {
+        d.key = d.organizationId;
+        d.value = d.organizationId;
+        d.title = d.organizationName;
+        if (typeof d.key === 'number') {
+          eks.push(d.key);
+        }
+      });
+      expandedRowKeys.value = eks;
+      data.value = toTreeData({
+        data: list,
+        idField: 'organizationId',
+        parentIdField: 'parentId'
+      });
+      if (list.length) {
+        if (typeof list[0].key === 'number') {
+          selectedRowKeys.value = [list[0].key];
+        }
+        // current.value = list[0];
+      } else {
+        selectedRowKeys.value = [];
+        // current.value = null;
+      }
+    })
+    .catch((e) => {
+      loading.value = false;
+      message.error(e.message);
+    });
 };
 
 /* 自定义行属性 */
diff --git a/src/views/hjm/hjmFence/index.vue b/src/views/hjm/hjmFence/index.vue
index ca0d64e..9323f6b 100644
--- a/src/views/hjm/hjmFence/index.vue
+++ b/src/views/hjm/hjmFence/index.vue
@@ -103,6 +103,12 @@ const datasource: DatasourceFunction = ({
 
 // 表格列配置
 const columns = ref<ColumnItem[]>([
+  {
+    title: 'ID',
+    dataIndex: 'id',
+    key: 'id',
+    width: 90
+  },
   {
     title: '围栏名称',
     dataIndex: 'name',
diff --git a/src/views/hjm/hjmGpsLog/components/hjmGpsLogEdit.vue b/src/views/hjm/hjmGpsLog/components/hjmGpsLogEdit.vue
new file mode 100644
index 0000000..0cb7b68
--- /dev/null
+++ b/src/views/hjm/hjmGpsLog/components/hjmGpsLogEdit.vue
@@ -0,0 +1,210 @@
+<!-- 编辑弹窗 -->
+<template>
+  <ele-modal
+    :width="800"
+    :visible="visible"
+    :maskClosable="false"
+    :maxable="maxable"
+    :title="isUpdate ? '编辑黄家明_gps轨迹' : '添加黄家明_gps轨迹'"
+    :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="车辆ID" name="carId">
+        <a-input
+          allow-clear
+          placeholder="请输入车辆ID"
+          v-model:value="form.carId"
+        />
+      </a-form-item>
+      <a-form-item label="gps编号" name="gpsNo">
+        <a-input
+          allow-clear
+          placeholder="请输入gps编号"
+          v-model:value="form.gpsNo"
+        />
+      </a-form-item>
+      <a-form-item label="经度" name="longitude">
+        <a-input
+          allow-clear
+          placeholder="请输入经度"
+          v-model:value="form.longitude"
+        />
+      </a-form-item>
+      <a-form-item label="纬度" name="latitude">
+        <a-input
+          allow-clear
+          placeholder="请输入纬度"
+          v-model:value="form.latitude"
+        />
+      </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-item label="状态, 0正常, 1冻结" name="status">
+        <a-radio-group v-model:value="form.status">
+          <a-radio :value="0">显示</a-radio>
+          <a-radio :value="1">隐藏</a-radio>
+        </a-radio-group>
+      </a-form-item>
+    </a-form>
+  </ele-modal>
+</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 { addHjmGpsLog, updateHjmGpsLog } from '@/api/hjm/hjmGpsLog';
+  import { HjmGpsLog } from '@/api/hjm/hjmGpsLog/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';
+
+  // 是否是修改
+  const isUpdate = ref(false);
+  const useForm = Form.useForm;
+  // 是否开启响应式布局
+  const themeStore = useThemeStore();
+  const { styleResponsive } = storeToRefs(themeStore);
+
+  const props = defineProps<{
+    // 弹窗是否打开
+    visible: boolean;
+    // 修改回显的数据
+    data?: HjmGpsLog | 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<HjmGpsLog>({
+    id: undefined,
+    carId: undefined,
+    gpsNo: undefined,
+    longitude: undefined,
+    latitude: undefined,
+    comments: undefined,
+    status: undefined,
+    tenantId: undefined,
+    createTime: undefined,
+    hjmGpsLogId: undefined,
+    hjmGpsLogName: '',
+    status: 0,
+    comments: '',
+    sortNumber: 100
+  });
+
+  /* 更新visible */
+  const updateVisible = (value: boolean) => {
+    emit('update:visible', value);
+  };
+
+  // 表单验证规则
+  const rules = reactive({
+    hjmGpsLogName: [
+      {
+        required: true,
+        type: 'string',
+        message: '请填写黄家明_gps轨迹名称',
+        trigger: 'blur'
+      }
+    ]
+  });
+
+  const chooseImage = (data: FileRecord) => {
+    images.value.push({
+      uid: data.id,
+      url: data.path,
+      status: 'done'
+    });
+    form.image = data.path;
+  };
+
+  const onDeleteItem = (index: number) => {
+    images.value.splice(index, 1);
+    form.image = '';
+  };
+
+  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 ? updateHjmGpsLog : addHjmGpsLog;
+        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);
+          if(props.data.image){
+            images.value.push({
+              uid: uuid(),
+              url: props.data.image,
+              status: 'done'
+            })
+          }
+          isUpdate.value = true;
+        } else {
+          isUpdate.value = false;
+        }
+      } else {
+        resetFields();
+      }
+    },
+    { immediate: true }
+  );
+</script>
diff --git a/src/views/hjm/hjmGpsLog/components/search.vue b/src/views/hjm/hjmGpsLog/components/search.vue
new file mode 100644
index 0000000..82fea9d
--- /dev/null
+++ b/src/views/hjm/hjmGpsLog/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 { GradeParam } from '@/api/user/grade/model';
+  import { watch } from 'vue';
+
+  const props = withDefaults(
+    defineProps<{
+      // 选中的角色
+      selection?: [];
+    }>(),
+    {}
+  );
+
+  const emit = defineEmits<{
+    (e: 'search', where?: GradeParam): void;
+    (e: 'add'): void;
+    (e: 'remove'): void;
+    (e: 'batchMove'): void;
+  }>();
+
+  // 新增
+  const add = () => {
+    emit('add');
+  };
+
+  watch(
+    () => props.selection,
+    () => {}
+  );
+</script>
diff --git a/src/views/hjm/hjmGpsLog/index.vue b/src/views/hjm/hjmGpsLog/index.vue
new file mode 100644
index 0000000..6479793
--- /dev/null
+++ b/src/views/hjm/hjmGpsLog/index.vue
@@ -0,0 +1,251 @@
+<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"
+            />
+          </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>
+        </ele-pro-table>
+      </a-card>
+
+      <!-- 编辑弹窗 -->
+      <HjmGpsLogEdit v-model:visible="showEdit" :data="current" @done="reload" />
+    </div>
+  </div>
+</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 = ({
+    page,
+    limit,
+    where,
+    orders,
+    filters
+  }) => {
+    if (filters) {
+      where.status = filters.status;
+    }
+    return pageHjmGpsLog({
+      ...where,
+      ...orders,
+      page,
+      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 reload = (where?: HjmGpsLogParam) => {
+    selection.value = [];
+    tableRef?.value?.reload({ where: where });
+  };
+
+  /* 打开编辑弹窗 */
+  const openEdit = (row?: HjmGpsLog) => {
+    current.value = row ?? null;
+    showEdit.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 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.hjmGpsLogId))
+          .then((msg) => {
+            hide();
+            message.success(msg);
+            reload();
+          })
+          .catch((e) => {
+            hide();
+            message.error(e.message);
+          });
+      }
+    });
+  };
+
+  /* 查询 */
+  const query = () => {
+    loading.value = true;
+  };
+
+  /* 自定义行属性 */
+  const customRow = (record: HjmGpsLog) => {
+    return {
+      // 行点击事件
+      onClick: () => {
+        // console.log(record);
+      },
+      // 行双击事件
+      onDblclick: () => {
+        openEdit(record);
+      }
+    };
+  };
+  query();
+</script>
+
+<script lang="ts">
+  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 798821f..e4cc2bb 100644
--- a/src/views/hjm/staff/index.vue
+++ b/src/views/hjm/staff/index.vue
@@ -120,7 +120,7 @@ const query = () => {
         loading.value = false;
         const eks: number[] = [];
         list.forEach((d, i) => {
-          d.title = d.organizationName;
+          d.title = d.organizationName + `[${d.organizationId}]`;
           d.key = d.organizationId;
           d.value = d.organizationId;
 
diff --git a/src/views/system/admin/index.vue b/src/views/system/admin/index.vue
index 5d69fd4..ea277c1 100644
--- a/src/views/system/admin/index.vue
+++ b/src/views/system/admin/index.vue
@@ -114,9 +114,6 @@ import {createVNode, ref, reactive} from 'vue';
 import {message, Modal} from 'ant-design-vue/es';
 import {
   PlusOutlined,
-  DeleteOutlined,
-  UploadOutlined,
-  EditOutlined,
   UserOutlined,
   Html5Outlined,
   ChromeOutlined,
@@ -129,7 +126,6 @@ import type {
   ColumnItem
 } from 'ele-admin-pro/es/ele-pro-table/types';
 import {messageLoading, formatNumber} from 'ele-admin-pro/es';
-import {timeAgo} from 'ele-admin-pro';
 import UserEdit from './components/user-edit.vue';
 import UserImport from './components/user-import.vue';
 import UserInfo from './components/user-info.vue';