merge

src/pages/Welcome.jsx

@@ -1,76 +1,60 @@
-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: '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)',
-          borderRadius: '12px', width: '32%', marginRight: '2%'
-        }}>
-          <span style={{ fontSize: '24px', color: '#fff' }}>总用户 </span>
-          <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{data.selectUserCount || '0'}</span>
-        </div>
-        <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.11rem 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.selectRegisteredCount || '0'}</span>
-        </div>
-        <div onClick={() => router.push('/indexEcharts/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',
-          boxShadow: '0px  0.11rem 14px -15px rgba(107,130,230,1)',
-          borderRadius: '12px', width: '32%',
-        }}>
-          <span style={{ fontSize: '24px', color: '#fff', borderBottom: '1px solid #fff', margin: '30px 0' }}>最近7天新增 </span>
-          <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> */}
-
-    </>
+    <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)',
+        borderRadius: '12px', width: '32%', marginRight: '2%'
+      }}>
+        <span style={{ fontSize: '24px', color: '#fff' }}>总用户 </span>
+        <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{data.selectUserCount || '0'}</span>
+      </div>
+      <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.11rem 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.selectRegisteredCount || '0'}</span>
+      </div>
+      <div onClick={() => router.push('/indexEcharts/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',
+        boxShadow: '0px  0.11rem 14px -15px rgba(107,130,230,1)',
+        borderRadius: '12px', width: '32%',
+      }}>
+        <span style={{ fontSize: '24px', color: '#fff', borderBottom: '1px solid #fff', margin: '30px 0' }}>最近7天新增 </span>
+        <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy', lineHeight: '100px' }}>{data.selectRecentlyCount || '0'}</span>
+      </div>
+      <IndexEcharts style={{ width: '100%' }} onReData={(e) => redata(e)} ></IndexEcharts>
+    </div>
   )
-}
-export default Welcome;
 
+}
+export default welcome
 

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/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/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/report/index.jsx

@@ -152,12 +152,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>

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`,