冲突解决

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

@@ -3,29 +3,10 @@ import { connect } from "react-redux";
 import { Card } from "@douyinfe/semi-ui";
 import "../style.less";
 
-const Example = (props) => {
+const NvrHeader = (props) =>{
-  const { dispatch, actions, user, loading } = props;
+    const { dispatch, actions, user, loading } = props
-
-  useEffect(() => {
-    // ACTION 示例
-    // dispatch(actions.example.getMembers(user.orgId));
-  }, []);
-
-  return <Card title="筛选条件" headerLine={false}></Card>;
-};
-
-function mapStateToProps(state) {
-  const { auth, global, members } = state;
-  return {
-    loading: members.isRequesting,
-    user: auth.user,
-    actions: global.actions,
-    members: members.data,
-  };
-}
-
-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>
@@ -33,47 +14,21 @@ const NvrHeader = () =>{
                 添加NVR
             </div>
         </div>
+        <Card title="筛选条件" headerLine={false}></Card>
+        </>
+        
     )
 }
 
-// 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) {
+function mapStateToProps (state) {
-//     const { auth, global, members } = state;
+    const { auth, global, members } = state;
-//     return {
+    return {
-//         loading: members.isRequesting,
+        loading: members.isRequesting,
-//         user: auth.user,
+        user: auth.user,
-//         actions: global.actions,
+        actions: global.actions,
-//         members: members.data
+        members: members.data
-//     };
+    };
-// }
+}
-
-// export default connect(mapStateToProps)(NvrHeader);
 
-export default connect()(NvrHeader);
+export default connect(mapStateToProps)(NvrHeader);