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

src/components/SelectButton/AreaSelect.jsx

@@ -48,7 +48,7 @@ const CitySelect = (props) => {
       showSearch
       value={props.value}
       style={{ width: '300px' }}
-      placeholder="请选择城市"
+      placeholder="请选择区域"
       onChange={props.onChange}
       filterOption={(input, option) =>
         option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0

src/pages/building/list/add/components/base.jsx

@@ -329,11 +329,13 @@ function AddBuilding(props) {
 
   function cityChange(e) {
     setCityId(e)
-    setTimeout(()=>{
-      props.form.setFieldsValue({
-          'buildingArea': buildingData.buildingArea
-      })
-  },0)
+    if(buildingData.cityId === e){
+      setTimeout(()=>{
+        props.form.setFieldsValue({
+            'buildingArea': buildingData.buildingArea
+        })
+    },0)
+    }
   }
 
   function setFormMapScopeTagValue(keyType, item) {

src/pages/charts/CityNums.jsx

@@ -6,6 +6,7 @@ const geoOptions = {
   backgroundColor: '#fff',
   title: {
     text: '城市分布',
+    subtext: '数据会存在一定时间延迟',
     left: 40,
     top: 40
   },

src/pages/indexEcharts/newUsers.jsx

@@ -24,6 +24,8 @@ let columns = [
   },
 ]
 
+let daterange= []
+
 const header = props => {
 
   const [tableData, setTableData] = useState([])
@@ -31,7 +33,7 @@ const header = props => {
   const [data, setDate] = useState({})
   const [userType, setUserType] = useState({})
   const [startDate, setStartDate] = useState({})
-  let daterange= []
+  
 
   useEffect(() => {
 
@@ -45,8 +47,8 @@ const header = props => {
 
   function onChangetime (dates, dateStrings) {
 
-    daterange[1]=dateStrings[1]
-    daterange[0]=dateStrings[0]
+    daterange[1]=`${moment(dateStrings[1]).format('YYYY-MM-DDT00:00:00.000')}Z`
+    daterange[0]=`${moment(dateStrings[0]).format('YYYY-MM-DDT00:00:00.000')}Z`
 
   }
 
@@ -70,10 +72,9 @@ const header = props => {
   }
 
   function datalist () {
-
     setEndDate(daterange[1])
     setStartDate(daterange[0])
-    userResource({startDate: daterange[0], endDate: daterange[1]})
+    userResource({startDate, endDate})
 
   }
 
@@ -162,7 +163,7 @@ const header = props => {
           Today: [moment(), moment()],
           'This Month': [moment().startOf('month'), moment().endOf('month')],
         }}
-        showTime
+        // showTime
         // format="YYYY/MM/DD HH:mm:ss"
         onChange={onChangetime}
       />

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

@@ -24,6 +24,9 @@ class StatsChart extends React.Component {
         axisLabel: {rotate: 45},
         data: data.buildingNameList || []
     },
+    grid: {
+      bottom:'30%'
+    },  
     tooltip: {},
     yAxis: {
         type: 'value'