合并

src/global.less

@@ -98,6 +98,9 @@ ol {
   background: #FF7E48;
   border-color: #FF7E48;
 }
+.ant-radio-button-wrapper:not(:first-child)::before{
+  background: #FF7E48;
+}
 .ant-row.ant-form-item .ant-form-item-label.ant-col-sm-3{
   min-width: 100px;
 }
@@ -105,8 +108,8 @@ ol {
   padding: 0;
 }
 .antd-pro-pages-index-echarts-styles-pie,.antd-pro-pages-index-echarts-styles-bar{
-  padding: 0.1rem;
-  margin-bottom: 25px;
+  padding: 40px;
+  margin-bottom: 40px;
 }
 .ant-breadcrumb{
   font-size: 0.1rem;

src/pages/Welcome.jsx

@@ -1,44 +1,32 @@
-import React, { useEffect, useState } from 'react';
+import React, { Component, useState, useEffect } from 'react';
 import { Card, Typography, Alert, Row, Col } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import EchartsTest from '../components/EchartsTest';
 import IndexEcharts from './indexEcharts/index';
 import router from 'umi/router';
+import request from '../utils/request';
 import apis from '../services/apis';
-import request from '../utils/request'
-const Welcome = (props) => {
 
-  const option = {
-    xAxis: {
-      type: 'category',
-      data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
-    },
-    yAxis: {
-      type: 'value'
-    },
-    series: [{
-      data: [820, 932, 901, 934, 1290, 1330, 1320],
-      type: 'line'
-    }]
-  };
+const welcome = (props) => {
+
+  const [data, setData] = useState([])
+
   useEffect(() => {
-    echratsInfo();
+    getIndexEcharts()
   }, [])
-  const [data, setData] = useState({ records: [] })
-  function echratsInfo(params) {
+
+  function getIndexEcharts(params) {
     request({
       ...apis.indexEcharts.list,
-      params,
+      params
     }).then((data) => {
       setData(data)
-      console.log(data, "666666666666666666666666666666")
-
+      console.log(data, '11111')
     })
   }
-
   return (
     <>
-      <div style={{ display: 'flex', marginBottom: '28px' }}>
+      <div style={{ display: 'flex', marginBottom: '33px' }}>
         <div style={{
           textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(241,43,62,1) 0%,rgba(254,144,155,1) 100%)', height: '100px',
           boxShadow: '0px  0.11rem 14px -15px rgba(241,43,62,1)',
@@ -64,13 +52,10 @@ const Welcome = (props) => {
           <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy', lineHeight: '100px' }}>{data.selectRecentlyCount || '0'}</span>
         </div>
       </div>
-      <IndexEcharts style={{ width: '100%' }}></IndexEcharts>
-
-      {/* <EchartsTest style={{ width: 500, height: 500 }}></EchartsTest> */}
-
+      <IndexEcharts style={{ width: '100%' }} onReData={(e) => redata(e)} ></IndexEcharts>
     </>
   )
-}
-export default Welcome;
 
+}
+export default welcome
 

src/pages/activity/ActivityList.jsx

@@ -202,6 +202,12 @@ const handleSubmit = (e, props) => {
     });
   }
 
+   //重置搜索
+   function handleReset() {
+    props.form.resetFields();
+  }
+
+
   const { getFieldDecorator } = props.form
   return (
 
@@ -242,6 +248,9 @@ const handleSubmit = (e, props) => {
           <Button type="primary" htmlType="submit" className={styles.searchBtn}>
             搜索
           </Button>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
         </Form.Item>
       </Form>
       <AuthButton name="admin.buildingDynamic.add.post" noRight={null}>

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

@@ -188,7 +188,7 @@ function AddBuilding(props) {
               <TagGroup />,
             )}
           </Form.Item>
-          <Form.Item label="周边交通" hasFeedback>
+          <Form.Item label="周边商业" hasFeedback>
             {getFieldDecorator('buildingMall')(
               <TagGroup />,
             )}

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

@@ -165,14 +165,14 @@ class ModalImage extends React.Component {
               <Form.Item label="名称">
                 {getFieldDecorator('apartmentName')(<Input />)}
               </Form.Item>
-              {/* <Form.Item label="类型">
+              <Form.Item label="类型">
                 {getFieldDecorator('apartmentType')(
                   <Select placeholder="类型">
                     <Option value="apart">户型</Option>
                     <Option value="photo">相册</Option>
                   </Select>,
                 )}
-              </Form.Item> */}
+              </Form.Item>
               <Form.Item label="销售状态">
                 {getFieldDecorator('marketStatus')(
                   <Select placeholder="销售状态">

src/pages/building/list/index.jsx

@@ -228,6 +228,14 @@ function body(props) {
     router.push({ pathname: '/building/list/add' })
   }
 
+  /**
+   * 重置搜索
+   */
+  function handleReset() {
+    props.form.resetFields();
+  }
+
+
   return (
     <>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
@@ -285,6 +293,9 @@ function body(props) {
             <Button type="primary" htmlType="submit">
               搜索
             </Button>
+            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
         </Form.Item>
       </Form>
 

src/pages/building/type/index.jsx

@@ -6,6 +6,7 @@ import Styles from './style.less'
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import AuthButton from '@/components/AuthButton';
+import { debuglog } from 'util';
 
 function body() {
   // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -51,22 +52,6 @@ function body() {
     getList({ pageNum: 1, pageSize: 10 })
   }, [])
 
-  function getList(params) {
-    request({ ...apis.buildingType.getList, params: { ...params } }).then(res => {
-      setData(res)
-    }).catch(err => {
-      // eslint-disable-next-line no-unused-expressions
-      <Alert
-        style={{
-          marginBottom: 24,
-        }}
-        message={err}
-        type="error"
-        showIcon
-      />
-    })
-  }
-
   const openNotificationWithIcon = (type, message) => {
     notification[type]({
       message,
@@ -75,6 +60,15 @@ function body() {
     });
   }
 
+  function getList(params) {
+    request({ ...apis.buildingType.getList, params: { ...params } }).then(res => {
+      setData(res)
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      openNotificationWithIcon('error', err)
+    })
+  }
+
   // 分页
   function onChange(pageNumber) {
     // eslint-disable-next-line no-console
@@ -90,7 +84,7 @@ function body() {
     }).then(() => {
       openNotificationWithIcon('success', '操作成功')
     }).catch(err => {
-      openNotificationWithIcon('error', err)
+      //openNotificationWithIcon('error', err.message)
     })
   }
 

src/pages/carouselFigure/advertisingList.jsx

@@ -164,6 +164,12 @@ const handleSubmit = (e, props) => {
     });
   }
 
+   //重置搜索
+   function handleReset() {
+    props.form.resetFields();
+  }
+
+
   const { getFieldDecorator } = props.form
   return (
 
@@ -204,6 +210,9 @@ const handleSubmit = (e, props) => {
           <Button type="primary" htmlType="submit" className={styles.searchBtn}>
             搜索
           </Button>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
         </Form.Item>
       </Form>
       <AuthButton name="admin.extendContent.post" noRight={null}>

src/pages/carouselFigure/carouselFigureList.jsx

@@ -164,6 +164,11 @@ const handleSubmit = (e, props) => {
     });
   }
 
+   //重置搜索
+   function handleReset() {
+    props.form.resetFields();
+  }
+
   const { getFieldDecorator } = props.form
   return (
 
@@ -204,6 +209,9 @@ const handleSubmit = (e, props) => {
           <Button type="primary" htmlType="submit" className={styles.searchBtn}>
             搜索
           </Button>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
         </Form.Item>
       </Form>
       <AuthButton name="admin.extendContent.post" noRight={null}>

src/pages/charts/CityNums.jsx

@@ -6,8 +6,8 @@ const geoOptions = {
   backgroundColor: '#fff',
   title: {
     text: '城市分布',
-    left: 20,
-    top: 20
+    left: 40,
+    top: 40
   },
   tooltip : {
       trigger: 'item',
@@ -128,7 +128,7 @@ const CityNums = (props) => {
   }
 
   return (
-    <div style={{ margin: ' 0 0 20px  0', width: '100%', borderRadius: '8px', boxShadow: '0px 0px 9px 1px rgba(0,0,0,0.12)', overflow: 'hidden' }}>
+    <div style={{ marginBottom:'40px', width: '100%', borderRadius: '12px', boxShadow: '0px 0px 9px 1px rgba(0,0,0,0.12)', overflow: 'hidden' }}>
       <Echart options={options} style={{ width: '100%', height: '600px' }} ></Echart>
     </div>
   )

src/pages/customer/customerlist/index.jsx

@@ -110,6 +110,11 @@ function body(props) {
     getList({ pageNumber: 1, pageSize: 10, customerType: value })
   }
 
+  function handleReset() {
+    props.form.resetFields();
+  }
+
+
   // 这里有个 Bug， 就是 Modal 弹框，会联动出现， 比如 我点击 调整归属的Model弹框， 那么 积分记录的Model弹框莫名其妙的也显示了
   // 所有这里临时解决方法是，弹出一个Modal对话框的时候，把其他的对话框给隐藏
 
@@ -257,6 +262,9 @@ function body(props) {
             <Button type="primary" htmlType="submit" >
               查询
             </Button>
+            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
         </Form.Item>
       </Form>
 

src/pages/customer/independentList/index.jsx

@@ -18,17 +18,17 @@ class ModalTable extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
-       dataSource: { records: [] },
-       visibleData: { visible: false, customerId: '', realtyConsultant: '' },
+      dataSource: { records: [] },
+      visibleData: { visible: false, customerId: '', realtyConsultant: '' },
     }
   }
 
   // 挂载之后
-  componentDidMount() {
+  componentDidMount () {
     this.getList({ pageNumber: 1, pageSize: 5 })
   }
 
-  componentDidUpdate(preProps, preState) {
+  componentDidUpdate (preProps, preState) {
     if (this.props.visibleData.customerId !== preState.visibleData.customerId) {
       this.getList({ pageNumber: 1, pageSize: 5 })
       this.setState({ visibleData: this.props.visibleData });
@@ -37,16 +37,16 @@ class ModalTable extends React.Component {
 
   // 弹框确定按钮
   // eslint-disable-next-line react/sort-comp
-  handleOk() {
+  handleOk () {
     this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
   }
 
   // 弹框取消按钮
-  handleCancel() {
+  handleCancel () {
     this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
   }
 
-  getList(params) {
+  getList (params) {
     console.log('this.state.visibleData', this.state.visibleData)
     const { customerId } = this.state.visibleData
     if (customerId === '' || customerId === undefined) {
@@ -69,17 +69,17 @@ class ModalTable extends React.Component {
     })
   }
 
-   // 分页
-  onChange(pageNum) {
+  // 分页
+  onChange (pageNum) {
     this.getList({ pageNumber: pageNum, pageSize: 5 })
   }
 
-  render() {
+  render () {
     const columns = [
       {
         title: '头像',
         // eslint-disable-next-line jsx-a11y/alt-text
-        render: (text, records) => <img src={records.picture } width={50} height={50} />,
+        render: (text, records) => <img src={records.picture} width={50} height={50} />,
       },
       {
         title: '用户名',
@@ -95,7 +95,7 @@ class ModalTable extends React.Component {
         title: '性别',
         dataIndex: 'sex',
         key: 'sex',
-        render: (text, records) => <span>{ records.sex === 1 ? '男' : '女' }</span>,
+        render: (text, records) => <span>{records.sex === 1 ? '男' : '女'}</span>,
       },
       {
         title: '意向项目',
@@ -111,29 +111,29 @@ class ModalTable extends React.Component {
         title: '状态',
         // eslint-disable-next-line consistent-return
         render: (text, records) => {
-                                    if (records.status === 1) { return '报备' }
-                                    if (records.status === 2) { return '到访' }
-                                    if (records.status === 3) { return '认购' }
-                                    if (records.status === 4) { return '签约' }
-                                    if (records.verifyStatus === 1) { return '待审核' }
-                                    if (records.verifyStatus === 2) { return '审核同意' }
-                                    if (records.verifyStatus === 3) { return '签约' }
-                                  },
+          if (records.status === 1) { return '报备' }
+          if (records.status === 2) { return '到访' }
+          if (records.status === 3) { return '认购' }
+          if (records.status === 4) { return '签约' }
+          if (records.verifyStatus === 1) { return '待审核' }
+          if (records.verifyStatus === 2) { return '审核同意' }
+          if (records.verifyStatus === 3) { return '签约' }
+        },
       },
     ]
     return (
       <>
         <Modal
-            title="推荐客户"
-            destroyOnClose="true"
-            width={900}
-            footer={null}
-            visible={this.state.visibleData.visible}
-            // onOk={() => this.handleOk()}
-            onCancel={(e) => this.handleCancel(e)}
-          >
-            <Table rowKey="independentList" dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
-          </Modal>
+          title="推荐客户"
+          destroyOnClose="true"
+          width={900}
+          footer={null}
+          visible={this.state.visibleData.visible}
+          // onOk={() => this.handleOk()}
+          onCancel={(e) => this.handleCancel(e)}
+        >
+          <Table rowKey="independentList" dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
+        </Modal>
       </>
     );
   }
@@ -147,18 +147,18 @@ class InviteTable extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
-       dataSource: { records: [] },
-       visibleData: { visible: false, customerId: '', realtyConsultant: '' },
+      dataSource: { records: [] },
+      visibleData: { visible: false, customerId: '', realtyConsultant: '' },
     }
   }
 
   // 挂载之后
-  componentDidMount() {
+  componentDidMount () {
     const { customerId } = this.state.visibleData
     this.getList({ id: customerId, pageNumber: 1, pageSize: 5 })
   }
 
-  componentDidUpdate(preProps, preState) {
+  componentDidUpdate (preProps, preState) {
     const { customerId } = this.state.visibleData
     if (this.props.visibleData.customerId !== preState.visibleData.customerId) {
       this.getList({ id: customerId, pageNumber: 1, pageSize: 5 })
@@ -168,17 +168,17 @@ class InviteTable extends React.Component {
 
   // 弹框确定按钮
   // eslint-disable-next-line react/sort-comp
-  handleOk() {
+  handleOk () {
     this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
   }
 
   // 弹框取消按钮
-  handleCancel() {
+  handleCancel () {
     this.setState({ visibleData: { visible: false, customerId: '', realtyConsultant: '' } })
   }
 
-  getList(params) {
-     const { customerId } = this.props.visibleData
+  getList (params) {
+    const { customerId } = this.props.visibleData
     if (customerId === '' || customerId === undefined) {
       return
     }
@@ -197,19 +197,19 @@ class InviteTable extends React.Component {
     })
   }
 
-   // 分页
-  onChange(pageNum) {
+  // 分页
+  onChange (pageNum) {
     this.getList({ pageNumber: pageNum, pageSize: 5 })
   }
 
-  render() {
+  render () {
     const columns = [
       {
         title: '头像',
         dataIndex: 'img',
         key: 'img',
         align: 'center',
-        render: (text, record) => <img src={record.avatarurl}  width = {50} height = {50}/>,
+        render: (text, record) => <img src={record.avatarurl} width={50} height={50} />,
       },
       {
         title: '用户姓名',
@@ -229,22 +229,22 @@ class InviteTable extends React.Component {
         dataIndex: 'sex',
         key: 'sex',
         align: 'center',
-        render: (text, list) => <span>{ list.sex === 1 ? '男' : '女' }</span>,
+        render: (text, list) => <span>{list.sex === 1 ? '男' : '女'}</span>,
       },
     ]
     return (
       <>
         <Modal
-            title="推荐客户"
-            destroyOnClose="true"
-            width={900}
-            footer={null}
-            visible={this.state.visibleData.visible}
-            // onOk={() => this.handleOk()}
-            onCancel={(e) => this.handleCancel(e)}
-          >
-            <Table rowKey="independent" dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
-          </Modal>
+          title="推荐客户"
+          destroyOnClose="true"
+          width={900}
+          footer={null}
+          visible={this.state.visibleData.visible}
+          // onOk={() => this.handleOk()}
+          onCancel={(e) => this.handleCancel(e)}
+        >
+          <Table rowKey="independent" dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
+        </Modal>
       </>
     );
   }
@@ -256,7 +256,7 @@ class InviteTable extends React.Component {
  * @param {*} props
  * @returns
  */
-function body(props) {
+function body (props) {
   const { getFieldDecorator } = props.form
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -268,7 +268,7 @@ function body(props) {
   }, [])
 
 
-  function openNotificationWithIcon(type, message) {
+  function openNotificationWithIcon (type, message) {
     notification[type]({
       message,
       description:
@@ -276,7 +276,7 @@ function body(props) {
     });
   }
 
-  function getList(params) {
+  function getList (params) {
     // 网路请求
     request({ ...apis.customer.agents, params: { ...params } }).then(res => {
       setDataSource(res)
@@ -286,7 +286,7 @@ function body(props) {
   }
 
   // 提交事件
-  function handleSubmit(e) {
+  function handleSubmit (e) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
@@ -299,29 +299,36 @@ function body(props) {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [gInviteData, setGInviteData] = useState({ visible: false, customerId: '', realtyConsultant: '' })
   // Change 事件
-  function handleSelectChange(e) {
+  function handleSelectChange (e) {
     // eslint-disable-next-line no-console
     console.log(e)
   }
-  function gM(row) {
+  function gM (row) {
     setGVisibleData({ visible: true, customerId: row.personId, realtyConsultant: row.realtyConsultant })
 
     setGInviteData({ visible: false })
   }
 
-  function Invite(row) {
+  function Invite (row) {
     setGInviteData({ visible: true, customerId: row.personId, realtyConsultant: row.realtyConsultant })
 
     setGVisibleData({ visible: false })
   }
 
   // 分页
-  function onChange(pageNum) {
+  function onChange (pageNum) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
-      getList({ pageNumber: pageNum, pageSize: 10 })
+    getList({ pageNumber: pageNum, pageSize: 10 })
+  }
+
+  /**
+    * 重置搜索
+    */
+  function handleReset () {
+    props.form.resetFields();
   }
 
-  function toAudit(cuurentId) {
+  function toAudit (cuurentId) {
     router.push({
       pathname: '/customer/recommendCustomer/audit',
       query: {
@@ -330,16 +337,16 @@ function body(props) {
     })
   }
 
-  function exportIndependen() {
+  function exportIndependen () {
     request({ ...apis.customer.customerRecommendAgentsExport, responseType: 'blob' })
-    .then(response => {
-      download(response)
-    }).catch(error => {
+      .then(response => {
+        download(response)
+      }).catch(error => {
 
-    })
+      })
   }
 
-  function download(data) {
+  function download (data) {
     if (!data) {
       return
     }
@@ -374,13 +381,13 @@ function body(props) {
       dataIndex: 'gender',
       key: 'gender',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><span>{ record.gender === '1' ? '男' : record.gender === '2' ? '女' : '未知' }</span></>,
+      render: (_, record) => <><span>{record.gender === '1' ? '男' : record.gender === '2' ? '女' : '未知'}</span></>,
     },
     {
       title: '类型',
       dataIndex: 'personType',
       key: 'personType',
-      render: (_, record) => <><span>{ record.channelName !== null ? '渠道经纪人' : '独立经纪人' }</span></>,
+      render: (_, record) => <><span>{record.channelName !== null ? '渠道经纪人' : '独立经纪人'}</span></>,
     },
     {
       title: '所属渠道',
@@ -412,7 +419,7 @@ function body(props) {
 
   return (
     <>
-      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{ display: 'flex', alignItems: 'center' }}>
         <Form.Item>
           {getFieldDecorator('name')(
             <Input
@@ -429,19 +436,22 @@ function body(props) {
             />,
           )}
         </Form.Item>
-        <Form.Item>
-            <Button type="primary" htmlType="submit" className={Styles.SubmitButton}>
-              搜索
+        <Form.Item style={{ position: 'absolute', right: '38px' }} >
+          <Button type="primary" htmlType="submit" >
+            搜索
+          </Button>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+            重置
             </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" onClick={() => exportIndependen()} className={Styles.SubmitButton} style={{ marginTop: '5px', marginBottom: '5px' }}>
-        导出数据
+      <Button type="primary" onClick={() => exportIndependen()} style={{ float: 'right', margin: '20px 0' }}>
+        导出
       </Button>
       <Table rowKey="independentIndex" dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
-            {/* 调整归属 */}
-        <ModalTable visibleData={gVisibleData} />
-        <InviteTable visibleData={gInviteData} />
+      {/* 调整归属 */}
+      <ModalTable visibleData={gVisibleData} />
+      <InviteTable visibleData={gInviteData} />
     </>
   );
 }

src/pages/customer/independentList/style.less

@@ -1,12 +1,12 @@
 .SubmitButton {
   background: rgba(239,39,58,1);
-  border-radius: 7px;
+  border-radius: 6px;
   border: 0px;
 }
 .SelectFrom {
   width: 180px;
   background: #ffffff;
-  border-radius: 7px;
+  border-radius: 6px;
   border: 1px solid #dbdbdb;
 }
 .addButton {

src/pages/customer/recommendCustomer/index.jsx

@@ -77,6 +77,14 @@ function body(props) {
     })
   }
 
+  
+ /**
+   * 重置搜索
+   */
+  function handleReset() {
+    props.form.resetFields();
+  }
+  
   /**
    *导出数据（推荐用户）
    *
@@ -171,7 +179,7 @@ function body(props) {
 
   return (
     <>
-      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{display:'flex'}}>
         <Form.Item>
           {getFieldDecorator('name')(
             <Input
@@ -207,14 +215,17 @@ function body(props) {
             </Select>,
           )}
         </Form.Item>
-        <Form.Item>
-            <Button type="primary" htmlType="submit" className={Styles.SubmitButton}>
+        <Form.Item style={{ position:'absolute',right:'38px' }}>
+            <Button type="primary" htmlType="submit" >
               搜索
             </Button>
+            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" onClick={() => exportRecommendCustomer()} className={Styles.SubmitButton} style={{ marginTop: '5px', marginBottom: '5px' }}>
-        导出数据
+      <Button type="primary" onClick={() => exportRecommendCustomer()} style={{float:'right',margin:'20px 0'}}>
+        导出
       </Button>
       <Table rowKey="recommendCustomer" dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
     </>

src/pages/customer/report/index.jsx

@@ -70,6 +70,13 @@ function body(props) {
       getList({ pageNumber: pageNum, pageSize: 9 })
   }
 
+ /**
+   * 重置搜索
+   */
+  function handleReset() {
+    props.form.resetFields();
+  }
+
   function exportReport() {
     request({ ...apis.customer.customerRecommendReportExport, responseType: 'blob' })
     .then(response => {
@@ -133,7 +140,7 @@ function body(props) {
 
   return (
     <>
-      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{display:'flex'}}>
         <Form.Item>
           {getFieldDecorator('name')(
             <Input
@@ -152,12 +159,12 @@ function body(props) {
         </Form.Item>
         <Form.Item>
           {getFieldDecorator('consultName')(
-            <Input placeholder="推荐人" />,
+            <Input placeholder="置业顾问" />,
           )}
         </Form.Item>
         <Form.Item>
           {getFieldDecorator('consultTel')(
-            <Input placeholder="推荐电话" />,
+            <Input placeholder="置业顾问电话" />,
           )}
         </Form.Item>
         <Form.Item>
@@ -173,14 +180,17 @@ function body(props) {
             <BuildSelect />,
           )}
         </Form.Item>
-        <Form.Item>
+        <Form.Item style={{ position:'absolute',right:'38px' }}>
             <Button type="primary" htmlType="submit">
               搜索
             </Button>
+            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" onClick={() => exportReport()} className={Styles.SubmitButton} style={{ marginTop: '5px' }}>
-        导出数据
+      <Button type="primary" onClick={() => exportReport()} style={{ float:'right',margin:'20px 0' }}>
+        导出
       </Button>
       <Table rowKey="report" style={{marginTop:'40px'}} dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
     </>

src/pages/indexEcharts/components/UserBehavior.jsx

@@ -116,9 +116,10 @@ const UserBehavior = props => {
       activity: props.activity,
       event: props.event,
       eventType: props.eventType,
+      buildingId: props.buildingId,
     })
     // getUserBehaviorProfile(formatDate(props.startDate, props.endDate))
-  }, [props.startDate, props.endDate, props.activity, props.event, props.eventType])
+  }, [props.startDate, props.endDate, props.activity, props.event, props.eventType, props.buildingId])
 
   const [recordList, setList] = useState([])
   function getUserBehaviorSummary(params) {
@@ -127,13 +128,12 @@ const UserBehavior = props => {
       params,
     }).then(data => {
       setData(data || {})
-      setList(data.data.records || [])
-
+      setList((data.data.records || []).filter(e => e.activity !== '客户'))
     })
   }
 
 
-  const seriesMaker = (data.selectUserBehavior || []).reduce((series, item) => {
+  const seriesMaker = (data.selectUserBehavior || []).filter(e => e.activity !== '客户').reduce((series, item) => {
     let { date, activityCount, activity } = item
     date = moment(date).format('YYYY-MM-DD')
     if (!activityCount) activityCount = 0

src/pages/indexEcharts/components/UserSourcepie.jsx

@@ -54,7 +54,7 @@ const UserSource = (props) => {
     series: [
       {
         type: 'pie',
-        center: ['44%', '65%'],
+        center: ['40%', '65%'],
         radius: ['34%', '52%'],
       },
     ],

src/pages/indexEcharts/styles.less

@@ -11,7 +11,6 @@
 .pie {
   width: 30%;
   min-width: 370px;
-  height: 560px;
   background: rgba(255, 255, 255, 1);
   box-shadow: 0px 0px 16px 2px rgba(0, 0, 0, 0.12);
   border-radius: 12px;
@@ -24,7 +23,7 @@
   background: rgba(255, 255, 255, 1);
   box-shadow: 0px 0px 16px 2px rgba(0, 0, 0, 0.12);
   border-radius: 12px;
-  margin-bottom: 25px;
+  margin-bottom: 40px;
   padding: 40px;
 }
 

src/pages/indexEcharts/userBehavior.jsx

@@ -121,6 +121,11 @@ function getUserBehaviorSummary(params) {
     setActivity(value)
   }
 
+  const [buildingId, setBuildingId] = useState('')
+  function handleBuildingChange(value) {
+    setBuildingId(value)
+  }
+
   const columns = [
     {
       title: '访问事件',
@@ -157,13 +162,7 @@ function getUserBehaviorSummary(params) {
   const dataSource = []
 
   return (<>
-    <div style={{
-      backgroundColor: '#fff',
-      padding: '32PX 28px',
-      boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)',
-      borderRadius: '12px',
-      minHeight: '60vh'
-    }}>
+    <div>
       <div>
         <Radio.Group buttonStyle="solid" defaultValue="a">
           <Radio.Button value="a" onClick={getDataOf(7)}>最近7天</Radio.Button>
@@ -206,7 +205,7 @@ function getUserBehaviorSummary(params) {
 
 
       <div style={{ margin: '24px 0' }}>
-        <UserBehavior tableShow={true} BuildSelectHide={true} endDate={endDate} startDate={startDate}  eventType={eventType} activity={activity}  event={event} dataZoom={true} onReData={(e) => redata(e)}></UserBehavior>
+        <UserBehavior tableShow={true} BuildSelectHide={true} buildingId={buildingId} endDate={endDate} startDate={startDate}  eventType={eventType} activity={activity}  event={event} dataZoom={true} onReData={(e) => redata(e)}></UserBehavior>
       </div>
 
       {/* <Table dataSource={dataSource} columns={columns} pagination={false} scroll={{ y: 500 }} /> */}

src/pages/integralMall/GoodsList.jsx

@@ -41,6 +41,9 @@ function header(props) {
     getList({ pageNum: pageNumber, pageSize: 10 })
   }
 
+  function handleReset() {
+    props.form.resetFields();
+  }
 
   // 跳转到编辑商品
   const toEditGoods = (goodsId) => () => {
@@ -188,6 +191,9 @@ function header(props) {
             <Button type="primary" htmlType="submit" className={styles.searchBtn}>
               搜索
             </Button>
+            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
         </Form.Item>
       </Form>
       <AuthButton name="admin.taGoods.add.post" noRight={null}>

src/pages/integralMall/exchangeRecords.jsx

@@ -32,6 +32,13 @@ function record(props) {
         setData(data)
     })
   }
+
+  //重置搜索
+  function handleReset() {
+    props.form.resetFields();
+  }
+
+
   
   // 提交事件
   const handleSubmit = (e, props) => {
@@ -155,7 +162,7 @@ function record(props) {
           </Form.Item>
           <Form.Item>
             {getFieldDecorator('personType')(
-              <Select style={{ width: '220px' }} placeholder="用户类型">
+              <Select style={{ minWidth: '1.1rem' }} placeholder="用户类型">
                 <Option value="Realty Consultant">置业顾问</Option>
                 <Option value="Sales Executive">销售主管</Option>
                 <Option value="estate agent">经纪人</Option>
@@ -164,27 +171,35 @@ function record(props) {
           </Form.Item>
           <Form.Item>
             {getFieldDecorator('status')(
-              <Select style={{ width: '220px' }} placeholder="状态">
+              <Select style={{ minWidth: '1.1rem' }} placeholder="状态">
                 <Option value="1">已领取</Option>
                 <Option value="0">未领取</Option>
               </Select>,
             )}
           </Form.Item>
-          <Form.Item>
+          
+          <Form.Item style={{position:'absolute',right:'38px'}}>
+            <Button type="primary" htmlType="submit">
+              搜索
+            </Button>
+            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
+          </Form.Item>
+        </div>
+        <div style={{margin:'10px 0'}}>
+        <Form.Item>
+          <span style={{marginRight:'10px'}}>兑换时间：</span>
             {getFieldDecorator('exchangeTime')(
-              <RangePicker placeholder={['兑换开始时间','兑换结束时间']}/>
+              <RangePicker placeholder={['开始时间','结束时间']}/>
             )}
           </Form.Item>
           <Form.Item>
+          <span style={{marginRight:'10px'}}>领取时间：</span>
             {getFieldDecorator('receiveTime')(
-              <RangePicker placeholder={['领取开始时间','领取结束时间']}/>
+              <RangePicker placeholder={['开始时间','结束时间']}/>
             )}
           </Form.Item>
-          <Form.Item>
-            <Button type="primary" htmlType="submit" className={styles.searchBtn}>
-              搜索
-            </Button>
-          </Form.Item>
         </div>
       </Form>
       <Table rowKey="exchangeRecords" style={{marginTop:'40px'}} dataSource={data.records} columns={columns} pagination={false} />

src/pages/news/list/NewsList.jsx

@@ -229,6 +229,11 @@ function body(props) {
     getList({ pageNum: pageNumber, pageSize: 6 })
   }
 
+   //重置搜索
+   function handleReset() {
+    props.form.resetFields();
+  }
+  
   function getDate(value, dateString) {
     // moment(value).format('YYYY-MM-DD HH:mm:ss')
     console.log(value, dateString)
@@ -273,6 +278,9 @@ function body(props) {
           <Button type="primary" htmlType="submit" >
             搜索
           </Button>
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
         </Form.Item>
       </Form>
       <AuthButton name="admin.taNews.post" noRight={null}>

src/pages/news/type/NewsType.jsx

@@ -129,7 +129,7 @@ function header(props) {
         </Form.Item>
       </Form>
       <AuthButton name="admin.taNewsType.post" noRight={null}>
-        <Button type="primary" className={styles.addBtn} onClick={toEditNews()}>新增</Button>
+        <Button type="danger" className={styles.addBtn} onClick={toEditNews()}>新增</Button>
       </AuthButton>
       <Table rowKey="newsType" dataSource={data.records} columns={columns} pagination={false} />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>

src/pages/staff/list/StaffList.jsx

@@ -132,6 +132,11 @@ const header = (props) => {
     });
   }
 
+   //重置搜索
+   function handleReset() {
+    props.form.resetFields();
+  }
+
   const { getFieldDecorator } = props.form
   return (
 
@@ -168,6 +173,10 @@ const header = (props) => {
           <Button type="primary" htmlType="submit" className={styles.searchBtn}>
             搜索
           </Button>
+          
+   <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
         </Form.Item>
       </Form>
       <Button type="danger" style={{ margin: '20px 0', padding: '2px 36px' }} onClick={toEditStaff()}>新增</Button>

src/pages/system/housingPolicy.jsx

@@ -182,7 +182,7 @@ const handleSubmit = (e, props) => {
         </Form.Item>
       </Form>
       <AuthButton name="admin.taPolicy.post" noRight={null}>
-        <Button type="primary" className={styles.addBtn} onClick={toEditPolicy()}>新增</Button>
+        <Button type="danger" className={styles.addBtn} onClick={toEditPolicy()}>新增</Button>
       </AuthButton>
       <Table rowKey="housingPolicy" dataSource={data.records} columns={columns} pagination={false}/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>

src/pages/system/intention.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker,message,Checkbox,Row, Col } from 'antd';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Checkbox, Row, Col } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../style/GoodsList.less';
 import moment from 'moment';
@@ -19,13 +19,13 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
  * @param {*} props
  * @returns
  */
- const Edit = (props) => {
-  const [ data, setData ] = useState([])
-  const [ buildingIdValue, setBuildingIdData ] = useState('')
+const Edit = (props) => {
+  const [data, setData] = useState([])
+  const [buildingIdValue, setBuildingIdData] = useState('')
 
   const changBuilding = (buildingId) => {
     setBuildingIdData(buildingId)
-    request({ ...apis.system.tdBizEventIntention, params: {pageNum: 1, pageSize: 999,buildingId}}).then((data) => {
+    request({ ...apis.system.tdBizEventIntention, params: { pageNum: 1, pageSize: 999, buildingId } }).then((data) => {
       console.log(data)
       setData(data.records)
     })
@@ -33,59 +33,64 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
   const changeBox = (x) => (e) => {
     setData(data.map((item) => {
-      return x.eventId === item.eventId ? {...item, checkbox: e.target.checked} : item
+      return x.eventId === item.eventId ? { ...item, checkbox: e.target.checked } : item
     }))
   }
 
   const changeInput = (x) => (e) => {
     setData(data.map((item) => {
-      return x.eventId === item.eventId ? {...item, intention: e.target.value} : item
+      return x.eventId === item.eventId ? { ...item, intention: e.target.value } : item
     }))
   }
 
   const submitValue = () => {
     console.log(buildingIdValue)
-    if(buildingIdValue === ''){
+    if (buildingIdValue === '') {
       return
     }
-    request({ ...apis.system.taBuildingIntentionAddOrUpdate, urlData: {id: buildingIdValue}, data,}).then((data) => {
+    request({ ...apis.system.taBuildingIntentionAddOrUpdate, urlData: { id: buildingIdValue }, data, }).then((data) => {
       message.info("保存成功")
     })
   }
 
   return (
     <>
-    <Row>
-      <Col span={12}>
-        <BuildSelect onChange={changBuilding}/>
-      </Col>
-    </Row>
-    <Row style={{margin:'10px 0'}}>
-      <Col span={5} offset={2}>
-        用户操作
-      </Col>
-      <Col span={3} offset={3}>
-        意向值
-      </Col>
-    </Row>
-    {data.map((x) => {
-      return <Row>
-                <Col span={5} offset={2}>
-                  <Checkbox checked={x.checkbox} onChange={changeBox(x)}>{x.eventName}</Checkbox>
-                </Col>
-                <Col span={3} offset={3}>
-                  <Input value={x.intention} onChange={changeInput(x)}/>
-                </Col>
-              </Row>
-    })}
-    <Row>
-      <AuthButton name="admin.taBuildingIntentionAddOrUpdate.buildingId.post" noRight={null}>
-        <Button type="primary" className={styles.searchBtn} onClick={submitValue}>确定</Button>
-      </AuthButton>
-    </Row>
+      <Row>
+        <Col span={6}>
+          <BuildSelect onChange={changBuilding} />
+        </Col>
+        <Col span={5} style={{ lineHeight: '30px' }}>
+          用户操作
+        </Col>
+        <Col span={5} offset={2} style={{ lineHeight: '30px' }}>
+          意向值
+        </Col>
+        <Col span={2} offset={4}>
+          <AuthButton name="admin.taBuildingIntentionAddOrUpdate.buildingId.post" noRight={null}>
+            <Button type="primary" className={styles.searchBtn} onClick={submitValue}>确定</Button>
+          </AuthButton>
+        </Col>
+      </Row>
+      {data.map((x) => {
+        return <Row style={{margin:'5px 0'}}>
+          <Col span={6}>
+
+          </Col>
+          <Col span={5} >
+            <Checkbox checked={x.checkbox} onChange={changeBox(x)}>{x.eventName}</Checkbox>
+          </Col>
+          <Col span={5} offset={2}>
+            <Input value={x.intention} onChange={changeInput(x)} />
+          </Col>
+          <Col span={2} offset={4}>
+
+          </Col>
+
+        </Row>
+      })}
     </>
   );
- }
+}
 
 
 

src/services/apis.js

@@ -263,6 +263,11 @@ export default {
     },
   },
   indexEcharts: {
+    list:{
+      method:'GET',
+      url: `${prefix}/indexStatistical`,
+      action: 'userStatistics',
+    },
     userResource: {
       method: 'GET',
       url: `${prefix}/selectUserResource`,