-
+
+
+
+
+ 点击可跳转服务器监控网站Grafana
+
+ {/*
*/}
)
}
-
function mapStateToProps (state) {
const { auth, global, members, webSocket } = state;
return {
@@ -28,6 +47,7 @@ function mapStateToProps (state) {
// actions: global.actions,
// members: members.data,
// socket: webSocket.socket
+ pomsMonitor: global.pomsMonitor,
};
}
diff --git a/web/client/src/sections/facility/index.js b/web/client/src/sections/facility/index.js
index ddcb65f..d6afe13 100644
--- a/web/client/src/sections/facility/index.js
+++ b/web/client/src/sections/facility/index.js
@@ -6,10 +6,10 @@ import actions from './actions';
import { getNavItem } from './nav-item';
export default {
- key: 'facility',
- name: '设备',
- reducers: reducers,
- routes: routes,
- actions: actions,
- getNavItem: getNavItem
+ key: 'facility',
+ name: '设备',
+ reducers: reducers,
+ routes: routes,
+ actions: actions,
+ getNavItem: getNavItem
};
\ No newline at end of file
diff --git a/web/client/src/sections/facility/nav-item.jsx b/web/client/src/sections/facility/nav-item.jsx
index 300bcc0..0a5c662 100644
--- a/web/client/src/sections/facility/nav-item.jsx
+++ b/web/client/src/sections/facility/nav-item.jsx
@@ -40,4 +40,5 @@ export function getNavItem (user, dispatch) {
},
]
);
-}
\ No newline at end of file
+}
+
diff --git a/web/client/src/sections/install/containers/system.jsx b/web/client/src/sections/install/containers/system.jsx
index 26017d2..2702f5d 100644
--- a/web/client/src/sections/install/containers/system.jsx
+++ b/web/client/src/sections/install/containers/system.jsx
@@ -258,7 +258,7 @@ const Example = (props) => {
},
{
title: "管理",
- width: "20%",
+ width: "150px",
dataIndex: "text",
key: 'text',
render: (_, row) => {
diff --git a/web/client/src/sections/problem/actions/problem.jsx b/web/client/src/sections/problem/actions/problem.jsx
index 91d4913..495e7a5 100644
--- a/web/client/src/sections/problem/actions/problem.jsx
+++ b/web/client/src/sections/problem/actions/problem.jsx
@@ -64,10 +64,11 @@ export function postApiConfirm (data) { //确认应用接口/元素错误信
});
}
-export function getAlarmDataGroup () { //获取数据告警分类
+export function getAlarmDataGroup (query) { //获取数据告警分类
return dispatch => basicAction({
type: 'get',
dispatch: dispatch,
+ query,
actionType: 'GET_ALARM_DATA_GROUP',
url: `${ApiTable.getAlarmDataGroup}`,
msg: { option: '获取数据告警分类' },
@@ -138,10 +139,11 @@ export function getAlarmVideoList (query) { //查询视频告警列表
-export function getAlarmVideoDeviceKind () { //查询视频设备类型
+export function getAlarmVideoDeviceKind (query) { //查询视频设备类型
return dispatch => basicAction({
type: 'get',
dispatch: dispatch,
+ query,
actionType: 'GET_ALARM_VIDEO_DEVICE_KIND',
url: `${ApiTable.getAlarmVideoDeviceKind}`,
msg: { option: '查询视频设备类型' },
@@ -150,15 +152,15 @@ export function getAlarmVideoDeviceKind () { //查询视频设备类型
}
export function getAlarmVideoExceptionType () { //查询视频异常类型
- return dispatch => basicAction({
- type: 'get',
- dispatch: dispatch,
- actionType: 'GET_ALARM_VIDEO_EXCEPTION_TYPE',
- url: `${ApiTable.getAlarmVideoExceptionType}`,
- msg: { option: '查询视频异常类型' },
- reducer: { name: '' }
- });
- }
+ return dispatch => basicAction({
+ type: 'get',
+ dispatch: dispatch,
+ actionType: 'GET_ALARM_VIDEO_EXCEPTION_TYPE',
+ url: `${ApiTable.getAlarmVideoExceptionType}`,
+ msg: { option: '查询视频异常类型' },
+ reducer: { name: '' }
+ });
+}
export function putAlarmVideoConfirm (data) { //确认视频告警
return dispatch => basicAction({
diff --git a/web/client/src/sections/problem/components/tableData.jsx b/web/client/src/sections/problem/components/tableData.jsx
index 5eb1177..f6f2fb8 100644
--- a/web/client/src/sections/problem/components/tableData.jsx
+++ b/web/client/src/sections/problem/components/tableData.jsx
@@ -379,12 +379,23 @@ const TableData = ({ route, dispatch, actions, collectData, setSetup, exhibition
placeholder={SkeletonScreen()}
>
{(() => {
- // console.log(tableData);
+ console.log(tableData);
+ console.log((route == 'useAbnormal' || route == 'videoAbnormal') ?
+ (tableData?.slice(query.page * query.limit, (query.page + 1) * query.limit) || [])
+ : tableData);
return
暂无告警数据}
+ empty={
+
+
暂无告警数据
+
+
+ {row?.disable ? (
+
+ ) : (
+
{
+ dispatch(service.putPushPushId({ pushId: row?.id, del: false, disable: true, msg: '更改推送配置状态' })).then(() => {
+ getPushList({ limit: query.limit, page: page.current });
+ })
+ }}
+ >
+
+
+ )}
+
{
+ dispatch(service.putPushPushId({ pushId: row?.id, del: true, disable: false, msg: '删除推送配置' })).then(() => {
+ if (page.current > 0 && mylimits.current < 2) {
+ getPushList({ limit: query.limit, page: page.current - 1 });
+ } else {
+ getPushList({ limit: query.limit, page: page.current });
+ }
+ })
+ }}
+ >
+
+
+
+ 结构物：
+ {
+ record.structure?.map((item, index) => {
+ return (
+
+ {item.name}
+
+ )
+ })
}
- })
- }
- const columns = [//表格属性
- {
- title: "操作",
- width: "12%",
- dataIndex: "text",
- key: 'text',
+
+ )
+ }
+ //获取表格属性设置
+ function attribute (val) {
+ const arr = localStorage.getItem(EMPUSH)
+ ? JSON.parse(localStorage.getItem(EMPUSH))
+ : [];
+ const column = [
+ {
+ title: '关联项目',
+ dataIndex: "projectName",
+ key: "projectName",
render: (_, row) => {
- return (
-
-
- {row?.disable ? (
-
+ let projectData = []
+ row.pomsProject?.map(v => {
+ projectData.push({
+ projectName: v.pepProject?.projectName,
+ name: v.name,
+ anxinerror: v.del,
+ constructionStatus: v.pepProject?.constructionStatus,
+ })
+ })
+ let anxinerror = false
+ let anxinerrorArr = ''
+ if (row.pomsProject.del == true) {
+ anxinerror = true
+ anxinerrorArr = row.pomsProject.pepProject?.projectName || row.pomsProject.name
+ }
+
+ return (
+ projectData.map((u, index) =>
+ {
+ u.anxinerror ? (
+
+
+
+
) : ('')
+ }
+ {
+
+
+ 7 || u.name?.length > 7 ? '112px' : '', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', color: row.pomsProject.del ? '#F93920' : '' }}>
+ {u.projectName || u.name}
+
+
+
+ }
+ {
+ u.projectName ? (
+
+
+
+
+
+ {u.constructionStatus}
+
+
) : (
-
{
- dispatch(service.putPushPushId({ pushId: row?.id, del: false, disable: true, msg: '更改推送配置状态' })).then(() => {
- getPushList({ limit: query.limit, page: page.current });
- })
- }}
- >
-
-
- )}
-
{
- dispatch(service.putPushPushId({ pushId: row?.id, del: true, disable: false, msg: '删除推送配置' })).then(() => {
- if (page.current > 0 && mylimits.current < 2) {
- getPushList({ limit: query.limit, page: page.current - 1 });
- } else {
- getPushList({ limit: query.limit, page: page.current });
- }
- })
- }}
- >
-
-
-
- );
- },
- },
- ]
- function expandRowRender (record, index) {
- return (
-
- 结构物：
- {
- record.structure?.map((item, index) => {
- return (
-
- {item.name}
-
+
+
+
+
+
+ POMS
+
+
)
- })
- }
-
- )
- }
- //获取表格属性设置
- function attribute (val) {
- const arr = localStorage.getItem(EMPUSH)
- ? JSON.parse(localStorage.getItem(EMPUSH))
- : [];
- const column = [
- {
- title: '关联项目',
- dataIndex: "projectName",
- key: "projectName",
- render: (_, row) => {
- let anxinerror = false
- let anxinerrorArr = ''
- if (row.pomsProject.del == true) {
- anxinerror = true
- anxinerrorArr = row.pomsProject.pepProject?.projectName || row.pomsProject.name
- }
- return (
-
- {
- anxinerror ? (
-
-
-
-
) : ('')
- }
- {
-
-
- 7 || row.pomsProject?.name?.length > 7 ? '112px' : '', whiteSpace: 'nowrap', overflow: 'hidden', textOverflow: 'ellipsis', color: row.pomsProject.del ? '#F93920' : '' }}>
- {row.pomsProject.pepProject?.projectName || row.pomsProject.name}
-
-
-
- }
- {
- row.pomsProject?.pepProject?.projectName ? (
-
-
-
-
-
- {
- val.map((ite, idx) => {
- return (
-
- {ite.id == row.pomsProject?.pepProject.constructionStatusId ? ite.construction_status : ''}
-
- )
- })
- }
-
-
- ) : (
-
-
-
-
-
- POMS
-
-
- )
- }
-
- )
- }
- },
- {
- title: '策略名称',
- dataIndex: "name",
- key: 'name',
- render: (_, row) => {
- return row.name
- }
- },
- {
- title: "创建时间",
- dataIndex: "createTime",
- key: "createTime",
- render: (_, r, index) => {
- return moment(r.createTime).format('YYYY-MM-DD HH:mm:ss');
- },
- },
- {
- title: '接收人',
- dataIndex: "receiverPepUser",
- key: 'receiverPepUser',
- render: (_, row) => {
- return (
-
- {
- row.receiverPepUser.map((item, index) => {
- return (
-
-
1 ? 'none' : '', color: '#005ABD' }}>
- {item.name}
-
-
0 ? 'none' : '' }}>
-
- )
- })
- }
- {
- row.receiverPepUser.length > 2 ? (
-
- {
- row.receiverPepUser.map((item, index) => {
- return (
-
- {item.name},
-
- )
- })
- }
-
- } trigger="click" style={{ lineHeight: 2 }}>
-
- +{row.receiverPepUser.length - 2}
-
-
- ) : ('')
- }
-
- {
- row.alarmType.map((item, index) => {
- return (
-
-
1 ? 'none' : '' }}>
- {alarmTypeObj[item]}
-
-
0 ? 'none' : '' }}>
-
- )
- })
- }
- {
- row.alarmType.length > 2 ? (
-
- {
- row.alarmType.map((item, index) => {
- return (
-
- {alarmTypeObj[item]},
-
- )
- })
- }
-
- +{row.alarmType.length - 2}
-
-
- ) : ('')
- }
-
- )
- }
+ },
+ {
+ title: '接收人',
+ dataIndex: "receiverPepUser",
+ key: 'receiverPepUser',
+ render: (_, row) => {
+ return (
+
+ {
+ row.receiverPepUser.map((item, index) => {
+ return (
+
+
1 ? 'none' : '', color: '#005ABD' }}>
+ {item.name}
+
+
0 ? 'none' : '' }}>
+
+ )
+ })
+ }
+ {
+ row.receiverPepUser.length > 2 ? (
+
+ {
+ row.receiverPepUser.map((item, index) => {
+ return (
+
+ {item.name},
+
+ )
+ })
+ }
+
+ +{row.receiverPepUser.length - 2}
+
+
+ ) : ('')
+ }
+
+ )
+ }
+ },
+ {
+ title: "推送方式",
+ dataIndex: "pushType",
+ key: "pushType",
+ render: (_, r, index) => {
+ return '邮件通知';
},
- {
- title: "生效项目节点",
- dataIndex: "timeType",
- key: "timeType",
- render: (_, row, index) => {
- return (
-
- {
- row.timeType.length > 0 ? (
- row.timeType.map((item, index) => {
- return (
-
1 ? 'none' : 'flex', alignItems: 'center'
- }}>
-
-
-
-
- {
- val.map((ite, idx) => {
- return (
-
- {ite.id == item ? ite.construction_status : ''}
-
- )
- })
- }
-
-
- )
+ },
+ {
+ title: "监听问题模块",
+ dataIndex: "alarmType",
+ key: "alarmType",
+ render: (_, row) => {
+ return (
+
+ {
+ row.alarmType.map((item, index) => {
+ return (
+
+
1 ? 'none' : '' }}>
+ {alarmTypeObj[item]}
+
+
0 ? 'none' : '' }}>
+
+ )
+ })
+ }
+ {
+ row.alarmType.length > 2 ? (
+
+ {
+ row.alarmType.map((item, index) => {
+ return (
+
+ {alarmTypeObj[item]},
+
+ )
})
- ) : (
-
-
-
-
-
- POMS
-
+ }
+
+ +{row.alarmType.length - 2}
+
+
+ ) : ('')
+ }
+
+ )
+ }
+ },
+ {
+ title: "生效项目节点",
+ dataIndex: "timeType",
+ key: "timeType",
+ render: (_, row, index) => {
+ return (
+
+ {
+ row.timeType.length > 0 ? (
+ row.timeType.map((item, index) => {
+ return (
+
1 ? 'none' : 'flex', alignItems: 'center'
+ }}>
+
+
+
+
+ {
+ val.map((ite, idx) => {
+ return (
+
+ {ite.id == item ? ite.construction_status : ''}
+
+ )
+ })
+ }
- )
- }
- {
- row.timeType.length > 2 ? (
-
- {
- row.timeType.map((item, index) => {
- return (
-
- {
- val.map((ite, idx) => {
- return (
-
- {ite.id == item ? ite.construction_status : ''}
-
- )
- })
- },
-
- )
+
+ )
+ })
+ ) : (
+
+
+
+
+
+ POMS
+
+
+ )
+ }
+ {
+ row.timeType.length > 2 ? (
+
+ {
+ row.timeType.map((item, index) => {
+ return (
+
+ {
+ val.map((ite, idx) => {
+ return (
+
+ {ite.id == item ? ite.construction_status : ''}
+
+ )
})
- }
-
- } trigger="click" style={{ lineHeight: 2 }}>
-
- +{row.timeType.length - 2}
-
-
- ) : ('')
- }
-
- )
- },
+ },
+
+ +{row.timeType.length - 2}
+
+
+ ) : ('')
+ }
+
+ )
},
- {
- title: "推送机制",
- dataIndex: "tactics",
- key: "tactics",
- render: (_, r, index) => {
- return tacticsObj[r.tactics]
- },
+ },
+ {
+ title: "推送机制",
+ dataIndex: "tactics",
+ key: "tactics",
+ render: (_, r, index) => {
+ return tacticsObj[r.tactics]
},
- {
- title: "启用状态",
- dataIndex: "disable",
- key: "disable",
- render: (_, row, index) => {
- let enableType = ''
- if (row.disable) {
- enableType = '禁用'
- }
- else {
- if (row.timeType.length > 0) {
- for (let i = 0; i < row.timeType.length; i++) {
- if (row.timeType[i] == row.pomsProject?.pepProject?.constructionStatusId) {
- enableType = '已生效'
- break;
- } else {
- enableType = '未生效'
- }
- }
- }
- else {
- enableType = '已生效'
+ },
+ {
+ title: "启用状态",
+ dataIndex: "disable",
+ key: "disable",
+ render: (_, row, index) => {
+ let enableType = ''
+ if (row.disable) {
+ enableType = '禁用'
+ } else {
+ let construcId = row.pomsProject?.map(v => (v.pepProject?.constructionStatusId || 'POMS')) || []
+ if (construcId?.includes('POMS')) {
+ enableType = '已生效'
+ } else {
+ let timeType = row.timeType?.map(Number) || []
+ for (let i = 0; i < timeType.length; i++) {
+ if (construcId?.includes(timeType[i])) {
+ enableType = '已生效'
+ break
+ } else {
+ enableType = '未生效'
}
- }
- return (
-
- {enableType}
-
- )
- },
+ }
+ }
+
+ }
+ return (
+
+ {enableType}
+
+ )
},
- {
- title: "推送次数",
- dataIndex: "pushCount",
- key: "pushCount",
- render: (_, r, index) => {
- return (r.pushCount||0) + '次'
- },
+ },
+ {
+ title: "推送次数",
+ dataIndex: "pushCount",
+ key: "pushCount",
+ render: (_, r, index) => {
+ return (r.pushCount || 0) + '次'
},
- ];
- for (let i = 0; i < arr.length; i++) {
- let colum = column.filter((item) => {
- return item.key === arr[i];
- });
- columns.splice(columns.length - 1, 0, colum[0]);
- }
- setSetupp(columns);
- }
- return (
- <>
-
-
-
-
-
-
-
-
setSetup(true)} />
-
-
-
-
-
-
EM推送提供对映射关系组的项目、结构物问题的监听和通知服务，支持对设备异常率、问题持续时间、即时响应等策略定义的动态推送。
-
-
-
- s)}
- dataSource={tableData}
- bordered={false}
- hideExpandedColumn={false}
- empty="暂无数据"
- expandedRowRender={expandRowRender}
- pagination={false}
- onRow={handleRow}
- />
-
-
-
-
-
-
- 共{limits}条信息
-
-
{
- setQuery({ limit: pageSize, page: currentPage - 1 });
- page.current = currentPage - 1
- setChange(!change)
- }}
- />
-
-
+
+
+
+
+
+
+
setSetup(true)} />
+
+
+
+
+
+
EM推送提供对映射关系组的项目、结构物问题的监听和通知服务，支持对设备异常率、问题持续时间、即时响应等策略定义的动态推送。
- {//推送配置弹框
- pushModal ?
-
{
- setPushModal(false);
+
+
+ s)}
+ dataSource={tableData}
+ bordered={false}
+ hideExpandedColumn={false}
+ empty="暂无数据"
+ expandedRowRender={expandRowRender}
+ pagination={false}
+ onRow={handleRow}
+ />
+
+
+
+
+
+
+ 共{limits}条信息
+
+
{
+ setQuery({ limit: pageSize, page: currentPage - 1 });
+ page.current = currentPage - 1
+ setChange(!change)
}}
- close={() => {
- setPushModal(false);
- getPushList(query)
- }} >
- : ''
- }
- {setup ? (
- {
- setSetup(false);
- attribute(projectStatus);
- }}
- />
- ) : (
- ""
- )}
-
- )
+ />
+
+
-
+ {/* style={{height: '100%', width: '100%',margin: '8px 12px', padding: '20px 20px 0px 20px'}} */}
+
+
)
@@ -27,7 +28,8 @@ function mapStateToProps (state) {
// user: auth.user,
// actions: global.actions,
// members: members.data,
- // socket: webSocket.socket
+ // socket: webSocket.socket,
+ dcWeb: global.dcWeb,
};
}
diff --git a/web/config.js b/web/config.js
index 2ee97e6..96c67fb 100644
--- a/web/config.js
+++ b/web/config.js
@@ -16,6 +16,9 @@ args.option('apiPomsUrl', 'webapi的URL 外网可访问');
args.option('apiAnxinyunUrl', '安心云 api');
args.option('apiEmisUrl', '企业管理 api');
args.option('iotVcmpWeb', 'IOT 视频服务');
+args.option('pomsMonitor', '运维监控 web');
+args.option('dcWeb', '报表中心web');
+
// 七牛
args.option('qnak', 'qiniuAccessKey');
@@ -30,6 +33,8 @@ const API_POMS_URL = process.env.API_POMS_URL || flags.apiPomsUrl;
const API_EMIS_URL = process.env.API_EMIS_URL || flags.apiEmisUrl;
const API_ANXINYUN_URL = process.env.API_ANXINYUN_URL || flags.apiAnxinyunUrl;
const IOT_VIDEO_WEB = process.env.IOT_VIDEO_WEB || flags.iotVcmpWeb;
+const POMS_MONITOR = process.env.POMS_MONITOR || flags.pomsMonitor;
+const DC_WEB = process.env.DC_WEB || flags.dcWeb;
// 七牛
const ANXINCLOUD_QINIU_AK = process.env.ANXINCLOUD_QINIU_ACCESSKEY || flags.qnak;
@@ -41,6 +46,7 @@ const ANXINCLOUD_QINIU_DOMAIN_QNDMN_RESOURCE = process.env.ANXINCLOUD_QINIU_DOMA
if (
!API_URL
|| !API_ANXINYUN_URL
+ || !POMS_MONITOR || !DC_WEB
|| !ANXINCLOUD_QINIU_AK || !ANXINCLOUD_QINIU_SK || !ANXINCLOUD_QINIU_BUCKET_RESOURCE || !ANXINCLOUD_QINIU_DOMAIN_QNDMN_RESOURCE || !IOT_VIDEO_WEB) {
console.log('缺少启动参数，异常退出');
args.showHelp();
@@ -85,6 +91,8 @@ const product = {
opts: {
apiUrl: API_POMS_URL,
iotVcmpWeb: IOT_VIDEO_WEB,
+ pomsMonitor: POMS_MONITOR,
+ dcWeb: DC_WEB,
staticRoot: './client',
qiniu: {
fetchUrl: '/_file-server',
diff --git a/web/package.json b/web/package.json
index 7e5c214..fdff1bd 100644
--- a/web/package.json
+++ b/web/package.json
@@ -7,7 +7,7 @@
"test": "mocha",
"start-vite": "cross-env NODE_ENV=developmentVite npm run start-params",
"start": "cross-env NODE_ENV=development npm run start-params",
- "start-params": "node server -p 5600 -u http://localhost:4600 --apiPomsUrl http://localhost:4600 --apiAnxinyunUrl http://10.8.30.112:4100 --apiEmisUrl http://10.8.30.112:14000 --qnak XuDgkao6cL0HidoMAPnA5OB10Mc_Ew08mpIfRJK5 --qnsk yewcieZLzKZuDfig0wLZ9if9jKp2P_1jd3CMJPSa --qnbkt dev-highways4good --qndmn http://rhvqdivo5.hn-bkt.clouddn.com --iotVcmpWeb https://mediaconsole.ngaiot.com",
+ "start-params": "node server -p 5600 -u http://localhost:4600 --apiPomsUrl http://localhost:4600 --apiAnxinyunUrl http://10.8.30.112:4100 --apiEmisUrl http://10.8.30.112:14000 --qnak XuDgkao6cL0HidoMAPnA5OB10Mc_Ew08mpIfRJK5 --qnsk yewcieZLzKZuDfig0wLZ9if9jKp2P_1jd3CMJPSa --qnbkt dev-highways4good --qndmn http://rhvqdivo5.hn-bkt.clouddn.com --iotVcmpWeb https://mediaconsole.ngaiot.com --pomsMonitor https://monitor.anxinyun.cn --dcWeb https://fsiot-oamss.anxinyun.cn",
"deploy": "export NODE_ENV=production&& npm run build && node server",
"build-dev": "cross-env NODE_ENV=development&&webpack --config webpack.config.js",
"build": "cross-env NODE_ENV=production&&webpack --config webpack.config.prod.js"
diff --git a/web/routes/attachment/index.js b/web/routes/attachment/index.js
index 18621d8..cff0286 100644
--- a/web/routes/attachment/index.js
+++ b/web/routes/attachment/index.js
@@ -19,12 +19,14 @@ module.exports = {
entry: function (app, router, opts) {
const getApiRoot = async function (ctx) {
- const { apiUrl, iotVcmpWeb } = opts;
+ const { apiUrl, iotVcmpWeb, pomsMonitor, dcWeb } = opts;
ctx.status = 200;
ctx.body = {
root: apiUrl,
iotVcmpWeb: iotVcmpWeb,
+ pomsMonitor: pomsMonitor,
+ dcWeb: dcWeb,
};
};