From 229c4c98a0ba6b7c494d6d369baceb73bfa27cb0 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Wed, 20 Aug 2025 19:13:16 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=91=84=E5=83=8F=E5=A4=B4=E5=88=86?=
 =?UTF-8?q?=E7=BB=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/device/deviceGroup.ts                 |  68 +++++++
 src/views/car/carRecord/index.vue             |   9 +-
 .../deviceGroup/camera-table-dialog.vue       | 118 +++++++++++++
 src/views/device/deviceGroup/form.vue         | 117 ++++++++++++
 src/views/device/deviceGroup/index.vue        | 167 ++++++++++++++++++
 src/views/door/doorAlarm/index.vue            |  44 ++---
 src/views/door/doorBeLate/index.vue           |  16 --
 7 files changed, 499 insertions(+), 40 deletions(-)
 create mode 100644 src/api/device/deviceGroup.ts
 create mode 100644 src/views/device/deviceGroup/camera-table-dialog.vue
 create mode 100644 src/views/device/deviceGroup/form.vue
 create mode 100644 src/views/device/deviceGroup/index.vue

diff --git a/src/api/device/deviceGroup.ts b/src/api/device/deviceGroup.ts
new file mode 100644
index 0000000..65bd6a2
--- /dev/null
+++ b/src/api/device/deviceGroup.ts
@@ -0,0 +1,68 @@
+import request from "/@/utils/request"
+
+/**
+ * 删除设施分组子项
+ */
+export function delGroupItemIds(data: any) {
+  return request({
+    url: '/admin/device/deviceGroup/delGroupItemIds',
+    method: 'delete',
+    data: data
+  })
+}
+
+export function getDeviceGroupList(query: any) {
+  return request({
+    url: '/admin/device/deviceGroup/getDeviceGroupList',
+    method: 'get',
+    params: query
+  })
+}
+
+export function syncAreaGroyup() {
+  return request({
+    url: '/admin/device/deviceGroup/syncAreaGroyup',
+    method: 'get',
+    params: {}
+  })
+}
+
+export function fetchList(query?: Object) {
+  return request({
+    url: '/admin/device/deviceGroup/page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function addObj(obj?: Object) {
+  return request({
+    url: '/admin/device/deviceGroup',
+    method: 'post',
+    data: obj
+  })
+}
+
+export function getObj(id?: string) {
+  return request({
+    url: '/admin/device/deviceGroup/' + id,
+    method: 'get'
+  })
+}
+
+export function delObjs(ids?: Object) {
+  return request({
+    url: '/admin/device/deviceGroup',
+    method: 'delete',
+    data: ids
+  })
+}
+
+export function putObj(obj?: Object) {
+  return request({
+    url: '/admin/device/deviceGroup',
+    method: 'put',
+    data: obj
+  })
+}
+
diff --git a/src/views/car/carRecord/index.vue b/src/views/car/carRecord/index.vue
index f76c609..2528752 100644
--- a/src/views/car/carRecord/index.vue
+++ b/src/views/car/carRecord/index.vue
@@ -6,6 +6,9 @@
           <el-form-item style="width: 250px;" label="车牌号" prop="carNum">
             <el-input v-model="state.queryForm.carNum" placeholder="请输入车牌号" />
           </el-form-item>
+          <el-form-item style="width: 250px;" label="行车方向" prop="carDirect">
+            <dict-select v-model="state.queryForm.carDirect" :options="dh_car_direct" placeholder="请选择行车方向" />
+          </el-form-item>
           <el-form-item style="width: 350px;" label="抓拍时间" prop="capTimeList">
             <el-date-picker v-model="state.queryForm.capTimeList" value-format="YYYY-MM-DD" type="daterange" />
           </el-form-item>
@@ -50,9 +53,9 @@
               <dict-tag :options="dh_car_color" :value="row.carColor" />
             </template>
           </el-table-column>
-          <el-table-column prop="carInnerCategory" width="120" label="车辆进出类型">
+          <el-table-column prop="carInnerCategory" width="120" label="车辆类型">
             <template #default="{ row }">
-              <dict-tag :options="dh_enter_or_exit" :value="row.carInnerCategory" />
+              <dict-tag :options="dh_car_inner_category" :value="row.carInnerCategory" />
             </template>
           </el-table-column>
 
@@ -119,7 +122,7 @@ import { useDict } from '/@/hooks/dict';
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import('./form.vue'));
 // 定义查询字典
-const { dh_car_color, dh_enter_or_exit, dh_car_num_color, dh_car_direct } = useDict("dh_car_color", "dh_enter_or_exit", "dh_car_num_color", "dh_car_direct")
+const { dh_car_color, dh_car_inner_category, dh_car_num_color, dh_car_direct } = useDict("dh_car_color", "dh_car_inner_category", "dh_car_num_color", "dh_car_direct")
 
 
 // 定义变量内容
diff --git a/src/views/device/deviceGroup/camera-table-dialog.vue b/src/views/device/deviceGroup/camera-table-dialog.vue
new file mode 100644
index 0000000..f6fea45
--- /dev/null
+++ b/src/views/device/deviceGroup/camera-table-dialog.vue
@@ -0,0 +1,118 @@
+<template>
+    <el-dialog title="摄像头列表" v-model="visible" :close-on-click-modal="false" draggable>
+        <el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
+            <el-form-item style="width: 250px;" label="设备名" prop="deviceName">
+                <el-input v-model="state.queryForm.deviceName" placeholder="请输入设备名" />
+            </el-form-item>
+            <el-form-item style="width: 250px;" label="设备ip" prop="deviceIp">
+                <el-input v-model="state.queryForm.deviceIp" placeholder="请输入设备ip" />
+            </el-form-item>
+            <el-form-item>
+                <el-button icon="search" type="primary" @click="getDataList">
+                    {{ $t('common.queryBtn') }}
+                </el-button>
+                <el-button icon="Refresh" @click="resetQuery">{{ $t('common.resetBtn') }}</el-button>
+            </el-form-item>
+        </el-form>
+        <el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
+            :header-cell-style="tableStyle.headerCellStyle" @selection-change="selectionChangHandle"
+            @sort-change="sortChangeHandle">
+            <el-table-column type="selection" width="40" align="center" />
+            <el-table-column type="index" label="#" width="40" />
+            <el-table-column prop="groupName" label="设备" />
+            <el-table-column label="设备">
+                <el-table-column prop="deviceName" label="设备名" />
+                <el-table-column prop="deviceIp" label="设备ip">
+                    <template #default="{ row }">
+                        <span>{{ row.deviceIp }}</span>
+                        <span v-if="row.devicePort">:{{ row.devicePort }}</span>
+                    </template>
+                </el-table-column>
+            </el-table-column>
+            <el-table-column label="操作">
+                <template #default="{ row }">
+                    <el-button icon="delete" text type="primary" size="mini" @click="handleDelete(row)">删除</el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+        <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+    </el-dialog>
+</template>
+
+<script setup lang="ts" name="CameraTableDialog">
+import { BasicTableProps, useTable } from "/@/hooks/table";
+import { useMessage, useMessageBox } from "/@/hooks/message";
+
+import * as deviceGroupApi from "/@/api/device/deviceGroup";
+
+// 定义变量内容
+const visible = ref(false)
+
+// 搜索变量
+const queryRef = ref()
+
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+    createdIsNeed: false,
+    queryForm: { groupId: "" },
+    pageList: deviceGroupApi.getDeviceGroupList
+})
+
+//  table hook
+const {
+    getDataList,
+    currentChangeHandle,
+    sizeChangeHandle,
+    sortChangeHandle,
+    downBlobFile,
+    tableStyle
+} = useTable(state)
+
+// 打开弹窗
+const openDialog = async (id: string) => {
+    visible.value = true
+    if (!id) return
+    getDataList()
+}
+
+// 清空搜索条件
+const resetQuery = () => {
+    // 清空搜索条件
+    queryRef.value?.resetFields()
+    // 清空多选
+    selectObjs.value = []
+    getDataList()
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+    selectObjs.value = objs.map(({ id }) => id);
+    multiple.value = !objs.length;
+};
+
+// 删除
+async function handleDelete(row: any) {
+    try {
+        await useMessageBox().confirm('此操作将永久删除');
+    } catch {
+        return;
+    }
+    try {
+        await deviceGroupApi.delGroupItemIds([row.id]);
+        getDataList();
+        useMessage().success('删除成功');
+    } catch (err: any) {
+        useMessage().error(err.msg);
+    }
+}
+
+// 暴露变量
+defineExpose({
+    openDialog
+});
+</script>
+
+<style></style>
\ No newline at end of file
diff --git a/src/views/device/deviceGroup/form.vue b/src/views/device/deviceGroup/form.vue
new file mode 100644
index 0000000..4321ef4
--- /dev/null
+++ b/src/views/device/deviceGroup/form.vue
@@ -0,0 +1,117 @@
+<template>
+  <el-dialog :title="form.id ? '编辑' : '新增'" v-model="visible" :close-on-click-modal="false" draggable>
+    <el-form ref="dataFormRef" :model="form" :rules="dataRules" formDialogRef label-width="90px" v-loading="loading">
+      <el-row :gutter="24">
+        <el-col :span="24" class="mb20">
+          <el-form-item label="分组名称" prop="name">
+            <el-input v-model="form.name" placeholder="请输入分组名称" />
+          </el-form-item>
+        </el-col>
+
+        <el-col v-if="false" :span="24" class="mb20">
+          <el-form-item label="类型" prop="bizType">
+            <el-input v-model="form.bizType" placeholder="请输入类型" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="24" class="mb20">
+          <el-form-item label="排序" prop="sort">
+            <template #label>
+              <span>排序</span>
+              <tip content="越大越在前" />
+            </template>
+            <el-input-number :min="0" :step="1" v-model="form.sort" placeholder="" />
+          </el-form-item>
+        </el-col>
+
+      </el-row>
+    </el-form>
+    <template #footer>
+      <span class="dialog-footer">
+        <el-button @click="visible = false">取消</el-button>
+        <el-button type="primary" @click="onSubmit" :disabled="loading">确认</el-button>
+      </span>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup lang="ts" name="DeviceGroupDialog">
+import { useDict } from '/@/hooks/dict';
+import { useMessage } from "/@/hooks/message";
+import * as deviceGroupApi from "/@/api/device/deviceGroup";
+import { rule } from '/@/utils/validate';
+const emit = defineEmits(['refresh']);
+
+// 定义变量内容
+const dataFormRef = ref();
+const visible = ref(false)
+const loading = ref(false)
+// 定义字典
+
+// 提交表单数据
+const form = reactive({
+  id: '',
+  name: '',
+  bizType: '',
+  sort: '',
+});
+
+// 定义校验规则
+const dataRules = ref({
+  name: [{ required: true, message: '分组名称不能为空', trigger: 'blur' }],
+  bizType: [{ required: true, message: '类型不能为空', trigger: 'blur' }],
+  sort: [{ required: true, message: '排序不能为空', trigger: 'blur' }],
+})
+
+// 打开弹窗
+const openDialog = (id: string) => {
+  visible.value = true
+  form.id = ''
+
+  // 重置表单数据
+  nextTick(() => {
+    dataFormRef.value?.resetFields();
+  });
+
+  // 获取deviceGroup信息
+  if (id) {
+    form.id = id
+    getdeviceGroupData(id)
+  }
+};
+
+// 提交
+const onSubmit = async () => {
+  const valid = await dataFormRef.value.validate().catch(() => { });
+  if (!valid) return false;
+
+  try {
+    loading.value = true;
+    form.id ? await deviceGroupApi.putObj(form) : await deviceGroupApi.addObj(form);
+    useMessage().success(form.id ? '修改成功' : '添加成功');
+    visible.value = false;
+    emit('refresh');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  } finally {
+    loading.value = false;
+  }
+};
+
+
+// 初始化表单数据
+const getdeviceGroupData = (id: string) => {
+  // 获取数据
+  loading.value = true
+  deviceGroupApi.getObj(id).then((res: any) => {
+    Object.assign(form, res.data)
+  }).finally(() => {
+    loading.value = false
+  })
+};
+
+// 暴露变量
+defineExpose({
+  openDialog
+});
+</script>
\ No newline at end of file
diff --git a/src/views/device/deviceGroup/index.vue b/src/views/device/deviceGroup/index.vue
new file mode 100644
index 0000000..7751f88
--- /dev/null
+++ b/src/views/device/deviceGroup/index.vue
@@ -0,0 +1,167 @@
+<template>
+  <div class="layout-padding">
+    <div class="layout-padding-auto layout-padding-view">
+      <el-row shadow="hover" v-show="showSearch" class="ml10">
+        <el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
+          <el-form-item style="width: 250px;" label="分组名称" prop="name">
+            <el-input v-model="state.queryForm.name" placeholder="请输入分组名称" />
+          </el-form-item>
+          <el-form-item style="width: 250px;" label="类型" prop="bizType">
+            <dict-select v-model="state.queryForm.bizType" :options="device_group_type" placeholder="请选择类型" />
+          </el-form-item>
+          <el-form-item>
+            <el-button icon="search" type="primary" @click="getDataList">
+              {{ $t('common.queryBtn') }}
+            </el-button>
+            <el-button icon="Refresh" @click="resetQuery">{{ $t('common.resetBtn') }}</el-button>
+          </el-form-item>
+        </el-form>
+      </el-row>
+      <el-row>
+        <div class="mb8" style="width: 100%">
+          <el-button icon="Refresh" type="primary" class="ml10" @click="syncAreaGroyup">
+            同步房屋分组
+          </el-button>
+          <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
+            v-auth="'device_deviceGroup_add'">
+            新 增
+          </el-button>
+          <el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'device_deviceGroup_del'"
+            @click="handleDelete(selectObjs)">
+            删除
+          </el-button>
+          <right-toolbar v-model:showSearch="showSearch" :export="'device_deviceGroup_export'"
+            @exportExcel="exportExcel" class="ml10 mr20" style="float: right;"
+            @queryTable="getDataList"></right-toolbar>
+        </div>
+      </el-row>
+      <el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
+        :header-cell-style="tableStyle.headerCellStyle" @selection-change="selectionChangHandle"
+        @sort-change="sortChangeHandle">
+        <el-table-column type="selection" width="40" align="center" />
+        <el-table-column type="index" label="#" width="40" />
+        <el-table-column prop="name" label="分组名称" />
+        <el-table-column prop="bizType" label="类型">
+          <template #default="{ row }">
+            <dict-tag :options="device_group_type" :value="row.bizType" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="sort" label="排序" />
+        <el-table-column label="操作" width="150">
+          <template #default="{ row }">
+            <el-button icon="VideoPlay" text type="primary" @click="cameraTableDialogRef.openDialog(row.id)">
+              摄像头
+            </el-button>
+            <el-button v-if="row.bizType != 1" icon="edit-pen" text type="primary" v-auth="'device_deviceGroup_edit'"
+              @click="formDialogRef.openDialog(row.id)">
+              编辑
+            </el-button>
+            <el-button v-if="row.bizType != 1" icon="delete" text type="primary" v-auth="'device_deviceGroup_del'"
+              @click="handleDelete([row.id])">
+              删除
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
+    </div>
+
+    <!-- 编辑、新增  -->
+    <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
+    <camera-table-dialog ref="cameraTableDialogRef" @refresh="getDataList(false)" />
+
+  </div>
+</template>
+
+<script setup lang="ts" name="systemDeviceGroup">
+import { BasicTableProps, useTable } from "/@/hooks/table";
+import * as deviceGroupApi from "/@/api/device/deviceGroup";
+import { useMessage, useMessageBox } from "/@/hooks/message";
+import { useDict } from '/@/hooks/dict';
+
+// 引入组件
+const FormDialog = defineAsyncComponent(() => import('./form.vue'));
+const CameraTableDialog = defineAsyncComponent(() => import('./camera-table-dialog.vue'));
+
+// 定义查询字典
+const { device_group_type } = useDict("device_group_type")
+// 定义变量内容
+const formDialogRef = ref()
+const cameraTableDialogRef = ref()
+// 搜索变量
+const queryRef = ref()
+const showSearch = ref(true)
+// 多选变量
+const selectObjs = ref([]) as any
+const multiple = ref(true)
+
+const state: BasicTableProps = reactive<BasicTableProps>({
+  queryForm: {},
+  pageList: deviceGroupApi.fetchList
+})
+
+//  table hook
+const {
+  getDataList,
+  currentChangeHandle,
+  sizeChangeHandle,
+  sortChangeHandle,
+  downBlobFile,
+  tableStyle
+} = useTable(state)
+
+// 清空搜索条件
+const resetQuery = () => {
+  // 清空搜索条件
+  queryRef.value?.resetFields()
+  // 清空多选
+  selectObjs.value = []
+  getDataList()
+}
+
+// 导出excel
+const exportExcel = () => {
+  downBlobFile('/device/deviceGroup/export', Object.assign(state.queryForm, { ids: selectObjs }), 'deviceGroup.xlsx')
+}
+
+// 多选事件
+const selectionChangHandle = (objs: { id: string }[]) => {
+  selectObjs.value = objs.map(({ id }) => id);
+  multiple.value = !objs.length;
+};
+
+// 删除操作
+const handleDelete = async (ids: string[]) => {
+  try {
+    await useMessageBox().confirm('此操作将永久删除');
+  } catch {
+    return;
+  }
+
+  try {
+    await deviceGroupApi.delObjs(ids);
+    getDataList();
+    useMessage().success('删除成功');
+  } catch (err: any) {
+    useMessage().error(err.msg);
+  }
+};
+
+/**
+ * 同步房屋分组
+ */
+async function syncAreaGroyup() {
+  try {
+    await useMessageBox().confirm('是否同步房屋分组');
+  } catch {
+    return;
+  }
+  try {
+    await deviceGroupApi.syncAreaGroyup();
+    getDataList();
+    useMessage().success('同步成功');
+  } catch (err: any) {
+    useMessage().error(err.msg ?? "同步失败");
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/door/doorAlarm/index.vue b/src/views/door/doorAlarm/index.vue
index 264489b..7266fde 100644
--- a/src/views/door/doorAlarm/index.vue
+++ b/src/views/door/doorAlarm/index.vue
@@ -3,27 +3,29 @@
     <div class="layout-padding">
         <div class="layout-padding-auto layout-padding-view">
             <el-row shadow="hover" v-show="showSearch" class="ml10">
-                <el-form-item style="width: 250px;" label="人员姓名" prop="personName">
-                    <el-input v-model="state.queryForm.personName" placeholder="请输入人员姓名" />
-                </el-form-item>
-                <el-form-item style="width: 250px;" label="进出门类型" prop="enterOrExit">
-                    <dict-select v-model="state.queryForm.enterOrExit" :options="dh_enter_or_exit"
-                        placeholder="请选择进出门类型" />
-                </el-form-item>
-                <el-form-item style="width: 250px;" label="报警类型" prop="door_alarm_type">
-                    <dict-select v-model="state.queryForm.alarmType" :options="door_alarm_type"
-                        placeholder="请选择进开门类型" />
-                </el-form-item>
-                <el-form-item style="width: 350px;" label="抓拍时间" prop="swingTimeList">
-                    <el-date-picker v-model="state.queryForm.swingTimeList" value-format="YYYY-MM-DD"
-                        type="daterange" />
-                </el-form-item>
-                <el-form-item>
-                    <el-button icon="search" type="primary" @click="getDataList">
-                        {{ $t('common.queryBtn') }}
-                    </el-button>
-                    <el-button icon="Refresh" @click="resetQuery">{{ $t('common.resetBtn') }}</el-button>
-                </el-form-item>
+                <el-form :model="state.queryForm" ref="queryRef" :inline="true" @keyup.enter="getDataList">
+                    <el-form-item style="width: 250px;" label="人员姓名" prop="personName">
+                        <el-input v-model="state.queryForm.personName" placeholder="请输入人员姓名" />
+                    </el-form-item>
+                    <el-form-item style="width: 250px;" label="进出门类型" prop="enterOrExit">
+                        <dict-select v-model="state.queryForm.enterOrExit" :options="dh_enter_or_exit"
+                            placeholder="请选择进出门类型" />
+                    </el-form-item>
+                    <el-form-item style="width: 250px;" label="报警类型" prop="door_alarm_type">
+                        <dict-select v-model="state.queryForm.alarmType" :options="door_alarm_type"
+                            placeholder="请选择进开门类型" />
+                    </el-form-item>
+                    <el-form-item style="width: 350px;" label="抓拍时间" prop="swingTimeList">
+                        <el-date-picker v-model="state.queryForm.swingTimeList" value-format="YYYY-MM-DD"
+                            type="daterange" />
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button icon="search" type="primary" @click="getDataList">
+                            {{ $t('common.queryBtn') }}
+                        </el-button>
+                        <el-button icon="Refresh" @click="resetQuery">{{ $t('common.resetBtn') }}</el-button>
+                    </el-form-item>
+                </el-form>
             </el-row>
             <el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
                 :header-cell-style="tableStyle.headerCellStyle" @selection-change="selectionChangHandle"
diff --git a/src/views/door/doorBeLate/index.vue b/src/views/door/doorBeLate/index.vue
index c052922..9e6d6f5 100644
--- a/src/views/door/doorBeLate/index.vue
+++ b/src/views/door/doorBeLate/index.vue
@@ -32,22 +32,6 @@
                         <span class="color-primary">{{ row.weekStr }}</span>
                     </template>
                 </el-table-column>
-                <el-table-column min-width="100" prop="morningPreCount" align="center" label="上午迟到、早退次数">
-                    <template #default="{ row }">
-                        <div class="color-success">
-                            <span> {{ row.morningPreCount }}</span>
-                            <span>次</span>
-                        </div>
-                    </template>
-                </el-table-column>
-                <el-table-column min-width="100" prop="afternoonPreCount" align="center" label="下午迟到、早退次数">
-                    <template #default="{ row }">
-                        <div class="color-success">
-                            <span> {{ row.afternoonPreCount }}</span>
-                            <span>人</span>
-                        </div>
-                    </template>
-                </el-table-column>
                 <el-table-column min-width="100" prop="timeCount" align="center" label="迟到、早退次数">
                     <template #default="{ row }">
                         <div class="color-success">