diff --git a/api/app/lib/controllers/control/data.js b/api/app/lib/controllers/control/data.js index 96734c3..fe5e291 100644 --- a/api/app/lib/controllers/control/data.js +++ b/api/app/lib/controllers/control/data.js @@ -278,8 +278,8 @@ async function getLatestDynamic (ctx) { if (projectCorrelationId) {//查指定项目,控制台全局切换 where.projectCorrelationId = projectCorrelationId } - console.log(1010, limit, page, projectCorrelationId, types); - + + let news = await models.LatestDynamicList.findAll({//最新动态 include: [{ model: models.ProjectCorrelation, @@ -297,12 +297,12 @@ async function getLatestDynamic (ctx) { model: models.AlarmConfirmLog }], where: where, - offset: 0, - limit: 1, + offset: Number(page) * Number(limit), + limit: Number(limit), order: [['time', 'desc']], }); - console.log(111111, news); + //查项目名称 查用户名 let pepPojectIds = new Set(), notedUserIds = new Set(), emailSendPomsProjectIds = new Set(); @@ -322,8 +322,7 @@ async function getLatestDynamic (ctx) { } } - console.log(222222, notedUserIds); - console.log(333333, emailSendPomsProjectIds); + // EM 推送的特殊处理 @@ -337,7 +336,7 @@ async function getLatestDynamic (ctx) { }) : [] - console.log(444444, emailLogProjectCorrelationRes); + for (let { dataValues: p } of emailLogProjectCorrelationRes) { if (p.pepProjectId) { @@ -345,14 +344,14 @@ async function getLatestDynamic (ctx) { } } - console.log(555555, pepPojectIds); + let pepProjects = pepPojectIds.size ? await clickHouse.projectManage.query(` SELECT id, project_name FROM t_pim_project WHERE id IN (${[...pepPojectIds].join(',')},-1) `).toPromise() : []; - console.log(666666, pepProjects); + let userPepRes = notedUserIds.size ? await clickHouse.pepEmis.query( @@ -401,7 +400,7 @@ async function getLatestDynamic (ctx) { confirm//确认 }; } catch (error) { - console.log(888888, error); + ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`); ctx.status = 400; ctx.body = { diff --git a/web/client/src/components/setup.jsx b/web/client/src/components/setup.jsx index d322197..36254c9 100644 --- a/web/client/src/components/setup.jsx +++ b/web/client/src/components/setup.jsx @@ -107,7 +107,7 @@ function Setup (props) { key={itm.value} value={itm.value} style={layout == 'long' ? {} : checkboxcss} - disabled={ischeck(itm.value) || ['workbench', 'dynamic', 'handle', 'DeviceAccess'].includes(itm.value)} + disabled={ischeck(itm.value) || ['workbench', 'dynamic', 'handle', 'DeviceAccess','discovery'].includes(itm.value)} > {itm.name} diff --git a/web/client/src/sections/control/containers/control.jsx b/web/client/src/sections/control/containers/control.jsx index 3bff5df..0060703 100644 --- a/web/client/src/sections/control/containers/control.jsx +++ b/web/client/src/sections/control/containers/control.jsx @@ -622,8 +622,7 @@ const Control = ({ dispatch, actions, user, history, loading, socket, pepProject workbench: ['project', 'data', 'app', 'device'], statistical: ['milestone', 'personnel', 'web', 'problem'], analyse: ['dataInterrupt', 'dataAbnormal', 'policyHit', 'videoException', 'appAbnormal', 'deviceAbnormal', 'problemAnalysis'], - // dynamic: ['discovery', 'notice', 'confirm'], - dynamic: [], + dynamic: ['discovery', 'notice', 'confirm'], } let listAll = [