合并

config/config.js

@@ -479,7 +479,7 @@ export default {
 
   proxy: {
     '/api/': {
-      target: 'http://192.168.0.84: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/components/AuthButton/index.jsx

@@ -0,0 +1,25 @@
+import React from 'react';
+
+let allBtns = [];
+let current = [];
+
+const AuthButton = ({ children, name, noRight }) => {
+  const btn = allBtns.filter(x => x.code === name)[0]
+
+  // 没维护的按钮, 或者不需要权限的按钮直接通过
+  if (!btn || !btn.roles || !btn.roles.length) {
+    return <>{children}</>
+  }
+
+  const hasRight = btn.roles.some(x => current.some(y => x === y))
+  return hasRight ? <>{children}</> : <>{noRight}</>
+}
+
+const setAllBtnAuth = x => allBtns = x;
+const setUserBtnAuth = x => current = x;
+
+export default AuthButton;
+export {
+  setAllBtnAuth,
+  setUserBtnAuth,
+};

src/components/EchartsTest/EChart.jsx

@@ -3,17 +3,20 @@ import React, { Component } from 'react';
 // 引入 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)
 
         // 绘制图表
@@ -23,25 +26,28 @@ class EchartsTest extends Component {
         });
     }
 
-    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/components/XForm/ImageListUpload.jsx

@@ -3,65 +3,79 @@ import { Upload, Icon, Modal } from 'antd';
 import './style.less';
 import { uploaderProps } from '../../utils/upload';
 
-function getBase64(file) {
-  return new Promise((resolve, reject) => {
-    const reader = new FileReader();
-    reader.readAsDataURL(file);
-    reader.onload = () => resolve(reader.result);
-    reader.onerror = error => reject(error);
-  });
-}
-
 class ImageListUpload extends React.Component {
   state = {
     previewVisible: false,
     previewImage: '',
-    fileList: [],
+    loadding: false,
   };
 
+  getFileList = () => {
+    return (this.props.value || []).map((img, inx) => ({ uid: inx, url: img, status: 'done' }))
+  }
+
   handleCancel = () => this.setState({ previewVisible: false });
 
   handlePreview = async file => {
-    if (!file.url && !file.preview) {
-      file.preview = await getBase64(file.originFileObj);
-    }
-
     this.setState({
-      previewImage: file.url || file.preview,
+      previewImage: file.url ,
       previewVisible: true,
     });
   };
 
-  handleChange = ({ fileList }) => {
-    this.setState({ fileList })
-    if (typeof this.props.onChange === 'function') {
-      // return item.response.url
-      const images = fileList.filter(item => item.status === 'done')
-      this.props.onChange(images.map(item => item.response.url))
+  handleChange = (e) => {
+    if (e.file.status === "uploading") {
+      this.setState({ loading: true });
+      return;
+    }
+
+    if (e.file.state === 'removed') {
+      const fileList = (this.props.value || []).filter(x => x != e.file.url);
+      this.props.onChange(fileList);
     }
+
+    // if (e.file.status === "done") {
+    //   this.setState({
+    //     loading: false,
+    //   })
+
+    //   if (e.file.response && e.file.response.url) {
+    //     if (typeof this.props.onChange === 'function') {
+    //       const fileList = this.getFileList()
+    //       this.props.onChange([...fileList || [], e.file.response.url]);
+    //     }
+    //   }
+    // }
   };
 
-  render() {
-    const { previewVisible, previewImage, fileList } = this.state;
+  handleUploadSucess = (url) => {
+    this.setState({ loading: false });
+    if (typeof this.props.onChange === 'function') {
+      const fileList = this.props.value || [];
+      this.props.onChange([...fileList, url]);
+    }
+  }
 
-    const { value } = this.props
+  render() {
+    const { previewVisible, previewImage } = this.state;
+    const fileList = this.getFileList();
 
     const uploadButton = (
       <div>
-        <Icon type="plus" />
-        <div className="ant-upload-text">Upload</div>
+        <Icon style={{ fontSize: '2em', color: '#aaa' }} type={this.state.loading ? "loading" : "plus"}  />
       </div>
     );
     return (
       <div className="clearfix">
         <Upload
           listType="picture-card"
-          fileList={fileList || value}
+          fileList={fileList}
           onPreview={this.handlePreview}
           onChange={this.handleChange}
           { ...uploaderProps }
+          onSuccess={this.handleUploadSucess}
         >
-          {fileList.length >= 8 ? null : uploadButton}
+          {(fileList || images).length >= 8 ? null : uploadButton}
         </Upload>
         <Modal visible={previewVisible} footer={null} onCancel={this.handleCancel}>
           <img alt="example" style={{ width: '100%' }} src={previewImage} />

src/components/XForm/ImageUpload.jsx

@@ -16,24 +16,35 @@ class ImageUpload extends React.Component {
       this.setState({ loading: true });
       return;
     }
+    
+    if (e.file.state === 'removed') {
+      this.props.onChange();
+    }
 
-    if (info.file.status === "done") {
-      this.setState({
-        loading: false,
-      })
+    // if (info.file.status === "done") {
+    //   this.setState({
+    //     loading: false,
+    //   })
 
-      if (info.file.response && info.file.response.url) {
-        this.setState({
-          imageUrl: info.file.response.thumbUrl,
-        });
+    //   if (info.file.response && info.file.response.url) {
+    //     this.setState({
+    //       imageUrl: info.file.response.thumbUrl,
+    //     });
 
-        if (typeof this.props.onChange === 'function') {
-          this.props.onChange(info.file.response.url);
-        }
-      }
-    }
+    //     if (typeof this.props.onChange === 'function') {
+    //       this.props.onChange(info.file.response.url);
+    //     }
+    //   }
+    // }
   };
 
+  handleUploadSucess = (url) => {
+    this.setState({ loading: false });
+    if (typeof this.props.onChange === 'function') {
+      this.props.onChange(url);
+    }
+  }
+
   render() {
     const uploadButton = (
       <div>
@@ -50,8 +61,8 @@ class ImageUpload extends React.Component {
         showUploadList={false}
         beforeUpload={this.props.beforeUpload}
         onChange={this.handleChange}
-
         {...uploaderProps}
+        onSuccess={this.handleUploadSucess}
       >
         {(this.state.imageUrl || value) ? (
           <img src={this.state.imageUrl || value} alt="avatar" style={{ width: "100%" }} />

src/global.less

@@ -23,6 +23,7 @@ body {
   text-rendering: optimizeLegibility;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
+  font-size: 16px;
 }
 
 ul,
@@ -70,6 +71,23 @@ ol {
 }
  
 .ant-layout{
+  .ant-menu-vertical .ant-menu-item,
+.ant-menu-vertical-left .ant-menu-item,
+.ant-menu-vertical-right .ant-menu-item,
+.ant-menu-inline .ant-menu-item,
+.ant-menu-vertical .ant-menu-submenu-title,
+.ant-menu-vertical-left .ant-menu-submenu-title,
+.ant-menu-vertical-right .ant-menu-submenu-title,
+.ant-menu-inline .ant-menu-submenu-title,
+.ant-input ,.ant-btn{
+  font-size: 16px;
+}
+.ant-breadcrumb{
+  font-size: 16px;
+  .anticon {
+    font-size: 16px;
+  }
+} 
   .ant-pro-global-header-trigger{
     display: none;
   }
@@ -92,8 +110,11 @@ ol {
   .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/layouts/BasicLayout.jsx

@@ -9,8 +9,9 @@ import Link from 'umi/link';
 import Redirect from 'umi/redirect';
 import { connect } from 'dva';
 import { formatMessage } from 'umi-plugin-react/locale';
-import Authorized from '@/utils/Authorized';
+// import Authorized from '@/utils/Authorized';
 import RightContent from '@/components/GlobalHeader/RightContent';
+import RenderAuthorize from '@/components/Authorized';
 import { isAntDesignPro } from '@/utils/utils';
 import logo from '../assets/logo.png';
   
@@ -33,12 +34,9 @@ const footerRender = () => {
 
 const BasicLayout = props => {
   const { dispatch, children, settings } = props;
-  /**
-   * constructor
-   */
-
+  
   useEffect(() => {
-    if (dispatch) {
+    if (dispatch && !props.user.currentUser.userId) {
       dispatch({
         type: 'user/fetchCurrent',
       });
@@ -47,9 +45,8 @@ const BasicLayout = props => {
       });
     }
   }, []);
-  /**
-   * init variables
-   */
+  
+  const Authorized = RenderAuthorize(props.user.currentUser.roles)
 
   const handleMenuCollapse = payload => {
     if (dispatch) {
@@ -61,7 +58,7 @@ const BasicLayout = props => {
   };
 
   const findAuthority = (path) => {
-    return ((props.user.menuList || []).filter(x => x.code === path)[0] || {}).roles || []
+    return ((props.user.menuList || []).filter(x => x.code === path)[0] || {}).roles
   }
   
   /**

src/models/login.js

@@ -1,8 +1,13 @@
 import { routerRedux } from 'dva/router';
 import { stringify } from 'querystring';
-import { fakeAccountLogin, getFakeCaptcha } from '@/services/login';
+// import { fakeAccountLogin, getFakeCaptcha } from '@/services/login';
 import { setAuthority } from '@/utils/authority';
 import { getPageQuery } from '@/utils/utils';
+import { fetch, apis } from '@/utils/request';
+
+const signin = fetch(apis.user.signin);
+const signout = fetch(apis.user.signout);
+
 const Model = {
   namespace: 'login',
   state: {
@@ -10,7 +15,7 @@ const Model = {
   },
   effects: {
     *login({ payload }, { call, put }) {
-      const response = yield call(fakeAccountLogin, payload);
+      const response = yield call(signin, { data: payload });
       yield put({
         type: 'changeLoginStatus',
         payload: response,
@@ -42,9 +47,11 @@ const Model = {
       yield call(getFakeCaptcha, payload);
     },
 
-    *logout(_, { put }) {
+    *logout(_, { put, call }) {
       const { redirect } = getPageQuery(); // redirect
 
+      yield call(signout, { logout: true });
+
       if (window.location.pathname !== '/user/login' && !redirect) {
         yield put(
           routerRedux.replace({
@@ -59,7 +66,7 @@ const Model = {
   },
   reducers: {
     changeLoginStatus(state, { payload }) {
-      setAuthority((payload.user.roles || []).map(x => x.roleId));
+      // setAuthority((payload.user.roles || []).map(x => x.roleId));
       return { ...state, status: 'ok', type: payload.type };
     },
   },

src/models/user.js

@@ -1,11 +1,14 @@
-import request from '../utils/request';
-import apis from '../services/apis';
+import { fetch, apis } from '@/utils/request';
+import { setAllBtnAuth, setUserBtnAuth } from '@/components/AuthButton';
+
+const getCurrentUser = fetch(apis.user.current)
 
 const UserModel = {
   namespace: 'user',
   state: {
     currentUser: {},
     menuList: [],
+    buttonList: [],
   },
   effects: {
     // *fetch(_, { call, put }) {
@@ -17,7 +20,7 @@ const UserModel = {
     // },
 
     *fetchCurrent(_, { call, put }) {
-      const response = yield call(request, apis.user.current);
+      const response = yield call(getCurrentUser);
 
       yield put({
         type: 'saveCurrentUser',
@@ -27,10 +30,13 @@ const UserModel = {
   },
   reducers: {
     saveCurrentUser(state, { payload }) {
-      const { taUser = {} , menuList = [] } = payload || {}
+      const { taUser = {} , menuList = [], buttonList = [] } = payload || {}
       const currentUser = { ...taUser, roles: (taUser.roles || []).map(x => x.roleId) }
 
-      return { ...state, currentUser, menuList };
+      setAllBtnAuth(buttonList)
+      setUserBtnAuth(currentUser.roles)
+
+      return { ...state, currentUser, menuList, buttonList };
     },
     changeNotifyCount(
       state = {

src/pages/activity/ActivityList.jsx

@@ -250,7 +250,7 @@ const handleSubmit = (e, props) => {
           </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
+      <Button type="danger" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
       <Table dataSource={data.list} columns={columns} pagination={false}/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />

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

@@ -9,6 +9,7 @@ import ImageUpload from '../../../../../components/XForm/ImageUpload'
 import ImageListUpload from '../../../../../components/XForm/ImageListUpload'
 import Wangedit from '../../../../../components/Wangedit/Wangedit'
 import TagGroup from './tags'
+import BudildingProjectType from './buildingProjectType'
 
 const { Option } = Select
 const { TabPane } = Tabs;
@@ -55,6 +56,7 @@ function AddBuilding(props) {
     request({ url: tempUrl, method }).then(res => {
       res.openingDate = moment(res.openingDate)
       res.receivedDate = moment(res.receivedDate)
+      res.avatarImage = res.buildingImg.map(item => item.url)
       props.form.setFieldsValue(res)
     })
   }
@@ -71,11 +73,11 @@ function AddBuilding(props) {
   function addBuilding(data) {
     data.openingDate = moment(data.openingDate, 'yyyy-MM-dd HH:mm:ss')
     data.receivedDate = moment(data.receivedDate, 'yyyy-MM-dd HH:mm:ss')
-    data.buildingProjectType = []
     // 项目主图
     data.img = data.avatarImage && data.avatarImage.map((item, index) => ({ imgType: 'banner', url: item, orderNo: index + 1 }))
 
-    request({ ...apis.building.addBuilding, data: { ...data } }).then(() => {
+    const api = data.buildingId === undefined ? apis.building.addBuilding : apis.building.updateBuilding
+    request({ ...api, data: { ...data } }).then(() => {
       openNotificationWithIcon('success', '操作成功')
     }).catch(err => {
       openNotificationWithIcon('error', err.message)
@@ -84,6 +86,9 @@ function AddBuilding(props) {
 
   return (
         <Form {...formItemLayout} onSubmit={handleSubmit}>
+          <Form.Item label="项目Id" hasFeedback style={{ display: 'none' }}>
+            {getFieldDecorator('buildingId')(<Input disabled />)}
+          </Form.Item>
           <Form.Item label="楼盘编号" hasFeedback>
             {getFieldDecorator('code')(<Input />)}
           </Form.Item>
@@ -93,8 +98,8 @@ function AddBuilding(props) {
           <Form.Item label="别名" hasFeedback>
             {getFieldDecorator('name')(<Input />)}
           </Form.Item>
-          <Form.Item label="项目类型" hasFeedback>
-            {getFieldDecorator('buildingProjectType')(<Input />)}
+          <Form.Item label="项目类型">
+            {getFieldDecorator('buildingProjectType')(<BudildingProjectType />)}
           </Form.Item>
           <Form.Item label="均价" hasFeedback>
             {getFieldDecorator('price')(<Input />)}

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

@@ -0,0 +1,262 @@
+import React, { useEffect, useState } from 'react'
+import { Button, Radio, Icon, Form, Input, Row, Col, Modal, notification, Checkbox } from 'antd';
+import { render } from 'react-dom';
+import request from '../../../../../utils/request';
+import apis from '../../../../../services/apis';
+
+
+const formItemLayout = {
+  labelCol: {
+    xs: { span: 24 },
+    sm: { span: 3 },
+  },
+  wrapperCol: {
+    xs: { span: 24 },
+    sm: { span: 16 },
+  },
+};
+
+/**
+ * 项目类型 form 表单子组件
+ *
+ * @param {*} props
+ */
+class TypeForm extends React.Component {
+
+  componentDidMount() {
+    this.props.form.setFieldsValue(this.props.type)
+  }
+
+  onChange(e, name) {
+    // console.log(e.target.value)
+    this.props.form.validateFieldsAndScroll((err, values) => {
+      if (!err) {
+        // console.log('Received values of form: ', values);
+        values[name] = e.target.value
+        values.buildingTypeName = this.props.type.buildingTypeName
+        console.log('values: ', values)
+        this.props.onSuccess(values)
+      }
+    });
+  }
+
+  close() {
+    this.props.onClose(this.props.form.getFieldsValue(['buildingTypeId']))
+  }
+
+  render() {
+    const { getFieldDecorator } = this.props.form;
+
+    // this.props.form.setFieldsValue(this.props.type)
+
+    return (
+      <>
+        <div>
+          <Row>
+            <Col span={8}>{ this.props.type.buildingTypeName || ''}</Col>
+            <Col span={1}>
+              <Button type="link" icon="close" onClick={() => this.close()} />
+            </Col>
+          </Row>
+          <Row>
+            <Col span={12}>
+              <Form {...formItemLayout}>
+                <Form.Item label="类型编号" style={{ display: 'none' }}>
+                  {getFieldDecorator('buildingTypeId')(<Input disabled />)}
+                </Form.Item>
+                <Form.Item label="状态" style={{ display: 'none' }}>
+                  {getFieldDecorator('status')(<Input disabled />)}
+                </Form.Item>
+                <Form.Item label="价格">
+                  {getFieldDecorator('price')(<Input type="number" placeholder="元/㎡" onChange={e => this.onChange(e, 'price')}/>)}
+                </Form.Item>
+                <Form.Item label="装修标准">
+                  {getFieldDecorator('decoration')(<Input onChange={e => this.onChange(e, 'decoration')}/>)}
+                </Form.Item>
+                <Form.Item label="产权年限">
+                  {getFieldDecorator('rightsYear')(<Input onChange={e => this.onChange(e, 'rightsYear')}/>)}
+                </Form.Item>
+              </Form>
+            </Col>
+          </Row>
+        </div>
+      </>
+    )
+  }
+}
+
+const WrappedTypeForm = Form.create({ name: 'TypeForm' })(TypeForm);
+
+/**
+ *项目类型组件
+ *
+ * @param {*} props
+ */
+class ProjectTypeBody extends React.Component {
+
+  constructor(props) {
+    super(props)
+    this.state = {
+      one: false,
+      projectType: [],
+      defaultCheckboxValue: [], // 多选框默认选中的值
+      visible: false,
+      data: [],
+      // data: [{ buildingTypeId: '1', buildingTypeName: '公寓', price: '10', decoration: '全包', rightsYear: '10', status: '1' }, { buildingTypeId: '2', buildingTypeName: '住宅', price: '10', decoration: '全包', rightsYear: '10', status: '1' }, { buildingTypeId: '3', buildingTypeName: '太平房', price: '10', decoration: '全包', rightsYear: '10', status: '1' }],
+    }
+  }
+
+  componentDidMount() {
+    this.getList({ pageNum: 1, pageSize: 999 })
+  }
+
+  componentDidUpdate(prevProps) {
+    // 典型用法（不要忘记比较 props）：
+    if (this.props.value !== prevProps.data && !this.state.one) {
+      this.setValue()
+      this.setState({ one: true })
+    }
+  }
+
+  onSuccess = (values, item) => {
+    console.log('values: ', values)
+    console.log('data: ', this.state.data, 'item: ', item)
+    const newData = this.getNewProjectType(values)
+    console.log('newData: ', newData)
+    this.setState({ data: newData })
+    if (typeof this.props.onChange === 'function') {
+      this.props.onChange(newData)
+    }
+  }
+
+  onCheckboxChange = checkedValues => {
+      const checked = (`${checkedValues}` || '').split(',')
+      const { projectType } = this.state
+      const buildingType = projectType.filter(item => checked.includes(`${item.buildingTypeId}`))
+
+      // 这里会把值替换掉
+
+      const tempDate = buildingType.map(item => ({ buildingTypeId: item.buildingTypeId, buildingTypeName: item.buildingTypeName, price: '', decoration: '', rightsYear: '', status: '1' }))
+      const updateProjectDate = this.updateProjectType(checkedValues)
+      console.log('updateProjectDate: ', updateProjectDate)
+      this.setState({ data: updateProjectDate })
+  }
+
+  onClose = e => {
+    const { data } = this.state
+    const buildingType = data.filter(item => e.buildingTypeId !== item.buildingTypeId)
+    console.log('buildingType: ', buildingType)
+    this.setState({ data: buildingType })
+    this.setState({ defaultCheckboxValue: buildingType.map(item => item.buildingTypeId) })
+  }
+
+  getNewProjectType = values => {
+    const data = []
+    this.state.data.map(item => {
+      console.log('item: ', item)
+      if (item.buildingTypeId === values.buildingTypeId) {
+        data.push(values)
+      } else {
+        data.push(item)
+      }
+    })
+
+    return data
+  }
+
+  updateProjectType = values => {
+    const data = []
+    this.state.data.map(item => {
+      values.map(va => {
+        if (item.buildingTypeId === va.buildingTypeId) {
+          data.push(va)
+        } else {
+          data.push(item)
+        }
+      })
+    })
+
+    return data
+  }
+
+  getList = params => {
+    request({ ...apis.buildingType.getList, params: { ...params } }).then(res => {
+      this.setState({ projectType: res.records })
+    }).catch(err => {
+      this.openNotificationWithIcon('error', err.message)
+    })
+  }
+
+  setValue = () => {
+    let tempData = []
+    let tempCheckboxValue = []
+    const { value } = this.props
+    // console.log('value: ', value)
+    if (value !== undefined && value !== null) {
+      tempData = value
+      tempCheckboxValue = tempData.map(item => item.buildingTypeId)
+      this.setState({ defaultCheckboxValue: tempCheckboxValue })
+      this.setState({ data: tempData }, () => {
+        console.log("state: ", this.state.data)
+      })
+
+      console.log("tempData: ", tempData, "tempCheckboxValue: ", tempCheckboxValue, "value: ", value)
+    }
+  }
+
+  openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description: '',
+    })
+  }
+
+  handleOk = e => {
+    this.setState({
+      visible: false,
+    });
+  };
+
+  handleCancel = e => {
+    this.setState({
+      visible: false,
+    });
+  };
+
+  showMadel = () => {
+    this.setState({ visible: true })
+    this.getList({ pageNum: 1, pageSize: 999 })
+  }
+
+  render () {
+
+    // let tempData = []
+    // let tempCheckboxValue = []
+    // const { value } = this.props
+    // if (value !== undefined && value !== null) {
+    //   tempData = value
+    // } else {
+    //   tempData = this.state.data
+    // }
+
+    // tempCheckboxValue = tempData.map(item => item.buildingTypeId)
+    return (
+      <>
+        <Button type="primary" icon="plus" size="large" onClick={() => this.showMadel()} />
+        <Modal
+          title="项目类型"
+          visible={this.state.visible}
+          onOk={this.handleOk}
+          onCancel={this.handleCancel}
+        >
+          <Checkbox.Group options={this.state.projectType.map(item => ({ label: item.buildingTypeName, value: item.buildingTypeId }))} defaultValue={this.state.defaultCheckboxValue} onChange={e => this.onCheckboxChange(e)} />
+        </Modal>
+        {
+          this.state.data.map(item => <WrappedTypeForm type={item} key={item.id} onSuccess={(e) => this.onSuccess(e, item)} onClose={(e) => this.onClose(e)} />)
+        }
+      </>
+    )
+  }
+}
+
+export default ProjectTypeBody

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

@@ -3,15 +3,23 @@ import { Tag, Input, Tooltip, Icon } from 'antd';
 
 class EditableTagGroup extends React.Component {
   state = {
-    tags: [],
     inputVisible: false,
     inputValue: '',
   };
 
+  // 每次取值，都从 this.props.value 获取最新值
+  getTags = () => (this.props.value || '').split(',')
+
+  toggleOnChange = tags => {
+    if (typeof this.props.onChange === 'function') {
+      this.props.onChange(tags.join(','))
+    }
+  }
+
   handleClose = removedTag => {
-    const tags = this.state.tags.filter(tag => tag !== removedTag);
-    console.log(tags);
-    this.setState({ tags });
+    const tags = this.getTags().filter(tag => tag !== removedTag);
+    // this.setState({ tags });
+    this.toggleOnChange(tags)
   };
 
   showInput = () => {
@@ -24,39 +32,27 @@ class EditableTagGroup extends React.Component {
 
   handleInputConfirm = () => {
     const { inputValue } = this.state;
-    let { tags } = this.state;
+
+    const tags = this.getTags()
     if (inputValue && tags.indexOf(inputValue) === -1) {
-      tags = [...tags, inputValue];
+      // 如果有新的值，就把这个值追加到 tags 原本值的后面，在通过onChange事件传递出去
+      this.toggleOnChange(tags.concat(inputValue))
     }
-    console.log(tags);
+
     this.setState({
-      tags,
       inputVisible: false,
       inputValue: '',
     });
-
-    if (typeof this.props.onChange === 'function') {
-      const tempTags = tags.join(',')
-      this.props.onChange(tempTags);
-    }
   };
 
   saveInputRef = input => (this.input = input);
 
   render() {
-    const { tags, inputVisible, inputValue } = this.state;
-
-    const { value } = this.props
-    let data = []
-    if (value !== undefined && value !== null) {
-      data = value.split(',')
-    } else {
-      data = tags
-    }
+    const { inputVisible, inputValue } = this.state;
 
     return (
       <div>
-        {data.map((tag, index) => {
+        {this.getTags().map((tag, index) => {
           const isLongTag = tag.length > 20;
           const tagElem = (
             <Tag key={tag} closable onClose={() => this.handleClose(tag)}>

src/pages/building/list/index.jsx

@@ -5,6 +5,7 @@ import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import Styles from './style.less';
 import { router } from 'umi';
+import AuthButton from '@/components/AuthButton';
 
 
 const { Option } = Select;
@@ -100,56 +101,56 @@ function CartBody(props) {
   }
 
   return (
-          <Card
-            hoverable
-            style={{ minWidth: '400px', borderRadius: '12px', margin: '10px', boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)' }}
-            cover={<img alt="example" src={ data.poster } style={{ borderRadius: '12px 12px 0 0', width: '100%', height: '14vw' }}></img>}
-            bodyStyle={{ padding: '10px 20px' }}
-          >
-            <p className={Styles.cardText}>
-              <span className={Styles.title}>楼盘编号</span>
-              <span >：{ data.code }</span>
-              <span className={Styles.ediText} onClick={() => toEdi(data)}>
-                编辑
+    <Card
+      hoverable
+      style={{ minWidth: '400px', borderRadius: '12px', margin: '10px', boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)' }}
+      cover={<img alt="example" src={data.poster} style={{ borderRadius: '12px 12px 0 0', width: '100%', height: '14vw' }}></img>}
+      bodyStyle={{ padding: '10px 20px' }}
+    >
+      <p className={Styles.cardText}>
+        <span className={Styles.title}>楼盘编号</span>
+        <span >：{data.code}</span>
+        <span className={Styles.ediText} onClick={() => toEdi(data)}>
+          编辑
                 <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
-              </span>
-            </p>
-            <p className={Styles.cardText}>
-              <span className={Styles.title}>楼盘名称</span>
-              <span >：{ data.name }</span>
-            </p>
-            <p className={Styles.cardItem}>
-              <span className={Styles.title}>均价</span>
-              <span >
-                ：约<span style={{ color: '#FF0707', fontSize: '20px' }}> { data.price } </span>元/m
         </span>
-            </p>
-            <p className={Styles.cardItem}>
-              <span className={Styles.title}>项目地址</span>
-              <span className={ Styles.address }>：{ data.address }</span>
-            </p>
-            <p className={Styles.cardItem}>
-              <span className={Styles.title}>发布状态</span>
-              <span >：{ data.status === 1 ? '已发布' : '未发布' }</span>
-            </p>
-            <p className={Styles.cardItem}>
-              <span className={Styles.title}>录入时间</span>
-              <span >：{ data.createDate }</span>
-            </p>
-            <p style={{ margin: '15px 0', position: 'relative', fontSize: '18px' }}>
-              <span style={{ color: '#1990FF' }} onClick={() => pulicAndUnPulic(data)}>
-                {/* 已发布的时候，需要显示取消发布的字样 */}
-                { data.status === 1 ? '取消发布' : '发布' }
-                <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
-              </span>
-              <span style={{
-                color: '#FF4A4A', position: 'absolute', right: '0',
-              }} onClick={() => deleteBuilding(data)}>
-                删除
+      </p>
+      <p className={Styles.cardText}>
+        <span className={Styles.title}>楼盘名称</span>
+        <span >：{data.name}</span>
+      </p>
+      <p className={Styles.cardItem}>
+        <span className={Styles.title}>均价</span>
+        <span >
+          ：约<span style={{ color: '#FF0707', fontSize: '20px' }}> {data.price} </span>元/m
+        </span>
+      </p>
+      <p className={Styles.cardItem}>
+        <span className={Styles.title}>项目地址</span>
+        <span className={Styles.address}>：{data.address}</span>
+      </p>
+      <p className={Styles.cardItem}>
+        <span className={Styles.title}>发布状态</span>
+        <span >：{data.status === 1 ? '已发布' : '未发布'}</span>
+      </p>
+      <p className={Styles.cardItem}>
+        <span className={Styles.title}>录入时间</span>
+        <span >：{data.createDate}</span>
+      </p>
+      <p style={{ margin: '15px 0', position: 'relative', fontSize: '18px' }}>
+        <span style={{ color: '#FF4A4A' }} onClick={() => pulicAndUnPulic(data)}>
+          {/* 已发布的时候，需要显示取消发布的字样 */}
+          {data.status === 1 ? '取消发布' : '发布'}
+          <Icon type={data.status === 1 ? 'close-circle' : 'form'} style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+        </span>
+        <span style={{
+          color: '#FF4A4A', position: 'absolute', right: '0',
+        }} onClick={() => deleteBuilding(data)}>
+          删除
                 <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
-              </span>
-            </p>
-          </Card>
+        </span>
+      </p>
+    </Card>
   )
 }
 
@@ -209,7 +210,7 @@ function body(props) {
   // 分页
   function onChange(pageNumber) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
-      getList({ pageNum: pageNumber, pageSize: 9 })
+    getList({ pageNum: pageNumber, pageSize: 9 })
   }
 
   function getDate(value, dateString) {
@@ -285,18 +286,21 @@ function body(props) {
           </Button>
         </Form.Item>
       </Form>
-      <Button type="danger" className={Styles.addButton} onClick={() => toAdd()}>
-        新增楼盘
-      </Button>
+
+      <AuthButton name="building.add" noRight={null}>
+        <Button type="danger" className={Styles.addButton} onClick={() => toAdd()}>
+          新增楼盘
+        </Button>
+      </AuthButton>
 
       {/* 卡片内容，显示楼盘项目  */}
       <Row style={{ padding: ' 0 10px' }}>
         {
           dataSource.records.map((item, _) => (
-              <Col span={8}>
-                <CartBody data={item} key={item.buildingId} onSuccess={getList}/>
-              </Col>
-            ))
+            <Col span={8}>
+              <CartBody data={item} key={item.buildingId} onSuccess={getList} />
+            </Col>
+          ))
         }
       </Row>
       {/* 分页 */}

src/pages/building/type/index.jsx

@@ -96,8 +96,8 @@ function body() {
 
   return (
     <>
-      <Button type="primary" className={Styles.addButton} onClick={() => toEdi()}>新增类型</Button>
-      <Table dataSource={data.records} columns={columns} pagination={false}/>
+      <Button type="danger" onClick={() => toEdi()}>新增类型</Button>
+      <Table style={{marginTop:'30px'}} dataSource={data.records} columns={columns} pagination={false}/>
       {/* 分页 */}
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={onChange} />

src/pages/carouselFigure/advertisingList.jsx

@@ -217,7 +217,7 @@ const handleSubmit = (e, props) => {
           </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" className={styles.addBtn} onClick={toEdit()}>新增</Button>
+      <Button type="danger" className={styles.addBtn} onClick={toEdit()}>新增</Button>
       <Table dataSource={data.records} columns={columns} pagination={false}/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />

src/pages/carouselFigure/carouselFigureList.jsx

@@ -217,7 +217,7 @@ const handleSubmit = (e, props) => {
           </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" className={styles.addBtn} onClick={toEditCarouse()}>新增</Button>
+      <Button type="danger" className={styles.addBtn} onClick={toEditCarouse()}>新增</Button>
       <Table dataSource={data.records} columns={columns} pagination={false}/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />

src/pages/channel/brokerList.jsx

@@ -166,7 +166,7 @@ return (
       {/* <Button onClick={() => refurbishList() }>重置</Button> */}
     </div>
     </div>
-    <Table dataSource={data.list} columns={columns} pagination={{ pageSize: 10, total: data.total, onChange }} />
+    <Table style={{marginTop:'40px'}} dataSource={data.list} columns={columns} pagination={{ pageSize: 10, total: data.total, onChange }} />
   </>
 )
 }

src/pages/customer/customerlist/index.jsx

@@ -248,8 +248,8 @@ function body(props) {
           )}
         </Form.Item>
         <Form.Item>
-          <Button type="danger" htmlType="submit" >
-            搜索
+          <Button type="primary" htmlType="submit" >
+            查询
           </Button>
         </Form.Item>
       </Form>

src/pages/customer/report/index.jsx

@@ -159,7 +159,7 @@ function body(props) {
           </Button>
         </Form.Item>
       </Form>
-      <Table dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
+      <Table style={{marginTop:'40px'}} dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
     </>
   );
 }

src/pages/indexEcharts/components/UserSource.jsx

@@ -0,0 +1,180 @@
+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

@@ -0,0 +1,27 @@
+
+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

@@ -0,0 +1,77 @@
+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/integralMall/GoodsList.jsx

@@ -184,7 +184,7 @@ function header(props) {
           </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
+      <Button type="danger" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
       <Table dataSource={data.records} columns={columns} pagination={false} />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />

src/pages/integralMall/exchangeRecords.jsx

@@ -190,7 +190,7 @@ function record(props) {
           </Form.Item>
         </div>
       </Form>
-      <Table dataSource={data.records} columns={columns} pagination={false} />
+      <Table style={{marginTop:'40px'}} dataSource={data.records} columns={columns} pagination={false} />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
       </div>

src/pages/news/list/NewsList.jsx

@@ -178,7 +178,7 @@ function body(props) {
           </span> :
           <span style={{ position: 'absolute', left: '280px', bottom: '18px', fontSize: '18px', color: '#FF7E48' }} onClick={cancelRelease.bind(this, data.newsId, 0, data.buildingId, data.newsType.newsTypeId)}>
             发布
-              <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+              <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
           </span>
         }
 

src/pages/staff/list/StaffList.jsx

@@ -11,125 +11,45 @@ import Styles from './style.less';
 const { Meta } = Card;
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
-//标签颜色
-const colors = {
-  金牌顾问: '#E34B59',
-  销售冠军: '#E8747E',
-  优选顾问: '#EEC37E',
-  人气顾问: '#FDDA9F',
-}
-// 提交事件
-function handleSubmit (e, props) {
-  e.preventDefault();
-  props.form.validateFields((err, values) => {
-    if (!err) {
-      console.log('提交数据: ', values)
-    }
-  });
-}
-// Change 事件
-function handleSelectChange (props) {
-  console.log(props)
-}
 
-// 分页
-function onChange (pageNumber) {
-  console.log('Page: ', pageNumber);
-}
 // 跳转到编辑商品
-function toEditStaff () {
+const toEditStaff = (userId) => () => {
   router.push({
     pathname: '/staff/editStaff',
-    // query: {
-    //   a: 'b',
-    // },
-  });
-}
-function confirm () {
-  Modal.confirm({
-    title: '确认停用该角色？',
-    okText: '确认',
-    cancelText: '取消',
-    onOk () {
-      console.log('OK');
-    },
-    onCancel () {
-      console.log('Cancel');
+    query: {
+      userId
     },
   });
-
 }
-/**
- *
- *
- * 
- */
-
-// 假数据
-const tempData = [
-  {
-    name: '吴媛',
-    status: '1',// 启用
-    tel: '133 333 222',
-    avatar: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
-    labels: ['金牌顾问', '销售冠军'],
-  },
-  {
-    name: '吴媛',
-    status: '1',// 启用
-    tel: '133 333 333',
-    avatar: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
-    labels: ['金牌顾问', '销售冠军'],
-  },
-  {
-    name: '吴媛',
-    status: '1',// 启用
-    tel: '133 333 444',
-    avatar: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
-    labels: ['金牌顾问', '销售冠军'],
-  },
-  {
-    name: '吴媛',
-    status: '1',// 启用
-    tel: '133 333 555',
-    avatar: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
-    labels: ['金牌顾问', '销售冠军'],
-  },
-  {
-    name: '吴媛',
-    status: '0',
-    tel: '133 333 555',
-    avatar: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
-    labels: ['金牌顾问', '销售冠军'],
-  },
-  {
-    name: '吴媛',
-    status: '1',// 启用
-    tel: '133 333 555',
-    avatar: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
-    labels: ['金牌顾问'],
-  },
-
-
-
-]
-
 
 /**
  *卡片
  *
  * @returns
  */
-function CartBody (props) {
+const CartBody = (props) => {
   const { data } = props
-
+    
+  const confirm = () => {
+    Modal.confirm({
+      title: '确认停用该角色？',
+      okText: '确认',
+      cancelText: '取消',
+      onOk () {
+        console.log('OK');
+      },
+      onCancel () {
+        console.log('Cancel');
+      },
+    });
+  }
   return (
 
     <Card className={Styles.card}>
       <div>
 
         <Avatar src={data.avatar} style={{ width: 94, height: 94 }} />
-        <span className={Styles.ediText} style={{ marginLeft: '20px' }} onClick={toEditStaff}>
+        <span className={Styles.ediText} style={{ marginLeft: '20px' }} onClick={toEditStaff(data.userId)}>
           编辑
                 <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
         </span>
@@ -143,29 +63,20 @@ function CartBody (props) {
 
         <span>
           {
-            data.labels.map((item, index) => {
-              const color = colors[item];
-              console.log(color, '------');
-              return <Tag className={Styles.cardTag}  color = {color}>{item}</Tag>
+            data.taTagsList.map((item, index) => {
+              return <Tag className={Styles.cardTag} color={item.tagColor}>{item.tagName}</Tag>
             })
           }
         </span>
-        {/* {
-           data.label.map((item, index) => (
-              
-                <Tag className={Styles.cardTag}>{item}</Tag>
-          
-            ))
-            } */}
 
         <p className={Styles.cardText} style={{ width: '300px' }}>
-          <span>姓名:{data.name}</span>
+          <span>姓名:{data.userName}</span>
 
           <span style={{ float: "right" }}>状态:{data.status === '1' ? '启用' : '停用'}</span>
 
         </p>
         <p className={Styles.cardText} style={{ width: '300px' }}>
-          <span>电话:{data.tel}</span>
+          <span>电话:{data.phone}</span>
         </p>
       </div>
 
@@ -175,29 +86,37 @@ function CartBody (props) {
 
 
 const header = (props) => {
-  const [data, setData] = useState({})
-  //   const [page, changePage] = useState({})
-
-  // useEffect(() => {
-  //   request({
-  //       url: '/api/admin/iBuildingDynamicList',
-  //       method: 'GET',
-  //       params: {pageNum: 1,pageSize: 10},
-  //   }).then((data) => {
-  //       console.log(data)
-  //       setData(data)
-  //   })
-  // })
-
-  // const getList = (e) => {
-  //   request({
-  //       url: '/api/xxx',
-  //       method: 'GET',
-  //       params: {},
-  //   }).then((data) => {
-  //       setData(data)
-  //   })
-  // }
+  const [tempData,setTempData] = useState([])
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10 });
+  },[])
+
+  const getList = (params) => {
+    request({
+      url: '/api/admin/taUser',
+      method: 'GET',
+      params: { ...params },
+    }).then((data) => {
+        console.log(data,"listData")
+        setTempData(data.records)
+    })
+  }
+
+  // 分页
+  const onChange = (pageNumber) => {
+    getList({ pageNum: pageNumber, pageSize: 10 });
+  }
+
+  // 提交事件
+const handleSubmit = (e, props) => {
+  e.preventDefault();
+  props.form.validateFields((err, values) => {
+    if (!err) {
+      console.log('提交数据: ', values)
+      getList({ pageNum: 1, pageSize: 10, ...values })
+    }
+  });
+}
 
   const { getFieldDecorator } = props.form
   return (
@@ -205,7 +124,7 @@ const header = (props) => {
     <>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
         <Form.Item>
-          {getFieldDecorator('name')(
+          {getFieldDecorator('userName')(
             <Input
               prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
               placeholder="姓名"
@@ -213,7 +132,7 @@ const header = (props) => {
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('tel')(
+          {getFieldDecorator('phone')(
             <Input
               prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
               placeholder="电话"
@@ -223,30 +142,13 @@ const header = (props) => {
 
         <Form.Item>
 
-          {getFieldDecorator('goodState')(
-            <Select style={{ width: '180px' }} placeholder="状态" onChange={handleSelectChange}>
+          {getFieldDecorator('status')(
+            <Select style={{ width: '180px' }} placeholder="状态" >
               <Option value="1">启用</Option>
               <Option value="0">停用</Option>
             </Select>,
           )}
         </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('isMain')(
-            <Select style={{ width: '180px' }} placeholder="请选择" onChange={handleSelectChange}>
-              <Option value="1">职业顾问</Option>
-              <Option value="0">其他</Option>
-            </Select>,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('name')(
-            <Input
-              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-              placeholder="标签"
-            />,
-          )}
-        </Form.Item>
-
 
         <Form.Item>
           <Button type="primary" htmlType="submit" className={styles.searchBtn}>
@@ -254,7 +156,7 @@ const header = (props) => {
           </Button>
         </Form.Item>
       </Form>
-      <Button type="danger" className={styles.addBtn} onClick={toEditStaff}>新增</Button>
+      <Button type="danger" className={styles.addBtn} onClick={toEditStaff()}>新增</Button>
 
       <Row style={{ padding: ' 0 10px' }}>
         {
@@ -266,10 +168,9 @@ const header = (props) => {
         }
       </Row>
 
-      {/* <Table dataSource={data.records} columns={columns} /> */}
       {/* 分页  */}
       <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={500} onChange={onChange} />
+        <Pagination showQuickJumper defaultCurrent={1} total={tempData.total} onChange={onChange} />
       </div>
     </>
   )

src/pages/staff/list/editStaff.jsx

@@ -1,15 +1,18 @@
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 
 import { Input, Menu, Dropdown, Button, Icon, message, Table, Tooltip, Tabs, Radio, Divider, Tag, Select, Form, Alert } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import router from 'umi/router';
 import styles from '../../style/GoodsList.less';
 import XForm, { FieldTypes } from '../../../components/XForm';
 import Wangedit from '../../../components/Wangedit/Wangedit'
 import channels from './channelList.less';
-
 import Tagss from '../components/Tagss.jsx';
+import request from '../../../utils/request'
 
 const { TextArea } = Input;
+const { Option } = Select;
 
 
 /**
@@ -19,109 +22,165 @@ const { TextArea } = Input;
  * @returns
  */
 const Edit = (props) => {
+  const userId = props.location.query.userId
+  const [userData, setUserData] = useState({})
+  const [tagData, setTagData] = useState([])
+
+  console.log(userData,"user----》")
+
+  const getTagList = () => {
+    request({
+      url: '/api/admin/taTags',
+      method: 'GET',
+      params: {pageNum:1,pageSize:999}
+    }).then((data) => {
+      setTagData(data.records)
+    })
+  }
+
+  // 查询列表
+  const getUserData = (userId) => {
+    request({
+      url: '/api/admin/taUser/'+userId,
+      method: 'GET',
+    }).then((data) => {
+      console.log(data,"tauser")
+      setUserData(data)
+    })
+  }
+
+  useEffect(() => {
+    getTagList();
+    if (userId) {
+      getUserData(userId);
+    }
+  }, [])
+
+  const tagsChange = (value) => {
+    console.log(`selected ${value}`);
+  }
+
+  const handleSubmit = val => {
+    window.console.log('submit data --->', val)
+    if(userId){
+      request({
+        url: '/api/admin/taUser/' + userId,
+        method: 'PUT',
+        data: val,
+      }).then((data) => {
+        console.log(data,"tauser")
+        message.info("保存成功")
+        router.go(-1)
+      })
+    }else{
+      request({
+        url: '/api/admin/taUser',
+        method: 'POST',
+        data: val,
+      }).then((data) => {
+        console.log(data,"tauser")
+        message.info("保存成功")
+        router.go(-1)
+      })
+    }
+  }
 
   const fields = [
     {
       label: '名称',
-      name: 'staffName',
+      name: 'userName',
       type: FieldTypes.Text,
-      // placeholder: '名称',
-      value: ''
+      value: userData.userName
     },
     {
       label: '公司',
-      name: 'staffCompany',
+      name: 'orgName',
       type: FieldTypes.Text,
       placeholder: '请输入公司名称',
-      value: ''
+      value: userData.orgName
     },
     {
       label: '部门',
-      name: 'staffDepartment',
+      name: 'department',
       type: FieldTypes.Text,
       placeholder: '请输入部门',
-      value: ''
+      value: userData.department
     },
     {
       label: '职位',
-      name: 'staffPosition',
+      name: 'position',
       type: FieldTypes.Text,
       placeholder: '请输入职位',
-      value: ''
+      value: userData.position
     },
     {
       label: '电话',
-      name: 'staffTel',
+      name: 'phone',
       type: FieldTypes.Text,
       placeholder: '请输入电话号码',
-      value: ''
-      // rules: [
-      //   { message: '请输入电话号码'}
-      // ]
+      value: userData.phone,
     },
     {
       label: '标签',
-      name: 'staffTag',
-      render: 
-      <Tagss/>
-     
-   
+      name: 'taTags',
+      render: <Select
+                mode="multiple"
+                style={{ width: '100%' }}
+                placeholder="请选择标签"
+                onChange={tagsChange} >
+                  {tagData.map(item => (
+                    <Select.Option key={item.tagId} value={item.tagId}>
+                      {item.tagName}
+                    </Select.Option>
+                  ))}
+              </Select>,
+      value: userData.taTags,
     },
     {
       label: '地址',
-      name: 'staffAddress',
+      name: 'address',
       type: FieldTypes.Text,
       placeholder: '请输入地址',
-      value: ''
+      value: userData.address
 
     },
     {
       label: '授权项目',
-      name: 'staffProject',
-      type: FieldTypes.Select,
-      placeholder: '请选择',
-      value: ''
+      name: 'buildingId',
+      render: <BuildSelect />,
+      value: userData.buildingId,
+      rules: [
+        { required: true, message: '请选择所属项目' },
+      ],
     },
-
-    // {
-    //   label: '授权项目',
-    //   name: 'staffProject',
-    //   type: FieldTypes.Text,
-    //   placeholder: '请选择'
-    // },
-
     {
       label: '图片',
-      name: 'staffImage',
+      name: 'photo',
       type: FieldTypes.ImageUploader,
       extra: '建议图片大小 640 * 640',
-      value: ''
+      value: userData.photo
     },
 
 
     {
       label: '简介',
-      name: 'staffIntroduction',
+      name: 'description',
       render: <TextArea className={channels.inpuitTxt} ></TextArea>,
-      value: ''
+      value: userData.description
 
     },
     {
       label: '状态',
-      name: 'staffstate',
+      name: 'status',
       render: <Radio.Group>
-        <Radio.Button style={{background:'#f0f0f0'}} value="a">禁用</Radio.Button>
-        <Radio.Button style={{background:'#f0f0f0',color:'#ff7e48'}} value="b">启用</Radio.Button>
+        <Radio.Button style={{background:'#f0f0f0'}} value="0">禁用</Radio.Button>
+        <Radio.Button style={{background:'#f0f0f0',color:'#ff7e48'}} value="1">启用</Radio.Button>
       </Radio.Group>,
-      value: 'b'
+      value: null != userData.status ? userData.status : '1'
     },
-
   ]
 
-  const handleSubmit = val => {
-    window.console.log('submit data --->', val)
-  }
-  return <XForm onSubmit={handleSubmit} fields={fields} push={8}></XForm>
+  return <XForm onSubmit={handleSubmit} fields={fields}></XForm>
 
 
 

src/pages/staff/list/style.less

@@ -61,7 +61,6 @@
 }
 
 .cardTag {
-  width: 48px;
   height: 18px;
   font-size: 10px;
   // background: #fdce22;

src/services/apis.js

@@ -2,10 +2,14 @@ const prefix = '/api/admin'
 
 export default {
   image: {
-    upload: {
+    uploadForAnt: {
       url: `${prefix}/antd/image`,
       method: 'POST',
-    }
+    },
+    upload: {
+      url: `${prefix}/image`,
+      method: 'POST',
+    },
   },
   user: {
     current: {
@@ -16,6 +20,10 @@ export default {
       method: 'POST',
       url: `${prefix}/taUser/signin`,
     },
+    signout: {
+      method: 'POST',
+      url: `${prefix}/taUser/signout`,
+    },
   },
   building: {
     getList: {
@@ -30,6 +38,10 @@ export default {
       method: 'POST',
       url: `${prefix}/building/add`,
     },
+    updateBuilding: {
+      method: 'PUT',
+      url: `${prefix}/building/update`,
+    },
     buildingGetById: {
       method: 'GET',
       url: `${prefix}/buildingSelectId/id`,
@@ -141,4 +153,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`
+  //   },
+  // },
 }

src/utils/upload.js

@@ -1,11 +1,39 @@
-import apis from '../services/apis';
+import { fetch, apis } from './request';
+import mixStr from './mixStr';
+
+const getToken = () => mixStr(window.localStorage.getItem('test-foobar'))
+
+const uploadImage = fetch(apis.image.upload)
 
 const uploaderProps = {
   name: 'file',
-  action: apis.image.upload.url,
-  headers: {
-    Authorization: `Bearer ${window.localStorage.getItem('x-token')}`
-  }
+  // action: apis.image.uploadForAnt.url,
+  accept: '.png, .jpg, .jpeg, .gif',
+  // headers: {
+  //   Authorization: `Bearer ${getToken()}`
+  // },
+  customRequest({
+    action,
+    file,
+    headers,
+    onError,
+    onProgress,
+    onSuccess,
+    withCredentials,
+  }) {
+    const data = new FormData()
+    data.append('file', file)
+
+    uploadImage({ data }).then((img) => {
+      onSuccess(img, file);
+    }).catch(onError);
+
+    return {
+      abort() {
+        console.log('upload progress is aborted.');
+      },
+    };
+  },
 }
 
 export { uploaderProps }