From 0f2334fb6a6062e84c859d1eee7f90c2d53be0a9 Mon Sep 17 00:00:00 2001 From: deartibers <947466799@qq.com> Date: Thu, 17 Nov 2022 13:46:28 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=B1=BB=E5=9E=8B=E6=8E=A5=E5=8F=A3=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/app/lib/routes/alarm/index.js | 4 ++-- web/client/src/sections/problem/actions/problem.jsx | 6 +++--- web/client/src/sections/problem/components/tableData.jsx | 2 +- web/client/src/utils/webapi.js | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/api/app/lib/routes/alarm/index.js b/api/app/lib/routes/alarm/index.js index 9d97aaf..2784dac 100644 --- a/api/app/lib/routes/alarm/index.js +++ b/api/app/lib/routes/alarm/index.js @@ -61,6 +61,6 @@ module.exports = function (app, router, opts) { app.fs.api.logAttr['GET/vcmp/auth'] = { content: '获取视频平台应用鉴权token', visible: true }; router.get('/vcmp/auth', videoAlarm.vcmpAppAuthToken); - app.fs.api.logAttr['GET/alarm/video/exception_statusId'] = { content: '查询视频异常类型', visible: true }; - router.get('/alarm/video/exception_statusId', videoAlarm.exceptionType); + app.fs.api.logAttr['GET/alarm/video/exceptionType'] = { content: '查询视频异常类型', visible: true }; + router.get('/alarm/video/exceptionType', videoAlarm.exceptionType); }; diff --git a/web/client/src/sections/problem/actions/problem.jsx b/web/client/src/sections/problem/actions/problem.jsx index 903cb7d..91d4913 100644 --- a/web/client/src/sections/problem/actions/problem.jsx +++ b/web/client/src/sections/problem/actions/problem.jsx @@ -149,12 +149,12 @@ export function getAlarmVideoDeviceKind () { //查询视频设备类型 }); } -export function getAlarmVideoExceptionStatusId () { //查询视频异常类型 +export function getAlarmVideoExceptionType () { //查询视频异常类型 return dispatch => basicAction({ type: 'get', dispatch: dispatch, - actionType: 'GET_ALARM_VIDEO_EXCEPTION_STATUS_ID', - url: `${ApiTable.getAlarmVideoExceptionStatusId}`, + actionType: 'GET_ALARM_VIDEO_EXCEPTION_TYPE', + url: `${ApiTable.getAlarmVideoExceptionType}`, msg: { option: '查询视频异常类型' }, reducer: { name: '' } }); diff --git a/web/client/src/sections/problem/components/tableData.jsx b/web/client/src/sections/problem/components/tableData.jsx index 0f78cbc..8dca288 100644 --- a/web/client/src/sections/problem/components/tableData.jsx +++ b/web/client/src/sections/problem/components/tableData.jsx @@ -153,7 +153,7 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition setGenre(res.payload.data.map(v => ({ name: v.kind, value: v.id }))) } }) - dispatch(problem.getAlarmVideoExceptionStatusId()).then((res) => { + dispatch(problem.getAlarmVideoExceptionType()).then((res) => { if (res.success) { setStatusId(res.payload.data.map(v => ({ name: v.describe, value: v.statusId }))) } diff --git a/web/client/src/utils/webapi.js b/web/client/src/utils/webapi.js index b69f118..86b60e5 100644 --- a/web/client/src/utils/webapi.js +++ b/web/client/src/utils/webapi.js @@ -47,7 +47,7 @@ export const ApiTable = { getAlarmVideoDeviceKind: 'alarm/video/device_kind', //查询视频设备类型 putAlarmVideoConfirm: 'alarm/video/confirm', //确认视频告警信息 getVcmpAuth: 'vcmp/auth', // 获取视频平台应用鉴权token - getAlarmVideoExceptionStatusId: 'alarm/video/exception_statusId', //查询视频设备类型 + getAlarmVideoExceptionType: 'alarm/video/exceptionType', //查询视频设备类型 //服务-信鸽服务 getPush: "push", //获取推送配置列表 From edb3a07dcada0e8aab0c89f86288353b379a49fd Mon Sep 17 00:00:00 2001 From: wenlele Date: Thu, 17 Nov 2022 14:37:54 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=98=A0=E5=B0=84?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=B1=95=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/client/src/sections/install/containers/system.jsx | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/web/client/src/sections/install/containers/system.jsx b/web/client/src/sections/install/containers/system.jsx index b192fbe..23159ce 100644 --- a/web/client/src/sections/install/containers/system.jsx +++ b/web/client/src/sections/install/containers/system.jsx @@ -224,10 +224,19 @@ const Example = (props) => { ) } }, + { + title: '映射类型', + dataIndex: "mappingClass", + key: 'mappingClass', + render: (_, row) => { + let data = { wisdom: '智慧类', monitor: '监测类', other: '其他' } + return data[row.mappingClass] + } + }, { title: '关联时间', dataIndex: "createTime", - key: 'time', + key: 'createTime', render: (_, row) => { return moment(row.createTime).format("YYYY-MM-DD HH:mm:ss") } From 6a09a3d691c795e2962c3af32e33fe261ed6f351 Mon Sep 17 00:00:00 2001 From: wenlele Date: Thu, 17 Nov 2022 14:40:57 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/client/src/sections/install/containers/system.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/web/client/src/sections/install/containers/system.jsx b/web/client/src/sections/install/containers/system.jsx index f05ebe9..26017d2 100644 --- a/web/client/src/sections/install/containers/system.jsx +++ b/web/client/src/sections/install/containers/system.jsx @@ -61,7 +61,6 @@ const Example = (props) => { dispatch(install.getProjectAppList(query)).then((res) => {//获取应用列表 setAppList(res.payload.data) }) - console.log('user', user); }, []) useEffect(() => { getProjectPomsList(); From 883c1d881768f65795c4aabf846a6d58d10cb199 Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Thu, 17 Nov 2022 15:05:46 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix=20=E5=BA=94=E7=94=A8=E5=91=8A=E8=AD=A6l?= =?UTF-8?q?imit=20=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/app/lib/controllers/alarm/app.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/api/app/lib/controllers/alarm/app.js b/api/app/lib/controllers/alarm/app.js index 8e989df..c035bbe 100644 --- a/api/app/lib/controllers/alarm/app.js +++ b/api/app/lib/controllers/alarm/app.js @@ -301,12 +301,13 @@ async function apiErrorList (ctx) { findOption.where.$or.push( { '$app.name$': { $like: `%${keyword}%` } - } + }, ) } else { - findOption.where['$app->projectCorrelations.id$'] = { - $in: pomsProjectIds - } + // findOption.where['$app->projectCorrelations.id$'] = { + // $in: pomsProjectIds + // } + findOption.include[0].include[0].where.id = { $in: pomsProjectIds } } if (errType) { @@ -371,7 +372,7 @@ async function apiErrorList (ctx) { } } -async function exportAppAlarms(ctx, listRes) { +async function exportAppAlarms (ctx, listRes) { let typeData = { element: "元素异常", apiError: "接口报错 ", timeout: "加载超时" } try { const { utils: { simpleExcelDown, getExportAlarmHeader } } = ctx.app.fs;