Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager into dev

src/pages/statistical/activity/addRegistNum.jsx

@@ -127,6 +127,8 @@ class SharePersonNum extends React.Component {
         ...formData,
         personFrom: personFrom,
         province: province,
+        pageNum: 1,
+        pageSize: 999
       }
     }, this.getTableList)
   }

src/pages/statistical/activity/compenents/Content.jsx

@@ -292,7 +292,9 @@ class OverView extends React.Component {
         endDate: endDate,
         buildingId: buildingId,
         targetType: targetType,
-        activityName: activityName
+        activityName: activityName,
+        pageNum: 1,
+        pageSize: 999
       }
     }, this.getTableList)
   }

src/pages/statistical/activity/compenents/OverView.jsx

@@ -258,7 +258,9 @@ class OverView extends React.Component {
         startDate: startDate,
         endDate: endDate,
         buildingId: buildingId,
-        targetType: activityType
+        targetType: activityType,
+        pageNum: 1,
+        pageSize: 999
       }
     }, this.getAllList)
     this.setState({ startDate: startDate, endDate: endDate, buildingId: this.props.form.getFieldValue("buildingId"), targetType: this.props.form.getFieldValue("targetType") })

src/pages/statistical/activity/shareNum.jsx

@@ -119,7 +119,9 @@ class SharePersonNum extends React.Component {
         ...formData,
         sharePersonType: sharePersonType,
         sharePersonPhone: sharePersonPhone,
-        sharePersonName: sharePersonName
+        sharePersonName: sharePersonName,
+        pageNum: 1,
+        pageSize: 999
       }
     }, this.getTableList)
   }

src/pages/statistical/activity/sharePersonNum.jsx

@@ -201,7 +201,9 @@ class SharePersonNum extends React.Component {
         ...formData,
         sharePersonType: sharePersonType,
         sharePersonPhone: sharePersonPhone,
-        sharePersonName: sharePersonName
+        sharePersonName: sharePersonName,
+        pageNum: 1,
+        pageSize: 999
       }
     }, this.getTableList)
   }

src/pages/statistical/activity/visitNum.jsx

@@ -143,7 +143,9 @@ class SharePersonNum extends React.Component {
         personFrom: personFrom,
         province: province,
         realtyConsultant: realtyConsultant,
-        realtyConsultantPhone: realtyConsultantPhone
+        realtyConsultantPhone: realtyConsultantPhone,
+        pageNum: 1,
+        pageSize: 999
       }
     }, this.getTableList)
   }
@@ -151,37 +153,6 @@ class SharePersonNum extends React.Component {
   //重置搜索
   handleReset = e => {
     this.props.form.resetFields()
-    let startDate;
-    let endDate;
-    if (this.props.location.query.queryDate){
-      startDate = moment(this.props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
-      endDate = moment(this.props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
-    }else{
-      startDate = moment(this.props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).toDate();
-      endDate = moment(this.props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).toDate();
-    }
-    this.setState({
-      formData: {
-        personFrom: '',
-        pageNum:'',
-        pageSize:'',
-        startDate: startDate,
-        endDate: endDate,
-        province:'',
-        realtyConsultant:'',
-        realtyConsultantPhone:'',
-        activityId: this.props.location.query.activityId,
-        activityType:this.props.location.query.activityType,
-        personId: this.props.location.query.personId,
-        buildingId: this.props.location.query.buildingId
-      },
-      personData: [],  
-      dataSoures: [],
-      tableData: [],
-      userType: 'all',
-      activityName:  this.props.location.query.activityName
-    })
-    this.getTableList()
   }
 
   goback = () => {

src/pages/statistical/activity/visitPersonNum.jsx

@@ -138,7 +138,9 @@ class SharePersonNum extends React.Component {
         personFrom: personFrom,
         province: province,
         realtyConsultant: realtyConsultant,
-        realtyConsultantPhone: realtyConsultantPhone
+        realtyConsultantPhone: realtyConsultantPhone,
+        pageNum: 1,
+        pageSize: 999
       }
     }, this.getTableList)
   }

src/pages/statistical/building/component/StatsChart.jsx

@@ -41,10 +41,10 @@ class StatsChart extends React.Component {
             barBorderRadius: [50, 50, 0, 0],
             color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
               offset: 0,
-              color: '#FD8A95'
+              color: '#FFC6AA'
             }, {
               offset: 1,
-              color: '#F13043'
+              color: '#FF7E48'
             }]),
             shadowColor: 'rgba(0, 0, 0, 0.4)',
 

src/pages/statistical/building/component/StatsChartLine.jsx

@@ -49,6 +49,7 @@ class StatsChart extends React.Component {
               name: '公客数',
               type: 'line',
               data: data.gkList || []
+              
           },
           {
               name: '私客数',

src/pages/statistical/consultant/visitNum.jsx

@@ -138,7 +138,7 @@ function record(props) {
             dataIndex: 'sex',
             key: 'sex',
             align: 'center',
-            render: (_, record) => <span>{record.sex == 1 ? '男' : '女'}</span>,
+            render: (_, record) => <span>{record.sex == null ? '未知': (record.sex == 1 ? '男' : '女')}</span>,
         },
         {
             title: '访问时间',