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

config/config.js

                   hideInMenu: true,
                   component: './staff/list/editRole',
                 },
-
+                {
+                  path: '/staff/list/addRole',
+                  name: '添加角色',
+                  hideInMenu: true,
+                  component: './staff/list/addRole',
+                },  
               ],
             },
             {

package.json

     "@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",
     "@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/components/EchartsTest/EChart.jsx

 // 引入 ECharts 主模块
 import echarts from 'echarts/lib/echarts';
 // 引入柱状图
-import  'echarts/lib/chart/bar';
+import 'echarts/lib/chart/bar';
+import 'echarts/lib/chart/pie';
 // 引入提示框和标题组件
 import 'echarts/lib/component/tooltip';
+import 'echarts/lib/component/legend';
 import 'echarts/lib/component/title';
 
+
 class EchartsTest extends Component {
-    chartRef = undefined
+    chartRef = React.createRef();
     chart = undefined
     defaultChartOption = {}
 
-    componentDidMount() {
+    componentDidMount () {
         this.chart = echarts.init(this.chartRef.current)
 
         // 绘制图表
         });
     }
 
-    componentDidUpdate(preProps) {
+    componentDidUpdate (preProps) {
         if (preProps.options != this.props.options) {
-            this.chart.setOption({
+            const options = {
                 ...this.defaultChartOption,
                 ...this.props.options || {},
-            });
+            }
+
+            console.log(options)
+
+            this.chart.setOption(options);
         }
     }
 
-    handleDom = ref => this.chartRef = ref
-
-    render() {
+    render () {
         const style = {
             width: '600px',
+            height: '400px',
             ...this.props.style || {}
         }
 
         return (
-            <div ref={this.handleDom} style={style}></div>
+            <div ref={this.chartRef} style={style}></div>
         );
     }
 }

src/global.less

   text-rendering: optimizeLegibility;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
+  font-size: 16px;
 }
 
 ul,
   .ant-menu-inline > .ant-menu-item{
     height: 45px;
     line-height: 45px;
-    font-size: 16px;
+    
     margin: 0;
+    .ant-menu-submenu-title{
+      font-size: 16px!important;
+    }
   }
   .ant-menu.ant-pro-sider-menu{
     padding: 0!important;

src/pages/activity/editActivity.jsx

           method: 'PUT',
           data: submitValue,
         }).then((data) => {
+          message.info("保存成功")
           cancelPage()
         }).catch((err) => {
           message.info(err.msg || err.message)
           method: 'POST',
           data: submitValue,
         }).then((data) => {
+          message.info("保存成功")
           cancelPage()
         }).catch((err) => {
           message.info(err.msg || err.message)
     const [inputValue, changeInput] = useState('')
     const [textAreaValue, changeTextArea] = useState('')
     const [imgValue, changeImg] = useState('')
+    const [posterId, setPosterId] = useState('')
+
+    if(dynamicId){
+      useEffect(() => {
+        request({
+          url: '/api/admin/poster',
+          method: 'GET',
+          params: {targetId: dynamicId,targetType: 'activity'},
+        }).then((data) => {
+          console.log(data,"2222")
+          if(data.length > 0){
+            setPosterId(data[0].posterId)
+            changeImg(data[0].posterImg)
+            changeTextArea(data[0].posterDescription)
+            changeInput(data[0].posterTitle)
+          }
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }, [])
+    }
 
     const submitPoster  = () => {
-      console.log(inputValue)
-      console.log(textAreaValue)
-      console.log(imgValue)
-      console.log(dynamicId)
+       if(dynamicId){
+        if(posterId){
+          request({
+            url: '/api/admin/poster/'+posterId,
+            method: 'PUT',
+            data: {targetId: dynamicId,targetType: 'activity',posterImg: imgValue,posterTitle: inputValue,posterDescription: textAreaValue},
+          }).then((data) => {
+            message.info("保存成功")
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+         }else{
+          request({
+            url: '/api/admin/poster',
+            method: 'POST',
+            data: {targetId: dynamicId,targetType: 'activity',posterImg: imgValue,posterTitle: inputValue,posterDescription: textAreaValue},
+          }).then((data) => {
+            setPosterId(data.posterId)
+            message.info("保存成功")
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+         }
+       }else{
+        message.warn("请先保存基本信息数据")
+       }
     }
 
     return <div>
         <div >
           <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
             <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报图片</p>
-            <ImageUploader onChange={e => changeImg(e)} />
+            <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
           </div>
           <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' }} placeholder="请输入海报标题" onChange={e => changeInput(e.target.value)} />
+            <Input style={{ width: '20vw' }} value={inputValue} placeholder="请输入海报标题" onChange={e => changeInput(e.target.value)} />
           </div>
           <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
             <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报描述</p>
-            <TextArea rows={5} onChange={e => changeTextArea(e.target.value)} />
+            <TextArea rows={5} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
           </div>
 
         </div>
   const Share = (props) => {
     const [inputValue, changeInput] = useState('')
     const [imgValue, changeImg] = useState('')
-    // const changeInputValue = e => {
-    //   changeInput(e.target.value)
-    // }
-
-    // const handleSubmit = (values) => {
+    const [shareContentId, setShareContentId] = useState('')
+    
+    if(dynamicId){
+      useEffect(() => {
+        request({
+          url: '/api/admin/shareContent',
+          method: 'GET',
+          params: {targetId: dynamicId,targetType: 'activity'},
+        }).then((data) => {
+          console.log(data,"2222")
+          if(data.length > 0){
+            setShareContentId(data[0].shareContentId)
+            changeImg(data[0].shareContentImg)
+            changeInput(data[0].shareContentTitle)
+          }
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }, [])
+    }
 
-    // }
+    const submitShare = () => {
+      if(dynamicId){
+        if(shareContentId){
+          request({
+            url: '/api/admin/shareContent/'+shareContentId,
+            method: 'PUT',
+            data: {targetId: dynamicId,shareContentType: 'activity',shareContentImg: imgValue,shareContentTitle: inputValue},
+          }).then((data) => {
+            message.info("保存成功")
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+         }else{
+          request({
+            url: '/api/admin/shareContent',
+            method: 'POST',
+            data: {targetId: dynamicId,shareContentType: 'activity',shareContentImg: imgValue,shareContentTitle: inputValue},
+          }).then((data) => {
+            setShareContentId(data.shareContentId)
+            message.info("保存成功")
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+         }
+       }else{
+        message.warn("请先保存基本信息数据")
+       }
+    }
 
     return <div style={{ padding: '20px' }}>
       <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
       </div>
       <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
         <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>
-        <Input placeholder="请输入海报标题" onChange={e => changeInput(e.target.value)} />
+        <Input placeholder="请输入海报标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
       </div>
       <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
         <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享图片</p>
-        <ImageUploader onChange={e => changeImg(e)} />
+        <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
       </div>
-      <Button type="primary" htmlType="submit" style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
+      <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
       <Button onClick={() => router.go(-1)}>取消</Button>
     </div>
   }

src/pages/indexEcharts/components/UserSource.jsx

+import React, { Component, useState, useEffect } from 'react';
+
+import EChart from '../../../components/EchartsTest/EChart';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import dayjs from 'dayjs';
+import router from 'umi/router';
+import {Table, Select, Row, Col, Menu, Dropdown, Button, Icon, message } from 'antd';
+// import UserSource from './mmm';
+
+
+const UserSource = (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)
+    })
+  }
+
+  function toEdit () {
+    router.push({
+      pathname: '/indexEcharts/userSource',
+      // query: {
+      //   a: 'b',
+      // },
+    });
+  }
+
+  const dataset = data || {};
+  const source = dataset.columnar || [];
+
+  // const source = this.dataset.columnar || [];
+  const subtitle = '最近7天';
+  const baroptions = {
+    color: ['#286DD0', '#8565CE', '#6A96F8', '#F5749E', '#8B7FE2'],
+    xAxis: { type: 'category' },
+    legend: {
+      left: '20%',
+      data: ['所有用户', '注册用户'],
+    },
+
+    tooltip: {},
+
+    yAxis: {},
+    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 } = dataset.pie || {};
+  const pieoptions = {
+    // xAxis: {},
+    color: ['#286DD0', '#8565CE', '#6A96F8', '#F5749E', '#8B7FE2'],
+    legend: {
+      // left: '70%',
+      data: ['来源置业顾问', '来源全民经纪人', '自主进入'],
+    },
+    tooltip: {},
+    // yAxis: {},
+
+    series: [
+      {
+        type: 'pie',
+        // datasetIndex: 1,
+        center: ['50%', '50%'],
+        radius: [0, '50%'],
+      },
+    ],
+    dataset: {
+      id: 'pie',
+      source: [
+        { form: '来源置业顾问', value: person_realty_consultant },
+        { form: '来源全民经纪人', value: person_estate_agent },
+        { form: '自主进入', value: person_null },
+      ]
+    },
+
+
+
+
+
+  }
+  function handleSelectChange (e) {
+    // eslint-disable-next-line no-console
+    console.log(e)
+  }
+
+  //表格
+  const dataSource = [
+    {
+      name: '置业顾问',
+      status: '1',//显示停用
+    },
+    {
+      name: '置业经理',
+      status: '1',//停用
+    },
+  ];
+
+  const columns = [
+    // {
+    //   title: '商品图片',
+    //   dataIndex: 'img',
+    //   key: 'img',
+    //   align: 'center',
+  
+    //   render: (text, record) => <img src={record.img} className={channels.touxiang} />,
+    // },
+    {
+      title: '角色名称',
+      dataIndex: 'name',
+      key: 'name',
+      align: 'center',
+      render: text => <a>{text}</a>,
+    },
+  
+    {
+      title: '操作  ',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+  
+      render: () => <>11</>
+       
+    },
+  ];
+
+  const style = {
+    width: '100%',
+    height: '400px',
+
+  }
+  const styles = {
+    width: '100%',
+    height: '400px',
+
+  }
+
+
+  return (
+    <>
+      <div>
+        <h3>用户来源 <small>{subtitle}</small></h3>
+        <Row>
+          <Col span={16}>
+            <EChart options={baroptions} style={style} /></Col>
+          <Col span={8}>
+            <EChart options={pieoptions} style={styles} /></Col>
+        </Row>
+      </div>
+      <Select style={{ width: '180px' }} placeholder="所有用户" onChange={handleSelectChange}>
+        <Option value={0}>所有用户</Option>
+        <Option value={1}>注册用户</Option>
+      </Select>
+
+
+      <Table dataSource={dataSource} columns={columns} />
+
+    </>
+  )
+}
+
+export default UserSource;

src/pages/indexEcharts/index.jsx

+
+import React, { useState, useEffect }  from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Row, Col, Tag, Pagination, Modal, DatePicker } from 'antd';
+
+// 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) => {
+
+
+  return (
+
+    <>
+    {/* <div>2222</div> */}
+     <UserSource  ></UserSource>
+    </>
+  )
+}
+
+
+export default  header

src/pages/indexEcharts/userSource.jsx

+import dayjs from 'dayjs';
+import React from 'react';
+import {Radio, DatePicker,  Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, Breadcrumb } from 'antd';
+
+import UserSource from './components/UserSource.jsx';
+// import XForm, { FieldTypes } from '../../components/XForm';
+import moment from 'moment';
+
+
+const header = props => {
+  const { RangePicker } = DatePicker;
+  function onChange(dates, dateStrings) {
+    console.log('From: ', dates[0], ', to: ', dates[1]);
+    console.log('From: ', dateStrings[0], ', to: ', dateStrings[1]);
+  }
+
+
+  const handleSubmit = (e, props) => {
+    e.preventDefault();
+    // props.form.validateFields((err, values) => {
+    //   if (!err) {
+    //     getList({ pageNum: 1, pageSize: 10, ...values })
+    //   }
+    // });
+  }
+
+
+  function getDataOf(days){      
+    // const endDate = new Date()
+    // const startDate = dayjs().subtract(days, 'day').toDate()
+
+    // this.$refs.chart.getData({ startDate, endDate })
+  }
+
+  function onChange(e) {
+    console.log(`radio checked:${e.target.value}`);
+  }
+
+  return (<>
+  {/* <el-button type="text" @click="() => getDataOf(7)">最近7天</el-button>
+      <el-button type="text" @click="() => getDataOf(30)">最近1月</el-button>
+      <el-date-picker
+        v-model="dateRange"
+        type="daterange"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+        style="margin-left: 16px">
+      </el-date-picker>
+      <el-button type="primary" icon="el-icon-search" style="margin-left: 32px" @click="search">查询</el-button>
+    </div>
+    <user-source ref="chart" mode="all"></user-source> */}
+  <Radio.Group onChange={onChange} defaultValue="a">
+        <Radio.Button value="a" onClick={getDataOf(7)}>最近7天</Radio.Button>
+        <Radio.Button value="b" onClick={getDataOf(30)}>最近1月</Radio.Button>
+      </Radio.Group>
+      <RangePicker
+      ranges={{
+        Today: [moment(), moment()],
+        'This Month': [moment().startOf('month'), moment().endOf('month')],
+      }}
+      showTime
+      format="YYYY/MM/DD HH:mm:ss"
+      // onChange={onChange}
+    />
+     <Button type="primary" htmlType="submit" >
+            查询
+          </Button>
+  <div>
+    
+
+    <UserSource ></UserSource>
+  </div>
+  </>
+  )
+}
+
+export default header

src/pages/staff/list/RoleList.jsx

 }
 function toEditRole() {
   router.push({
-    pathname: '/staff/editRole',
+    pathname: '/staff/list/addRole',
     query: {
       a: 'b',
     },

src/pages/staff/list/StaffList.jsx

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

+import React, { useState, useEffect } from 'react';
+import { Checkbox, Input, Card } from 'antd';
+import { connect } from 'dva';
+import XForm, { FieldTypes } from '../../../components/XForm';
+import request from '../../../utils/request';
+import channels from './channelList.less';
+
+const { TextArea } = Input;
+
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const Edit = props => {
+  console.log('props,props', props.user.currentUser)
+  const userMenus = props.user.currentUser.menus;
+  const userBtns = props.user.currentUser.buttons;
+
+
+  const [data, setData] = useState({ data: [] })
+ // 获取当前所有菜单
+  useEffect(() => {
+    localStorage.removeItem('value');
+    menuList({ pageNum: 1, pageSize: 100 })
+  }, [])
+
+  function menuList(params) {
+    request({
+      url: '/api/admin/menuList',
+      method: 'GET',
+      params: { ...params },
+  // eslint-disable-next-line no-shadow
+  }).then(data => {
+      console.log(data)
+      setData(data)
+  })
+  }
+
+  // function SuBmenu(params) {
+  //  return Array.from(userMenus).map(Item =>
+  //  <Checkbox value={ Item.menuId }> { Item.name }</Checkbox>)
+  // }
+  // const [tab, changeTab] = useState('basic')
+
+  const Permission = [
+    '项目管理',
+    '员工管理',
+    '客户管理',
+    '系统管理',
+    '渠道管理',
+    '轮播图管理',
+    '资讯管理',
+    '活动管理',
+    '积分商城',
+    '首页数据',
+  ]
+
+  const Poster = props => {
+    const dataSource = [
+      {
+        name: '员工管理',
+        per: [
+          '111111',
+          '22222',
+          '33333',
+        ],
+      },
+      {
+        name: '角色管理',
+        per: [
+          '444',
+          '555',
+          '666',
+        ],
+      },
+    ];
+
+
+    const gridStyle1 = {
+      width: '20%',
+      textAlign: 'left',
+    };
+    const gridStyle2 = {
+      width: '80%',
+      textAlign: 'left',
+      height: '69px',
+    };
+
+    return (
+    <>
+      <div style={{}}>
+        {userMenus.map(item => (
+          <Card title={<Checkbox>{item.name}</Checkbox>} bordered style={{ width: '100%' }}>
+              {
+                   userMenus.map(menu => (
+
+                    (item.menuId === menu.menuRoot && item.menuId !== menu.menuId) &&
+                    <>
+                      <Card.Grid style={gridStyle1} >
+                          <Checkbox>{menu.name}</Checkbox>
+                      </Card.Grid>
+                      <Card.Grid style={gridStyle2}>
+                        {userBtns.map(btn => (
+                          <>
+                            {
+                              btn.menuId === menu.menuId &&
+                              <Checkbox>{btn.name}</Checkbox>
+                            }
+                          </>
+                        ))}
+                      </Card.Grid>
+                   </>
+                   ))
+              }
+          </Card>
+        ))}
+      </div>
+    </>
+    )
+  }
+
+  const fields = [
+    {
+      label: '角色名称',
+      name: 'roleName',
+      type: FieldTypes.Text,
+      // placeholder: '名称',
+      value: ''
+    },
+    {
+      label: '简介',
+      name: 'roleIntroduction',
+      render: <TextArea className={channels.inpuitTxt} ></TextArea>,
+      value: ''
+
+    },
+
+    {
+      label: '菜单权限',
+      name: 'rolePermission',
+      render:
+        <>
+          <div>
+
+            <Poster />
+          </div>
+        </>,
+    },
+
+  ]
+
+  const handleSubmit = val => {
+    window.console.log('submit data --->', val)
+  }
+  return <XForm onSubmit={handleSubmit} fields={fields}></XForm>
+}
+
+
+export default connect(({ user }) => ({ user }))(Edit);

src/pages/staff/list/editRole.jsx

       textAlign: 'left',
     };
 
-{/* <Checkbox>{Permission[index]}</Checkbox> */}
+    {/* <Checkbox>{Permission[index]}</Checkbox> */ }
     return <>
       <div style={{}}>
       {Array.from(data).map(Item =>
             
               {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

       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`
+  //   },
+  // },
 }