zzz

config/config.js

@@ -122,11 +122,6 @@ export default {
                   name: '项目列表',
                   component: './building/list/index',
                 },
-                {
-                  path: '/building/list/add',
-                  name: '', // 项目添加
-                  component: './building/list/add/index',
-                },
                 {
                   path: '/building/type',
                   name: '项目类型',
@@ -149,11 +144,6 @@ export default {
                   name: '客户列表',
                   component: './customer/customerlist/index',
                 },
-                {
-                  path: '/customer/customerlist/customerDetail',
-                  name: '',
-                  component: './customer/customerlist/customerDetail',
-                },
                 {
                   path: '/customer/drift/list',
                   name: '游客列表',
@@ -275,11 +265,6 @@ export default {
                   name: '资讯列表',
                   component: './news/list/NewsList',
                 },
-                {
-                  path: '/news/list/editNewsList',
-                  name: '',
-                  component: './news/list/editNewsList',
-                },
               ],
             },
             {
@@ -304,6 +289,7 @@ export default {
                 },
               ],
             },
+
             {
               path: '/staff',
               name: '员工管理',
@@ -319,7 +305,7 @@ export default {
                   name: '',
                   component: './staff/list/editStaff',
                 },
-
+             
                 {
                   path: '/staff/RoleList',
                   name: '角色管理',
@@ -330,51 +316,21 @@ export default {
                   name: '',
                   component: './staff/list/editRole',
                 },
-
+             
               ],
             },
             {
-              path: '/carouselFigure',
-              name: '轮播图管理',
+              path: '/indexEcharts',
+              name: 'echarts',
               component: '../layouts/BlankLayout',
               routes: [
                 {
-                  path: '/carouselFigure/carouselFigureList',
-                  name: '轮播图列表',
-                  component: './carouselFigure/carouselFigureList',
-                },
-                {
-                  path: '/carouselFigure/editCarousel',
-                  name: '',
-                  component: './carouselFigure/editCarousel',
-                },
-                {
-                  path: '/carouselFigure/advertisingList',
-                  name: '开屏广告',
-                  component: './carouselFigure/advertisingList',
-                },
-                {
-                  path: '/carouselFigure/editAdvertising',
-                  name: '',
-                  component: './carouselFigure/editAdvertising',
-                },
-              ],
-            },
-            {
-              path: '/system',
-              name: '系统管理',
-              component: '../layouts/BlankLayout',
-              routes: [
-                {
-                  path: '/system/messageList',
-                  name: '客户留言',
-                  component: './system/messageList',
-                },
-                {
-                  path: '/system/report',
-                  name: '报表数据',
-                  component: './system/report',
+                  path: '/indexEcharts/index',
+                  name: '报表',
+                  component: './indexEcharts/index',
                 },
+                
+
               ],
             },
             {
@@ -440,7 +396,7 @@ export default {
 
   proxy: {
     '/api/': {
-      target: 'http://127.0.0.1:8080/',
+      target: 'http://192.168.0.11:8080/',
       changeOrigin: true,
       // pathRewrite: { '^/server': '' },
     },

package.json

@@ -45,6 +45,7 @@
     "@antv/data-set": "^0.10.2",
     "antd": "^3.20.0",
     "classnames": "^2.2.6",
+    "dayjs": "^1.8.16",
     "dva": "^2.4.1",
     "echarts": "^4.3.0",
     "lodash": "^4.17.11",
@@ -68,6 +69,7 @@
     "@ant-design/colors": "^3.1.0",
     "@ant-design/pro-cli": "^1.0.0",
     "@types/classnames": "^2.2.7",
+    "@types/echarts": "^4.1.14",
     "@types/express": "^4.17.0",
     "@types/history": "^4.7.2",
     "@types/jest": "^24.0.13",

src/pages/indexEcharts/components/UserSource.jsx

@@ -0,0 +1,160 @@
+import React, { Component, useState, useEffect } from 'react';
+
+// 引入 ECharts 主模块
+import echarts from 'echarts/lib/echarts';
+// 引入环形图
+import 'echarts/lib/chart/pie';
+import 'echarts/lib/chart/bar'
+
+// 引入提示框和标题组件
+import 'echarts/lib/component/tooltip';
+import 'echarts/lib/component/title';
+import 'echarts/lib/component/visualMap';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import dayjs from 'dayjs';
+
+
+// 
+class UserSource extends React.Component {
+
+  state = {
+    piedata: {},
+    loading: false,
+    dataset: {},
+    reportOpts: {
+      legend: {},
+      color: ['#286DD0', '#8565CE', '#6A96F8', '#F5749E', '#8B7FE2'],
+      tooltip: {},
+      yAxis: {},
+      grid: [
+        { right: '50%' },
+        { right: '5%' }
+      ],
+    },
+    userType: 'all',
+    tableTitle: ['日期'],
+  }
+
+
+
+  initCharts = () => {
+
+
+
+    console.log(this.dataset, '5555')
+    // 基于准备好的dom，初始化echarts实例
+    var myChart = echarts.init(document.getElementById('usersourcebar'));
+    const source = this.dataset.columnar || [];
+
+    // 柱图
+    const barOptions = {
+
+
+      xAxis: { type: 'category' },
+      legend: {
+        left: '20%',
+        data: ['所有用户', '注册用户'],
+      },
+      series: [
+        { type: 'bar', name: '所有用户', datasetIndex: 0 },
+        { type: 'bar', name: '注册用户' },
+      ],
+      dataset: {
+        id: 'bar',
+        dimensions: ['fromName', 'userCount', 'registered'],
+        source: source,
+      },
+
+    };
+    const { person_estate_agent = 0, person_null = 0, person_realty_consultant = 0 } = this.dataset.pie || {};
+    const pieOptions = {
+
+
+      xAxis: {},
+      legend: {
+        left: '70%',
+        data: ['来源置业顾问', '来源全民经纪人', '自主进入'],
+      },
+      series: [
+        {
+          type: 'pie',
+          datasetIndex: 1,
+          center: ['75%', '50%'],
+          radius: [0, '50%'],
+        },
+      ],
+      dataset: {
+        id: 'pie',
+        source: [
+          { form: '来源置业顾问', value: person_realty_consultant },
+          { form: '来源全民经纪人', value: person_estate_agent },
+          { form: '自主进入', value: person_null },
+        ]
+      },
+
+    };
+    // 绘制图表
+    myChart.setOption({
+      // ...this.reportOpts,
+      xAxis: { type: 'category' },
+        legend: {
+          left: '20%',
+          data: ['所有用户', '注册用户'],
+        },
+        series: [
+          { type: 'bar', name: '所有用户', datasetIndex: 0 },
+          { type: 'bar', name: '注册用户' },
+        ],
+        dataset: {
+          id: 'bar',
+          dimensions: [ 'fromName', 'userCount', 'registered' ],
+          source: source,
+        },
+    });
+
+
+  }
+
+
+  componentDidMount () {
+    this.initCharts();
+  }
+  componentDidUpdate () {  //当图表切换的时候，重新执行
+    this.initCharts();
+  }
+
+
+
+  render () {
+    this.piedata = this.props.data;
+    this.dataset = this.piedata || {};
+
+    return (
+
+
+      <div>
+        {/* 饼图 */}
+
+        {/* <div class="chart-box" v-if="mode == 'all' || mode == 'report'">
+      <h3>用户来源 <small>{{subtitle}}</small></h3>
+      <v-chart v-loading="loading" class="chart" options="options" />
+    </div>
+    <div class="chart-box" v-if="mode == 'all' || mode == 'table'">
+      <el-select v-model="userType">
+        <el-option label="所有用户" value="all"></el-option>
+        <el-option label="注册用户" value="registered"></el-option>
+      </el-select>
+      <el-table v-loading="loading" data="tableData"  border  center  style="width: 100%; margin-top: 16px" height="400">
+        <el-table-column v-for="(item, index) in tableTitle" key="index" label="item" prop="index == 0 ? 'label' : item"></el-table-column>
+      </el-table>
+    </div> */}
+
+        <div id="usersourcebar" style={{ width: '1060px', height: '560px' }}></div>
+
+      </div>
+    );
+  }
+}
+
+export default UserSource;

src/pages/indexEcharts/index.jsx

@@ -0,0 +1,50 @@
+
+import React, { useState, useEffect }  from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Row, Col, Tag, Pagination, Modal, DatePicker } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+// import styles from '../../style/GoodsList.less';
+import router from 'umi/router';
+
+import request from '../../utils/request'
+import apis from '../../services/apis';
+// import Styles from './style.less';/
+import UserSource from './components/UserSource.jsx';
+
+
+
+
+const header = (props) => {
+  const [ data, setData ] = useState({records: []})
+  //柱图
+  
+  useEffect(() => {
+    userResource()
+  }, [])
+  
+  function userResource() {
+        request({
+          ...apis.indexEcharts.userResource,
+           params: { pageNum: 1, pageSize:9999}
+        }).then((data) => {
+            // console.log(data , '3333')
+            setData(data)
+        })
+      }
+
+  
+
+  
+
+
+
+  const { getFieldDecorator } = props.form
+  return (
+
+    <>
+     <UserSource data={data} ></UserSource>
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/pages/staff/list/StaffList.jsx

@@ -146,7 +146,7 @@ function CartBody (props) {
             data.labels.map((item, index) => {
               const color = colors[item];
               console.log(color, '------');
-              return <Tag className={Styles.cardTag}  color = {color}>{item}</Tag>
+              return <Tag className={Styles.cardTag} color={color}>{item}</Tag>
             })
           }
         </span>

src/pages/staff/list/editRole.jsx

@@ -132,27 +132,27 @@ const Edit = (props) => {
       textAlign: 'left',
     };
 
-{/* <Checkbox>{Permission[index]}</Checkbox> */}
+    {/* <Checkbox>{Permission[index]}</Checkbox> */ }
     return <>
       <div style={{}}>
 
         {Permission.map((item, index) => (
 
 
-          <Card title={<Checkbox>{Permission[index]}</Checkbox>} bordered={true} style={{ width: '100%' }}>
-            
-              {dataSource.map((items, indexs) => (
+          <Card title={<Checkbox value=''>{Permission[index]}</Checkbox>} bordered={true} style={{ width: '100%' }}>
+
+            {dataSource.map((items, indexs) => (
               <>
-                <Card.Grid style={gridStyle1}><Checkbox>{items.name}</Checkbox></Card.Grid>
-                
+                <Card.Grid style={gridStyle1}><Checkbox value=''>{items.name}</Checkbox></Card.Grid>
+
                 <Card.Grid style={gridStyle2}>
-                {items.per.map((itemss,indexss) =>(
-                  <Checkbox>{items.per[indexss]}</Checkbox>
-                ))}
+                  {items.per.map((itemss, indexss) => (
+                    <Checkbox value=''>{items.per[indexss]}</Checkbox>
+                  ))}
                 </Card.Grid>
-                </>
+              </>
             ))}
-            
+
           </Card>
 
 

src/services/apis.js

@@ -109,4 +109,55 @@ export default {
       url: `${prefix}/customer/recommend/get/id`,
     },
   },
+  indexEcharts: {
+    userResource: {
+      method: 'GET',
+      url: `${prefix}/selectUserResource`
+    },
+
+  }
+  // indexEcharts:{
+  //   list:{
+  //     method:'get',
+  //     url: `${commPrefix}/indexStatistical`
+  //   },
+  //   userResource: {
+  //       method:'get',
+  //       url: `${commPrefix}/selectUserResource`
+  //   },
+  //   userConversion: {
+  //     method:'get',
+  //     url: `${commPrefix}/selectConversion`
+  //   },
+  //   userActive: {
+  //     method:'get',
+  //     url: `${commPrefix}/selectActiveUserCount`
+  //   },
+  //   newUser: {
+  //     method:'get',
+  //     url: `${commPrefix}/selectNewsUserCount`
+  //   },
+  //   userBehavior: {
+  //     summary: {
+  //       method:'get',
+  //       url: `${commPrefix}/selectUserBehavior`
+  //     },
+  //     profile: {
+  //       method:'get',
+  //       url: `${commPrefix}/selectEventAll`
+  //     },
+  //   },
+  //   intentionUsers: {
+  //     method:'get',
+  //     url: `${commPrefix}/selectIntentionUser`
+  //   },
+  //   userSex: {
+  //     method:'get',
+  //     url: `${commPrefix}/selectSexUser`
+  //   },
+  //   userCity: {
+  //     method:'get',
+  //     url: `${commPrefix}/selectCityUser`
+  //   },
+  // },
 }