From b1d1b4bfb5b5ac70e5de697d2bc4bed4c71c49e1 Mon Sep 17 00:00:00 2001 From: deartibers <947466799@qq.com> Date: Thu, 28 Apr 2022 16:37:32 +0800 Subject: [PATCH] =?UTF-8?q?nvr=E5=BC=B9=E5=87=BA=E6=A1=86=E4=BA=A4?= =?UTF-8?q?=E4=BA=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/nvrModal.jsx | 7 +- .../equipmentWarehouse/containers/camera.jsx | 70 +++++++++++++++++++ .../equipmentWarehouse/containers/index.js | 4 +- .../equipmentWarehouse/containers/nvr.jsx | 4 +- .../src/sections/equipmentWarehouse/routes.js | 4 +- .../sections/equipmentWarehouse/style.less | 5 -- 6 files changed, 80 insertions(+), 14 deletions(-) create mode 100644 code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/nvrModal.jsx b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/nvrModal.jsx index 1f46205..fd36234 100644 --- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/nvrModal.jsx +++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/nvrModal.jsx @@ -3,6 +3,7 @@ import { Modal,Form,Row,Col,Spin,Notification } from '@douyinfe/semi-ui'; import { IconTickCircle } from '@douyinfe/semi-icons'; function nvrModal(props){ const {modalName}=props + const nvrData = props.nvrData||{} const form = useRef(); const [visible, setVisible] = useState(false);//是否显示弹框 const [isloading,setloading] = useState(false);//是否显示loading @@ -66,9 +67,9 @@ function nvrModal(props){ } return ( <> -
{modalName}
+
{modalName=='add'?'添加NVR':'修改'}
form.current = formApi}> - diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx new file mode 100644 index 0000000..b735465 --- /dev/null +++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx @@ -0,0 +1,70 @@ +import React, { useState, useEffect } from "react"; +import { connect } from "react-redux"; +import { Button, Form, Input, Row, Table } from "@douyinfe/semi-ui"; +import "../style.less"; + +const CameraHeader = (props) => { + return ( + <> +
+
+ + ); +}; + +function mapStateToProps(state) { + const { auth, global, members } = state; + return { + loading: members.isRequesting, + user: auth.user, + actions: global.actions, + members: members.data, + }; +} + +export default connect(mapStateToProps)(CameraHeader); diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/index.js b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/index.js index 59ce10b..df5ae2b 100644 --- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/index.js +++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/index.js @@ -1,5 +1,5 @@ 'use strict'; import Nvr from './nvr'; - -export { Nvr }; \ No newline at end of file +import Camera from './camera'; +export { Nvr,Camera }; \ No newline at end of file diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/nvr.jsx b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/nvr.jsx index 473bbd3..c58be70 100644 --- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/nvr.jsx +++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/nvr.jsx @@ -67,7 +67,7 @@ const NvrHeader = (props) => { // console.log(row); return ( <> - + @@ -149,7 +149,7 @@ const NvrHeader = (props) => { cursor: "pointer", }} > - + diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/routes.js b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/routes.js index 1f26df4..adb5808 100644 --- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/routes.js +++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/routes.js @@ -1,5 +1,5 @@ 'use strict'; -import { Nvr, } from './containers'; +import { Nvr,Camera } from './containers'; export default [{ type: 'inner', @@ -16,7 +16,7 @@ export default [{ },{ path: '/camera', key: 'camera', - component: Nvr, + component: Camera, breadcrumb: '摄像头管理', }] } diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/style.less b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/style.less index 4ed565a..e69de29 100644 --- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/style.less +++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/style.less @@ -1,5 +0,0 @@ -.NvrHeader{ - background-image: url(/assets/images/background/nvr_banner.png); - height: 171px; - background-size:100% 100%; -} \ No newline at end of file