样式调整

src/model/index.js

@@ -8,15 +8,10 @@ import { reducers } from './reducer';
 import * as user from './user';
 import * as map from './map';
 import * as datamodel from './datamodel';
-<<<<<<< HEAD
 import * as assetmanage from './assetmanage';
-
-const funcs = Connect({ user, datamodel, map,assetmanage })
-=======
 import * as dataassetelement from './dataassetelement';
 
-const funcs = Connect({ user, datamodel, map, dataassetelement })
->>>>>>> 38340f8dec7bab08e4d6f7a73db93a2d59a4c42c
+const funcs = Connect({ user, datamodel, map, assetmanage, dataassetelement })
 
 function* request(args) {
   const { type, payload, callback, error } = args.args;

src/view/Manage/AssetManage/components/AssetTable.jsx

@@ -152,14 +152,7 @@ export default (props) =>{
                     itemLayout="vertical"
                     dataSource={dataList || []}
                     footer={null}
-                    pagination={{
-                        total:total,
-                        showTotal:(total) => (`共 ${total} 项`),
-                        showSizeChanger:true,
-                        pageSize:size,
-                        onChange:changeCurrent,
-                        onShowSizeChange:changeCurrent,
-                    }}
+                    Pagination={false}
                     renderItem={(item) => (
                         <List.Item
                             actions={[
@@ -193,6 +186,19 @@ export default (props) =>{
                         </List.Item>
                     )}
                 />
+                <Pagination
+                    size="small"
+                    className="text-center mt-3"
+                    showSizeChanger
+                    showQuickJumper
+                    onChange={changeCurrent}
+                    onShowSizeChange={changeCurrent}
+                    current={page}
+                    pageSize={size}
+                    defaultCurrent={1}
+                    total={total}
+                    showTotal={total => `共 ${total} 条`}
+                    />
             </Checkbox.Group>
             <AssetModal visible={visible.visible} attrBox2={attrBox2} editBox={editBox} addType={visible.addtype} handleCancle={handleCancle} attrBox={attrBox} nodeId={nodeId}  setPageNumber={setPageNumber} pageNumber={pageNumber}/>
             {contextHolder}

src/view/Manage/AssetManage/components/AssetTable.less

@@ -8,7 +8,8 @@
     .yy-list-vertical .yy-list-item-action > li {
         padding: 0 ;
     }
-    .yy-list-pagination{
-        margin-top: 10px !important;
+    .yy-checkbox-group {
+        height: calc(100vh - 64px - 30px - 53px - 53px - 5px) !important;
+        overflow: auto !important;
     }
 }
\ No newline at end of file

src/view/Manage/AssetManage/components/LeftTree.jsx

@@ -5,6 +5,7 @@ import { showMessage, generateList } from '../../../../util';
 import { dispatchLatest,dispatch } from '../../../../model';
 import TreeModal from "./TreeModal"
 import './LeftTree.less';
+
 const {TreeNode} = Tree
 export default (props)=>{
     const {setNodeId} = props
@@ -150,7 +151,6 @@ export default (props)=>{
 
     const deleteNode = () => {
         if (nodeBox.selectKey&&nodeBox.selectKey[0]!==undefined) {
-            
             dispatch({
                 type: 'assetmanage.existDataAsset',
                 payload: {dirId:nodeBox.dataBox.nodeId},

src/view/Manage/AssetManage/components/LeftTree.less

@@ -3,7 +3,7 @@
         padding: 0;
     }
     .yy-tree-list {
-        height: calc(100vh - 64px - 20px - 53px - 20px - 42px) !important;
+        height: calc(100vh - 64px - 30px - 53px - 20px - 42px) !important;
         overflow: auto !important;
       }
   }
\ No newline at end of file

src/view/Manage/AssetManage/index.jsx

@@ -23,7 +23,7 @@ class Index extends React.Component {
 
     render() {
         return (
-            <Row gutter={8}>
+            <Row gutter={15}>
                 <Col span={6}>
                     <LeftTree setNodeId={this.setNodeId}/>
                 </Col>

src/view/Manage/Element/index.less

 .element {
   .yy-table {
-    height: calc(100vh - 64px - 30px - 53px - 20px) !important;
+    height: calc(100vh - 64px - 30px - 53px - 20px - 34px) !important;
     overflow: auto !important;
   }
 }
\ No newline at end of file