From 4cddb9a71bb532537e26a9fabf94d04a00290f26 Mon Sep 17 00:00:00 2001 From: wwp <782568523@qq.com> Date: Mon, 30 Sep 2024 16:00:20 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/modules/usermanage/dormitory.ts | 4 + SafeCampus.WEB/src/api/modules/warn/zjrq.ts | 8 ++ SafeCampus.WEB/src/views/home/index.vue | 94 +++++++++---------- .../components/formDormitory/index.vue | 4 +- 4 files changed, 60 insertions(+), 50 deletions(-) diff --git a/SafeCampus.WEB/src/api/modules/usermanage/dormitory.ts b/SafeCampus.WEB/src/api/modules/usermanage/dormitory.ts index 5b8f83d..aec6ee6 100644 --- a/SafeCampus.WEB/src/api/modules/usermanage/dormitory.ts +++ b/SafeCampus.WEB/src/api/modules/usermanage/dormitory.ts @@ -78,6 +78,10 @@ const userManageDormitoryApi = { /** 获取归寝时间 */ getReturnTime() { return httpChamber.get("getReturnTime"); + }, + // 获取宿舍楼摄像头列表 + getBuildCameraList() { + return http.get("getBuildCameraList"); } }; diff --git a/SafeCampus.WEB/src/api/modules/warn/zjrq.ts b/SafeCampus.WEB/src/api/modules/warn/zjrq.ts index fe9d0e3..6ed6a6c 100644 --- a/SafeCampus.WEB/src/api/modules/warn/zjrq.ts +++ b/SafeCampus.WEB/src/api/modules/warn/zjrq.ts @@ -45,6 +45,14 @@ const warnZJRQApi = { /** 处理预警 */ handWarn(params: ReqId) { return http.post("handWarn", params); + }, + // 首页基础数据 + basicInfo() { + return http.get("getBaseStatistics"); + }, + // 首页高危预警 + highWarn() { + return http.get("getHighRisk"); } }; diff --git a/SafeCampus.WEB/src/views/home/index.vue b/SafeCampus.WEB/src/views/home/index.vue index f63b5d0..7948175 100644 --- a/SafeCampus.WEB/src/views/home/index.vue +++ b/SafeCampus.WEB/src/views/home/index.vue @@ -16,7 +16,7 @@
摄像头数量
-
3
+
{{ basicInfo.cameraCount }}
@@ -27,7 +27,7 @@
预警信息总量
-
1972
+
{{ basicInfo.warnCount }}
@@ -38,7 +38,7 @@
处理意见提交
-
40
+
{{ basicInfo.handCount }}
@@ -49,7 +49,7 @@
参与安防教师
-
22
+
{{ basicInfo.teacherCount }}
@@ -86,7 +86,7 @@
高危预警信息统计
- +
@@ -108,7 +108,7 @@ diff --git a/SafeCampus.WEB/src/views/userManage/dormitory/components/formDormitory/index.vue b/SafeCampus.WEB/src/views/userManage/dormitory/components/formDormitory/index.vue index 301b366..39a4142 100644 --- a/SafeCampus.WEB/src/views/userManage/dormitory/components/formDormitory/index.vue +++ b/SafeCampus.WEB/src/views/userManage/dormitory/components/formDormitory/index.vue @@ -142,8 +142,8 @@ onMounted(() => { getCreamaList(); }); const getCreamaList = () => { - monitorLIVEApi.list({ pageNum: 1, pageSize: 1000 }).then(res => { - creamaData.value = res.data.list; + userManageDormitoryApi.getBuildCameraList().then((res: any) => { + creamaData.value = res.data; }); }; // 暴露给父组件的方法 From f3300826fc73e34d2c916387ea9009cfa94b4526 Mon Sep 17 00:00:00 2001 From: wwp <782568523@qq.com> Date: Mon, 30 Sep 2024 16:40:59 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E8=BF=9B=E5=87=BA=E6=91=84=E5=83=8F?= =?UTF-8?q?=E5=A4=B4=E5=8E=BB=E6=8E=89=E5=BF=85=E5=A1=AB=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../userManage/dormitory/components/formDormitory/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SafeCampus.WEB/src/views/userManage/dormitory/components/formDormitory/index.vue b/SafeCampus.WEB/src/views/userManage/dormitory/components/formDormitory/index.vue index 39a4142..c5b7a61 100644 --- a/SafeCampus.WEB/src/views/userManage/dormitory/components/formDormitory/index.vue +++ b/SafeCampus.WEB/src/views/userManage/dormitory/components/formDormitory/index.vue @@ -88,9 +88,9 @@ const sysDormitoryProps = reactive>({ // 表单验证规则 const rules = reactive({ name: [required("请输入宿舍楼名称")], - gender: [required("请选择宿舍类型")], - insCameraId: [required("请选择进楼摄像头")], - outCameraId: [required("请选择出楼摄像头")] + gender: [required("请选择宿舍类型")] + // insCameraId: [required("请选择进楼摄像头")], + // outCameraId: [required("请选择出楼摄像头")] }); /** From b30f937a881fcdab016b9b026ab7a2c02a8d1c4c Mon Sep 17 00:00:00 2001 From: suyanyan <1321717064@qq.com> Date: Tue, 8 Oct 2024 09:54:07 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E7=A6=85=E9=81=93bug=E5=A4=84=E7=90=86938?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/violation/portrait/detail.vue | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/SafeCampus.WEB/src/views/violation/portrait/detail.vue b/SafeCampus.WEB/src/views/violation/portrait/detail.vue index 957fb53..2f8906e 100644 --- a/SafeCampus.WEB/src/views/violation/portrait/detail.vue +++ b/SafeCampus.WEB/src/views/violation/portrait/detail.vue @@ -6,7 +6,7 @@
- +
- 编号:{{ formData.personId }} +
- +
- + 姓名拼音:{{ pinyin(formData.name, { toneType: "none", type: "array" }).flat().join(" ") }} - 编号:{{ formData.personId }}编号:{{ formData.personId }} 联系方式:{{ formData.phone }} + >联系方式:{{ formData.phone }} 所属院系:{{ formData.depName }} + >所属院系:{{ formData.depName }} 所属专业:{{ formData.majorName }} + >所属专业:{{ formData.majorName }} 所属班级:{{ formData.personSetName }} + >所属班级:{{ formData.personSetName }} 寝室名称:{{ formData.dormitoryName }} + >寝室名称:{{ formData.dormitoryName }}
{ } } .personId { + display: block; + max-width: 90%; margin-bottom: 10px; + overflow: hidden; font-size: 14px; - display: block; text-overflow: ellipsis; - overflow: hidden; white-space: nowrap; - max-width: 90%; } } .right { @@ -647,6 +643,13 @@ onMounted(() => { .el-col { height: 50px; line-height: 50px; + .ellipsis { + display: block; + max-width: 100%; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } } } } From b6386e988df3743fdf0468cab082ba7621877692 Mon Sep 17 00:00:00 2001 From: suyanyan <1321717064@qq.com> Date: Tue, 8 Oct 2024 11:40:13 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E7=A6=85=E9=81=93bug=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/userManage/keyPersonnel/components/form/index.vue | 3 +-- .../src/views/userManage/personnel/components/form/index.vue | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/SafeCampus.WEB/src/views/userManage/keyPersonnel/components/form/index.vue b/SafeCampus.WEB/src/views/userManage/keyPersonnel/components/form/index.vue index 1c9cb8f..f328e6f 100644 --- a/SafeCampus.WEB/src/views/userManage/keyPersonnel/components/form/index.vue +++ b/SafeCampus.WEB/src/views/userManage/keyPersonnel/components/form/index.vue @@ -43,8 +43,7 @@ const sysUserProps = reactive>({ disabled: false }); const checkAgeNumber = (rule: any, value: any, callback: any) => { - if (value === "") callback("请输入年龄"); - if (value > 100 || value < 0) { + if (value && (value > 100 || value <= 0)) { callback(new Error("请输入正确的年龄(年龄范围1-100岁)")); } else { return callback(); diff --git a/SafeCampus.WEB/src/views/userManage/personnel/components/form/index.vue b/SafeCampus.WEB/src/views/userManage/personnel/components/form/index.vue index 8271add..7fbd31e 100644 --- a/SafeCampus.WEB/src/views/userManage/personnel/components/form/index.vue +++ b/SafeCampus.WEB/src/views/userManage/personnel/components/form/index.vue @@ -44,8 +44,7 @@ const sysUserProps = reactive>({ disabled: false }); const checkAgeNumber = (rule: any, value: any, callback: any) => { - if (value === "") callback("请输入年龄"); - if (value > 100 || value < 0) { + if (value && (value > 100 || value <= 0)) { callback(new Error("请输入正确的年龄(年龄范围1-100岁)")); } else { return callback(); From 26a133ce016a00e059c6f071d605e6b05f4a379e Mon Sep 17 00:00:00 2001 From: wwp <782568523@qq.com> Date: Tue, 8 Oct 2024 15:56:04 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Selectors/ClassUserselector/index.vue | 27 +++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/SafeCampus.WEB/src/components/Selectors/ClassUserselector/index.vue b/SafeCampus.WEB/src/components/Selectors/ClassUserselector/index.vue index 68366db..8c4b222 100644 --- a/SafeCampus.WEB/src/components/Selectors/ClassUserselector/index.vue +++ b/SafeCampus.WEB/src/components/Selectors/ClassUserselector/index.vue @@ -67,7 +67,7 @@ [] = [ { prop: "dormitoryName", label: "寝室" }, ]; - +const columns2: ColumnProps[] = [ + { type: "selection", fixed: "left", width: 50 }, + { prop: "operation", label: "操作", width: 80, fixed: "left" }, + { + prop: "faceUrl", + label: "人脸", + render: scope => { + return ( + 0 ? scope.row.faces[0].faceUrl : ''} onClick={() => viewHeadImage(scope)} style='width:30px;height:30px;' alt=''/> + ); + } + }, + { + prop: "personName", + label: "姓名", + render: row => { + return row.row.name; + }, + search: { el: "input", span: 2 } + }, + { prop: "personSetName", label: "班级" }, + // { prop: "dormitoryName", label: "寝室" }, + +]; /** 显示选择器 */ function showSelector(data: SysUser.SysUserInfo[] = []) { visible.value = true; From 193d48c395bfc68f722cb2e84494b3a537b1fb46 Mon Sep 17 00:00:00 2001 From: suyanyan <1321717064@qq.com> Date: Tue, 8 Oct 2024 15:57:13 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E7=A6=85=E9=81=93bug=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SafeCampus.WEB/src/api/modules/usermanage/classManage.ts | 3 +++ .../src/views/userManage/classManage/index.vue | 9 +-------- SafeCampus.WEB/src/views/userManage/personnel/index.vue | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/SafeCampus.WEB/src/api/modules/usermanage/classManage.ts b/SafeCampus.WEB/src/api/modules/usermanage/classManage.ts index 7c233af..1194b81 100644 --- a/SafeCampus.WEB/src/api/modules/usermanage/classManage.ts +++ b/SafeCampus.WEB/src/api/modules/usermanage/classManage.ts @@ -26,6 +26,9 @@ const userManageClassManageApi = { page(params: SysUserPersonnel.ClassPage) { return http.get("queryAll", params); }, + getPageList(params: SysUserPersonnel.ClassPage) { + return http.get("getPageList", params); + }, /** 删除底库 */ delete(params: ReqId) { return http.delete("deleteDfieldD", params); diff --git a/SafeCampus.WEB/src/views/userManage/classManage/index.vue b/SafeCampus.WEB/src/views/userManage/classManage/index.vue index 88940d4..6db656d 100644 --- a/SafeCampus.WEB/src/views/userManage/classManage/index.vue +++ b/SafeCampus.WEB/src/views/userManage/classManage/index.vue @@ -6,14 +6,7 @@