Merge

code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/nvr.jsx

@@ -24,4 +24,56 @@ function mapStateToProps(state) {
   };
 }
 
-export default connect(mapStateToProps)(Example);
+const NvrHeader = () =>{
+    return(
+        <div className="NvrHeader">
+            <div style={{fontSize:22+'px',paddingTop:15+'px',marginLeft:21+'px'}}>NVR管理</div>
+            <div style={{fontSize:14+'px',paddingTop:18+'px',marginLeft:20+'px'}}>对NVR（网络硬盘录像机）设备节点的管理</div>
+            <div style={{fontSize:14+'px',marginTop:28+'px',marginLeft:21+'px',width:89+'px',height:32+'px',lineHeight:32+'px',textAlign:'center',backgroundColor:"#D9EAFF",color:'#1859C1',cursor:'pointer'}}>
+                添加NVR
+            </div>
+        </div>
+    )
+}
+
+// const Example = (props) => {
+//     const { dispatch, actions, user, loading } = props
+
+//     useEffect(() => {
+//         // ACTION 示例
+//         dispatch(actions.example.getMembers(user.orgId))
+//     }, [])
+
+//     return (
+//         <Spin tip="biubiubiu~" spinning={loading}>
+//             <div id='example'>
+//                 <p>STYLE EXAMPLE</p>
+//             </div>
+//             <Card
+//                 style={{ maxWidth: 300 }}
+//                 cover={
+//                     <img
+//                         alt="example"
+//                         src="https://lf3-static.bytednsdoc.com/obj/eden-cn/ptlz_zlp/ljhwZthlaukjlkulzlp/root-web-sites/card-cover-docs-demo2.jpeg"
+//                     />
+//                 }
+//             >
+//                 <Meta title="组件示例" />
+//             </Card>
+//         </Spin>
+//     )
+// }
+
+// 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)(NvrHeader);
+
+export default connect()(NvrHeader);

code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/index.js

@@ -3,7 +3,7 @@
 import reducers from './reducers';
 import routes from './routes';
 import actions from './actions';
-import { getNavItem } from './warehouse-item';
+import { getNavItem } from './nav-item';
 
 export default {
     key: 'equipmentWarehouse',

code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/style.less

@@ -0,0 +1,5 @@
+.NvrHeader{
+  background-image: url(../../../assets/images/background/nvr_banner.png);
+  height: 171px;
+  background-size:100% 100%;
+}