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/Monitor.jsx

@@ -31,6 +31,7 @@ const Monitor = props => {
 
   function getBuildingReports() {
     request({ ...apis.system.taBuildingReports, }).then((data) => {
+      console.log(data,"22222222222222222")
       setCheckData((data.records || []).map((x) => x.reportCode))
     })
   }
@@ -58,6 +59,16 @@ const Monitor = props => {
             <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{data.selectRegisteredCount || '0'}</span>
           </div>
         }
+        {checkData.includes('total_number_of_visit_users') &&
+          <div style={{
+            textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(255,126,74,1) 0%,rgba(255,196,168,1) 100%)', height: '100px',
+            boxShadow: '0px  0.106rem 14px -15px rgba(255,126,74,1)',
+            borderRadius: '12px', width: '32%', marginRight: '2%'
+          }}>
+            <span style={{ fontSize: '24px', color: '#fff' }}>今日访问次数 </span>
+            <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{data.selectVisitCount || '0'}</span>
+          </div>
+        }
         {checkData.includes('number_of_new_users') &&
           <div onClick={() => router.push('/statistical/newUsers')} style={{
             textAlign: 'center', display: 'flex', justifyContent: 'center', background: 'linear-gradient(137deg,rgba(107,130,230,1) 0%,rgba(152,175,251,1) 100%)', height: '100px',

src/pages/activity/editActivity.jsx

@@ -57,14 +57,14 @@ const BasicForm = props => {
     })
   }
 
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    useEffect(() => {
-      props.form.setFieldsValue({ isEnlist })
-      if (dynamicId) {
-        getDynamicData(dynamicId);
-      }
-    }, [])
- 
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    props.form.setFieldsValue({ isEnlist })
+    if (dynamicId) {
+      getDynamicData(dynamicId);
+    }
+  }, [])
+
   const handleSubmit = e => {
     e.preventDefault();
     props.form.validateFields((err, values) => {
@@ -79,7 +79,7 @@ const BasicForm = props => {
           values.enlistStart = moment(enlistStart).format('YYYY-MM-DD HH:mm');
           values.enlistEnd = moment(enlistEnd).format('YYYY-MM-DD HH:mm');
         }
-        
+
         console.log('submit data --->', values)
         if (dynamicId) {
           values.dynamicId = dynamicId
@@ -112,97 +112,97 @@ const BasicForm = props => {
     <>
       <Form {...formItemLayout} onSubmit={handleSubmit}>
         <Form.Item label="所属项目">
-        {getFieldDecorator('buildingId', {
-          rules: [
-            {
-              required: true,
-              message: '请选择所属项目',
-            },
-          ],
-        })(<BuildSelect disabled={disable}/>)}
+          {getFieldDecorator('buildingId', {
+            rules: [
+              {
+                required: true,
+                message: '请选择所属项目',
+              },
+            ],
+          })(<BuildSelect disabled={disable} />)}
         </Form.Item>
         <Form.Item label="活动封面图1" help="建议图片尺寸：750px*420px，比例16:9,格式：jpg，用于：首页推荐/活动列表">
           {getFieldDecorator('listImgUrl', {
-          rules: [
-            {
-              required: true,
-              message: '请选择活动封面图1',
-            },
-          ],
-        })(<ImageUploader />)}
+            rules: [
+              {
+                required: true,
+                message: '请选择活动封面图1',
+              },
+            ],
+          })(<ImageUploader />)}
         </Form.Item>
         <Form.Item label="活动封面图2" help="建议图片尺寸：750*250，比例3:1，格式：jpg，用于：项目详情页">
           {getFieldDecorator('bannerListImg', {
-          rules: [
-            {
-              required: true,
-              message: '请选择活动封面图2',
-            },
-          ],
-        })(<ImageUploader />)}
+            rules: [
+              {
+                required: true,
+                message: '请选择活动封面图2',
+              },
+            ],
+          })(<ImageUploader />)}
         </Form.Item>
         <Form.Item label="活动详情主图" help="建议图片尺寸：750*600px，比例5:4,格式：jpg，用于：普通活动详情">
           {getFieldDecorator('imgUrl', {
-          rules: [
-            {
-              required: true,
-              message: '请选择活动详情主图',
-            },
-          ],
-        })(<ImageUploader />)}
+            rules: [
+              {
+                required: true,
+                message: '请选择活动详情主图',
+              },
+            ],
+          })(<ImageUploader />)}
         </Form.Item>
         <Form.Item label="活动标题">
-        {getFieldDecorator('title', {
-          rules: [
-            {
-              required: true,
-              message: '请输入活动标题',
-            },
-          ],
-        })(<Input/>)}
+          {getFieldDecorator('title', {
+            rules: [
+              {
+                required: true,
+                message: '请输入活动标题',
+              },
+            ],
+          })(<Input />)}
         </Form.Item>
         <Form.Item label="活动时间">
-        {getFieldDecorator('activityTime', {
-          rules: [
-            {
-              required: true,
-              message: '请选择活动时间',
-            },
-          ],
-        })(<RangePicker format="YYYY-MM-DD HH:mm" disabled={activityStatus===0 ? true : false}/>)}
+          {getFieldDecorator('activityTime', {
+            rules: [
+              {
+                required: true,
+                message: '请选择活动时间',
+              },
+            ],
+          })(<RangePicker format="YYYY-MM-DD HH:mm" disabled={activityStatus === 0 ? true : false} />)}
         </Form.Item>
         <Form.Item label="活动地点">
-        {getFieldDecorator('address', {
-          rules: [
-            {
-              required: true,
-              message: '请输入活动地点',
-            },
-          ],
-        })(<Input disabled={activityStatus===0 ? true : false}/>)}
+          {getFieldDecorator('address', {
+            rules: [
+              {
+                required: true,
+                message: '请输入活动地点',
+              },
+            ],
+          })(<Input disabled={activityStatus === 0 ? true : false} />)}
         </Form.Item>
-        <Form.Item label="活动人数">
-        {getFieldDecorator('personNum', {
-          rules: [
-            {
-              required: true,
-              message: '请输入活动人数',
-            },
-          ],
-        })(<Input type="number" disabled={activityStatus===0 ? true : false}/>)}
+        <Form.Item label="活动人数" help="当前活动最多可报名人数">
+          {getFieldDecorator('personNum', {
+            rules: [
+              {
+                required: true,
+                message: '请输入活动人数',
+              },
+            ],
+          })(<Input type="number" disabled={activityStatus === 0 ? true : false} />)}
         </Form.Item>
-        <Form.Item label="最大报名人数">
-        {getFieldDecorator('maxEnlistByPerson', {
-          rules: [
-            {
-              required: true,
-              message: '请输入最大报名人数',
-            },
-          ],
-        })(<Input type="number" min={1} disabled={activityStatus===0 ? true : false}/>)}
+        <Form.Item label="用户携带人数" help="每个用户最多可携带参与活动的人数">
+          {getFieldDecorator('maxEnlistByPerson', {
+            rules: [
+              {
+                required: true,
+                message: '请输入用户携带人数',
+              },
+            ],
+          })(<Input type="number" min={1} disabled={activityStatus === 0 ? true : false} />)}
         </Form.Item>
         <Form.Item label="活动详情">
-        {getFieldDecorator('desc')(<Wangedit />)}
+          {getFieldDecorator('desc')(<Wangedit />)}
         </Form.Item>
         <Form.Item label="报名时间">
           {getFieldDecorator('signupTime', {
@@ -212,17 +212,17 @@ const BasicForm = props => {
                 message: '请选择报名时间',
               },
             ],
-          })(<RangePicker format="YYYY-MM-DD HH:mm" disabled={activityStatus===0 ? true : false}/>)}
-        </Form.Item>  
+          })(<RangePicker format="YYYY-MM-DD HH:mm" disabled={activityStatus === 0 ? true : false} />)}
+        </Form.Item>
         <Form.Item label="权重">
-        {getFieldDecorator('heavy', {
-          rules: [
-            {
-              required: true,
-              message: '请输入权重',
-            },
-          ],
-        })(<Input type="number" style={{ width: 80}}/>)}<span style={{ marginLeft: 30, color:'grey'}}>数字越大越靠前</span>
+          {getFieldDecorator('heavy', {
+            rules: [
+              {
+                required: true,
+                message: '请输入权重',
+              },
+            ],
+          })(<Input type="number" style={{ width: 80 }} />)}<span style={{ marginLeft: 30, color: 'grey' }}>数字越大越靠前</span>
         </Form.Item>
         <Form.Item wrapperCol={{ span: 12, offset: 8 }}>
           <Button type="primary" htmlType="submit">
@@ -273,7 +273,7 @@ const Edit = props => {
         })
         getMiniappName()
       }, [])
-    }else{
+    } else {
       getMiniappName()
     }
     // 获取小程序名称
@@ -358,7 +358,7 @@ const Edit = props => {
             <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>活动海报图</p>
             <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
           </div>
-          <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议图片尺寸：640*670px，比例64:67,格式：jpg，用于普通活动海报</p>
+          <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px' }}>建议图片尺寸：640*670px，比例64:67,格式：jpg，用于普通活动海报</p>
           <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
             <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>
             <Input style={{ width: '20vw' }} value={inputValue} placeholder="请输入海报标题" onChange={e => changeInput(e.target.value)} />

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/activity/compenents/OverView.jsx

@@ -192,7 +192,7 @@ class OverView extends React.Component {
       endDate: '',
       startDate: '',
       buildingId: [],
-      targetType: []
+      targetType: [],
     }
   }
 
@@ -243,9 +243,13 @@ class OverView extends React.Component {
     const targetType = this.props.form.getFieldValue("targetType");
     if (this.props.form.getFieldValue("startDate") != undefined){
       startDate = this.props.form.getFieldValue("startDate").toDate()
+    }else{
+      startDate = moment().subtract(7, 'day').toDate()
     }
     if (this.props.form.getFieldValue("endDate") != undefined){
       endDate = this.props.form.getFieldValue("endDate").toDate()
+    }else{
+      endDate = new Date
     }
     const { formData } = this.state
     this.setState({
@@ -263,6 +267,7 @@ class OverView extends React.Component {
   //重置搜索
   handleReset = e => {
     this.props.form.resetFields()
+    this.getAllList()
   }
 
   exportActivityStats = () => {
@@ -347,16 +352,12 @@ class OverView extends React.Component {
         </Radio.Group>
         <Form layout="inline" onSubmit={e => this.handleSubmit(e, this.props)}>
             <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
-            {getFieldDecorator('startDate', {initialValue: moment(startDate)
-              
-            })(
+            {getFieldDecorator('startDate')(
                 <DatePicker placeholder="开始日期"/>,
             )}
             </Form.Item>
             <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
-            {getFieldDecorator('endDate', {initialValue: moment(endDate)
-              
-            })(
+            {getFieldDecorator('endDate')(
                 <DatePicker placeholder="结束日期"/>,
             )}
             </Form.Item>
@@ -380,7 +381,10 @@ class OverView extends React.Component {
             </Button>
             <Button onClick={e => this.handleReset()} style={{ marginLeft: '30px' }}>重置</Button>
           </Form.Item>
+          <Icon type="question-circle" theme="filled" style={{ marginTop:'25px', fontSize: '25px', color: '#F00', marginLeft:'30px'}} onClick={() => setShowHelp(true)}/>
+          
           </Form>     
+          
         <div>
 
             <div style={{ display: 'flex', marginBottom: '33px' }}>

src/pages/statistical/activity/detail.jsx

@@ -17,7 +17,7 @@ const { RangePicker } = DatePicker;
 const { Text } = Typography;
 
 function record(props) {
-    const [radioVal, updateRadioVal] = useState(7)
+    const [radioVal, updateRadioVal] = useState(6)
     const [formData, updateFormData] = useState({
         pageNum: 1,
         pageSize: 10,
@@ -332,8 +332,9 @@ function record(props) {
             <Form layout="inline">
                 <div style={{ display: 'flex', alignItems: 'center' }}>
                     <Radio.Group buttonStyle="solid" value={radioVal} onChange={setFormData} style={{ marginRight: '16px', }}>
-                        <Radio.Button value={7}>最近7天</Radio.Button>
-                        <Radio.Button value={30}>最近1月</Radio.Button>
+                        <Radio.Button value={0}>今日</Radio.Button>
+                        <Radio.Button value={6}>最近7天</Radio.Button>
+                        <Radio.Button value={29}>最近1月</Radio.Button>
                     </Radio.Group>
                     <Form.Item>
                         <RangePicker value={dateRange} onChange={handleDateChange} placeholder={['开始日期', '结束日期']} />
@@ -351,7 +352,7 @@ function record(props) {
 
             <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between' }}>
                 <h4 style={{ fontSize: '0.12rem', fontWeight: '600' }}>详细数据</h4>
-                <AuthButton name="admin.statistical.consultant.export" noRight={null}>
+                <AuthButton name="admin.statistical.activity.content.export" noRight={null}>
                     <Button type="primary" onClick={exportRecord} loading={btnloading} style={{ zIndex: 1 }}>
                         导出
                 </Button>

src/pages/statistical/activity/index.jsx

@@ -48,14 +48,16 @@ function EditHouse(props) {
 
   return (
     <>
+    
       <Tabs type="card" value={ tab } buttonStyle="solid" onChange={e => tabsCallback(e)}>
         <TabPane tab="统计总况" key="overView" ></TabPane>
         <TabPane tab="统计内容" key="content" ></TabPane>
-        {/* <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00', marginLeft:'30px'}} /> */}
       </Tabs>
       <div style={{ marginTop: '20px' }}>
         { (tab === 'overView' && <OverView />)}
         { (tab === 'content' && <Content />)}
+        { (tab === 'desc' && <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00', marginLeft:'30px'}} />)}
+        
       </div>
     </>
   )

src/pages/statistical/activity/shareNum.jsx

@@ -33,7 +33,7 @@ let columns = [
     key: 'shareType',
     render: (text, records) => {
       if (records.sharePersonType === 'drift') { return '游客' }
-      if (records.sharePersonType === 'customer') { return '客户' }
+      if (records.sharePersonType === 'customer') { return '普通客户' }
       if (records.sharePersonType === 'Realty Consultant') { return '置业顾问' }
     },
   },

src/pages/statistical/activity/sharePersonNum.jsx

@@ -85,7 +85,7 @@ let columns = [
     key: 'sharePersonType',
     render: (text, records) => {
       if (records.sharePersonType === 'drift') { return '游客' }
-      if (records.sharePersonType === 'customer') { return '客户' }
+      if (records.sharePersonType === 'customer') { return '普通客户' }
       if (records.sharePersonType === 'Realty Consultant') { return '置业顾问' }
     },
   },

src/pages/statistical/activity/visitPersonNum.jsx

@@ -59,15 +59,10 @@ let columns = [
     key: 'realtyConsultantPhone',
   },
   {
-    title: '分享者',
+    title: '推广人',
     dataIndex: 'sharePersonName',
     key: 'sharePersonName',
   },
-  {
-    title: '分享者电话',
-    dataIndex: 'sharePersonPhone',
-    key: 'sharePersonPhone',
-  },
   {
     title: '访问次数',
     dataIndex: 'visitNum',

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'

src/pages/statistical/building/detail.jsx

@@ -7,6 +7,7 @@ import apis from '../../../services/apis';
 import StatsChartLine from './component/StatsChartLine';
 import BuildSelect from '../../../components/SelectButton/BuildSelect'
 import router from 'umi/router';
+import AuthButton from '@/components/AuthButton';
 
 
 const { RangePicker } = DatePicker;
@@ -167,7 +168,9 @@ class buildingDetailStats extends React.Component {
               <span>详细数据</span>
             </Col>
             <Col span={2}>
+            <AuthButton name="admin.statistical.building.content.export" noRight={null}>
               <Button type="primary" onClick={this.exportBuildingStats}>导出</Button>
+            </AuthButton>
             </Col>
         </Row>
         

src/pages/statistical/building/index.jsx

@@ -7,6 +7,7 @@ import apis from '../../../services/apis';
 import StatsChart from './component/StatsChart';
 import BuildSelect from '../../../components/SelectButton/BuildSelect'
 import router from 'umi/router';
+import AuthButton from '@/components/AuthButton';
 
 
 const { RangePicker } = DatePicker;
@@ -211,7 +212,9 @@ class buildingStats extends React.Component {
               <BuildSelect slot='action' onChange={(e => this.handleBuildingChange(e))} value={this.state.buildingId}></BuildSelect>
             </Col>
             <Col span={2}>
+            <AuthButton name="admin.statistical.building.export" noRight={null}>
               <Button type="primary" onClick={this.exportBuildingStats}>导出</Button>
+            </AuthButton>
             </Col>
         </Row>
         

src/pages/statistical/consultant/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Button, DatePicker, Table, Pagination, Radio, Typography } from 'antd';
+import { Form, Button, DatePicker, Modal, Table, Pagination, Radio, Typography } from 'antd';
 import router from 'umi/router';
 import moment from 'moment';
 import BuildSelect from '../../../components/SelectButton/BuildSelect'
@@ -15,7 +15,7 @@ const { RangePicker } = DatePicker;
 const { Text } = Typography;
 
 function record(props) {
-    const [radioVal, updateRadioVal] = useState(7)
+    const [radioVal, updateRadioVal] = useState(6)
     const [formData, updateFormData] = useState({
         pageNum: 1,
         pageSize: 10,
@@ -31,6 +31,7 @@ function record(props) {
     const [totalRow, setTotalRow] = useState({})
     const [loading, updataLoading] = useState(true)
     const [btnloading, updataBtnloading] = useState(false)
+    const [visible, setVisible] = useState(false)
 
     useEffect(() => {
         getList(formData);
@@ -38,6 +39,7 @@ function record(props) {
 
     // 查询列表
     const getList = (params) => {
+        updataLoading(true)
         request({ ...apis.stats.consultantKPI, params: { ...params }, }).then((data) => {
             setData(data.paged)
             setTotalRow(data.total)
@@ -50,6 +52,21 @@ function record(props) {
     //重置搜索
     function handleReset() {
         props.form.resetFields();
+        updateFormData({
+            pageNum: 1,
+            pageSize: 10,
+            startDate: moment().subtract(radioVal, 'day').format('YYYYMMDD'),
+            endDate: moment().format('YYYYMMDD'),
+            buildingId: '',
+        })
+        updateRadioVal(6)
+        getList({
+            pageNum: 1,
+            pageSize: 10,
+            startDate: moment().subtract(radioVal, 'day').format('YYYYMMDD'),
+            endDate: moment().format('YYYYMMDD'),
+            buildingId: '',
+        });
     }
 
     // 提交事件
@@ -227,7 +244,7 @@ function record(props) {
             dataIndex: 'buildingName',
             key: 'buildingName',
             align: 'center',
-            // render: (txt, _, index) => index ? txt : <span>总计</span>,
+            render: (txt, _, index) => index ? txt : <span>总计</span>,
         },
 
         {
@@ -248,8 +265,8 @@ function record(props) {
             key: 'totalPersons',
             align: 'center',
             sorter: true,
-            render: (txt, record, index) => clickCon(txt, record, 'totalPersons'),
-            // render: (txt, record, index) => index ? clickCon(txt, record, 'totalPersons') : <strong>{txt}</strong>,
+            // render: (txt, record, index) => clickCon(txt, record, 'totalPersons'),
+            render: (txt, record, index) => index ? clickCon(txt, record, 'totalPersons') : <strong>{txt}</strong>,
         },
         {
             title: '新增客户',
@@ -257,7 +274,8 @@ function record(props) {
             key: 'newPersons',
             align: 'center',
             sorter: true,
-            render: (txt, record, index) => clickCon(txt, record, 'newPersons'),
+            // render: (txt, record, index) => clickCon(txt, record, 'newPersons'),
+            render: (txt, record, index) => index ? clickCon(txt, record, 'newPersons') : <strong>{txt}</strong>,
         },
         {
             title: '分享次数',
@@ -265,7 +283,8 @@ function record(props) {
             key: 'shareNum',
             align: 'center',
             sorter: true,
-            render: (txt, record, index) => clickCon(txt, record, 'shareNum'),
+            // render: (txt, record, index) => clickCon(txt, record, 'shareNum'),
+            render: (txt, record, index) => index ? clickCon(txt, record, 'shareNum') : <strong>{txt}</strong>,
         },
         {
             title: '分享访问人数',
@@ -273,7 +292,8 @@ function record(props) {
             key: 'visitPersons',
             align: 'center',
             sorter: true,
-            render: (txt, record, index) => clickCon(txt, record, 'visitPersons'),
+            // render: (txt, record, index) => clickCon(txt, record, 'visitPersons'),
+            render: (txt, record, index) => index ? clickCon(txt, record, 'visitPersons') : <strong>{txt}</strong>,
         },
         {
             title: '分享访问次数',
@@ -281,7 +301,8 @@ function record(props) {
             key: 'visitNum',
             align: 'center',
             sorter: true,
-            render: (txt, record, index) => clickCon(txt, record, 'visitNum'),
+            // render: (txt, record, index) => clickCon(txt, record, 'visitNum'),
+            render: (txt, record, index) => index ? clickCon(txt, record, 'visitNum') : <strong>{txt}</strong>,
         },
 
         {
@@ -290,7 +311,8 @@ function record(props) {
             key: 'sharePersons',
             align: 'center',
             sorter: true,
-            render: (txt, record, index) => clickCon(txt, record, 'sharePersons'),
+            // render: (txt, record, index) => clickCon(txt, record, 'sharePersons'),
+            render: (txt, record, index) => index ? clickCon(txt, record, 'sharePersons') : <strong>{txt}</strong>,
         },
         {
             title: '主页访问人数',
@@ -298,7 +320,8 @@ function record(props) {
             key: 'homePagePersons',
             align: 'center',
             sorter: true,
-            render: (txt, record, index) => clickCon(txt, record, 'homePagePersons'),
+            // render: (txt, record, index) => clickCon(txt, record, 'homePagePersons'),
+            render: (txt, record, index) => index ? clickCon(txt, record, 'homePagePersons') : <strong>{txt}</strong>,
         },
         {
             title: '主页访问次数',
@@ -306,7 +329,8 @@ function record(props) {
             key: 'homePageNums',
             align: 'center',
             sorter: true,
-            render: (txt, record, index) => clickCon(txt, record, 'homePageNums'),
+            // render: (txt, record, index) => clickCon(txt, record, 'homePageNums'),
+            render: (txt, record, index) => index ? clickCon(txt, record, 'homePageNums') : <strong>{txt}</strong>,
         },
         {
             title: '咨询数',
@@ -314,7 +338,8 @@ function record(props) {
             key: 'chatPersons',
             align: 'center',
             sorter: true,
-            render: (txt, record, index) => clickCon(txt, record, 'chatPersons'),
+            // render: (txt, record, index) => clickCon(txt, record, 'chatPersons'),
+            render: (txt, record, index) => index ? clickCon(txt, record, 'chatPersons') : <strong>{txt}</strong>,
         },
         {
             title: '点赞数',
@@ -322,7 +347,8 @@ function record(props) {
             key: 'favorNum',
             align: 'center',
             sorter: true,
-            render: (txt, record, index) => clickCon(txt, record, 'favorNum'),
+            // render: (txt, record, index) => clickCon(txt, record, 'favorNum'),
+            render: (txt, record, index) => index ? clickCon(txt, record, 'favorNum') : <strong>{txt}</strong>,
         },
     ];
     // 下载文档
@@ -354,16 +380,44 @@ function record(props) {
         moment(formData.startDate),
         moment(formData.endDate),
     ]
-    // const list = data.records
-    // const _list = list && list.length > 0 ? [totalRow, ...list] : [];
+    const list = data.records
+    const _list = list && list.length > 0 ? [totalRow, ...list] : [];
     return (
 
         <>
+            <p style={{ fontSize: '0.09rem', color: '#999' }} onClick={() => setVisible(true)}>指标说明</p>
+            <Modal
+                title="指标说明（数据会存在一定时间延迟）"
+                centered
+                visible={visible}
+                footer={null}
+                onCancel={() => setVisible(false)}
+            >
+                <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>主页访问人数：</p>
+                <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>访问置业顾问名片的用户数</p>
+                <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>主页访问次数：</p>
+                <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>访问置业顾问名片的用户数</p>
+                <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>客户总计：</p>
+                <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>当前置业顾问的所有客户数(与列表时间筛选无关)</p>
+                <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>新增客户：</p>
+                <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>当前时间段内置业顾问新增的客户数</p>
+                <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>分享次数：</p>
+                <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>置业顾问分享小程序内容的次数</p>
+                <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>分享访问人数：</p>
+                <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>通过置业顾问分享访问小程序内容的用户数</p>
+                <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>分享拓客：</p>
+                <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>通过置业顾问分享内容进行手机授权的用户数</p>
+                <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>咨询数：</p>
+                <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>在线微聊，咨询置业顾问的用户数</p>
+                <p style={{ fontSize: '0.106rem', color: '#333', marginBottom: '8px' }}>点赞数：</p>
+                <p style={{ fontSize: '0.106rem', color: '#999', marginBottom: '8px' }}>置业顾问获得的点赞数</p>
+            </Modal>
             <Form layout="inline">
                 <div style={{ display: 'flex', alignItems: 'center' }}>
                     <Radio.Group buttonStyle="solid" value={radioVal} onChange={setFormData} style={{ marginRight: '16px', }}>
-                        <Radio.Button value={7}>最近7天</Radio.Button>
-                        <Radio.Button value={30}>最近1月</Radio.Button>
+                        <Radio.Button value={0}>今日</Radio.Button>
+                        <Radio.Button value={6}>最近7天</Radio.Button>
+                        <Radio.Button value={29}>最近1月</Radio.Button>
                     </Radio.Group>
                     <Form.Item>
                         <RangePicker value={dateRange} onChange={handleDateChange} placeholder={['开始日期', '结束日期']} />
@@ -384,7 +438,8 @@ function record(props) {
             </AuthButton>
             <Table rowKey={record => (record.userId + record.buildingId || '')}
                 style={{ marginTop: '30px' }}
-                dataSource={data.records}
+                dataSource={_list}
+                // dataSource={data.records}
                 columns={columns}
                 pagination={false}
                 onChange={handleChange}

src/pages/statistical/consultant/sharetable.jsx

@@ -40,7 +40,7 @@ const typeList = [
     },
     {
         label: '首页',
-        value: 'mian'
+        value: 'main'
     },
 ]
 const showTypeList = [
@@ -128,7 +128,7 @@ function record(props) {
             dataIndex: 'targetType',
             key: 'targetType',
             align: 'center',
-            render: (_, record) => <><span>{getType(record.targetType)} {'【' + record.targetName + '】'}</span></>
+            render: (_, record) => <><span>{getType(record.targetType)} {record.targetName ? '【' + record.targetName + '】' : ''}</span></>
         },
         {
             title: '分享时间',

src/pages/statistical/consultant/table.jsx

@@ -138,7 +138,7 @@ function record(props) {
                         dataIndex: 'reportDate',
                         key: 'reportDate',
                         align: 'center',
-                        render: (_, record) => <><span>{record.reportDate && moment(record.reportDate).format('YYYY-MM-DD HH:mm:ss')}</span>}</>,
+                        render: (_, record) => <><span>{record.reportDate && moment(record.reportDate).format('YYYY-MM-DD HH:mm:ss')}</span></>,
                     },
                 ]
     const columns = basicColunms.concat(lastColum)

src/pages/statistical/consultant/visitNum.jsx

@@ -113,7 +113,7 @@ function record(props) {
             dataIndex: 'targetType',
             key: 'targetType',
             align: 'center',
-            render: (_, record) => <><span>{getType(record.targetType)} {'【' + record.targetName + '】'}</span></>
+            render: (_, record) => <><span>{getType(record.targetType)} {record.targetName ? '【' + record.targetName + '】' : ''}</span></>
         },
         {
             title: '姓名',
@@ -146,7 +146,7 @@ function record(props) {
     ];
 
     const { getFieldDecorator } = props.form
-    
+
     let row = 0
 
     return (