nvr table

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

@@ -46,7 +46,7 @@ const NvrHeader = (props) => {
       equipmentGetNvr();
    }, [query, search]);
 
-  function equipmentGetNvr() {
+   function equipmentGetNvr () {
       dispatch(equipmentWarehouse.getNvr({ ...query, ...search }));
    }
    const columns = [
@@ -123,7 +123,7 @@ const NvrHeader = (props) => {
    ];
 
    //获取表格属性设置
-  function attribute(data) {
+   function attribute (data) {
       const arr = localStorage.getItem(SETUPS)
          ? JSON.parse(localStorage.getItem(SETUPS))
          : [];
@@ -435,7 +435,7 @@ const NvrHeader = (props) => {
                </div>
             </div>
             <Table
-          columns={setupp}
+               columns={setupp.filter(s => s)}
                dataSource={equipmentWarehouseNvr.data}
                bordered={false}
                empty="暂无数据"
@@ -497,14 +497,14 @@ const NvrHeader = (props) => {
 };
 
 
-function mapStateToProps(state) {
+function mapStateToProps (state) {
    const { auth, global, members, equipmentWarehouseNvr } = state;
    return {
       loading: members.isRequesting,
       user: auth.user,
       actions: global.actions,
       members: members.data,
-    equipmentWarehouseNvr: equipmentWarehouseNvr.data || [],
+      equipmentWarehouseNvr: equipmentWarehouseNvr.data || {},
    };
 }