From 85002c799c4afb78f6e988ce2d74b5d13d75fe6d Mon Sep 17 00:00:00 2001
From: deartibers <947466799@qq.com>
Date: Thu, 1 Sep 2022 11:00:50 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=90=8D=E7=A7=B0?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../client/src/sections/offline/components/pushModal.jsx | 4 ++--
.../src/sections/offline/components/pushSideSheet.jsx | 2 +-
.../src/sections/offline/containers/carrierpigeon.jsx | 6 +++---
.../web/client/src/sections/offline/style.less | 8 ++++++++
4 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushModal.jsx b/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushModal.jsx
index 00ed2e5..478a339 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushModal.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushModal.jsx
@@ -76,7 +76,7 @@ function pushModal (props) {
const [policyList, setPolicyList] = useState([//通知策略备注
{
strategy: '系统监听到设备离线时，进行一次邮件推送，并将当前所 有离线的设备一同推送至信息邮箱，每次起始推送间隔不少于15分钟。',
- example: '【superadmin】账号下的设备:【智慧小蓝排涝-乡山站排口】于【2022年22时00分】掉线，【智慧小蓝排涝-乡山站排口】于【2022年22时00分】掉线，【智慧小蓝排涝-乡山站排口】于【2022年22时00分】掉线，请及时处理！',
+ example: '【superadmin】账号下的设备:【智慧小蓝排涝-乡山站排口】于【2022年22时00分】掉线，【智慧小蓝排涝-乡山站排口】于【2022年22时00分】掉线，【智慧小蓝排涝-乡山站排口】于【2022年22时00分】掉线，请即时处理！',
},
{
strategy: '系统监听到设备上线时，推送至信息邮箱，每次推送间隔 不少于15分钟。',
@@ -84,7 +84,7 @@ function pushModal (props) {
},
{
strategy: '系统在设定时间前统计所有离线的设备信息，并推送至信 息邮箱。',
- example: '【superadmin】账号下的设备，截止【2022年22时00分】，有15个设备掉线:【智慧小蓝排涝-乡山站排口】于【2022年22时00分】掉线，【智慧小蓝排涝-乡山站排口】于【2022年22时00分】掉线，【智慧小蓝排涝-乡山站排口】于【2022年22时00分】掉线，请及时处理！',
+ example: '【superadmin】账号下的设备，截止【2022年22时00分】，有15个设备掉线:【智慧小蓝排涝-乡山站排口】于【2022年22时00分】掉线，【智慧小蓝排涝-乡山站排口】于【2022年22时00分】掉线，【智慧小蓝排涝-乡山站排口】于【2022年22时00分】掉线，请即时处理！',
},
]);//阶段信息
const [chooseCameraList, setChooseCameraList] = useState([]);//第三阶段选中监听范围摄像头列表
diff --git a/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushSideSheet.jsx b/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushSideSheet.jsx
index 38dc967..f4bdfc4 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushSideSheet.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushSideSheet.jsx
@@ -157,7 +157,7 @@ function pushSideSheet (props) {
}>
{itm.cameraList}
- {itm.noticeWay == 'online' ? '上线及时通知' : itm.noticeWay == 'offline' ? '离线即时通知' : '24时定时统计'}
+ {itm.noticeWay == 'online' ? '上线即时通知' : itm.noticeWay == 'offline' ? '离线即时通知' : '24时定时统计'}
)
})}
diff --git a/code/VideoAccess-VCMP/web/client/src/sections/offline/containers/carrierpigeon.jsx b/code/VideoAccess-VCMP/web/client/src/sections/offline/containers/carrierpigeon.jsx
index fbd509b..30e7b05 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/offline/containers/carrierpigeon.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/offline/containers/carrierpigeon.jsx
@@ -46,8 +46,8 @@ const Carrierpigeon = (props) => {
},
];
const noticeWayObj = {
- 'offline':'离线及时通知',
- 'online':'上线及时通知',
+ 'offline':'离线即时通知',
+ 'online':'上线即时通知',
'timing':'定时统计',
}
useEffect(() => {
@@ -206,7 +206,7 @@ const Carrierpigeon = (props) => {
let val = r.noticeWay[index]
noticeWayValue.push(noticeWayObj[val])
}
- let noticeWayString=noticeWayValue.join(';')
+ let noticeWayString=noticeWayValue.join('；')
return noticeWayString;
},
},
diff --git a/code/VideoAccess-VCMP/web/client/src/sections/offline/style.less b/code/VideoAccess-VCMP/web/client/src/sections/offline/style.less
index e69de29..bce4fa2 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/offline/style.less
+++ b/code/VideoAccess-VCMP/web/client/src/sections/offline/style.less
@@ -0,0 +1,8 @@
+.semi-table{
+ .semi-table-row:first-child{
+ .semi-table-row-head{
+ background: #2662DC;
+ color: #FFFFFF;
+ }
+ }
+}
From 082e8efa3ed0158f7084a78844ac2dd0831a0d60 Mon Sep 17 00:00:00 2001
From: "gao.zhiyuan"
Date: Thu, 1 Sep 2022 11:08:12 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=9C=89=20->=20=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../api/app/lib/schedule/cameraStatePush.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/code/VideoAccess-VCMP/api/app/lib/schedule/cameraStatePush.js b/code/VideoAccess-VCMP/api/app/lib/schedule/cameraStatePush.js
index 4758961..a9e9c56 100644
--- a/code/VideoAccess-VCMP/api/app/lib/schedule/cameraStatePush.js
+++ b/code/VideoAccess-VCMP/api/app/lib/schedule/cameraStatePush.js
@@ -126,7 +126,7 @@ module.exports = function (app, opts) {
if (offArr.length && c.noticeWay && c.noticeWay.includes('offline') && receiver.length) {
if (c.pushWay == 'email') {
// 邮件
- let text = `【${corUser[0].username}】账号下的设备，截止【${moment(timeNow).format('MM月DD日 HH时mm分')}】，有${offArr.length}个设备掉线：\n`
+ let text = `【${corUser[0].username}】账号下的设备，截止【${moment(timeNow).format('MM月DD日 HH时mm分')}】，新增${offArr.length}个设备掉线：\n`
text += offArr.map(o => `【${o.name}】于【${moment(o.time).format('MM月DD日 HH时mm分')}】掉线，`).join('\n')
text += `\n请及时处理！`
await pushByEmail({
@@ -285,7 +285,7 @@ module.exports = function (app, opts) {
],
})
for (let c of configRes) {
- // 查配置信息所对应的摄像头15min内的在离线状态
+ // 查配置信息所对应的摄像头在离线状态
const cameraIds = c.cameraStatusPushMonitors.map(m => m.cameraId)
const offlineRes = await models.Camera.findAll({
where: {
@@ -330,7 +330,7 @@ module.exports = function (app, opts) {
group: ['cameraId'],
})
if (offlineTimeRes.length) {
- let text = `【${corUser[0].username}】账号下的设备，截止${moment(timeNow).format('MM月DD日 HH时mm分')}，有${offlineRes.length}个设备掉线：\n`
+ let text = `【${corUser[0].username}】账号下的设备，截止${moment(timeNow).format('MM月DD日 HH时mm分')}，新增${offlineRes.length}个设备掉线：\n`
text += offlineTimeRes.map(o => {
let corCamera = offlineRes.find(c => c.id == o.cameraId)
if (corCamera) {
From e5beb9af36c08bb3bb0b3f8da2e8d70d30f398e0 Mon Sep 17 00:00:00 2001
From: "gao.zhiyuan"
Date: Thu, 1 Sep 2022 17:22:47 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=9C=89=20->=20=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../web/client/src/sections/offline/components/pushModal.jsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushModal.jsx b/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushModal.jsx
index 478a339..8832bfb 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushModal.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushModal.jsx
@@ -84,7 +84,7 @@ function pushModal (props) {
},
{
strategy: '系统在设定时间前统计所有离线的设备信息，并推送至信 息邮箱。',
- example: '【superadmin】账号下的设备，截止【2022年22时00分】，有15个设备掉线:【智慧小蓝排涝-乡山站排口】于【2022年22时00分】掉线，【智慧小蓝排涝-乡山站排口】于【2022年22时00分】掉线，【智慧小蓝排涝-乡山站排口】于【2022年22时00分】掉线，请即时处理！',
+ example: '【superadmin】账号下的设备，截止【2022年22时00分】，新增15个设备掉线:【智慧小蓝排涝-乡山站排口】于【2022年22时00分】掉线，【智慧小蓝排涝-乡山站排口】于【2022年22时00分】掉线，【智慧小蓝排涝-乡山站排口】于【2022年22时00分】掉线，请即时处理！',
},
]);//阶段信息
const [chooseCameraList, setChooseCameraList] = useState([]);//第三阶段选中监听范围摄像头列表