zlisen 3 years ago
parent
commit
1ed4df9d0e

+ 3
- 3
src/pages/customer/Customer/PublicCustomer/publicCustomerDetail.jsx View File

86
 
86
 
87
   function changBuilding(buildingId) {
87
   function changBuilding(buildingId) {
88
     setBuildingIdData(buildingId);
88
     setBuildingIdData(buildingId);
89
-    getById({ pageNumber: 1, pageSize: 10, buildingId: buildingId });
89
+    // getById({ pageNumber: 1, pageSize: 10, buildingId: buildingId });
90
   }
90
   }
91
 
91
 
92
   const columns = [
92
   const columns = [
217
         <p className={publicStyle.tableName}>访问记录</p>
217
         <p className={publicStyle.tableName}>访问记录</p>
218
         <BuildSelect onChange={changBuilding} value={buildingIdValue} />
218
         <BuildSelect onChange={changBuilding} value={buildingIdValue} />
219
         <Table
219
         <Table
220
-          // dataSource={records}
220
+          dataSource={records}
221
           columns={columns}
221
           columns={columns}
222
           style={{ marginTop: '15px' }}
222
           style={{ marginTop: '15px' }}
223
-          pagination={{ pageSize: 10, total: records?.length, onChange }}
223
+          pagination={{ pageSize: 10, total: records?.length,  }}
224
         />
224
         />
225
       </div>
225
       </div>
226
     </>
226
     </>

+ 1
- 0
src/pages/staff/staff/list/index.jsx View File

8
 import BuildingSelect from '@/components/SelectButton/BuildSelect';
8
 import BuildingSelect from '@/components/SelectButton/BuildSelect';
9
 import OperButton from '@/components/OperButton';
9
 import OperButton from '@/components/OperButton';
10
 import withActions from '@/components/ActionList';
10
 import withActions from '@/components/ActionList';
11
+import CustomerChange from '../components/CustomerChange'
11
 import { router } from 'umi';
12
 import { router } from 'umi';
12
 
13
 
13
 export default props => {
14
 export default props => {

+ 5
- 5
src/pages/statistics/activity/index.jsx View File

23
   useEffect(() => {
23
   useEffect(() => {
24
     if (time) {
24
     if (time) {
25
       getTableList({
25
       getTableList({
26
-        buildingValue,
26
+        buildingId:buildingValue,
27
         startDate: moment(time[0]).format('YYYY-MM-DDT00:00:00.000') + 'Z',
27
         startDate: moment(time[0]).format('YYYY-MM-DDT00:00:00.000') + 'Z',
28
         endDate: moment(time[1]).format('YYYY-MM-DDT23:59:59.999') + 'Z',
28
         endDate: moment(time[1]).format('YYYY-MM-DDT23:59:59.999') + 'Z',
29
       });
29
       });
35
       title: '活动名称',
35
       title: '活动名称',
36
       dataIndex: 'title',
36
       dataIndex: 'title',
37
       key: 'title',
37
       key: 'title',
38
-      sorter: true,
38
+      // sorter: true,
39
     },
39
     },
40
     {
40
     {
41
       title: '访问人数',
41
       title: '访问人数',
80
   const handleTableChange = (pagination, filters, sorter) => {
80
   const handleTableChange = (pagination, filters, sorter) => {
81
     console.log(pagination, filters, sorter);
81
     console.log(pagination, filters, sorter);
82
     getTableList({
82
     getTableList({
83
-      buildingValue,
83
+      buildingId:buildingValue,
84
       startDate: moment(time[0]).format('YYYY-MM-DDT00:00:00.000') + 'Z',
84
       startDate: moment(time[0]).format('YYYY-MM-DDT00:00:00.000') + 'Z',
85
       endDate: moment(time[1]).format('YYYY-MM-DDT23:59:59.999') + 'Z',
85
       endDate: moment(time[1]).format('YYYY-MM-DDT23:59:59.999') + 'Z',
86
       pageNum: pagination.current,
86
       pageNum: pagination.current,
87
       pageSize: pagination.pageSize,
87
       pageSize: pagination.pageSize,
88
-    //   sort: sorter.order,
89
-    //   colKey: sorter.columnKey,
88
+      sort: sorter.order,
89
+      sortField: sorter.columnKey,
90
     });
90
     });
91
     // const { formData } = this.state
91
     // const { formData } = this.state
92
     // this.setState({
92
     // this.setState({