From c0b0b6cece08873365a73733998cc3ece65b0c3a Mon Sep 17 00:00:00 2001 From: suyanyan <1321717064@qq.com> Date: Mon, 29 Jul 2024 16:04:52 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=88=86=E6=9E=90=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/modules/sysconfig/ability.ts | 8 +- .../passenger/components/form/form_basic.vue | 2 +- .../src/views/attendance/passenger/index.vue | 2 +- .../src/views/userManage/dormitory/index.vue | 2 +- .../src/views/violation/analysis/index.vue | 116 ++++++++++++++---- 5 files changed, 100 insertions(+), 30 deletions(-) diff --git a/SafeCampus.WEB/src/api/modules/sysconfig/ability.ts b/SafeCampus.WEB/src/api/modules/sysconfig/ability.ts index 40f89c8..464f272 100644 --- a/SafeCampus.WEB/src/api/modules/sysconfig/ability.ts +++ b/SafeCampus.WEB/src/api/modules/sysconfig/ability.ts @@ -13,11 +13,11 @@ * @see https://gitee.com/dotnetmoyu/SimpleAdmin */ import { moduleRequest } from "@/api/request"; -import { ReqId, ResPage, ZJRQ,setWarn } from "@/api/interface"; +import { ReqId, ResPage, ZJRQ, setWarn } from "@/api/interface"; const http = moduleRequest("/business/warn/"); +const http1 = moduleRequest("/violation/analysis/"); const abilityApi = { - /** 获取告警分组 */ warnGroup(params: ReqId) { return http.get("getWarnGroup", params); @@ -26,6 +26,10 @@ const abilityApi = { setWarnGroup(params: setWarn) { return http.post("setWarnGroupDevice", params); }, + /* 预警分析报告导出 */ + reportExport(params: any) { + return http1.download("reportExport", params); + } }; export { abilityApi }; diff --git a/SafeCampus.WEB/src/views/attendance/passenger/components/form/form_basic.vue b/SafeCampus.WEB/src/views/attendance/passenger/components/form/form_basic.vue index 872f727..11f8b41 100644 --- a/SafeCampus.WEB/src/views/attendance/passenger/components/form/form_basic.vue +++ b/SafeCampus.WEB/src/views/attendance/passenger/components/form/form_basic.vue @@ -67,7 +67,7 @@ const splitOptions = ref([ ]); // 摄像头 let cameraldsOptions = ref([]); -monitorLIVEApi.list({ pageSize: 1000, pageNum: 1 }).then(res => { +monitorLIVEApi.list({ pageSize: 1000, pageNum: 1 }).then((res: any) => { if (res.code == 200) { cameraldsOptions.value = res.data.list.map(e => { return { diff --git a/SafeCampus.WEB/src/views/attendance/passenger/index.vue b/SafeCampus.WEB/src/views/attendance/passenger/index.vue index 7166533..87fd6c4 100644 --- a/SafeCampus.WEB/src/views/attendance/passenger/index.vue +++ b/SafeCampus.WEB/src/views/attendance/passenger/index.vue @@ -88,7 +88,7 @@ function onOpen(opt: FormOptEnum, record: {} | AttendancePassenger.PassengerInfo const RefreshTable = () => { proTable.value?.refresh(); }; -const haseExtJson = row => { +const haseExtJson = (row: any) => { let extJson = JSON.parse(row.extJson); return extJson.length == 0; }; diff --git a/SafeCampus.WEB/src/views/userManage/dormitory/index.vue b/SafeCampus.WEB/src/views/userManage/dormitory/index.vue index 61c51b6..8edda77 100644 --- a/SafeCampus.WEB/src/views/userManage/dormitory/index.vue +++ b/SafeCampus.WEB/src/views/userManage/dormitory/index.vue @@ -160,7 +160,7 @@ const columns: ColumnProps[] = [ ]; const size = ref<'default' | 'large' | 'small'>('default') const timeVisible = ref(false); //是否显示时间设置 -const timeForm = reactive({ +const timeForm = reactive({ dateArr: [], timeArr: [], diff --git a/SafeCampus.WEB/src/views/violation/analysis/index.vue b/SafeCampus.WEB/src/views/violation/analysis/index.vue index 3cd6009..180c67e 100644 --- a/SafeCampus.WEB/src/views/violation/analysis/index.vue +++ b/SafeCampus.WEB/src/views/violation/analysis/index.vue @@ -6,57 +6,123 @@