zlisen 3 年前
父节点
当前提交
6fb3928e43

+ 5
- 5
src/pages/customer/Customer/PrivateCustomer/CustomerDetail.jsx 查看文件

203
          
203
          
204
           </div>
204
           </div>
205
           <div className={styles.rightphone}>
205
           <div className={styles.rightphone}>
206
-          <p className={styles.infoItem}>{taUser?.userName}</p>
207
-          <p className={styles.infoItem}>号码:{taUser?.phone} </p>
206
+          <p className={styles.infoItem}>{realtyConsultantPerson?.userName}</p>
207
+          <p className={styles.infoItem}>号码:{realtyConsultantPerson?.phone} </p>
208
       
208
       
209
           </div>
209
           </div>
210
           <div className={styles.left}>
210
           <div className={styles.left}>
211
-          <p className={styles.infoItem}>部门:{taUser?.department} </p>
212
-          <p className={styles.infoItem}>岗位:{taUser?.position} </p>
213
-          <p className={styles.infoItem}>公司:{taUser?.orgName} </p>
211
+          <p className={styles.infoItem}>部门:{realtyConsultantPerson?.department} </p>
212
+          <p className={styles.infoItem}>岗位:{realtyConsultantPerson?.post} </p>
213
+          {/* <p className={styles.infoItem}>公司:{realtyConsultantPerson?.orgName} </p> */}
214
            
214
            
215
             <p className={styles.infoItem}>
215
             <p className={styles.infoItem}>
216
               所属项目:
216
               所属项目:

+ 1
- 1
src/pages/customer/Customer/PublicCustomer/publicCustomerDetail.jsx 查看文件

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,  }}
223
           pagination={{ pageSize: 10, total: records?.length,  }}

+ 7
- 5
src/pages/statistics/activity/index.jsx 查看文件

18
 const DataReport = props => {
18
 const DataReport = props => {
19
   const [data, setData] = useState({});
19
   const [data, setData] = useState({});
20
   const [time, setTime] = useState();
20
   const [time, setTime] = useState();
21
-  const [buildingValue, setBuildingValue] = useState('');
21
+  const [buildingValue, setBuildingValue] = useState();
22
 
22
 
23
   useEffect(() => {
23
   useEffect(() => {
24
     if (time) {
24
     if (time) {
40
     {
40
     {
41
       title: '访问人数',
41
       title: '访问人数',
42
       dataIndex: 'visitPersonNum',
42
       dataIndex: 'visitPersonNum',
43
-      key: 'visitPersonNum',
43
+      key: 'visit_person_num',
44
       width:'25%',
44
       width:'25%',
45
       sorter: true,
45
       sorter: true,
46
       render: (text)=>text||0
46
       render: (text)=>text||0
48
     {
48
     {
49
       title: '访问次数',
49
       title: '访问次数',
50
       dataIndex: 'visitNum',
50
       dataIndex: 'visitNum',
51
-      key: 'visitNum',
51
+      key: 'visit_num',
52
       width:'25%',
52
       width:'25%',
53
       sorter: true,
53
       sorter: true,
54
       render: (text)=>text||0
54
       render: (text)=>text||0
56
     {
56
     {
57
       title: '报名人数',
57
       title: '报名人数',
58
       dataIndex: 'signNum',
58
       dataIndex: 'signNum',
59
-      key: 'signNum',
59
+      key: 'sign_num',
60
       width:'25%',
60
       width:'25%',
61
       sorter: true,
61
       sorter: true,
62
       // render: (text)=>text||0
62
       // render: (text)=>text||0
79
   //排序
79
   //排序
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
+    // Desc  和asc
83
+    const sortType=  sorter.order=="ascend"?'asc':sorter.order=="descend"?'Desc':undefined
82
     getTableList({
84
     getTableList({
83
       buildingId:buildingValue,
85
       buildingId:buildingValue,
84
       startDate: moment(time[0]).format('YYYY-MM-DDT00:00:00.000') + 'Z',
86
       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',
87
       endDate: moment(time[1]).format('YYYY-MM-DDT23:59:59.999') + 'Z',
86
       pageNum: pagination.current,
88
       pageNum: pagination.current,
87
       pageSize: pagination.pageSize,
89
       pageSize: pagination.pageSize,
88
-      sort: sorter.order,
90
+      sortType: sortType,
89
       sortField: sorter.columnKey,
91
       sortField: sorter.columnKey,
90
     });
92
     });
91
     // const { formData } = this.state
93
     // const { formData } = this.state