fix

config/routes.js

@@ -613,83 +613,83 @@ export default [
                 path: '/statistics/dataReport',
                 name: '数据报表',
                 component: './statistics/dataReport',
-                menuCode: '/building/list',
+                menuCode: '/statistics/dataRepor',
               },
               {
                 path: '/statistics/dataReport/newAdd',
                 name: '新增用户',
                 hideInMenu: true,
                 component: './statistics/dataReport/newAdd',
-                menuCode: '/building/list',
+                menuCode: '/statistics/dataRepor',
               },
               {
                 path: '/statistics/activity',
                 name: '活动统计',
                 component: './statistics/activity',
-                menuCode: '/building/list',
+                menuCode: '/statistics/activity',
               },
               {
                 path: '/statistics/activity/sharePersonNum',
                 name: '分享人数',
                 hideInMenu: true,
                 component: './statistics/activity/sharePersonNum',
-                menuCode: '/building/list',
+                menuCode: '/statistics/activity',
               },
               {
                 path: '/statistics/activity/shareNum',
                 name: '分享次数',
                 hideInMenu: true,
                 component: './statistics/activity/shareNum',
-                menuCode: '/building/list',
+                menuCode: '/statistics/activity',
               },
               {
                 path: '/statistics/activity/visitPersonNum',
                 name: '访问人数',
                 hideInMenu: true,
                 component: './statistics/activity/visitPersonNum',
-                menuCode: '/building/list',
+                menuCode: '/statistics/activity',
               },
               {
                 path: '/statistics/activity/visitNum',
                 name: '访问次数',
                 hideInMenu: true,
                 component: './statistics/activity/visitNum',
-                menuCode: '/building/list',
+                menuCode: '/statistics/activity',
               },
               {
                 path: '/statistics/activity/addRegistNum',
                 name: '新增注册用户',
                 hideInMenu: true,
                 component: './statistics/activity/addRegistNum',
-                menuCode: '/building/list',
+                menuCode: '/statistics/activity',
               },
               {
                 path: '/statistics/activity/detail',
                 name: '查看',
                 hideInMenu: true,
                 component: './statistics/activity/detail',
-                menuCode: '/building/list',
+                menuCode: '/statistics/activity',
               },
               
               {
                 path: '/statistics/building',
                 name: '项目统计',
                 component: './statistics/building',
-                menuCode: '/building/list',
+                menuCode: '/statistics/building',
               },
               {
                 path: '/statistics/building/detail',
                 name: '项目统计',
                 hideInMenu: true,
                 component: './statistics/building/detail',
-                menuCode: '/building/list',
+                menuCode: '/statistics/building',
               },
 
               {
                 path: '/statistics/consultant',
                 name: 'KPI',
                 component: './statistics/consultant',
-                menuCode: '/building/list',
+                menuCode: '/statistics/consultant',
               },
             ],
           },

src/pages/statistics/activity/compents/ContentTable.jsx

@@ -235,16 +235,13 @@ const ContentTable = props => {
 
   //排序
   const handleTableChange = (pagination, filters, sorter) => {
-    console.log(pagination, filters, sorter);
-    // Desc  和asc
-    const sortType =
-      sorter.order == 'ascend' ? 'asc' : sorter.order == 'descend' ? 'Desc' : undefined;
+
     getTableList({
       ...params,
       pageNum: pagination.current,
       pageSize: pagination.pageSize,
-      sortType: sortType,
-      sortField: sorter.columnKey,
+      sort: sorter.order,
+      colKey: sorter.columnKey
     });
   };
 

src/pages/statistics/activity/compents/OverviewDeatil.jsx

@@ -182,11 +182,11 @@ const NewUsers = props => {
 
   return (
     <Card title="详细数据" headStyle={{ textAlign: 'left' }}>
-      <div style={{ textAlign: 'right' }}>
+      {/* <div style={{ textAlign: 'right' }}>
         <Button type="primary" onClick={exportActivityStats}>
           导出
         </Button>
-      </div>
+      </div> */}
 
       <Table
         key="date"

src/pages/statistics/activity/shareNum.jsx

@@ -331,7 +331,7 @@ class SharePersonNum extends React.Component {
               重置
             </Button>
           </Form.Item>
-          <AuthButton name="admin.statistical.activity.export" noRight={null}>
+          {/* <AuthButton name="admin.statistical.activity.export" noRight={null}>
             <Button
               type="primary"
               style={{ position: 'absolute', right: '27px', zIndex: 1 }}
@@ -339,7 +339,7 @@ class SharePersonNum extends React.Component {
             >
               导出
             </Button>
-          </AuthButton>
+          </AuthButton> */}
         </Form>
         <div>
           <Table

src/pages/statistics/activity/sharePersonNum.jsx

@@ -325,11 +325,11 @@ class SharePersonNum extends React.Component {
             </Button>
             <Button onClick={e => this.handleReset()} style={{ marginLeft: '30px' }}>重置</Button>
           </Form.Item>
-          <AuthButton name="admin.statistics.activity.export" noRight={null}>
+          {/* <AuthButton name="admin.statistics.activity.export" noRight={null}>
             <Button type="primary" style={{ float: 'right', zIndex: 1, marginTop: '24px' }} onClick={this.exportActivityStats}>
               导出
             </Button>
-          </AuthButton>
+          </AuthButton> */}
         </Form>
         <div>
 

src/pages/statistics/activity/visitNum.jsx

@@ -335,7 +335,7 @@ class SharePersonNum extends React.Component {
               重置
             </Button>
           </Form.Item>
-          <AuthButton name="admin.statistics.activity.export" noRight={null}>
+          {/* <AuthButton name="admin.statistics.activity.export" noRight={null}>
             <Button
               type="primary"
               style={{ float: 'right', margin: '20px 0', zIndex: 1 }}
@@ -343,7 +343,7 @@ class SharePersonNum extends React.Component {
             >
               导出
             </Button>
-          </AuthButton>
+          </AuthButton> */}
         </Form>
         <div>
           <Table

src/pages/statistics/activity/visitPersonNum.jsx

@@ -245,11 +245,11 @@ class SharePersonNum extends React.Component {
             </Button>
             <Button onClick={e => this.handleReset()} style={{ marginLeft: '30px' }}>重置</Button>
           </Form.Item>
-          <AuthButton name="admin.statistics.activity.export" noRight={null}>
+          {/* <AuthButton name="admin.statistics.activity.export" noRight={null}>
             <Button type="primary" style={{ float: 'right', margin: '20px 0', zIndex: 1 }} onClick={this.exportActivityStats}>
               导出
             </Button>
-          </AuthButton>
+          </AuthButton> */}
         </Form>
         <div>
 

src/pages/statistics/building/detail/tableDetail.jsx

@@ -91,13 +91,13 @@ const detailData = props => {
       headStyle={{ textAlign: 'left' }}
 
     >
-      <div style={{ marginBottom: '20px', textAlign: 'right' }}>
+      {/* <div style={{ marginBottom: '20px', textAlign: 'right' }}>
         <AuthButton name="admin.statistical.building.export" noRight={null}>
           <Button type="primary" onClick={exportBuildingStats}>
             导出
           </Button>
         </AuthButton>
-      </div>
+      </div> */}
       <Table
         dataSource={data?.records || []}
         columns={columns}

src/pages/statistics/consultant/index.jsx

@@ -201,16 +201,20 @@ const consultant = props => {
   const handleChange = (pagination, filters, sorter) => {
     console.log(pagination, filters, sorter);
     // Desc  和asc
-    const sortType =
-      sorter.order == 'ascend' ? 'asc' : sorter.order == 'descend' ? 'Desc' : undefined;
-    getTableList({
+    let sort = {};
+    if (sorter.order == 'ascend') {
+      sort.asc = sorter.columnKey;
+    } else if (sorter.order == 'descend') {
+      sort.desc = sorter.columnKey;
+    }
+
+    getList({
       buildingId: buildingValue,
       startDate: moment(time[0]).format('YYYY-MM-DDT00:00:00.000') + 'Z',
       endDate: moment(time[1]).format('YYYY-MM-DDT23:59:59.999') + 'Z',
       pageNum: pagination.current,
       pageSize: pagination.pageSize,
-      sortType: sortType,
-      sortField: sorter.columnKey,
+      ...sort,
     });
   };
 
@@ -288,7 +292,7 @@ const consultant = props => {
         </AuthButton>
       </div> */}
       <Table
-        rowKey={record => data.current * data.size + row++}
+        // rowKey={record => data?.current * data?.size + row++}
         style={{ marginTop: '30px' }}
         dataSource={_list}
         // dataSource={data.records}

src/pages/statistics/dataReport/components/IntentionalCustomers.jsx

@@ -122,9 +122,9 @@ const UserBehavior = props => {
             ></BuildingSelect>
           </Col>
           <Col span={2} style={{ textAlign: 'right' }}>
-            <Button type="primary" onClick={exportIntentionUsers}>
+            {/* <Button type="primary" onClick={exportIntentionUsers}>
               导出
-            </Button>
+            </Button> */}
           </Col>
         </Row>
         <Table