diff --git a/api/config.js b/api/config.js
index ebe11e7..099c5de 100644
--- a/api/config.js
+++ b/api/config.js
@@ -153,7 +153,7 @@ const ANXINCLOUD_ES_NODES_REST = process.env.ANXINCLOUD_ES_NODES_REST || flags.e
//文件上传类型限制(主要是固件升级上传固件包)
const TYPES= process.env.TYPES&&process.env.TYPES.split(',')||flags.types.split(',')
-console.log('process.env.TYPES',process.env.TYPES,TYPES)
+
const requireParams = {
FS_CAMUNDA_HOST, FS_CAMUNDA_ROOT,
POMS_DB,
diff --git a/web/client/src/sections/analysis/containers/index.js b/web/client/src/sections/analysis/containers/index.js
index eaa6303..bc1f685 100644
--- a/web/client/src/sections/analysis/containers/index.js
+++ b/web/client/src/sections/analysis/containers/index.js
@@ -3,4 +3,5 @@
import ProblemData from './problemData';
import OperationData from './operationData';
import WorkorderData from './workorderData';
-export { ProblemData,OperationData ,WorkorderData};
\ No newline at end of file
+import Network from './network.jsx';
+export { ProblemData, OperationData, WorkorderData,Network };
\ No newline at end of file
diff --git a/web/client/src/sections/analysis/containers/network.jsx b/web/client/src/sections/analysis/containers/network.jsx
new file mode 100644
index 0000000..4995c38
--- /dev/null
+++ b/web/client/src/sections/analysis/containers/network.jsx
@@ -0,0 +1,136 @@
+import React, { useEffect, useState, useRef } from 'react';
+import { connect } from 'react-redux';
+import ReactECharts from 'echarts-for-react';
+import echarts from 'echarts';
+import { Spin, Card, CardGroup, Form, Button } from '@douyinfe/semi-ui';
+import TableShow from './tableShow';
+import TreeShow from './treeShow';
+
+
+
+const Network = (props) => {
+ const { dispatch, actions, user, clientHeight } = props
+
+ const [show, setShow] = useState('tree')
+
+ const form = useRef();//表单
+
+
+ useEffect(() => {
+
+ }, [])
+
+
+ return (
+ <>
+
+
+
+
+
一图统揽
+
PICTURE CENTRALIZE
+
+
+
+
+ 项目
+ 结构物
+ 策略名
+
+
+ 即时推送机制
+ 持续时长推送机制
+ 异常率推送机制
+
+
+
+
+
+
+
+
+
+
+ >
+ }
+ >
+ {show == 'tree' && }
+ {show == 'table' && }
+
+
+
+
+
+ >
+ )
+}
+
+function mapStateToProps (state) {
+ const { auth, global, members, webSocket } = state;
+ return {
+ user: auth.user,
+ actions: global.actions,
+ clientHeight: global.clientHeight
+ };
+}
+
+export default connect(mapStateToProps)(Network);
diff --git a/web/client/src/sections/analysis/containers/tableShow.jsx b/web/client/src/sections/analysis/containers/tableShow.jsx
new file mode 100644
index 0000000..5f84bc8
--- /dev/null
+++ b/web/client/src/sections/analysis/containers/tableShow.jsx
@@ -0,0 +1,40 @@
+import React, { useEffect, useState, useRef } from 'react';
+import { connect } from 'react-redux';
+import ReactECharts from 'echarts-for-react';
+import echarts from 'echarts';
+import { Spin, Card, CardGroup, Form, Button } from '@douyinfe/semi-ui';
+
+
+
+const Network = (props) => {
+ const { dispatch, actions, user, clientHeight } = props
+
+ const form = useRef();//表单
+
+
+ useEffect(() => {
+
+ }, [])
+
+
+ return (
+
+
+
+ 表格展示
+
+
+
+ )
+}
+
+function mapStateToProps (state) {
+ const { auth, global, members, webSocket } = state;
+ return {
+ user: auth.user,
+ actions: global.actions,
+ clientHeight: global.clientHeight
+ };
+}
+
+export default connect(mapStateToProps)(Network);
diff --git a/web/client/src/sections/analysis/containers/treeShow.jsx b/web/client/src/sections/analysis/containers/treeShow.jsx
new file mode 100644
index 0000000..f02713a
--- /dev/null
+++ b/web/client/src/sections/analysis/containers/treeShow.jsx
@@ -0,0 +1,40 @@
+import React, { useEffect, useState, useRef } from 'react';
+import { connect } from 'react-redux';
+import ReactECharts from 'echarts-for-react';
+import echarts from 'echarts';
+import { Spin, Card, CardGroup, Form, Button } from '@douyinfe/semi-ui';
+
+
+
+const Network = (props) => {
+ const { dispatch, actions, user, clientHeight } = props
+
+ const form = useRef();//表单
+
+
+ useEffect(() => {
+
+ }, [])
+
+
+ return (
+
+
+
+ 树状展示
+
+
+
+ )
+}
+
+function mapStateToProps (state) {
+ const { auth, global, members, webSocket } = state;
+ return {
+ user: auth.user,
+ actions: global.actions,
+ clientHeight: global.clientHeight
+ };
+}
+
+export default connect(mapStateToProps)(Network);
diff --git a/web/client/src/sections/analysis/nav-item.jsx b/web/client/src/sections/analysis/nav-item.jsx
index 68ea5ec..76213e6 100644
--- a/web/client/src/sections/analysis/nav-item.jsx
+++ b/web/client/src/sections/analysis/nav-item.jsx
@@ -24,6 +24,8 @@ export function getNavItem (user, dispatch) {
to: '/analysis/operationAnalysis/operationData',
items: [{
itemKey: 'operationData', to: '/analysis/operationAnalysis/operationData', text: '运维数据'
+ },{
+ itemKey: 'network', to: '/analysis/operationAnalysis/network', text: '一图统揽'
}]
},
// {
diff --git a/web/client/src/sections/analysis/routes.js b/web/client/src/sections/analysis/routes.js
index 02475e9..b8b5ba5 100644
--- a/web/client/src/sections/analysis/routes.js
+++ b/web/client/src/sections/analysis/routes.js
@@ -1,4 +1,4 @@
-import { ProblemData, OperationData, WorkorderData } from './containers';
+import { ProblemData, OperationData, WorkorderData, Network } from './containers';
export default [{
type: 'inner',
@@ -27,6 +27,12 @@ export default [{
key: 'operationData',
component: OperationData,
breadcrumb: '运维数据',
+ },
+ {
+ path: '/network',
+ key: 'network',
+ component: Network,
+ breadcrumb: '一图统揽',
}]
},
{