From cde9302acf79f2060e25c5333a5bf4a6b376f91d Mon Sep 17 00:00:00 2001 From: yxq Date: Tue, 22 Oct 2024 14:01:30 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=B7=A1=E8=AD=A6?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=92=8C=E8=AF=A6=E6=83=85=E9=A1=B5=E5=AD=A6?= =?UTF-8?q?=E7=94=9F=E4=BF=A1=E6=81=AF=E5=9B=9E=E6=98=BE=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- monitorMobile/pages/earlyWarning/detail.vue | 2 +- monitorMobile/pages/earlyWarning/index.vue | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/monitorMobile/pages/earlyWarning/detail.vue b/monitorMobile/pages/earlyWarning/detail.vue index 6cdf23c..19741f2 100644 --- a/monitorMobile/pages/earlyWarning/detail.vue +++ b/monitorMobile/pages/earlyWarning/detail.vue @@ -23,7 +23,7 @@ 班级： - -- + {{ detailData.personSetName || "--" }} diff --git a/monitorMobile/pages/earlyWarning/index.vue b/monitorMobile/pages/earlyWarning/index.vue index 073e68d..8f8fad0 100644 --- a/monitorMobile/pages/earlyWarning/index.vue +++ b/monitorMobile/pages/earlyWarning/index.vue @@ -131,19 +131,19 @@ - 姓名：-- + 姓名：{{item.sceneName || '--'}} - 系部：-- + 系部：{{item.majorName || '--'}} - 专业：-- + 专业：{{item.depName || '--'}} From 58da6961ccf3ad8bcfd7d87940477d62fbb7a87f Mon Sep 17 00:00:00 2001 From: yxq Date: Tue, 22 Oct 2024 14:21:17 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=BD=92=E5=AF=9D=20?= =?UTF-8?q?=E5=8F=B3=E4=B8=8B=E8=A1=A8=E6=A0=BC=E7=8A=B6=E6=80=81=E5=AE=8C?= =?UTF-8?q?=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SafeCampus.WEB/src/views/screen/stureturn.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SafeCampus.WEB/src/views/screen/stureturn.vue b/SafeCampus.WEB/src/views/screen/stureturn.vue index 6200c26..be42503 100644 --- a/SafeCampus.WEB/src/views/screen/stureturn.vue +++ b/SafeCampus.WEB/src/views/screen/stureturn.vue @@ -66,7 +66,7 @@ - + @@ -88,7 +88,7 @@ const getStuReturnInfo = async obj => { screenApi.getStudentReturnBed({ buildId: buildInfo.value.value }).then(res => { if (res.code == 200) { res.data.attendList = res.data.attendList.map(e => { - e.$status = e.cameraId == buildInfo.value.outCameraId ? "未归寝" : e.cameraId == buildInfo.value.insCameraId ? "归寝" : ""; + e.$status = e.cameraId == buildInfo.value.outCameraId ? "外出" : e.cameraId == buildInfo.value.insCameraId ? "进入" : ""; return e; }); screenData.value = res.data; From 5590ff776d64632841d4214ffcea953b83583c15 Mon Sep 17 00:00:00 2001 From: yxq Date: Wed, 23 Oct 2024 09:30:11 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=95=B0=E5=AD=97=E7=9B=B8=E5=85=B3=E5=AE=8C?= =?UTF-8?q?=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SafeCampus.WEB/src/views/screen/component/index/peopeleNum.vue | 1 + SafeCampus.WEB/src/views/screen/component/index/todayNotice.vue | 1 + 2 files changed, 2 insertions(+) diff --git a/SafeCampus.WEB/src/views/screen/component/index/peopeleNum.vue b/SafeCampus.WEB/src/views/screen/component/index/peopeleNum.vue index 202fa47..4ba7d67 100644 --- a/SafeCampus.WEB/src/views/screen/component/index/peopeleNum.vue +++ b/SafeCampus.WEB/src/views/screen/component/index/peopeleNum.vue @@ -239,6 +239,7 @@ const getCharts2 = data => { // 设备统计 const count = ref(0); const getCharts3 = () => { + count.value = 0; const chart = echarts.init(chart3.value); let data = props.screenData.camera || []; let xArr = data.map(e => e.cameraInfos.length); diff --git a/SafeCampus.WEB/src/views/screen/component/index/todayNotice.vue b/SafeCampus.WEB/src/views/screen/component/index/todayNotice.vue index 22211ab..af84e82 100644 --- a/SafeCampus.WEB/src/views/screen/component/index/todayNotice.vue +++ b/SafeCampus.WEB/src/views/screen/component/index/todayNotice.vue @@ -82,6 +82,7 @@ const getData = () => { typeStatisti.value = props.screenData.alarmStatisti.typeStatisti.sort((a, b) => { return b.value - a.value; }); + typeStatistiCount.value = 0; typeStatisti.value.forEach(e => { typeStatistiCount.value += e.value; }); From 289dcdb77d2bc465fbba96a97a7f05614bb320d4 Mon Sep 17 00:00:00 2001 From: yxq Date: Wed, 23 Oct 2024 10:20:36 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=AD=E7=8F=AD=E7=BA=A7=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E9=A1=B9=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SafeCampus.WEB/src/views/userManage/classManage/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SafeCampus.WEB/src/views/userManage/classManage/index.vue b/SafeCampus.WEB/src/views/userManage/classManage/index.vue index 6db656d..ee866e7 100644 --- a/SafeCampus.WEB/src/views/userManage/classManage/index.vue +++ b/SafeCampus.WEB/src/views/userManage/classManage/index.vue @@ -99,8 +99,8 @@ const columns: ColumnProps[] = [ prop: "personSetName", label: "班级名称", search: { el: "input",span:1,props: { - clearable: true, - }, }, + clearable: true + },key:'SetName' }, }, {