diff --git a/web/client/assets/images/monitor/left.png b/web/client/assets/images/monitor/left.png new file mode 100644 index 0000000..dc616ac Binary files /dev/null and b/web/client/assets/images/monitor/left.png differ diff --git a/web/client/assets/images/monitor/pillar.png b/web/client/assets/images/monitor/pillar.png new file mode 100644 index 0000000..3321f36 Binary files /dev/null and b/web/client/assets/images/monitor/pillar.png differ diff --git a/web/client/assets/images/monitor/right.png b/web/client/assets/images/monitor/right.png new file mode 100644 index 0000000..cd19530 Binary files /dev/null and b/web/client/assets/images/monitor/right.png differ diff --git a/web/client/src/sections/bigScreen/components/basis.js b/web/client/src/sections/bigScreen/components/basis.js index 3e2f4f8..4ce2613 100644 --- a/web/client/src/sections/bigScreen/components/basis.js +++ b/web/client/src/sections/bigScreen/components/basis.js @@ -9,7 +9,7 @@ const Basis = ({ user, module, setModule }) => { - return
+ return
基础信息
diff --git a/web/client/src/sections/bigScreen/components/capacity.js b/web/client/src/sections/bigScreen/components/capacity.js index 5091abd..a22d328 100644 --- a/web/client/src/sections/bigScreen/components/capacity.js +++ b/web/client/src/sections/bigScreen/components/capacity.js @@ -4,14 +4,45 @@ import { Spin, Card, Modal, TreeSelect, message } from 'antd'; import ProForm, { ProFormText, ModalForm, ProFormSwitch, ProFormTreeSelect } from '@ant-design/pro-form'; import Title from 'antd/lib/skeleton/Title'; -const Capacity = ({ user, }) => { - - - - - - return
- 能耗监测 +const Capacity = ({ user, }) => { + + + + + + return
+ +
+
+
+ +
+
+ +
+
+ + +
+
+
+ +
+
+
+
+
+
+
+
} @@ -23,4 +54,4 @@ function mapStateToProps (state) { }; } -export default connect(mapStateToProps)(Capacity); \ No newline at end of file +export default connect(mapStateToProps)(Capacity); \ No newline at end of file diff --git a/web/client/src/sections/bigScreen/components/electrical.js b/web/client/src/sections/bigScreen/components/electrical.js index 12465e0..6df4b9c 100644 --- a/web/client/src/sections/bigScreen/components/electrical.js +++ b/web/client/src/sections/bigScreen/components/electrical.js @@ -10,7 +10,7 @@ const Electrical = ({ user, module, setModule }) => { - return
+ return
电排远控
diff --git a/web/client/src/sections/bigScreen/components/header.js b/web/client/src/sections/bigScreen/components/header.js index cf2887d..834a501 100644 --- a/web/client/src/sections/bigScreen/components/header.js +++ b/web/client/src/sections/bigScreen/components/header.js @@ -9,7 +9,7 @@ const Header = ({ dispatch, actions, user, module, setModule, history }) => { - return
+ return
{
@@ -40,9 +40,9 @@ const Header = ({ dispatch, actions, user, module, setModule, history }) => {
{ return
{ - return
+ return
实时监测
} diff --git a/web/client/src/sections/bigScreen/containers/systemManagement.js b/web/client/src/sections/bigScreen/containers/systemManagement.js index 35a87ed..b73b3bd 100644 --- a/web/client/src/sections/bigScreen/containers/systemManagement.js +++ b/web/client/src/sections/bigScreen/containers/systemManagement.js @@ -27,13 +27,13 @@ const SystemManagement = ({ clientHeight, user, history }) => {