fix

config/proxy.js

@@ -8,8 +8,8 @@
 export default {
   dev: {
     '/api/': {
-      // target: 'https://xlk.njyz.tech/',
-      target: 'http://localhost:8081/',
+      target: 'https://xlk.njyz.tech/',
+      // target: 'http://localhost:8081/',
       changeOrigin: true,
       pathRewrite: {
         '^': '',

config/routes.js

@@ -542,17 +542,17 @@ export default [
                 hideInMenu: true,
                 component: './carouselFigure/editAdvertising',
               },
-              {
-                path: '/carouselFigure/propagandaList',
-                name: '宣传位',
-                component: './carouselFigure/propagandaList',
-              },
-              {
-                path: '/carouselFigure/propaganda',
-                name: '宣传位编辑',
-                hideInMenu: true,
-                component: './carouselFigure/propaganda',
-              },
+              // {
+              //   path: '/carouselFigure/propagandaList',
+              //   name: '宣传位',
+              //   component: './carouselFigure/propagandaList',
+              // },
+              // {
+              //   path: '/carouselFigure/propaganda',
+              //   name: '宣传位编辑',
+              //   hideInMenu: true,
+              //   component: './carouselFigure/propaganda',
+              // },
               {
                 path: '/carouselFigure/customImg/list',
                 name: '其他',
@@ -594,32 +594,32 @@ export default [
               },
               {
                 path: '/system/houseTypes/index',
-                name: '购房百科类型',
+                name: '购房百百科类型',
                 component: './system/Sellhouse/houseTypes/index',
               },
               {
                 path: '/system/Sellhouse/Edit',
-                name: '新增/编辑购房百科',
+                name: '编辑购房百科',
                 hideInMenu: true,
                 component: './system/Sellhouse/Edit',
               },
               {
                 path: '/system/Sellhouse/houseTypes/Newindex',
-                name: '新增',
+                name: '编辑购房百百科类型',
                 hideInMenu: true,
                 component: './system/Sellhouse/houseTypes/Newindex',
               },
-              {
-                path: '/system/housingPolicy/list',
-                name: '购房百科',
-                component: './system/housingPolicy/List',
-              },
-              {
-                path: '/system/housingPolicy/edit',
-                name: '购房百科编辑',
-                hideInMenu: true,
-                component: './system/housingPolicy/Edit',
-              },
+              // {
+              //   path: '/system/housingPolicy/list',
+              //   name: '购房百科',
+              //   component: './system/housingPolicy/List',
+              // },
+              // {
+              //   path: '/system/housingPolicy/edit',
+              //   name: '购房百科编辑',
+              //   hideInMenu: true,
+              //   component: './system/housingPolicy/Edit',
+              // },
               // {
               //   path: '/system/editPolicy',
               //   name: '购房政策编辑',
@@ -659,11 +659,11 @@ export default [
                 path: '/statistical',
                 redirect: '/statistical/monitor',
               },
-              // {
-              //   path: '/statistical/monitor',
-              //   name: '数据报表',
-              //   component: './Monitor',
-              // },
+              {
+                path: '/statistical/monitor',
+                name: '数据报表',
+                component: './statistical/Monitor',
+              },
               {
                 path: '/statistical/activity',
                 name: '活动统计',

src/components/SelectButton/CitySelect.jsx

@@ -37,7 +37,7 @@ const CitySelect = (props) => {
     if (props.value) {
       const tempData = data.filter(f => f.id == props.value)
       const va = (tempData.length > 0) ? props.value : undefined
-      props.onChange(va)
+      // props.onChange(va)
     }
   }
 

src/components/SelectButton/SelectPolicyType.jsx

@@ -0,0 +1,57 @@
+import React, { useState, useEffect } from 'react';
+import { Select } from 'antd';
+import apis from '../../services/apis';
+import request from '../../utils/request'
+
+const { Option } = Select;
+
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const SelectPolicyType = props => {
+  const [data, setData] = useState([])
+//   const [value, setValue] = useState([])
+  useEffect(() => {
+    getBuildList();
+  }, [])
+
+  const getBuildList = e => {
+    request({ ...apis.system.getPolicyTypeList, params: { pageNum: 1, pageSize: 999 } }).then(data => {
+        setData(data.records)
+        checkValue(data.records)
+        // 默认选中第一个
+    })
+  }
+
+
+  const checkValue = (data) => {
+    if (props.value) {
+      const tempData = data.filter(f => f.institutionId == props.value)
+      const va = (tempData.length > 0) ? props.value : '类型已删除，请重新选择类型'
+      props.onChange(va)
+
+    }
+  }
+
+  return (
+      <Select
+      showSearch
+      value={props.value}
+      style={{ width: '300px' }}
+      placeholder="请选择项目"
+      onChange={props.onChange}
+      filterOption={(input, option) =>
+        option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      }>
+          {/* <Option key="" value="">全部项目</Option> */}
+          {data.map(building => (
+            <Option key={building.policyTypeId} value={building.policyTypeId}>{building.policyTypeName}</Option>
+          ))}
+      </Select>
+  )
+}
+export default SelectPolicyType

src/pages/Live/liveActivity copy/add/index.jsx

@@ -1,182 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker, Radio, Upload, InputNumber } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-import XForm, { FieldTypes } from '../../../../components/XForm';
-import router from 'umi/router';
-import moment from 'moment';
-import styles from '../../../style/GoodsList.less';
-import SelectCity from '../../../../components/SelectButton/CitySelect'
-import BuildSelect2 from '../../../../components/SelectButton/BuildSelect2'
-import LivePlatSelect from '../../../../components/SelectButton/LivePlatSelect'
-import CitySelect3 from '../../../../components/SelectButton/CitySelect3'
-import ImageUpload from '../../../../components/XForm/ImageUpload'
-import Wangedit from '../../../../components/Wangedit/Wangedit'
-import Navigate from '@/components/Navigate';
-import apis from '../../../../services/apis';
-import request from '../../../../utils/request';
-import AuthButton from '@/components/AuthButton';
-import Prompt from 'umi/prompt';
-
-const { Option } = Select;
-const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
-
-let cityId = ''
-
-const header = props => {
-  const { salesBatchId } = props.location.query
-  console.log(salesBatchId)
-  const [ saleBatchData, setSaleBatchData ] = useState({})
-  const [showHelp, setShowHelp] = useState(false)
-
-  const cancelPage = () =>{
-    router.push({
-      pathname: '/activity/liveActivity/list',
-    });
-  }
-
-   //打开新页面
-   const openIndexImg = () => {
-    const newWin=window.open('about:blank');
-    newWin.location.href="http://njcj.oss-cn-shanghai.aliyuncs.com/%E6%95%99%E7%A8%8B.png"
-  }
-
-  function highlightsTypeChange(e) {
-    console.log(e.target.value,"ee")
-    setTypeState(e.target.value)
-  }
-
-  function disabledDate(current) {
-    // Can not select days before today and today
-    return current && current < moment().endOf('day');
-  }
-
-  function handleSubmit (e) {
-    e.preventDefault();
-    props.form.validateFields((err, values) => {
-      if (!err){
-        let {liveTime, ...submitValue} = values
-        submitValue.liveStartDate = moment(submitValue.liveStartDate._d).format('YYYY-MM-DD HH:mm:ss')
-        submitValue.liveEndDate = moment(submitValue.liveEndDate._d).format('YYYY-MM-DD HH:mm:ss')
-        
-        if (values.liveStartDate > values.liveEndDate){
-          message.info("直播结束时间大于开始时间")
-          return;
-        }
-
-        request({ ...apis.taliveActivity.addTaLiveActivity, data: { ...submitValue },}).then((data) => {
-          message.info("保存成功")
-          console.log(data,"datattttttt")
-          router.push({
-            pathname: '/activity/liveActivity/list/index',
-          });
-        }).catch((err) => {
-          message.info(err.msg || err.message)
-        })
-      }
-    });
-  }
-
-  const { getFieldDecorator } = props.form;
-
-  return (
-    <>
-      <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
-        <Form.Item label="所属城市">
-          {getFieldDecorator('cityId', {
-            rules: [{ required: true, message: ' 请输入所属城市' }],
-          })(<CitySelect3 buildingId={props.form.getFieldValue('buildingId')}/>)}
-        </Form.Item>
-        <Form.Item label="所属楼盘">
-          {getFieldDecorator('buildingId')(<BuildSelect2 cityId={props.form.getFieldValue('cityId')}/>)}
-        </Form.Item>
-        <Form.Item label="直播活动标题">
-          {getFieldDecorator('liveActivityTitle', {
-            rules: [{ required: true, message: '请输入直播活动标题' }],
-          })(<Input maxLength={20} placeholder="给直播活动起个名字" />)}
-        </Form.Item>
-        <Form.Item label="直播开始时间">
-          {getFieldDecorator('liveStartDate', {
-                rules: [
-                  {
-                    required: true,
-                    message: '请选择直播开始时间',
-                  },
-                ],
-              })(<DatePicker placeholder="预计开始时间"style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
-        </Form.Item>
-        <Form.Item label="直播结束时间">
-          {getFieldDecorator('liveEndDate', {
-                rules: [
-                  {
-                    required: true,
-                    message: '请选择直播结束时间',
-                  },
-                ],
-              })(<DatePicker placeholder="预计结束时间" disabledDate={disabledDate} style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
-        </Form.Item>
-        <Form.Item label="直播小程序">
-          {getFieldDecorator('liveApp', {
-              rules: [{ required: true, message: '请选择直播小程序' }],
-            })((<LivePlatSelect />))}
-        </Form.Item>
-        <Form.Item label="房间参数">
-          {getFieldDecorator('liveRoomParam', {
-            rules: [{ required: true, message: '请输入房间参数' }],
-          })(<Input maxLength={1000} placeholder="点击右侧按钮查看如何获取房间参数" style={{width:'680px'}}/>)}<Navigate onClick={openIndexImg}>不知道怎么填？查看说明</Navigate>
-        </Form.Item>
-        <Form.Item label="封面图1" help="建议尺寸：750px*420px，比例16:9，格式：jpg，用于：活动列表">
-              {getFieldDecorator('listImg', {
-                  rules: [{ required: true, message: '请上传封面图1' }],
-              })(
-                <ImageUpload />,
-              )}
-        </Form.Item>  
-        <Form.Item label="封面图2" help="建议尺寸：750*250px，比例3:1，格式：jpg，用于：项目详情页">
-              {getFieldDecorator('detailImg', {
-                  rules: [{ required: true, message: '请上传封面图2' }],
-              })(
-                <ImageUpload />,
-              )}
-        </Form.Item>  
-        <Form.Item label="详情图" help="格式：jpg，用于：直播活动详情页，点击可跳转到直播间">
-              {getFieldDecorator('detailTypeImg', {
-                  rules: [{ required: true, message: '请上传详情图' }],
-              })(
-                <ImageUpload />,
-              )}
-        </Form.Item>      
-        <Form.Item label="权重">
-              {getFieldDecorator('weight', {
-                  rules: [{ required: true, message: '请设置权重' }],
-              })(
-                <InputNumber placeholder="权重越大越靠前" style={{width:'150px'}}/>
-              )}
-        </Form.Item>
-        <Form.Item label="发布状态">
-          {getFieldDecorator('status', {
-              rules: [{ required: true, message: '请选择发布状态' }],
-            })(<Select placeholder="发布状态" style={{ width: '300px' }}>
-            <Option value="0">否</Option>
-            <Option value="1">是</Option>
-          </Select>)}
-        </Form.Item>
-        <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
-          <Button type="primary" htmlType="submit"style={{marginRight:'20px'}}>
-            确定
-          </Button>
-          <Button onClick={() => router.go(-1)}>
-            取消
-          </Button>
-        </Form.Item>
-      </Form>
-      <Prompt message={location =>
-        location.pathname.startsWith("/activity/liveActivity")
-          ? true
-          : localStorage.removeItem("liveActivePageParams")} />
-    </>
-  )
-}
-
-const WrappedHeader = Form.create({ name: 'header' })(header);
-
-export default WrappedHeader

src/pages/Live/liveActivity copy/edit/components/BuildSelect/BuildSelect.jsx

@@ -1,65 +0,0 @@
-import React, { useState, useEffect, useRef } from 'react';
-import { Select } from 'antd';
-import apis from '../../../../../../services/apis';
-import request from '../../../../../../utils/request'
-
-const { Option } = Select;
-
-function usePrevious(props) {
-  const ref = useRef();
-  useEffect(() => {
-    ref.current = props;
-  });
-  return ref.current;
-}
-
-/**
- *
- *
- * @param {*} props
- * @returns
- */
-const BuildingSelect = props => {
-  const [data, setData] = useState([])
-  const [value, setValue] = useState([])
-  console.log('props', props.cityId());
-  useEffect(() => {
-    getBuildList();
-  }, [props.cityId()])
-
-
-  const getBuildList = e => {
-    request({ ...apis.building.buildingSelect, params: { cityId: props.cityId(), pageNum: 1, pageSize: 999 } }).then(data => {
-        setData(data)
-        checkValue(data)
-        // 默认选中第一个
-    })
-  }
-
-
-  const checkValue = (data) => {
-    if (props.value) {
-      const tempData = data.filter(f => f.buildingId == props.value)
-      const va = (tempData.length > 0) ? props.value : '项目已下线，请重新选择项目'
-      props.onChange(va)
-
-    }
-  }
-
-  return (
-      <Select
-      showSearch
-      value={props.value}
-      style={{ width: '300px' }}
-      placeholder="请选择项目"
-      onChange={props.onChange}
-      filterOption={(input, option) =>
-        option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-      }>
-          {data.map(building => (
-            <Option key={building.buildingId} value={building.buildingId}>{building.buildingName}</Option>
-          ))}
-      </Select>
-  )
-}
-export default BuildingSelect

src/pages/Live/liveActivity copy/edit/components/HelpDoc/index.jsx

@@ -1,109 +0,0 @@
-import React, { PureComponent } from 'react'
-import { Modal, Row, Col } from 'antd'
-import EnDash from '../EnDash'
-
-import Style from './style.less'
-import HotBlock from '../HotBlock'
-
-const dataset = [
-  {
-    label: '(0)',
-    value: 0,
-  },
-  {
-    label: '(1)',
-    value: 1,
-  },
-  {
-    label: '(2)',
-    value: 2,
-  },
-  {
-    label: '(3)',
-    value: 3,
-  },
-  {
-    label: '(4)',
-    value: 4,
-  },
-  {
-    label: '(5)',
-    value: 5,
-  },
-  {
-    label: '(6~10)',
-    value: 8,
-  },
-  {
-    label: '(11~20)',
-    value: 15,
-  },
-  {
-    label: '(21~30)',
-    value: 25,
-  },
-  {
-    label: '(31~40)',
-    value: 35,
-  },
-  {
-    label: '(41~50)',
-    value: 45,
-  },
-  {
-    label: '(51~100)',
-    value: 80,
-  },
-  {
-    label: '(101~200)',
-    value: 150,
-  },
-  {
-    label: '(200以上)',
-    value: 201,
-  },
-]
-
-function Cell(props) {
-  return (
-    <Row type="flex" align="middle" gutter={20}>
-      <Col span={2}>{props.left}</Col>
-      <Col span={12}><EnDash /></Col>
-      <Col span={6}>{props.right}</Col>
-    </Row>
-  )
-}
-
-export default function HelpDoc(props) {
-  return (
-    <Modal footer={null} title="相关说明" visible={props.visible} onCancel={props.onCancel} width={800}>
-      <div className={Style.article}>
-        <div className={Style.section}>
-          <div className={Style.title}>1.图例解释：</div>
-          <div>
-            <Cell left="1号楼" right="楼栋/幢" />
-            <Cell left="2单元" right="单元" />
-            <Cell left="3楼" right="楼层" />
-            <Cell left="301" right="房号" />
-            <Cell left="1人" right="预选人数" />
-            <Cell left="234万" right="价格" />
-            <Cell left="A户型" right="户型名" />
-          </div>
-        </div>
-        <div className={Style.section}>
-          <div className={Style.title}>2.预选人数（热度）：</div>
-          <div>每有一位客户预选此房源，热度自动增加1，热度越大说明想购买此房源的用户越多，认筹摇号购买难度越大。</div>
-        </div>
-        <div className={Style.section}>
-          <div className={Style.title}>3.热度指标:</div>
-          <div className={Style.subtitle}>颜色越深代表热度越高。黑底白字代表房源未发布,未发布房源用户不会看到。</div>
-          <div className={Style.flex}>
-            {
-              dataset.map((block) => (<div className={Style['flex-item']} key={block.value}><HotBlock number={block.value}>{block.label}</HotBlock></div>))
-            }
-          </div>
-        </div>
-      </div>
-    </Modal>
-  );
-}

src/pages/Live/liveActivity copy/edit/components/HelpDoc/style.less

@@ -1,36 +0,0 @@
-.article {
-    .section {
-        font-size: 16px;
-        line-height: 1.8em;
-        color: #666;
-
-        & + .section {
-            margin-top: 24px;
-        }
-    }
-
-    .title {
-        font-size: 18px;
-        line-height: 2em;
-        color: #333;
-    }
-
-    .subtitle {
-        font-size: 14px;
-        line-height: 1.6em;
-        color: #999;
-    }
-
-    .flex {
-        display: flex;
-        flex-wrap: wrap;
-
-        .flex-item {
-            margin-top: 16px;
-            margin-right: 8px;
-            flex: none;
-            width: 100px;
-            text-align: center;
-        }
-    }
-}

src/pages/Live/liveActivity copy/edit/components/base.jsx

@@ -1,206 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload, InputNumber } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-import moment from 'moment';
-import router from 'umi/router';
-import styles from '../../../../style/GoodsList.less';
-import XForm, { FieldTypes, createForm } from '../../../../../components/XForm';
-import apis from '../../../../../services/apis';
-import BuildSelect2 from '../../../../../components/SelectButton/BuildSelect2';
-import LivePlatSelect from '../../../../../components/SelectButton/LivePlatSelect'
-import CitySelect3 from '../../../../../components/SelectButton/CitySelect3';
-import ImageUpload from '../../../../../components/XForm/ImageUpload'
-import request from '../../../../../utils/request';
-import Navigate from '@/components/Navigate';
-
-const { Option } = Select;
-const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
-
-let cityId = ''
-
-const header = props => {
-  console.log(props)
-  const liveActivityId = props.liveActivityId.liveId
-  console.log(liveActivityId)
-  const [ liveActivityData, setLiveActivityData ] = useState({})
-  const [showHelp, setShowHelp] = useState(false)
-
-  if(liveActivityId){
-    useEffect(() => {
-      getLiveActivityData(liveActivityId);
-    },[])
-
-  // 查询列表
-  const getLiveActivityData = (liveActivityId) => {
-    request({ ...apis.taliveActivity.getTaLiveActivity, urlData: {id: liveActivityId} }).then((data) => {
-        console.log(data, 'getLiveActivityData')
-        setLiveActivityData(data.data)
-        // if(data.qrCode == 'null'){
-        //   message.error("暂时无法获取二维码")
-        // }
-    })
-  }
-  }
-
-  const cancelPage = () =>{
-    router.push({
-      pathname: '/activity/liveActivity/list/index',
-    });
-  }
-
-  //打开新页面
-  const openIndexImg = () => {
-    const newWin=window.open('about:blank');
-    newWin.location.href="http://njcj.oss-cn-shanghai.aliyuncs.com/%E6%95%99%E7%A8%8B.png"
-  }
-
-  function highlightsTypeChange(e) {
-    console.log(e.target.value,"ee")
-    setTypeState(e.target.value)
-  }
-
-  function disabledDate(current) {
-    // Can not select days before today and today
-    return current && current < moment().endOf('day');
-  }
-
-  function handleSubmit (e) {
-    e.preventDefault();
-    props.form.validateFields((err, values) => {
-      console.log(values, 'values');
-      if (!err){
-        let {liveTime, ...submitValue} = values
-        if (submitValue.status == '已发布' || submitValue.status == '1'){
-          submitValue.status = 1
-        }else{
-          submitValue.status = 0
-        }
-        if (values.liveStartDate > values.liveEndDate){
-          message.info("直播结束时间大于开始时间")
-          return;
-        }
-        submitValue.liveStartDate = moment(submitValue.liveStartDate._d).format('YYYY-MM-DD HH:mm:ss')
-        submitValue.liveEndDate = moment(submitValue.liveEndDate._d).format('YYYY-MM-DD HH:mm:ss')
-        console.log(submitValue)
-        request({ ...apis.taliveActivity.updateTaLiveActivity, urlData: {id: liveActivityId},data: submitValue, }).then((data) => {
-          message.info("保存成功")
-          cancelPage()
-        }).catch((err) => {
-          message.info(err.msg || err.message)
-        })
-      }
-    });
-  }
-
-  const { getFieldDecorator } = props.form;
-
-  return (
-    <>
-      <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
-        <Form.Item label="所属城市">
-          {getFieldDecorator('cityId', {
-            initialValue: liveActivityData.cityId,
-            rules: [{ required: true, message: ' 请输入所属城市' }],
-          })(<CitySelect3 buildingId={props.form.getFieldValue('buildingId')}/>)}
-        </Form.Item>
-        <Form.Item label="所属楼盘">
-          {getFieldDecorator('buildingId', {
-            initialValue: liveActivityData.buildingId,
-          })(<BuildSelect2 cityId={props.form.getFieldValue('cityId')}/>)}
-        </Form.Item>
-        <Form.Item label="直播活动标题">
-          {getFieldDecorator('liveActivityTitle', {
-            initialValue: liveActivityData.liveActivityTitle,
-            rules: [{ required: true, message: '请输入直播活动标题' }],
-          })(<Input maxLength={20} placeholder="给直播活动起个名字" />)}
-        </Form.Item>
-        <Form.Item label="直播开始时间">
-          {getFieldDecorator('liveStartDate', { initialValue : liveActivityData.liveStartDate ? moment(liveActivityData.liveStartDate, 'YYYY-MM-DD HH:mm:ss') : null,
-                rules: [
-                  {
-                    required: true,
-                    message: '请选择直播开始时间',
-                  },
-                ],
-              })(<DatePicker placeholder="预计开始时间" style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
-        </Form.Item>
-        <Form.Item label="直播结束时间">
-          {getFieldDecorator('liveEndDate', { initialValue : liveActivityData.liveEndDate ? moment(liveActivityData.liveEndDate, 'YYYY-MM-DD HH:mm:ss') : null,
-                rules: [
-                  {
-                    required: true,
-                    message: '请选择直播结束时间',
-                  },
-                ],
-              })(<DatePicker placeholder="预计结束时间" disabledDate={disabledDate} style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
-        </Form.Item>
-        <Form.Item label="直播小程序">
-          {getFieldDecorator('liveApp', {
-              initialValue: liveActivityData.liveApp,
-              rules: [{ required: true, message: '请选择直播小程序' }],
-            })(<LivePlatSelect />)}
-        </Form.Item>
-        <Form.Item label="房间参数">
-          {getFieldDecorator('liveRoomParam', {
-            initialValue: liveActivityData.liveRoomParam,
-            rules: [{ required: true, message: '请输入房间参数' }],
-          })(<Input maxLength={1000} placeholder="点击右侧按钮查看如何获取房间参数" style={{width:'680px'}}/>)}
-          <Navigate onClick={openIndexImg}>不知道怎么填？查看说明</Navigate>
-        </Form.Item>
-        <Form.Item label="封面图1" help="建议尺寸：750px*420px，比例16:9，格式：jpg，用于：活动列表">
-              {getFieldDecorator('listImg', {
-                  initialValue: liveActivityData.listImg,
-                  rules: [{ required: true, message: '请上传封面图1' }],
-              })(
-                <ImageUpload />,
-              )}
-        </Form.Item>  
-        <Form.Item label="封面图2" help="建议尺寸：750*250px，比例3:1，格式：jpg，用于：项目详情页">
-              {getFieldDecorator('detailImg', {
-                  initialValue: liveActivityData.detailImg,
-                  rules: [{ required: true, message: '请上传封面图2' }],
-              })(
-                <ImageUpload />,
-              )}
-        </Form.Item>  
-        <Form.Item label="详情图" help="格式：jpg，用于：直播活动详情页，点击可跳转到直播间">
-              {getFieldDecorator('detailTypeImg', {
-                  initialValue: liveActivityData.detailTypeImg,
-                  rules: [{ required: true, message: '请上传详情图' }],
-              })(
-                <ImageUpload style={{width:'300px',height:'600px'}}/>,
-              )}
-        </Form.Item>      
-        <Form.Item label="权重">
-              {getFieldDecorator('weight', {
-                  initialValue: liveActivityData.weight,
-                  rules: [{ required: true, message: '请设置权重' }],
-              })(
-                <InputNumber placeholder="权重越大越靠前" style={{width:'150px'}}/>
-              )}
-        </Form.Item>
-        <Form.Item label="发布状态">
-          {getFieldDecorator('status', {
-              initialValue: liveActivityData.status == 1 ? '已发布' : '未发布',
-              rules: [{ required: true, message: '请选择发布状态' }],
-            })(<Select placeholder="发布状态" style={{ width: '300px' }}>
-            <Option value="0">未发布</Option>
-            <Option value="1">已发布</Option>
-          </Select>)}
-        </Form.Item>
-        <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
-          <Button type="primary" htmlType="submit"style={{marginRight:'20px'}}>
-            确定
-          </Button>
-          <Button onClick={() => router.go(-1)}>
-            取消
-          </Button>
-        </Form.Item>
-      </Form>
-    </>
-  )
-}
-
-const Base = Form.create({ name: 'header' })(header);
-
-export default Base

src/pages/Live/liveActivity copy/edit/components/poster.jsx

@@ -1,167 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-import moment from 'moment';
-import router from 'umi/router';
-import BuildSelect from '../../../../../components/SelectButton/BuildSelect'
-import XForm, { FieldTypes } from '../../../../../components/XForm';
-import Wangedit from '../../../../../components/Wangedit/Wangedit'
-import request from '../../../../../utils/request'
-import yinhao from '../../../../../assets/yinhao.png'
-import xiaochengxu from '../../../../../assets/xiaochengxu.png'
-import ImageUploader from '../../../../../components/XForm/ImageUpload';
-import poster1 from '../../../../../assets/poster1.png';
-import poster2 from '../../../../../assets/poster2.png';
-import Styles from './style.less';
-import apis from '../../../../../services/apis';
-
-const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
-const { TextArea } = Input;
-
-const Poster = props => {
-  const [inputValue, changeInput] = useState('')
-  const [textAreaValue, changeTextArea] = useState('')
-  const [imgValue, changeImg] = useState('')
-  const [posterId, setPosterId] = useState('')
-
-  const [building, setBuilding] = useState({ buildingImg: [{ url: '' }] })
-  const liveActivityId = props.liveActivityId.liveId
-  if (liveActivityId) {
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    useEffect(() => {
-      request({
-        ...apis.activity.poster,
-        params: { targetId: liveActivityId, targetType: 'live' },
-      }).then(data => {
-        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)
-      })
-
-      // getById(salesBatchId)
-      getMiniappName()
-    }, [])
-  }
-
-  // 获取详情信息
-  function getById(currentId) {
-
-    request({ ...apis.building.buildingGetById, urlData: { id: currentId } }).then(res => {
-      setBuilding(res)
-      console.log('getById: ', res)
-    })
-  }
-  // 获取小程序名称
-  const [miniappName, setMiniappName] = useState('')
-  function getMiniappName() {
-
-    request({ ...apis.building.getMiniappName }).then(res => {
-    
-      setMiniappName(res)
-     
-    })
-  }
-
-  const submitPoster = () => {
-    if (liveActivityId) {
-      if (!imgValue) {
-        message.error('请选择海报图片')
-        return
-      }
-
-      if (posterId) {
-        request({
-          ...apis.activity.updatePoster,
-          urlData: { id: posterId },
-          data: { targetId: liveActivityId, targetType: 'live', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue },
-        }).then(() => {
-          message.info('保存成功')
-        }).catch(err => {
-          message.info(err.msg || err.message)
-        })
-      } else {
-        request({
-          ...apis.activity.addPoster,
-          data: { targetId: liveActivityId, targetType: 'live', 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 style={{ display: 'flex' }}>
-      <div style={{ width: '420px', height: '900px', display: 'inline-block', marginTop: '30px' }}>
-        <div style={{ width: '375px', height: '600px', backgroundColor: '#fff', boxShadow: '0px 0px 16px 6px rgba(0,0,0,0.15)', position: 'relative', margin: '0 auto' }}>
-          <img style={{ width: '100%', height: '560px' }} src={imgValue ? imgValue : poster1} alt="" />
-
-          {/* <p className={Styles.tagLabel}>
-            {
-              building.buildingTag && building.buildingTag.map(item => <span>{item.tagName}</span>)
-            }
-          </p> */}
-          {/* <p style={{
-            margin: '10px 20px', fontSize: '20px', color: '#222', fontWeight: '600',
-            display: '-webkit-box', lineClamp: '3', height: '36px', lineHeight: '36px',
-            WebkitLineClamp: '1',
-            WebkitBoxOrient: 'vertical',
-            overflow: 'hidden',
-            textOverflow: 'ellipsis',
-          }}>{inputValue || (building.buildingName || '海报标题')}</p>
-          <p style={{ color: '#999', padding: ' 0 20px' }}><span style={{ color: '#fd0d0c', fontSize: '24px', marginLeft: '6px' }}>{building.price} </span><span style={{ color: '#fd0d0c', fontSize: '20px' }}></span></p>
-          <img src={yinhao} style={{ width: '30px', marginLeft: '22px' }} alt="" />
-          <p style={{
-            margin: '16px 20px 28px 20px', fontSize: '17px', color: '#999',
-            display: '-webkit-box', lineClamp: '3', height: '72px',
-            WebkitLineClamp: '3',
-            WebkitBoxOrient: 'vertical',
-            overflow: 'hidden',
-            textOverflow: 'ellipsis',
-          }}>{textAreaValue || '海报描述'}</p> */}
-          <div style={{ backgroundColor: '#f1f1f1', padding: '22px 30px', boxShadow: '0px 6px 12px -4px #dcdcdc',position:'relative' }}>
-            <p style={{margin:'0',fontSize:'18px',color:'#888'}}>长按识别小程序码</p>
-            <p style={{margin:'0',fontSize:'18px',color:'#888'}}>进入<span style={{margin:'0 5px',fontSize:'18px',color:'#333',fontWeight:'600'}}>{miniappName||'置业V顾问'}</span>房源列表</p>
-            <img style={{ width: '80px',position: 'absolute',right:'30px',top:'10px' }} src={xiaochengxu} alt="" />
-          </div>
-        </div>
-        <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>海报模板</p>
-      </div>
-      <div >
-        <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
-        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>
-          <span style={{marginLeft:'135px', color: '#999'}}>请上传制作好的海报图片用于置业顾问或用户保存分享到朋友圈，可随时更新</span>
-        </p>
-        </div>
-        <div style={{ display: 'flex', width: '100%', margin: '30px 0' }}>
-          <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}><span style={{ color: 'red' }}>*</span> 海报图片</p>
-          <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
-        </div>
-        <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginBottom: '30px'}}>建议尺寸：640*960px，比例2::3，格式：jpg，文件小于300KB，用于：吸引用户扫码进入直播活动页</p>
-        <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' }} 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} maxLength={1024} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
-        </div> */}
-
-      </div>
-    </div>
-    <Button type="primary" onClick={submitPoster} style={{ margin: '40px 40px 40px 30vw' }}> 确定</Button>
-    <Button onClick={() => router.go(-1)}>取消</Button>
-  </div>
-}
-
-export default Poster

src/pages/Live/liveActivity copy/edit/components/share.jsx

@@ -1,118 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-import moment from 'moment';
-import router from 'umi/router';
-import BuildSelect from '../../../../../components/SelectButton/BuildSelect'
-import XForm, { FieldTypes } from '../../../../../components/XForm';
-import Wangedit from '../../../../../components/Wangedit/Wangedit'
-import request from '../../../../../utils/request'
-import yinhao from '../../../../../assets/yinhao.png'
-import ImageUploader from '../../../../../components/XForm/ImageUpload';
-import logo from '../../../../../assets/logo.svg';
-import touxiang from '../../../../../assets/touxiang.jpg';
-import poster1 from '../../../../../assets/poster1.png';
-import poster2 from '../../../../../assets/poster2.png';
-import apis from '../../../../../services/apis';
-
-const Share = props => {
-  const [inputValue, changeInput] = useState('')
-  const [imgValue, changeImg] = useState('')
-  const [shareContentId, setShareContentId] = useState('')
-  const liveActivityId = props.liveActivityId.liveId
-  if (liveActivityId) {
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    useEffect(() => {
-      request({
-        ...apis.activity.shareContent,
-        params: { targetId: liveActivityId, targetType: 'live' },
-      }).then(data => {
-        if (data.length > 0) {
-          setShareContentId(data[0].shareContentId)
-          changeImg(data[0].shareContentImg)
-          changeInput(data[0].shareContentTitle)
-        }
-        // else{
-        //   changeInput("诚挚邀您在线选房购房~");
-        //   request({ ...apis.house.getTaSalesBatch, urlData: {id: salesBatchId} }).then((data) => {
-        //     changeImg(data.aerialViewImg);
-        // })
-        // }
-      }).catch(err => {
-        message.info(err.msg || err.message)
-      })
-      getMiniappName();
-    }, [])
-  }
-
-  // 获取小程序名称
-  const [miniappName, setMiniappName] = useState('')
-  function getMiniappName() {
-
-    request({ ...apis.building.getMiniappName }).then(res => {
-    
-      setMiniappName(res)
-     
-    })
-  }
-
-  const submitShare = () => {
-    if (liveActivityId) {
-      if (shareContentId) {
-        request({
-          ...apis.activity.updateShareContent,
-          urlData: { id: shareContentId },
-          data: { targetId: liveActivityId, shareContentType: 'live', shareContentImg: imgValue,shareContentTitle: inputValue },
-        }).then(data => {
-          message.info('保存成功')
-        }).catch(err => {
-          message.info(err.msg || err.message)
-        })
-       } else {
-        request({
-          ...apis.activity.addShareContent,
-          data: { targetId: liveActivityId, shareContentType: 'live', 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', alignItems: 'center', width: '100%' }}>
-      <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>
-        <span style={{marginLeft:'135px', color: '#999'}}>请上传制作好的分享图片用于置业顾问或用户分享房源列表页面到好友或群</span>
-      </p>
-    </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>
-      <div>
-        <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}>
-          <img src={logo} style={{ width: '22px', marginRight: '10px' }} />
-            {miniappName}
-        </p>
-        <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{miniappName ? miniappName : '置业V客厅 精准获客平台'}</p>
-        <img style={{ width: '200px', height: '160px' }} src={imgValue ? imgValue : poster2} alt="" />
-      </div>
-    </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="请输入分享标题" 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 value={imgValue} onChange={e => changeImg(e)} />
-    </div>
-    <p style={{ fontSize: '0.5vw', color: '#A9A9A9', marginLeft: '230px', marginTop: '20px' }}>建议尺寸：750*600px，比例5：4，格式：jpg</p>
-    <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
-    <Button onClick={() => router.go(-1)}>取消</Button>
-  </div>
-}
-
-export default Share

src/pages/Live/liveActivity copy/edit/components/shareRecord.jsx

@@ -1,154 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload, Table, Pagination } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-import moment from 'moment';
-import router from 'umi/router';
-import apis from '../../../../../services/apis';
-import BuildSelect from '../../../../../components/SelectButton/BuildSelect';
-import AuthButton from '@/components/AuthButton';
-import styles from './style.less';
-import request from '../../../../../utils/request';
-
-const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
-const { TextArea } = Input;
-
-const header = (props) => {
-  const [ data, setData ] = useState({})
-  const [page, changePage] = useState({})
-  const liveActivityId = props.liveActivityId.liveId
-
-  useEffect(() => {
-    getList({ pageNum: 1, pageSize: 10, liveActivityId : liveActivityId});
-  },[])
-
-  // 查询列表
-  const getList = (params) => {
-    request({ ...apis.taliveActivity.taLiveShare, params: { ...params },}).then((data) => {
-        console.log(data)
-        setData(data)
-    }).catch(e=>
-      console.error(e))
-  }
-  
-  const columns = [
-    {
-      title: '头像',
-      align: 'center',
-      render: (text, records) => <img src={records.photoOravatar} width={50} height={50} />,
-    },
-    {
-      title: '昵称',
-      dataIndex: 'nameOrnick',
-      key: 'nameOrnick',
-      align: 'center',
-    },
-    {
-      title: '姓名',
-      dataIndex: 'name',
-      key: 'name',
-      align: 'center',
-    },
-    {
-      title: '手机号',
-      dataIndex: 'phone',
-      key: 'phone',
-      align: 'center',
-    },
-    {
-      title: '身份',
-      dataIndex: 'personType',
-      key: 'personType',
-      align: 'center',
-      render: (personType) => <span>{ personType === 'Realty Consultant' ? '置业顾问' : personType === 'customer' || personType === 'estate agent' ? '用户' : '游客' }</span>
-    },
-    {
-      title: '分享时间',
-      dataIndex: 'createDate',
-      key: 'createDate',
-      align: 'center',
-      render: (x, row) => <><span>{moment(row.createDate).format('YYYY-MM-DD hh:mm:ss')}</span></>
-    },
-    {
-      title: '分享方式',
-      dataIndex: 'shareType',
-      key: 'shareType',
-      align: 'center',
-      render: (x, row) => <span>{ row.tagertType == 'livePost' ? '海报分享' : '小程序分享' }</span>
-    },
-    {
-      title: '分享内容',
-      dataIndex: 'liveActivityTitle',
-      key: 'liveActivityTitle',
-      align: 'center',
-      render: (x, row) => <span>直播活动{ row.liveActivityTitle }的活动详情</span>
-    },
-  ];
-  
-  const changePageNum = (pageNumber) => {
-      getList({ pageNum: pageNumber, pageSize: 10, liveActivityId : liveActivityId, ...props.form.getFieldsValue() })
-  }
-
-  // 提交事件
-const handleSubmit = (e, props) => {
-    e.preventDefault();
-    props.form.validateFields((err, values) => {
-      if (!err) {
-        console.log('提交数据: ', values)
-        getList({ pageNum: 1, pageSize: 10, liveActivityId : liveActivityId,  ...values })
-      }
-    });
-  }
-
-   //重置搜索
-   function handleReset() {
-    props.form.resetFields();
-  }
-
-  const { getFieldDecorator } = props.form
-  return (
-
-    <>
-      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
-        <Form.Item>
-          {getFieldDecorator('shareType')(
-            <Select style={{ width: '180px' }} placeholder="分享方式">
-              <Option value="livePost">海报分享</Option>
-              <Option value="liveApp">小程序分享</Option>
-            </Select>,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('personType')(
-            <Select style={{ width: '180px' }} placeholder="身份">
-              <Option value="Realty Consultant">置业顾问</Option>
-              <Option value="customer">用户</Option>
-            </Select>,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('phone')(
-            <Input placeholder="手机号"/>
-          )}
-        </Form.Item>
-        <Form.Item>
-        <AuthButton name="admin.extendContent.search" noRight={null}>
-          <Button type="primary" htmlType="submit" className={styles.searchBtn}>
-            搜索
-          </Button>
-          </AuthButton>
-          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
-              重置
-            </Button>
-        </Form.Item>
-      </Form>
-      <span>共筛选出{data.total}条记录</span>
-      <Table dataSource={data.records} columns={columns} pagination={false} rowKey="carouseFigureList"/>
-      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
-      </div>
-    </>
-  )
-}
-const ShareRecord = Form.create({ name: 'header' })(header);
-
-export default ShareRecord

src/pages/Live/liveActivity copy/edit/components/style.less

@@ -1,97 +0,0 @@
-.SubmitButton {
-  background: #3a91d5;
-  border-radius: 7px;
-  border: 0px;
-}
-.SelectFrom {
-  width: 180px;
-  background: #ffffff;
-  border-radius: 7px;
-  border: 1px solid #dbdbdb;
-}
-.addButton {
-  border-radius: 4px;
-  border: 0px;
-  margin: 10px 0px;
-}
-.cardText {
-  font-size: 0.106rem;
-  color: #333;
-  display: flex;
-  align-items: center;
-  position: relative;
-  margin-bottom: 0.08rem; 
-}
-
-.recommderTag{
-  position: absolute;
-  color: #fff;
-  line-height: 0.28rem;
-  width: 0.54rem;
-  background-color: rgba(0,0,0,0.4);
-  text-align: center;
-  border-radius: 12px 0 12px 0;
-  font-size: 0.09rem;
-}
-.cardItem{
-  font-size: 0.106rem;
-  font-weight: 400;
-  color: #666;
-  display: flex;
-  align-items: center;  
-  margin-bottom: 0.08rem;
-  .title{
-    display: inline-block;
-    width: 0.58rem;
-  
-    min-width: 0.58rem;
-    justify-content: space-between;
-    text-align: justify;
-    text-align-last:justify
-  }
-  
-}
-.cardText{
-  font-size: 0.106rem;
-  font-weight: 400;
-  color: #666;
-  display: flex;
-  align-items: center;  
-  margin-bottom: 0.08rem;
-  .title{
-    display: inline-block;
-    width: 0.58rem;
-  
-    min-width: 0.58rem;
-    justify-content: space-between;
-    text-align: justify;
-    text-align-last:justify
-  }
-  
-}
-.ediText {
-  font-size: 0.106rem;
-  color: #ff925c;
-  position: absolute;
-  right: 0;
-
-}
-
-
-.address { 
-  width: 400px;
-  height: 24px; 
-  text-overflow: ellipsis; 
-  white-space: nowrap;
-  overflow: hidden;
-}
-.cover{
-  width: 100%;
-
-  padding-bottom: 56.25%;
-  background-size: 100% 100% !important;
- 
-  border-radius: 12px 12px 0 0;
-  
-    // height: '14vw';
-}

src/pages/Live/liveActivity copy/edit/components/visitRecord.jsx

@@ -1,154 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload, Table, Pagination } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-import moment from 'moment';
-import router from 'umi/router';
-import apis from '../../../../../services/apis';
-import BuildSelect from '../../../../../components/SelectButton/BuildSelect';
-import AuthButton from '@/components/AuthButton';
-import styles from './style.less';
-import request from '../../../../../utils/request';
-
-const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
-const { TextArea } = Input;
-
-const header = (props) => {
-  const [ data, setData ] = useState({})
-  // const [page, changePage] = useState({})
-  const liveActivityId = props.liveActivityId.liveId
-
-  useEffect(() => {
-    getList({ pageNum: 1, pageSize: 10, liveActivityId : liveActivityId});
-  },[])
-
-  // 查询列表
-  const getList = (params) => {
-    request({ ...apis.taliveActivity.taLiveVisit, liveActivityId : liveActivityId, params: { ...params },}).then((data) => {
-        console.log(data)
-        setData(data)
-    })
-  }
-  
-  const columns = [
-    {
-      title: '头像',
-      align: 'center',
-      render: (text, records) => <img src={records.photoOravatar} width={50} height={50} />,
-    },
-    {
-      title: '昵称',
-      dataIndex: 'nameOrnick',
-      key: 'nameOrnick',
-      align: 'center',
-    },
-    {
-      title: '姓名',
-      dataIndex: 'name',
-      key: 'name',
-      align: 'center',
-    },
-    {
-      title: '手机号',
-      dataIndex: 'phone',
-      key: 'phone',
-      align: 'center',
-    },
-    {
-      title: '身份',
-      dataIndex: 'sharePersonType',
-      key: 'sharePersonType',
-      align: 'center',
-      render: (sharePersonType) => <span>{ sharePersonType == 'Realty Consultant' ? '置业顾问' : sharePersonType == 'customer' || sharePersonType === 'estate agent'? '用户' : '游客' }</span>
-    },
-    {
-      title: '访问时间',
-      dataIndex: 'createDate',
-      key: 'createDate',
-      align: 'center',
-      render: (x, row) => <><span>{moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}</span></>
-    },
-    // {
-    //   title: '进入场景',
-    //   dataIndex: 'sceneName',
-    //   key: 'sceneName',
-    //   align: 'center',
-    //   render: (x, row) => <span>{ row.sceneName === 'mini_program_code' ? '扫码进入' : row.sceneName === 'search' ? '自主进入' : '小程序分享进入' }</span>
-    // },
-    {
-      title: '访问内容',
-      dataIndex: 'liveActivityTitle',
-      key: 'liveActivityTitle',
-      align: 'center',
-      render: (x, row) => <span>直播活动{ row.liveActivityTitle }的活动详情</span>
-    },
-  ];
-  
-  const changePageNum = (pageNumber) => {
-      getList({ pageNum: pageNumber, pageSize: 10, liveActivityId : liveActivityId, ...props.form.getFieldsValue() })
-  }
-
-  // 提交事件
-const handleSubmit = (e, props) => {
-    e.preventDefault();
-    props.form.validateFields((err, values) => {
-      if (!err) {
-        console.log('提交数据: ', values)
-        getList({ pageNum: 1, pageSize: 10, liveActivityId: liveActivityId, ...values})
-      }
-    });
-  }
-
-   //重置搜索
-   function handleReset() {
-    props.form.resetFields();
-  }
-
-  const { getFieldDecorator } = props.form
-  return (
-
-    <>
-      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
-        {/* <Form.Item>
-          {getFieldDecorator('sceneType')(
-            <Select style={{ width: '180px' }} placeholder="进入场景">
-              <Option value="mini_program_code">扫码进入</Option>
-              <Option value="share">小程序分享进入</Option>
-              <Option value="search">自主进入</Option>
-            </Select>,
-          )}
-        </Form.Item> */}
-        <Form.Item>
-          {getFieldDecorator('personType')(
-            <Select style={{ width: '180px' }} placeholder="身份">
-              <Option value="Realty Consultant">置业顾问</Option>
-              <Option value="customer">用户</Option>
-              <Option value="drift">游客</Option>
-            </Select>,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('phone')(
-            <Input placeholder="手机号"/>
-          )}
-        </Form.Item>
-        <Form.Item>
-        <AuthButton name="admin.extendContent.search" noRight={null}>
-          <Button type="primary" htmlType="submit" className={styles.searchBtn}>
-            搜索
-          </Button>
-          </AuthButton>
-          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
-              重置
-            </Button>
-        </Form.Item>
-      </Form>
-      <span>共筛选出{data.total}条记录</span>
-      <Table dataSource={data.records} columns={columns} pagination={false} rowKey="carouseFigureList"/>
-      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
-      </div>
-    </>
-  )
-}
-const VisitRecord = Form.create({ name: 'header' })(header);
-export default VisitRecord

src/pages/Live/liveActivity copy/edit/index.jsx

@@ -1,87 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Radio, Tag, Tooltip, Tabs, notification } from 'antd';
-import moment from 'moment';
-import request from '../../../../utils/request';
-import apis from '../../../../services/apis';
-import { router } from 'umi';
-
-import Base from './components/base'
-import Poster from './components/poster'
-import Share from './components/share'
-import ShareRecord from './components/shareRecord'
-import VisitRecord from './components/visitRecord'
-import Prompt from 'umi/prompt';
-
-
-const { Option } = Select
-const { TabPane } = Tabs;
-
-const formItemLayout = {
-  labelCol: {
-    xs: { span: 24 },
-    sm: { span: 2 },
-  },
-  wrapperCol: {
-    xs: { span: 24 },
-    sm: { span: 16 },
-  },
-};
-
-function openNotificationWithIcon(type, message) {
-  notification[type]({
-    message,
-    description:
-      '',
-  });
-}
-
-function EditHouse(props) {
-  const {liveActivityId} = props.location.query.id;
-  console.log(props.location.query.id)
-  const [tab, setTab] = useState('base')
-  const [liveActivity, setLiveActivity] = useState({ liveActivityId: undefined })
-  const [houseId, setHouseId] = useState('')
-
-  function tabsCallback(e) {
-    setTab(e.target.value)
-  }
-
-  // building 回调
-  function buildingOnSuccess(e) {
-    setBuildingData(e)
-  }
-
-  function housTabChange(e) {
-    setHouseId(e.houseId)
-    setTab('preselectionRecord')
-  }
-
-  const liveId = liveActivity.liveActivityId || (props.location.query && props.location.query.id)
-  console.log(liveId)
-  return (
-    <>
-      <Radio.Group value={ tab } buttonStyle="solid" onChange={e => tabsCallback(e)}>
-        <Radio.Button value="base">基本信息</Radio.Button>
-        <Radio.Button value="poster">海报设置</Radio.Button>
-        <Radio.Button value="share">分享设置</Radio.Button>
-        <Radio.Button value="shareRecord">分享记录</Radio.Button>
-        <Radio.Button value="visitRecord">分享访问记录</Radio.Button>
-      </Radio.Group>
-      <div style={{ marginTop: '20px' }}>
-        { (tab === 'base' && <Base liveActivityId={{ liveId }} onSuccess={e => buildingOnSuccess(e)}/>)} 
-        { (tab === 'poster' && <Poster liveActivityId={{ liveId }}/>)}
-        { (tab === 'share' && <Share liveActivityId={{ liveId }}/>)}
-        { (tab === 'shareRecord' && <ShareRecord liveActivityId={{ liveId }}/>)}
-        { (tab === 'visitRecord' && <VisitRecord liveActivityId={{ liveId }}/>)}
-      </div>
-      <Prompt message={location =>
-        location.pathname.startsWith("/activity/liveActivity")
-          ? true
-          : localStorage.removeItem("liveActivePageParams")} />
-    </>
-  )
-}
-
-const WrappedEditHouseForm = Form.create({ name: 'editHouse' })(EditHouse);
-
-export default WrappedEditHouseForm

src/pages/Live/liveActivity copy/list/index.jsx

@@ -1,323 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Pagination, Modal, DatePicker, notification } from 'antd';
-import router from 'umi/router';
-import moment from 'moment';
-import AuthButton from '@/components/AuthButton';
-import Prompt from 'umi/prompt';
-import withActions from '@/components/ActionList';
-import EditIcon from '@/components/EditIcon';
-import styles from '../../../style/GoodsList.less';
-import SelectCity from '../../../../components/SelectButton/CitySelect'
-import BuildSelect from '../../../../components/SelectButton/BuildSelect'
-import apis from '../../../../services/apis';
-import request from '../../../../utils/request';
-import Navigate from '@/components/Navigate';
-// import SaleBatchListHelpDoc from '../edit/components/SalesBatchListHelpDoc';
-
-const { Option } = Select;
-
-const header = props => {
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [data, setData] = useState({ list: [], total: 0 })
-  //   const [page, changePage] = useState({})
-  const [liveIdList, setLiveIdList] = useState([])
-  const [time, setTime] = useState('')
-  const [showHelp, setShowHelp] = useState(false)
-
-  // 查询列表
-  const getList = params => {
-    request({ ...apis.taliveActivity.taLiveActivity, params: { ...params } }).then(data => {
-      console.log(data)
-      setData(data)
-    })
-  }
-
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  useEffect(() => {
-
-    if (localStorage.getItem("liveActivePageParams")) {
-      props.form.setFieldsValue(JSON.parse(localStorage.getItem("liveActivePageParams")));
-      // const { getFieldDecorator } = JSON.parse(localStorage.getItem("pageParams"))
-
-      getList(JSON.parse(localStorage.getItem("liveActivePageParams")))
-    } else {
-      localStorage.setItem("liveActivePageParams", JSON.stringify({ pageNum: 1, pageSize: 10 }));
-      getList({ pageNum: 1, pageSize: 10 });
-    }
-   
-  }, [])
-
-  // 跳转到编辑
-  const toAddLive = rowData => () => {
-    if(rowData) {
-      router.push({
-      pathname: '/activity/liveActivity/edit',
-      query: {
-        id: rowData.liveActivityId,
-        buildingId: rowData.buildingId,
-      },
-    });
-      return
-    }
-    router.push({
-      pathname: '/activity/liveActivity/add',
-    });
-  }
-
-  const toDataReacord = rowData => () => {
-  
-      router.push({
-      pathname: '/activity/liveActivity/liveActivityRecord',
-      query: {
-        id: rowData.liveActivityId,
-      },
-    });
-  }
-
-  function openNotificationWithIcon(type, message) {
-    notification[type]({
-      message,
-      description:
-        '',
-    });
-  }
-
-  
-  const toDelLiveActivity = rowData => () =>{
-    console.log(liveIdList, 'liveIdListliveIdList')
-    if(liveIdList.length < 1){
-      openNotificationWithIcon('error', '请先选择需要删除的直播活动')
-      return
-    }
-    Modal.confirm({
-      title: '删除后当前直播活动关联的小程序端开屏图、banner图等也会自动下架',
-      okText: '确定',
-      cancelText: '取消',
-      onOk () {
-        request({ ...apis.taliveActivity.deleteTaLiveActivity, data: liveIdList, }).then((data) => {
-          message.info("操作成功")
-          getList(JSON.parse(localStorage.getItem("liveActivePageParams")))
-        }).catch((err) => {
-          // message.info(err.msg)
-        })
-      },
-    });
-
-    
-  }
-
-  /**
-   *
-   *
-   * @param {*} props
-   * @returns
-   */
-  const columns = [
-    {
-      title: '直播活动标题',
-      dataIndex: 'liveActivityTitle',
-      key: 'liveActivityTitle',
-      align: 'center',
-      render:  (x, row) => <Navigate onClick={toAddLive(row)}>{row.liveActivityTitle}</Navigate>,
-    },
-    {
-      title: '所属城市',
-      dataIndex: 'cityName',
-      key: 'cityName',
-      align: 'center',
-    },
-    {
-      title: '所属楼盘',
-      dataIndex: 'buildingName',
-      key: 'buildingName',
-      align: 'center',
-    },
-    {
-      title: '直播开始时间',
-      dataIndex: 'liveStartDate',
-      key: 'liveStartDate',
-      align: 'center',
-      render: (x, row) => <><span>{`${moment(row.liveStartDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
-    },
-    {
-      title: '直播结束时间',
-      dataIndex: 'liveEndDate',
-      key: 'liveEndDate',
-      align: 'center',
-      render: (x, row) => <><span>{`${moment(row.liveEndDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
-    },
-    {
-      title: '权重',
-      dataIndex: 'weight',
-      key: 'weight',
-      align: 'center',
-    },
-    {
-      title: '发布状态',
-      dataIndex: 'status',
-      key: 'status',
-      align: 'center',
-      render: status => <><span>{status == 0 ? '未发布' : '已发布'}</span></>,
-    },
-    {
-      title: '新增人',
-      dataIndex: 'createName',
-      key: 'createName',
-      align: 'center',
-    },
-    {
-      title: '新增时间',
-      dataIndex: 'createDate',
-      key: 'createDate',
-      align: 'center',
-      render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
-    },
-    {
-      title: '修改人',
-      dataIndex: 'updateName',
-      key: 'updateName',
-      align: 'center',
-    },
-    {
-      title: '修改时间',
-      dataIndex: 'updateDate',
-      key: 'updateDate',
-      align: 'center',
-      render: (x, row) => <><span>{`${moment(row.updateDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
-    },
-    {
-      title: '操作',
-      align: 'center',
-      width: 240,
-      render: withActions((text, record) => [    
-        <AuthButton name="admin.liveActivity.dataRecord" noRight={null}>
-          <EditIcon type="record" text="数据记录" onClick={toDataReacord(record)} />
-        </AuthButton>,
- 
-        <AuthButton name="admin.live.detail.get" noRight={null}>
-          <EditIcon type="look" text="查看详情" onClick={toAddLive(record)} />
-        </AuthButton>,
-      ]),
-    },
-  ];
-  const getSignList = dynamicId => {
-    router.push({
-      pathname: '/activity/SignList',
-      query: {
-        dynamicId,
-      },
-    });
-  }
-
-  const changePageNum = pageNumber => {
-    localStorage.setItem("liveActivePageParams", JSON.stringify({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() }));
-    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
-  }
-
-  const rowSelection = {
-    onChange: (selectedRowKeys, selectedRows) => {
-      console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
-      setLiveIdList(selectedRows)
-    },
-  };
-
-  // 提交事件
-  const handleSubmit = e => {
-    e.preventDefault();
-    props.form.validateFields((err, values) => {
-      if (!err) {
-        console.log('提交数据: ', values)
-        if (time) {
-          values.time = `${moment(time).format('YYYY-MM-DDT00:00:00.000')}Z`
-        } else {
-          values.time = null
-        }
-        localStorage.setItem("liveActivePageParams", JSON.stringify({ pageNum: 1, pageSize: 10, ...values }));
-        getList({ pageNum: 1, pageSize: 10, ...values })
-      }
-    });
-  }
-
-  // 重置搜索
-  function handleReset () {
-    props.form.resetFields();
-    setTime('')
-    localStorage.setItem("liveActivePageParams", JSON.stringify({ pageNum: 1, pageSize: 10 }));
-    getList({ pageNum: 1, pageSize: 10 })
-  }
-
-  // 时间回调
-  function timeOnChange(date, dateString) {
-    console.log(date, dateString)
-    setTime(date)
-  }
-
-
-  const { getFieldDecorator } = props.form
-  return (
-
-    <>
-      {/* style={{ display: 'none' }} */}
-      <div id="qrcode"></div>
-      <Form layout="inline" onSubmit={e => handleSubmit(e)}>
-        <Form.Item>
-          {getFieldDecorator('liveActivityTitle')(
-             <Input
-             prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-             placeholder="直播活动标题"
-           />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('cityId')(
-            <SelectCity />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('buildingId')(
-            <BuildSelect />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('status')(
-            <Select style={{ width: '180px' }} placeholder="发布状态">
-            <Option value="1">已发布</Option>
-            <Option value="0">未发布</Option>
-          </Select>,
-          )}
-        </Form.Item>
-        <Form.Item>
-          <AuthButton name="admin.buildingDynamic.search" noRight={null}>
-            <Button type="primary" htmlType="submit" className={styles.searchBtn}>
-              搜索
-            </Button>
-          </AuthButton>
-          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
-            重置
-            </Button>
-        </Form.Item>
-      </Form>
-      
-      <AuthButton name="admin.live.add.post" noRight={null}>
-        <Button type="danger" className={styles.addBtn} onClick={toAddLive()}>新增</Button>
-      </AuthButton>
-      <AuthButton name="admin.live.del" noRight={null}>
-        <Button type="primary" className={styles.addBtn} onClick={toDelLiveActivity()} style={{marginLeft:'30px'}}>删除</Button>
-      </AuthButton><br/>
-      <span>共筛选出{data.total}条记录</span>
-      <Table rowSelection={rowSelection}
-       dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
-      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e)} current={data.current}/>
-      </div>
-      {/* <SaleBatchListHelpDoc visible={showHelp} onCancel={() => setShowHelp(false)} /> */}
-      <Prompt message={location =>
-        location.pathname.startsWith("/activity/liveActivity")
-          ? true
-          : localStorage.removeItem("liveActivePageParams")} />
-    </>
-  )
-}
-const WrappedHeader = Form.create({ name: 'header' })(header);
-
-export default WrappedHeader

src/pages/Live/liveActivity copy/list/liveActivityRecord.jsx

@@ -1,16 +0,0 @@
-import React from 'react';
-import DataRecord from '../../dataRecord/index'
-import Prompt from 'umi/prompt';
-
-const header = props =>{
-    const id = props.location.query.id
-    // type:'live',
-    return <><DataRecord id ={id} activeType="live"/>
-    <Prompt message={location =>
-        location.pathname.startsWith("/activity/liveActivity")
-          ? true
-          : localStorage.removeItem("liveActivePageParams")} />
-          </>
-}
-
-export default header

src/pages/Live/video/Edit/index.jsx

@@ -25,10 +25,6 @@ import ImageUpload from '@/components/XForm/ImageUpload';
 import request from '@/utils/request';
 import Navigate from '@/components/Navigate';
 
-const { Option } = Select;
-const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
-
-let cityId = '';
 
 const header = props => {
   console.log(props);

src/pages/Live/video/List/index.jsx

@@ -102,6 +102,7 @@ const Video = props => {
       dataIndex: 'lookNum',
       key: 'lookNum',
       align: 'center',
+      render: (x, row) =>x||0
     },
     {
       title: '归属楼盘',

src/pages/building/Edit/SpecialRoom/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react'
-import { Button } from 'antd'
+import { Button,notification } from 'antd'
 import Form from './Form'
 import List from './List'
 import request from '@/utils/request';

src/pages/building/type/index.jsx

@@ -1,5 +1,5 @@
-import React from 'react';
-import { Button, Tag,  Modal } from 'antd';
+import React, { useRef } from 'react';
+import { Button, Tag, Modal, message } from 'antd';
 
 import router from 'umi/router';
 import moment from 'moment';
@@ -7,11 +7,11 @@ import withActions from '@/components/ActionList';
 import EditIcon from '@/components/EditIcon';
 import AuthButton from '@/components/AuthButton';
 import TableList from '@/components/TableList';
-// import request from '../../../utils/request';
-import apis from '../../../services/apis';
+import request from '@/utils/request';
+import apis from '@/services/apis';
 
 export default function BuildType() {
-
+  const ref = useRef();
 
   const columns = [
     {
@@ -55,7 +55,6 @@ export default function BuildType() {
     },
   ];
 
-
   function deleteType(row) {
     row.status = -1;
     const modal = Modal.confirm();
@@ -64,20 +63,18 @@ export default function BuildType() {
       okText: '确认',
       cancelText: '关闭',
       onOk: () => {
-        // request({
-        //   ...apis.buildingType.update,
-        //   urlData: { id: row.buildingTypeId },
-        //   data: { ...row },
-        // })
-        //   .then(() => {
-     
-        //   })
-        //   .then(() => {
-        //     openNotificationWithIcon('success', '操作成功');
-        //   })
-        //   .catch(err => {
-        //     // openNotificationWithIcon('error', err.message)
-        //   });
+        request({
+          ...apis.buildingType.update,
+          urlData: { id: row.buildingTypeId },
+          data: { ...row },
+        })
+          .then(() => {
+            ref.current.reload();
+            message.info('删除成功！');
+          })
+          .catch(err => {
+            // openNotificationWithIcon('error', err.message)
+          });
 
         modal.destroy();
       },
@@ -99,7 +96,7 @@ export default function BuildType() {
   const actionRender = () => {
     return (
       <AuthButton name="admin.tdBuildingType.add" noRight={null}>
-        <Button type='primary' onClick={() => toEdi()} style={{ marginBottom: '20px' }}>
+        <Button type="primary" onClick={() => toEdi()} style={{ marginBottom: '20px' }}>
           新增类型
         </Button>
       </AuthButton>
@@ -109,8 +106,8 @@ export default function BuildType() {
   return (
     <>
       <TableList
-        // ref={ref}
-        rowKey="buildingType"
+        ref={ref}
+        rowKey="buildingTypeId"
         api={apis.buildingType.getList}
         // searchFields={searchFields}
         actionRender={actionRender}

src/pages/carouselFigure/advertisingList.jsx

@@ -55,13 +55,13 @@ const header = (props) => {
       key: 'cityName',
       align: 'center',
     },
-    {
-      title: '关联项目',
-      dataIndex: 'buildingName',
-      key: 'buildingName',
-      align: 'center',
-      render: (buildingName) => <span>{buildingName === null ? '无' : buildingName}</span>
-    },
+    // {
+    //   title: '关联项目',
+    //   dataIndex: 'buildingName',
+    //   key: 'buildingName',
+    //   align: 'center',
+    //   render: (buildingName) => <span>{buildingName === null ? '无' : buildingName}</span>
+    // },
     {
       title: '关联内容类型',
       dataIndex: 'contentType',
@@ -70,13 +70,13 @@ const header = (props) => {
       render: (contentType) => <span>{contentType === 'project' ? '项目' : contentType === 'activity' ? '报名活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' :
         contentType === 'help' ? '助力活动' : contentType === 'group' ? '拼团活动' : contentType === 'h5' ? 'H5活动' : contentType === 'salesBatch' ? '在线选房' : contentType === 'live' ? '直播活动' : '无'}</span>
     },
-    {
-      title: '发布位置',
-      dataIndex: 'showPosition',
-      key: 'showPosition',
-      align: 'center',
-      render: (showPosition) => <span>{ showPosition === 'index' ? '首页' : showPosition === 'building' ? '项目' : '' }</span>
-    },
+    // {
+    //   title: '发布位置',
+    //   dataIndex: 'showPosition',
+    //   key: 'showPosition',
+    //   align: 'center',
+    //   render: (showPosition) => <span>{ showPosition === 'index' ? '首页' : showPosition === 'building' ? '项目' : '' }</span>
+    // },
     {
       title: '发布时间',
       dataIndex: 'createDate',
@@ -233,24 +233,24 @@ const header = (props) => {
             <Select style={{ width: '180px' }} placeholder="类型">
               <Option value="project">项目</Option>
               <Option value="news">资讯</Option>
-              <Option value="activity">报名活动</Option>
-              <Option value="help">助力活动</Option>
+              <Option value="activity">活动</Option>
+              {/* <Option value="help">助力活动</Option>
               <Option value="group">拼团活动</Option>
-              <Option value="h5">H5活动</Option>
+              <Option value="h5">H5活动</Option> */}
               <Option value="live">直播活动</Option>
-              <Option value="salesBatch">在线选房</Option>
+              {/* <Option value="salesBatch">在线选房</Option> */}
               <Option value="nothing">无</Option>
             </Select>,
           )}
         </Form.Item>
-        <Form.Item>
+        {/* <Form.Item>
           {getFieldDecorator('showPosition')(
             <Select style={{ width: '180px' }} placeholder="发布位置">
               <Option value="index">首页</Option>
               <Option value="building">项目</Option>
             </Select>,
           )}
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item>
           {getFieldDecorator('status')(
             <Select style={{ width: '180px' }} placeholder="状态">

src/pages/carouselFigure/carouselFigureList.jsx

@@ -103,15 +103,15 @@ const header = props => {
         </span>
       ),
     },
-    {
-      title: '发布位置',
-      dataIndex: 'showPosition',
-      key: 'showPosition',
-      align: 'center',
-      render: showPosition => (
-        <span>{showPosition === 'index' ? '首页' : showPosition === 'mall' ? '商城' : ''}</span>
-      ),
-    },
+    // {
+    //   title: '发布位置',
+    //   dataIndex: 'showPosition',
+    //   key: 'showPosition',
+    //   align: 'center',
+    //   render: showPosition => (
+    //     <span>{showPosition === 'index' ? '首页' : showPosition === 'mall' ? '商城' : ''}</span>
+    //   ),
+    // },
     {
       title: '发布时间',
       dataIndex: 'createDate',
@@ -289,22 +289,22 @@ const header = props => {
               <Option value="activity">活动</Option>
               <Option value="project">项目</Option>
               <Option value="news">资讯</Option>
-              <Option value="help">助力</Option>
+              {/* <Option value="help">助力</Option>
               <Option value="group">拼团</Option>
-              <Option value="h5">H5</Option>
+              <Option value="h5">H5</Option> */}
               <Option value="nothing">无</Option>
               {/* <Option value="other">其他</Option> */}
             </Select>,
           )}
         </Form.Item>
-        <Form.Item>
+        {/* <Form.Item>
           {getFieldDecorator('showPosition')(
             <Select style={{ width: '180px' }} placeholder="发布位置">
               <Option value="mall">积分商城</Option>
               <Option value="index">首页</Option>
             </Select>,
           )}
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item>
           {getFieldDecorator('status')(
             <Select style={{ width: '180px' }} placeholder="状态">

src/pages/carouselFigure/editAdvertising.jsx

@@ -152,54 +152,54 @@ const createEditor = () => {
     };
 
     const fields = [
-      {
-        label: '是否关联项目',
-        name: 'isHaveActive',
-        type: FieldTypes.Switch,
-        value: isHaveActive,
-        hidden: () => !isCanChoose,
-        props: {
-          onChange: () => {
-            const type = formRef.current.props.form.getFieldValue('contentType');
-            if (formRef.current && type !== 'live' && type !== 'h5') {
-              console.log(formRef.current.props.form.getFieldValue('contentType'), '2222');
-              formRef.current.props.form.resetFields(['contentType', []]);
-            }
-          },
-        },
-        rules: [{ required: true, message: '是否城市活动' }],
-      },
-      {
-        label: '发布位置',
-        name: 'showPosition',
-        type: FieldTypes.Select,
-        value: isHaveActive,
-        dict: [
-          {
-            label: '首页',
-            value: 'index',
-          },
-          {
-            label: '项目',
-            value: 'building',
-          },
-        ],
-        value: data.showPosition,
-        rules: [{ required: true, message: '请选择发布位置' }],
-      },
-      {
-        label: '所属项目',
-        name: 'buildingId',
-        render: <BuildSelect />,
-        value: data.buildingId,
-        hidden: () => !isHaveActive && isHavePosition,
-        rules: [{ required: true, message: '请选择所属项目' }],
-      },
+      // {
+      //   label: '是否关联项目',
+      //   name: 'isHaveActive',
+      //   type: FieldTypes.Switch,
+      //   value: isHaveActive,
+      //   hidden: () => !isCanChoose,
+      //   props: {
+      //     onChange: () => {
+      //       const type = formRef.current.props.form.getFieldValue('contentType');
+      //       if (formRef.current && type !== 'live' && type !== 'h5') {
+         
+      //         formRef.current.props.form.resetFields(['contentType', []]);
+      //       }
+      //     },
+      //   },
+      //   rules: [{ required: true, message: '是否城市活动' }],
+      // },
+      // {
+      //   label: '发布位置',
+      //   name: 'showPosition',
+      //   type: FieldTypes.Select,
+      //   value: isHaveActive,
+      //   dict: [
+      //     {
+      //       label: '首页',
+      //       value: 'index',
+      //     },
+      //     {
+      //       label: '项目',
+      //       value: 'building',
+      //     },
+      //   ],
+      //   value: data.showPosition,
+      //   rules: [{ required: true, message: '请选择发布位置' }],
+      // },
+      // {
+      //   label: '所属项目',
+      //   name: 'buildingId',
+      //   render: <BuildSelect />,
+      //   value: data.buildingId,
+      //   hidden: () => !isHaveActive && isHavePosition,
+      //   rules: [{ required: true, message: '请选择所属项目' }],
+      // },
       {
         label: '展示城市',
         name: 'cityId',
         render: <CitySelect />,
-        hidden: () => !isHavePosition || isHaveActive,
+        // hidden: () => !isHavePosition || isHaveActive,
         value: data.cityId,
         rules: [{ required: true, message: '请选择展示城市' }],
       },
@@ -211,28 +211,28 @@ const createEditor = () => {
         help: '建议图片尺寸：640*960px，比例2:3,格式：jpg，用于开屏广告',
         rules: [{ required: true, message: '请上传图片' }],
       },
-      {
-        label: '类型',
-        name: 'contentType',
-        type: FieldTypes.Select,
-        hidden: () => isHaveActive,
-        dict: [
-          {
-            label: 'H5活动详情',
-            value: 'h5',
-          },
-          {
-            label: '直播活动详情',
-            value: 'live',
-          },
-          {
-            label: '其它',
-            value: 'others',
-          },
-        ],
-        value: data.contentType,
-        rules: [{ required: true, message: '请选择类型' }],
-      },
+      // {
+      //   label: '类型',
+      //   name: 'contentType',
+      //   type: FieldTypes.Select,
+      //   hidden: () => isHaveActive,
+      //   dict: [
+      //     // {
+      //     //   label: 'H5活动详情',
+      //     //   value: 'h5',
+      //     // },
+      //     {
+      //       label: '直播活动详情',
+      //       value: 'live',
+      //     },
+      //     {
+      //       label: '其它',
+      //       value: 'others',
+      //     },
+      //   ],
+      //   value: data.contentType,
+      //   rules: [{ required: true, message: '请选择类型' }],
+      // },
       {
         label: '标题',
         name: 'title',
@@ -244,7 +244,7 @@ const createEditor = () => {
       {
         label: '类型',
         name: 'contentType',
-        hidden: () => !isHaveActive,
+        // hidden: () => !isHaveActive,
         type: FieldTypes.Select,
         dict: [
           {
@@ -259,29 +259,29 @@ const createEditor = () => {
             label: '资讯详情',
             value: 'news',
           },
-          {
-            label: '拼团活动详情',
-            value: 'group',
-          },
-          {
-            label: '助力活动详情',
-            value: 'help',
-          },
-          {
-            label: 'H5活动详情',
-            value: 'h5',
-          },
-          {
-            label: '在线选房详情',
-            value: 'salesBatch',
-          },
+          // {
+          //   label: '拼团活动详情',
+          //   value: 'group',
+          // },
+          // {
+          //   label: '助力活动详情',
+          //   value: 'help',
+          // },
+          // {
+          //   label: 'H5活动详情',
+          //   value: 'h5',
+          // },
+          // {
+          //   label: '在线选房详情',
+          //   value: 'salesBatch',
+          // },
           {
             label: '直播活动详情',
             value: 'live',
           },
           {
-            label: '其它',
-            value: 'others',
+            label: '无',
+            value: 'nothing',
           },
         ],
         value: data.contentType,
@@ -371,14 +371,15 @@ const createEditor = () => {
 
     const handleSubmit = val => {
       val.showType = 'screen';
-      if (!isHaveActive && val.targetId) {
-        if (!val.contentType) {
-          val.contentType = 'h5';
-        }
-      }
-      if (!isHaveActive && !val.targetId) {
-        val.contentType = '';
-      }
+      // if (!isHaveActive && val.targetId) {
+      //   if (!val.contentType) {
+      //     val.contentType = 'h5';
+      //   }
+      // }
+      // if (!isHaveActive && !val.targetId) {
+      //   val.contentType = '';
+      // }
+      val.showPosition='index'
       if (contentId) {
         request({
           ...apis.carsuseFigure.updataExtendContent,
@@ -386,6 +387,7 @@ const createEditor = () => {
           data: val,
         })
           .then(data => {
+            message.info('操作成功');
             cancelPage();
           })
           .catch(err => {
@@ -394,6 +396,7 @@ const createEditor = () => {
       } else {
         request({ ...apis.carsuseFigure.addExtendContent, data: val })
           .then(data => {
+            message.info('操作成功');
             cancelPage();
           })
           .catch(err => {

src/pages/carouselFigure/editCarousel.jsx

@@ -147,23 +147,23 @@ const Edit = props => {
         value: data.cityId,
         rules: [{ required: true, message: '请选择展示城市' }],
       },
-      {
-        label: '发布位置',
-        name: 'showPosition',
-        type: FieldTypes.Select,
-        dict: [
-          {
-            label: '首页',
-            value: 'index',
-          },
-          {
-            label: '积分商城',
-            value: 'mall',
-          },
-        ],
-        value: data.showPosition,
-        rules: [{ required: true, message: '请选择发布位置' }],
-      },
+      // {
+      //   label: '发布位置',
+      //   name: 'showPosition',
+      //   type: FieldTypes.Select,
+      //   dict: [
+      //     {
+      //       label: '首页',
+      //       value: 'index',
+      //     },
+      //     {
+      //       label: '积分商城',
+      //       value: 'mall',
+      //     },
+      //   ],
+      //   value: data.showPosition,
+      //   rules: [{ required: true, message: '请选择发布位置' }],
+      // },
       {
         label: () => (locationType ? '积分商城轮播图' : '首页轮播图'),
         name: 'image',
@@ -181,12 +181,12 @@ const Edit = props => {
         type: FieldTypes.Select,
         hidden: () => isHaveActive,
         dict: [
+          // {
+          //   label: 'h5',
+          //   value: 'h5',
+          // },
           {
-            label: 'h5',
-            value: 'h5',
-          },
-          {
-            label: '直播活动详情',
+            label: '直播活动',
             value: 'live',
           },
           {
@@ -212,7 +212,7 @@ const Edit = props => {
         hidden: () => !isHaveActive,
         dict: [
           {
-            label: '常规活动',
+            label: '活动',
             value: 'activity',
           },
           {
@@ -227,24 +227,24 @@ const Edit = props => {
           //   label: '其他',
           //   value: 'other',
           // },
+          // {
+          //   label: '拼团',
+          //   value: 'group',
+          // },
+          // {
+          //   label: '助力',
+          //   value: 'help',
+          // },
+          // {
+          //   label: 'h5',
+          //   value: 'h5',
+          // },
+          // {
+          //   label: '销售批次详情',
+          //   value: 'salesBatch',
+          // },
           {
-            label: '拼团',
-            value: 'group',
-          },
-          {
-            label: '助力',
-            value: 'help',
-          },
-          {
-            label: 'h5',
-            value: 'h5',
-          },
-          {
-            label: '销售批次详情',
-            value: 'salesBatch',
-          },
-          {
-            label: '直播活动详情',
+            label: '直播活动',
             value: 'live',
           },
         ],
@@ -351,6 +351,8 @@ const Edit = props => {
       if (!isHaveActive && !val.targetId) {
         val.contentType = '';
       }
+      // 发布在首页
+      val.showPosition ='index'
       if (contentId) {
         request({
           ...apis.carsuseFigure.updataExtendContent,
@@ -358,6 +360,7 @@ const Edit = props => {
           data: val,
         })
           .then(data => {
+            message.info('操作成功');
             cancelPage();
           })
           .catch(err => {
@@ -366,6 +369,7 @@ const Edit = props => {
       } else {
         request({ ...apis.carsuseFigure.addExtendContent, data: val })
           .then(data => {
+            message.info('操作成功');
             cancelPage();
           })
           .catch(err => {

src/pages/statistical/Monitor/components/indexEcharts/components/IntentionalCustomers.jsx

@@ -0,0 +1,132 @@
+import React, { Component, useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Modal, Descriptions } from 'antd';
+import BuildSelect from '@/components/SelectButton/BuildSelect'
+import { func } from 'prop-types';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+// const { Option } = Select;
+
+const UserBehavior = (props) => {
+  const [data, setData] = useState({ records: [] })
+  const [buildingId, setBuildingId] = useState('')
+  useEffect(() => {
+    IntentionUsers({ pageNum: 1, pageSize: 5 })
+    // getUserBehaviorProfile(formatDate(props.startDate, props.endDate))
+
+  }, [])
+  function IntentionUsers (params) {
+    request({
+      ...apis.indexEcharts.intentionUsers,
+      params: { ...params }
+    }).then((data) => {
+      console.log(data,"datadata")
+      setData(data)
+    })
+  }
+
+  // 分页
+  function onChange(pageNum) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    IntentionUsers({ pageNum: pageNum, pageSize: 5, buildingId })
+  }
+
+  // getIntentionUsers({ commit }, payload) {
+  //   return new Promise((resolve, reject) => {
+  //     request({
+  //       ...apis.indexEcharts.intentionUsers,
+  //       params: { pageSize: 9999, ...payload }
+  //     }).then((data) => {
+  //       resolve(data.records)
+  //     }).catch((err) => {
+  //       reject(err)
+  //     })
+  //   })
+  // },
+  // const dataSource = [
+  //   {
+  //     key: '1',
+  //     name: '胡彦斌',
+  //     age: 32,
+  //     address: '西湖区湖底公园1号',
+  //   },
+  //   {
+  //     key: '2',
+  //     name: '胡彦祖',
+  //     age: 42,
+  //     address: '西湖区湖底公园1号',
+  //   },
+  // ];
+  
+  const columns = [
+    {
+      title: '用户姓名',
+      dataIndex: 'personName',
+      key: 'personName',
+      width: '25%',
+    },
+    {
+      title: '手机号',
+      dataIndex: 'phone',
+      key: 'phone',
+      width: '25%',
+    },
+    {
+      title: '意向楼盘',
+      dataIndex: 'buildingName',
+      key: 'buildingName',
+      width: '25%',
+    },
+    {
+      title: '意向值',
+      dataIndex: 'intention',
+      key: 'intention',
+      width: '25%',
+    },
+  ];
+
+  function handleBuildingChange (e) {
+    IntentionUsers({  pageNum: 1, pageSize: 5, buildingId: e })
+    setBuildingId(e)
+  }
+
+  //意向客户导出
+  function exportIntentionUsers () {
+    request({
+      ...apis.indexEcharts.exportIntentionUsers,
+      params: { buildingId }
+    }).then((data) => {
+      if (!data) {
+        return
+      }
+      const url = window.URL.createObjectURL(new Blob([data]))
+      const link = document.createElement('a')
+      link.style.display = 'none'
+      link.href = url
+      link.setAttribute('download', '意向客户.xlsx')
+      document.body.append(link)
+      link.click()
+    })
+  }
+
+  return (
+    <>
+      <div>
+      <p style={{fontSize:'0.12rem',fontWeight:'600'}}>意向客户</p>
+        <Row>
+          <Col span={22}>
+            <BuildSelect slot='action' onChange={(e => handleBuildingChange(e))} value={buildingId}></BuildSelect>
+          </Col>
+          <Col span={2}>
+            <Button type="primary" onClick={exportIntentionUsers}>导出</Button>
+          </Col>
+        </Row>
+
+        <Table rowKey="IntentionalCustomers" dataSource={data.records} columns={columns} style={{marginTop:'15px'}} pagination={{ total: data.total, defaultPageSize: 5, onChange: e => onChange(e) }} scroll={{ y: 500 }} />
+
+      </div>
+
+    </>
+  )
+}
+
+export default UserBehavior;

src/pages/statistical/Monitor/components/indexEcharts/components/NewUsers.jsx

@@ -0,0 +1,103 @@
+import React, { Component, useState, useEffect } from 'react';
+import echarts from 'echarts/lib/echarts';
+import EChart from '@/components/EchartsTest/EChart';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+import moment from 'moment';
+import router from 'umi/router';
+import { Table, Select, Row, Col, Menu, Dropdown, Button, Icon, message } from 'antd';
+
+// import styles from '../styles.less'
+const formatDate = (start, end) => {
+  const startDate = moment(start).format('YYYY-MM-DDT00:00:00.000') + 'Z'
+  const endDate = moment(end).format('YYYY-MM-DDT23:59:59.999') + 'Z'
+  return { startDate, endDate }
+}
+const NewUsers = (props) => {
+  const [data, setData] = useState({ records: [] })
+
+
+  useEffect(() => {
+    NewsUserCount(formatDate(props.startDate, props.endDate))
+  }, [props.startDate, props.endDate])
+
+
+  function NewsUserCount (params) {
+    request({
+      ...apis.indexEcharts.changeNewUser,
+      params,
+    }).then((data) => {
+      setData(data)
+    })
+  }
+
+  const dataZoom=props.dataZoom?[
+    {
+      type: 'inside',
+      start: 0,
+      end: 100
+    },
+    {
+      type: 'slider',
+      start: 0,
+      end: 100
+    },
+  ] : undefined 
+  const dataset = data || []
+  const options = {
+
+   
+      color: ["#FF814C", "#F02B3E"],
+      tooltip: {
+        trigger: "axis"
+      },
+      icon: "rect",
+      legend: {
+        data: ["新用户数", "授权注册"]
+      },
+      toolbox: {},
+      xAxis: {
+        type: "category",
+      },
+      yAxis: {},
+      dataZoom,
+      series: [
+        {
+          name: "新用户数",
+          type: "line",
+          smooth:true, 
+        },
+        {
+          name: "授权注册",
+          type: "line",
+          smooth:true, 
+        }
+      ],
+      dataset: {
+        dimensions: ['createTime', 'fromNum', 'registeredNum'],
+        source: dataset
+      }
+ 
+    
+    
+  }
+
+
+  const piestyles = {
+    width: '100%',
+    height: '400px',
+  }
+
+  return (
+    <>
+      <div>
+        <div >
+          <p onClick={()=>router.push('/statistical/newUsers')}><span style={{borderBottom:'1px solid #f02d40',cursor: 'pointer',fontSize:'0.12rem',fontWeight:'600'}}>新增用户</span> {!props.BuildSelectHide && <span style={{ fontSize: '0.09rem', color: '#888', marginLeft: '0.06rem' }}>最近七天</span>}</p>
+       </div>
+        <EChart options={options} style={piestyles}  />
+      </div>
+    </>
+  )
+}
+
+export default NewUsers;

src/pages/statistical/Monitor/components/indexEcharts/components/UserActive.jsx

@@ -0,0 +1,109 @@
+import React, { Component, useState, useEffect } from 'react';
+import echarts from 'echarts/lib/echarts';
+import EChart from '@/components/EchartsTest/EChart';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+import moment from 'moment';
+import router from 'umi/router';
+import { Table, Select, Row, Col, Menu, Dropdown, Button, Icon, message } from 'antd';
+// import UserSource from './mmm';
+
+import styles from '../styles.less'
+const formatDate = (start, end) => {
+  const startDate = moment(start).format('YYYY-MM-DDT00:00:00.000') + 'Z'
+  const endDate = moment(end).format('YYYY-MM-DDT23:59:59.999') + 'Z'
+  return { startDate, endDate }
+}
+const UserSource = (props) => {
+  const [data, setData] = useState({ records: [] })
+  //柱图
+
+  useEffect(() => {
+    UserActive({ dateType: 'day' })
+  }, [])
+
+
+
+  function UserActive (params) {
+    request({
+      ...apis.indexEcharts.userActive,
+      params: { pageSize: 9999, ...params },
+    }).then((data) => {
+  
+      setData(data)
+    })
+  }
+
+  const dataset = (data.selectActiveUserCount) || []
+  const options = {
+
+    tooltip: {},
+    xAxis: { type: 'category' },
+    yAxis: {},
+    series: {
+      type: 'bar',
+      name: '活跃用户',
+      barWidth: 50,
+      data: dataset.map(x => ([x.date, !x.activityCount ? 0 : x.activityCount])),
+      itemStyle: {
+        normal: {
+          barBorderRadius: [50, 50, 0, 0],
+          color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+            offset: 0,
+            color: '#FD8A95'
+          }, {
+            offset: 1,
+            color: '#F13043'
+          }]),
+          shadowColor: 'rgba(0, 0, 0, 0.4)',
+
+        }
+      }
+    }
+
+  }
+
+
+  function onChange (value) {
+    UserActive({ dateType: value })
+  }
+
+
+  const piestyles = {
+    width: '100%',
+    height: '400px',
+
+  }
+
+
+  return (
+    <>
+      <div>
+
+
+        <div >
+        <p><span style={{fontSize:'0.12rem',fontWeight:'600'}}>用户活跃数</span></p>
+
+          <Select
+            showSearch
+            style={{ width: 100 }}
+            placeholder="日活跃"
+            optionFilterProp="children"
+            onChange={onChange}
+          >
+            <Option value="day">日活跃</Option>
+            <Option value="month">月活跃</Option>
+
+          </Select>
+        
+       </div>
+
+
+        <EChart options={options} style={piestyles} />
+      </div>
+
+    </>
+  )
+}
+
+export default UserSource;

src/pages/statistical/Monitor/components/indexEcharts/components/UserBehavior.jsx

@@ -0,0 +1,289 @@
+import React, { Component, useState, useEffect } from 'react';
+import EChart from '../../../components/EchartsTest/EChart';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import moment from 'moment';
+import router from 'umi/router';
+import 'echarts/lib/component/dataZoom'
+import { Table, Select, Row, Col, Menu, Dropdown, Button, Icon, message, Modal } from 'antd';
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+
+const { Option } = Select;
+
+
+const eventcolumns = [
+  {
+    title: '编号',
+    dataIndex: 'recordId',
+    key: 'recordId',
+    align: 'center',
+    width: '16%',
+  },
+  {
+    title: '访问时间',
+    dataIndex: 'visitTime',
+    key: 'visitTime',
+    align: 'center',
+    width: '18%',
+    render: (x, row) => (
+      <>
+        <span>{ moment(row.visitTime).format('YYYY-MM-DD hh:mm:ss') }</span>
+      </>
+    ),
+  },
+  {
+    title: '离开时间',
+    dataIndex: 'leaveTime',
+    key: 'leaveTime',
+    align: 'center',
+    width: '18%',
+    render: (x, row) => (
+      <>
+        <span>{ row.leaveTime && moment(row.leaveTime).format('YYYY-MM-DD hh:mm:ss') }</span>
+      </>
+    ),
+  },
+]
+
+
+class EventcoModal extends React.Component {
+  constructor(props) {
+    super(props)
+    this.state = {
+      eventList: [],
+      visibleData: { visible: false, row: {} },
+    }
+  }
+
+  componentDidUpdate(prevProps) {
+    if (this.props.visibleData.visible !== prevProps.visibleData.visible) {
+      // eslint-disable-next-line react/no-did-update-set-state
+      this.setState({ visibleData: this.props.visibleData }, () => {
+        this.showDetails(this.props.visibleData.row)
+      })
+    }
+  }
+
+  showDetails = row => {
+    request({
+      ...apis.indexEcharts.userBehavior.profile,
+      params: { event: row.event, personId: row.personId },
+    }).then(data => {
+        this.setState({ eventList: data })
+    })
+  }
+
+  handleOk = e => {
+    this.props.onSuccess()
+  };
+
+  handleCancel = e => {
+    this.props.onSuccess()
+  };
+
+  render() {
+    return (
+      <>
+        <Modal
+          title="访问详情"
+          visible={this.state.visibleData.visible}
+          onOk={() => this.handleOk()}
+          onCancel={() => this.handleCancel()}
+          footer={null}
+        >
+         <Table rowKey="UserBehavior" dataSource={this.state.eventList} columns={eventcolumns} pagination={false} rowKey="eventall" scroll={{ y: 400 }} />
+        </Modal>
+      </>
+    )
+  }
+}
+
+
+const formatDate = (start, end) => {
+  const startDate = `${moment(start).format('YYYY-MM-DDT00:00:00.000')}Z`
+  const endDate = `${moment(end).format('YYYY-MM-DDT23:59:59.999')}Z`
+  return { startDate, endDate }
+}
+const UserBehavior = props => {
+  const [data, setData] = useState({ records: [] })
+  const [visibleData, setVisibleData] = useState({ visible: false, row: {} })
+  const [buildingId, setBuildingId] = useState('')
+
+  // 柱图
+  useEffect(() => {
+    const date = formatDate(props.startDate, props.endDate)
+    getUserBehaviorSummary({
+      ...date,
+      activity: props.activity,
+      event: props.event,
+      eventType: props.eventType,
+      buildingId: props.buildingId,
+    })
+    // getUserBehaviorProfile(formatDate(props.startDate, props.endDate))
+  }, [props.startDate, props.endDate, props.activity, props.event, props.eventType, props.buildingId])
+
+  const [recordList, setList] = useState([])
+  function getUserBehaviorSummary(params) {
+    request({
+      ...apis.indexEcharts.userBehavior.summary,
+      params,
+    }).then(data => {
+      setData(data || {})
+      setList((data.data.records || []).filter(e => e.activity !== '客户'))
+    })
+  }
+
+
+  const seriesMaker = (data.selectUserBehavior || []).filter(e => e.activity !== '客户' && e.activity !== '首页').reduce((series, item) => {
+    let { date, activityCount, activity } = item
+    date = moment(date).format('YYYY-MM-DD')
+    if (!activityCount) activityCount = 0
+
+    // 使用对象, 可以去重
+    series[`${activity}`] = (series[`${activity}`] || []).concat([[date, activityCount]])
+
+    return series;
+  }, {})
+
+
+  const dataZoom = props.dataZoom ? [
+    {
+      type: 'inside',
+      start: 0,
+      end: 100,
+    },
+    {
+      type: 'slider',
+      start: 0,
+      end: 100,
+    },
+  ] : undefined
+
+
+  const options = {
+    title: {},
+    icon: 'rect',
+    legend: {
+      show: true,
+      zlevel: 10,
+      itemGap: 100,
+    },
+    color: ['#F12B3E', '#FE929C', '#647CE1', '#A2B9FF', '#FF844F', '#FFBB9D'],
+    tooltip: {
+      trigger: 'axis',
+    },
+    xAxis: { type: 'category' },
+    yAxis: {},
+    dataZoom,
+    series: Object.keys(seriesMaker).map(x => ({
+        type: 'line',
+        smooth: true,
+        name: x,
+        data: seriesMaker[x],
+      })),
+  }
+  function handleBuildingChange(e) {
+    const date = formatDate(props.startDate, props.endDate)
+    getUserBehaviorSummary({
+      ...date,
+      activity: props.activity,
+      event: props.event,
+      eventType: props.eventType,
+      buildingId: e,
+    })
+    setBuildingId(e)
+  }
+
+  function showDetails(row) {
+    setVisibleData({ visible: true, row })
+  }
+
+  function onSuccess() {
+    setVisibleData({ visible: false, row: {} })
+  }
+
+
+  const style = {
+    width: '100%',
+    height: '400px',
+
+  }
+
+  const columns = [
+    {
+      title: '访问事件',
+      dataIndex: 'eventName',
+      key: 'eventName',
+      align: 'center',
+      width: '16%',
+
+    },
+    {
+      title: '访问用户',
+      dataIndex: 'userName',
+      key: 'userName',
+      align: 'center',
+      width: '15%',
+
+    },
+    {
+      title: '访问次数',
+      dataIndex: 'accessCount',
+      key: 'accessCount',
+      align: 'center',
+      width: '17%',
+
+      render: (x, row) => (
+        <>
+          <span style={{ color: '#EF273A', cursor: 'pointer' }} onClick={() => showDetails(row)}> {row.accessCount}</span>
+        </>
+      ),
+    },
+    {
+      title: '首次访问时间',
+      dataIndex: 'visitTime',
+      key: 'visitTime',
+      align: 'center',
+      width: '18%',
+      render: (x, row) => (
+        <>
+          <span>{ row.visitTime && moment(row.visitTime).format('YYYY-MM-DD hh:mm:ss') }</span>
+        </>
+      ),
+    },
+    {
+      title: '离开时间',
+      dataIndex: 'leaveTime',
+      key: 'leaveTime',
+      width: '18%',
+      align: 'center',
+      render: (x, row) => (
+        <>
+          <span>{ row.leaveTime && moment(row.leaveTime).format('YYYY-MM-DD hh:mm:ss') }</span>
+        </>
+      ),
+    },
+  ]
+
+
+  return (
+    <>
+      <div>
+        <p onClick={() => router.push('/statistical/userBehavior')} style={{cursor: 'pointer'}}>
+          <span style={{ borderBottom: '1px solid #f02d40', color: '#333', fontSize: '0.12rem', fontWeight: '600' }}>用户行为</span>
+          {!props.BuildSelectHide && <span style={{ fontSize: '0.09rem', color: '#888', marginLeft: '0.06rem' }}>最近七天</span>}
+        </p>
+        <div style={{ float: 'right', marginTop: '-40px', marginBottom: '20px' }}>
+          {!props.BuildSelectHide && <BuildSelect slot="action" onChange={(e => handleBuildingChange(e))} value={buildingId}></BuildSelect>}
+        </div>
+        <EChart options={options} style={style} />
+        {props.tableShow &&
+          <Table rowKey="UserBehaviorTwo" dataSource={recordList} columns={columns} pagination={false} rowKey="userbehavior" scroll={{ y: 500 }} />
+        }
+      </div>
+      <EventcoModal visibleData={visibleData} onSuccess={() => onSuccess()} />
+    </>
+  )
+}
+
+export default UserBehavior

src/pages/statistical/Monitor/components/indexEcharts/components/UserBehaviorIndex.jsx

@@ -0,0 +1,291 @@
+import React, { Component, useState, useEffect } from 'react';
+import EChart from '@/components/EchartsTest/EChart';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+import moment from 'moment';
+import router from 'umi/router';
+import 'echarts/lib/component/dataZoom'
+import { Table, Select, Row, Col, Menu, Dropdown, Button, Icon, message, Modal } from 'antd';
+import BuildSelect from '@/components/SelectButton/BuildSelect'
+
+const { Option } = Select;
+
+
+const eventcolumns = [
+  {
+    title: '编号',
+    dataIndex: 'recordId',
+    key: 'recordId',
+    align: 'center',
+    width: '16%',
+  },
+  {
+    title: '访问时间',
+    dataIndex: 'visitTime',
+    key: 'visitTime',
+    align: 'center',
+    width: '18%',
+    render: (x, row) => (
+      <>
+        <span>{moment(row.visitTime).format('YYYY-MM-DD hh:mm:ss')}</span>
+      </>
+    ),
+  },
+  {
+    title: '离开时间',
+    dataIndex: 'leaveTime',
+    key: 'leaveTime',
+    align: 'center',
+    width: '18%',
+    render: (x, row) => (
+      <>
+        <span>{row.leaveTime && moment(row.leaveTime).format('YYYY-MM-DD hh:mm:ss')}</span>
+      </>
+    ),
+  },
+]
+
+
+class EventcoModal extends React.Component {
+  constructor(props) {
+    super(props)
+    this.state = {
+      eventList: [],
+      visibleData: { visible: false, row: {} },
+    }
+  }
+
+  componentDidUpdate(prevProps) {
+    if (this.props.visibleData.visible !== prevProps.visibleData.visible) {
+      // eslint-disable-next-line react/no-did-update-set-state
+      this.setState({ visibleData: this.props.visibleData }, () => {
+        this.showDetails(this.props.visibleData.row)
+      })
+    }
+  }
+
+  showDetails = row => {
+    request({
+      ...apis.indexEcharts.userBehavior.profile,
+      params: { event: row.event, personId: row.personId },
+    }).then(data => {
+      this.setState({ eventList: data })
+    })
+  }
+
+  handleOk = e => {
+    this.props.onSuccess()
+  };
+
+  handleCancel = e => {
+    this.props.onSuccess()
+  };
+
+  render() {
+    return (
+      <>
+        <Modal
+          title="访问详情"
+          visible={this.state.visibleData.visible}
+          onOk={() => this.handleOk()}
+          onCancel={() => this.handleCancel()}
+          footer={null}
+        >
+          <Table rowKey="UserBehavior" dataSource={this.state.eventList} columns={eventcolumns} pagination={false} rowKey="eventall" scroll={{ y: 400 }} />
+        </Modal>
+      </>
+    )
+  }
+}
+
+
+const formatDate = (start, end) => {
+  const startDate = `${moment(start).format('YYYY-MM-DDT00:00:00.000')}Z`
+  const endDate = `${moment(end).format('YYYY-MM-DDT23:59:59.999')}Z`
+  return { startDate, endDate }
+}
+const UserBehaviorIndex = props => {
+  const [data, setData] = useState({ records: [] })
+  const [visibleData, setVisibleData] = useState({ visible: false, row: {} })
+  const [buildingId, setBuildingId] = useState('')
+
+  // 柱图
+  useEffect(() => {
+    const date = formatDate(props.startDate, props.endDate)
+    getUserBehaviorSummary({
+      ...date,
+      activity: props.activity,
+      event: props.event,
+      eventType: props.eventType,
+      buildingId: props.buildingId,
+    })
+    // getUserBehaviorProfile(formatDate(props.startDate, props.endDate))
+  }, [props.startDate, props.endDate, props.activity, props.event, props.eventType, props.buildingId])
+
+  const [recordList, setList] = useState([])
+  function getUserBehaviorSummary(params) {
+    request({
+      ...apis.indexEcharts.userBehavior.tsUserBehavior,
+      params,
+    }).then(data => {
+      setData(data || {})
+      // setList((data.data.records || []).filter(e => e.activity !== '客户'))
+    })
+  }
+
+
+  const seriesMaker = (data.selectUserBehavior || []).filter(e => e.activity !== '客户' && e.activity !== '首页').reduce((series, item) => {
+    let { date, activityCount, activity } = item
+    date = moment(date).format('YYYY-MM-DD')
+    if (!activityCount) activityCount = 0
+
+    // 使用对象, 可以去重
+    series[`${activity}`] = (series[`${activity}`] || []).concat([[date, activityCount]])
+
+    return series;
+  }, {})
+
+
+  const dataZoom = props.dataZoom ? [
+    {
+      type: 'inside',
+      start: 0,
+      end: 100,
+    },
+    {
+      type: 'slider',
+      start: 0,
+      end: 100,
+    },
+  ] : undefined
+
+
+  const options = {
+    title: {},
+    icon: 'rect',
+    legend: {
+      show: true,
+      zlevel: 10,
+      itemGap: 100,
+    },
+    color: ['#F12B3E', '#FE929C', '#647CE1', '#A2B9FF', '#FF844F', '#FFBB9D'],
+    tooltip: {
+      trigger: 'axis',
+    },
+    xAxis: { type: 'category' },
+    yAxis: {},
+    dataZoom,
+    series: Object.keys(seriesMaker).map(x => ({
+      type: 'line',
+      smooth: true,
+      name: x,
+      data: seriesMaker[x],
+    })),
+  }
+  function handleBuildingChange(e) {
+    const date = formatDate(props.startDate, props.endDate)
+    getUserBehaviorSummary({
+      ...date,
+      activity: props.activity,
+      event: props.event,
+      eventType: props.eventType,
+      buildingId: e,
+    })
+    setBuildingId(e)
+  }
+
+  function showDetails(row) {
+    setVisibleData({ visible: true, row })
+  }
+
+  function onSuccess() {
+    setVisibleData({ visible: false, row: {} })
+  }
+
+
+  const style = {
+    width: '100%',
+    height: '400px',
+
+  }
+
+  const columns = [
+    {
+      title: '访问事件',
+      dataIndex: 'eventName',
+      key: 'eventName',
+      align: 'center',
+      width: '16%',
+
+    },
+    {
+      title: '访问用户',
+      dataIndex: 'userName',
+      key: 'userName',
+      align: 'center',
+      width: '15%',
+
+    },
+    {
+      title: '访问次数',
+      dataIndex: 'accessCount',
+      key: 'accessCount',
+      align: 'center',
+      width: '17%',
+
+      render: (x, row) => (
+        <>
+          <span style={{ color: '#EF273A', cursor: 'pointer' }} onClick={() => showDetails(row)}> {row.accessCount}</span>
+        </>
+      ),
+    },
+    {
+      title: '首次访问时间',
+      dataIndex: 'visitTime',
+      key: 'visitTime',
+      align: 'center',
+      width: '18%',
+      render: (x, row) => (
+        <>
+          <span>{row.visitTime && moment(row.visitTime).format('YYYY-MM-DD hh:mm:ss')}</span>
+        </>
+      ),
+    },
+    {
+      title: '离开时间',
+      dataIndex: 'leaveTime',
+      key: 'leaveTime',
+      width: '18%',
+      align: 'center',
+      render: (x, row) => (
+        <>
+          <span>{row.leaveTime && moment(row.leaveTime).format('YYYY-MM-DD hh:mm:ss')}</span>
+        </>
+      ),
+    },
+  ]
+
+
+  return (
+    <>
+      <div>
+        {/* <p onClick={() => router.push('/statistical/userBehavior')} style={{cursor: 'pointer'}}> */}
+        <div style={{marginBottom:'40px'}}>
+          <span style={{ borderBottom: '1px solid #f02d40', color: '#333', fontSize: '0.12rem', fontWeight: '600' }}>用户行为</span>
+          {!props.BuildSelectHide && <span style={{ fontSize: '0.09rem', color: '#888', marginLeft: '0.06rem' }}>最近七天</span>}
+          {/* </p> */}
+          <div style={{ float: 'right' }}>
+            {!props.BuildSelectHide && <BuildSelect slot="action" onChange={(e => handleBuildingChange(e))} value={buildingId}></BuildSelect>}
+          </div>
+        </div>
+        <EChart options={options} style={style} />
+        {false &&
+          <Table rowKey="UserBehaviorTwo" dataSource={recordList} columns={columns} pagination={false} rowKey="userbehavior" scroll={{ y: 500 }} />
+        }
+      </div>
+      <EventcoModal visibleData={visibleData} onSuccess={() => onSuccess()} />
+    </>
+  )
+}
+
+export default UserBehaviorIndex

src/pages/statistical/Monitor/components/indexEcharts/components/UserConversion.jsx

@@ -0,0 +1,139 @@
+import React, { Component, useState, useEffect } from 'react';
+import echarts from 'echarts/lib/echarts';
+import EChart from '@/components/EchartsTest/EChart';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+import moment from 'moment';
+import router from 'umi/router';
+import { Table, Select, Row, Col, Menu, Dropdown, Button, Icon, message } from 'antd';
+
+// import styles from '../styles.less'
+
+
+const UserSource = props => {
+
+  const [theCurrent, setTheCurrent] = useState({ records: [] })
+  const [conversionRate, setConversionRate] = useState(0)
+  useEffect(() => {
+    UserConversionRate({ conversion: 'authorization_phone' })
+  }, [])
+
+  function UserConversionRate(params) {
+
+    request({
+      ...apis.indexEcharts.userConversion,
+      params,
+    }).then(data => {
+      console.log(data.data_count.registeredCount / data.data_count.pvNum, '1241234')
+      setDataset(data, params.conversion)
+    })
+  }
+
+  function setDataset(data, theStatis) {
+    const { pvNum, ...other } = data.data_count
+
+    // 获取第一个值
+    let num = 0
+    for (const v of Object.keys(other)) {
+      num = other[v]
+      break
+    }
+
+    if (pvNum < num) {
+      setTheCurrent([
+        { name: getStatisName(theStatis), value: '0' },
+        { name: '其余', value:  '0' },
+      ])
+    } else {
+
+      setConversionRate(num / pvNum)
+      setTheCurrent([
+        { name: getStatisName(theStatis), value: num },
+        { name: '其余', value: pvNum - num },
+      ])
+    }
+  }
+
+  function getStatisName(theStatis) {
+    const statisTypes = [
+      { label: '授权手机', value: 'authorization_phone' },
+      { label: '项目收藏', value: 'building_save' },
+      { label: '项目转发', value: 'building_share' },
+      { label: '活动收藏', value: 'activity_save' },
+      { label: '活动转发', value: 'activity_share' },
+      { label: '资讯收藏', value: 'news_save' },
+      { label: '资讯转发', value: 'news_share' },
+      { label: '活动报名', value: 'activity_sign' },
+
+    ]
+    return statisTypes.filter(x => x.value === theStatis)[0].label
+  }
+
+  const options = {
+    legend: {},
+    color: ['#FF7E48', '#dcdcdc'],
+    tooltip: {},
+    series: {
+      type: 'pie',
+      name: '转化率',
+      radius: ['34%', '52%'],
+      avoidLabelOverlap: false,
+      label: {
+        formatter: '{b} {@value}',
+        emphasis: {
+          show: true,
+          formatter: '{d}%',
+          textStyle: {
+            fontSize: '22',
+            fontWeight: 'bold'
+          }
+        }
+      },
+      labelLine: {
+        normal: {
+          show: false
+        }
+      },
+
+      data: theCurrent,
+    },
+  }
+
+  function onChange(e) {
+    UserConversionRate({ conversion: e })
+  }
+  const piestyles = {
+    width: '100%',
+    height: '400px',
+  }
+
+  return (
+    <>
+      <div>
+        <p style={{ fontSize: '0.12rem', fontWeight: '600' }}>转化率</p>
+
+        <Select
+          style={{ width: 200 }}
+          placeholder="授权手机"
+          onChange={onChange}
+        >
+          <Select.Option value="authorization_phone">授权手机</Select.Option>
+          <Select.Option value="building_save">项目收藏</Select.Option>
+          <Select.Option value="building_share">项目转发</Select.Option>
+          <Select.Option value="activity_save">活动收藏</Select.Option>
+          <Select.Option value="activity_share">活动转发</Select.Option>
+          <Select.Option value="news_save">资讯收藏</Select.Option>
+          <Select.Option value="news_share">资讯转发</Select.Option>
+          <Select.Option value="activity_sign">活动报名</Select.Option>
+        </Select>
+        <EChart options={options} style={piestyles} />
+
+
+      </div>
+
+
+    </>
+  )
+}
+
+export default UserSource

src/pages/statistical/Monitor/components/indexEcharts/components/UserSex.jsx

@@ -0,0 +1,92 @@
+import React, { Component, useState, useEffect } from 'react';
+import echarts from 'echarts/lib/echarts';
+import EChart from '@/components/EchartsTest/EChart';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+import moment from 'moment';
+import router from 'umi/router';
+import { Table, Select, Row, Col, Menu, Dropdown, Button, Icon, message } from 'antd';
+
+// import styles from '../styles.less'
+
+const formatDate = (start, end) => {
+  const startDate = moment(start).format('YYYY-MM-DDT00:00:00.000') + 'Z'
+  const endDate = moment(end).format('YYYY-MM-DDT23:59:59.999') + 'Z'
+  return { startDate, endDate }
+}
+
+const UserSource = (props) => {
+
+  const [data, setData] = useState({ records: [] })
+  const endDate = new Date()
+  const startDate = moment().subtract(7, 'day').toDate()
+
+  useEffect(() => {
+    UserSex(formatDate(startDate, endDate))
+  }, [])
+
+  function UserSex(params) {
+    request({
+      ...apis.indexEcharts.userSex,
+      params,
+    }).then((data) => {
+      setData(data)
+    })
+  }
+
+  const dataset = (data.selectSexUser) || []
+
+  const options = {
+    title: {
+      text: '性别比例'
+    },
+    legend: {},
+    color: ['#FF7E48', '#dcdcdc'],
+    tooltip: {
+      trigger: 'item',
+      formatter: "{b}: ({d}%)"
+    },
+    series: {
+      type: 'pie',
+      name: '性别比例',
+      center: ['44%', '65%'],
+      radius: ['34%', '52%'],
+      label: {
+        formatter: '{b} {@value}',
+      },
+      data:
+        dataset,
+    }
+  }
+
+
+  const piestyles = {
+    width: '100%',
+    height: '400px',
+    minWidth: '350px'
+
+  }
+
+
+  return (
+    <>
+      <div>
+        {/* <h3>性别比例</h3> */}
+
+
+        <EChart options={options} style={piestyles} />
+
+
+
+
+      </div>
+
+
+
+
+
+    </>
+  )
+}
+
+export default UserSource;

src/pages/statistical/Monitor/components/indexEcharts/components/UserSource.jsx

@@ -0,0 +1,123 @@
+import React, { Component, useState, useEffect } from 'react';
+import echarts from 'echarts/lib/echarts';
+import EChart from '@/components/EchartsTest/EChart';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+import moment from 'moment';
+import router from 'umi/router';
+
+
+const formatDate = (start, end) => {
+  const startDate = moment(start).format('YYYY-MM-DDT00:00:00.000') + 'Z'
+  const endDate = moment(end).format('YYYY-MM-DDT23:59:59.999') + 'Z'
+  return { startDate, endDate }
+}
+
+const UserSource = (props) => {
+  const [xData, setxData] = useState([])
+  const [fromData, setFromData] = useState([])
+  const [registerData, setRegisterData] = useState([])
+  //柱图
+  useEffect(() => {
+    userResource(formatDate(props.startDate, props.endDate))
+  }, [props.startDate, props.endDate])
+
+  function userResource(params) {
+    request({
+      ...apis.indexEcharts.selectPersonFrom,
+      params,
+    }).then((data) => {
+      console.log(data,"222222")
+      setxData(data.tdWxDicts.map(x =>  x.sceneAlias))
+      setFromData(data.tdWxDicts.map(x => x.fromData))
+      setRegisterData(data.tdWxDicts.map(x => x.registerSum))
+      props.onSuccess(data)
+    })
+  }
+
+  const subtitle = '最近7天';
+  const baroptions = {
+    title: { },
+    xAxis: { 
+              type: 'category',
+              data: xData,
+              axisLabel: {rotate: 45}
+            },
+    legend: {
+      left: '20%',
+      data: ['所有用户', '注册用户']
+    },
+
+    tooltip: {},
+
+    yAxis: {},
+    series: [
+      {
+        type: 'bar', name: '所有用户', datasetIndex: 0,
+        barWidth: 20,
+        data: fromData,
+        itemStyle: {
+          normal: {
+            barBorderRadius: [20, 20, 0, 0],
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+              offset: 0,
+              color: '#FFC4A8'
+            }, {
+              offset: 1,
+              color: '#FF7E49'
+            }]),
+            shadowColor: 'rgba(0, 0, 0, 0.4)',
+
+          }
+        }
+      },
+      {
+        type: 'bar',
+        name: '注册用户',
+        barWidth: 20,
+        data: registerData,
+        itemStyle: {
+          normal: {
+            barBorderRadius: [20, 20, 0, 0],
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [{
+              offset: 0,
+              color: '#FE939D'
+            }, {
+              offset: 1,
+              color: '#F0293C'
+            }]),
+            shadowColor: 'rgba(0, 0, 0, 0.4)',
+
+          }
+        }
+
+      },
+    ],
+    // dataset: {
+    //   id: 'bar',
+    //   dimensions: ['fromName', 'userCount', 'registered'],
+    //   source: source,
+    // },
+  }
+
+
+  const barstyle = {
+    width: '100%',
+    height: '480px',
+    minWidth: '400px'
+  }
+
+  return (
+    <>
+      <div>
+      <p onClick={()=>router.push('/statistical/userSource')}><span style={{borderBottom:'1px solid #f02d40',cursor: 'pointer',color:'#333',fontSize:'0.12rem',fontWeight:'600'}}>用户来源</span> {!props.BuildSelectHide && <span style={{ fontSize: '0.09rem', color: '#888', marginLeft: '0.06rem' }}>最近七天</span>}</p>
+
+        <EChart options={baroptions} style={barstyle} />
+
+      </div>
+
+    </>
+  )
+}
+
+export default UserSource;

src/pages/statistical/Monitor/components/indexEcharts/components/UserSourceDetail.jsx

@@ -0,0 +1,139 @@
+import React, { Component, useState, useEffect } from 'react';
+import echarts from 'echarts/lib/echarts';
+import EChart from '../../../components/EchartsTest/EChart';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import moment from 'moment';
+import router from 'umi/router';
+import { Table, Select, Row, Col, Menu, Dropdown, Button, Icon, message } from 'antd';
+
+import styles from '../styles.less'
+
+const formatDate = (start, end) => {
+  const startDate = moment(start).format('YYYY-MM-DDT00:00:00.000') + 'Z'
+  const endDate = moment(end).format('YYYY-MM-DDT23:59:59.999') + 'Z'
+  return { startDate, endDate }
+}
+
+const UserSourceDetail = (props) => {
+  const [xData, setxData] = useState([])
+  const [fromData, setFromData] = useState([])
+  const [registerData, setRegisterData] = useState([])
+  //柱图
+  useEffect(() => {
+    userResource(formatDate(props.startDate, props.endDate))
+  }, [props.startDate, props.endDate])
+
+  function userResource(params) {
+    request({
+      ...apis.indexEcharts.selectPersonFromGroupByDay,
+      params,
+    }).then((data) => {
+      setxData(data.map(x =>  x.createTime))
+      setFromData(data.map(x => x.fromNum))
+      setRegisterData(data.map(x => x.registeredNum))
+      props.onSuccess(data)
+    })
+  }
+
+  const subtitle = '最近7天';
+  const baroptions = {
+    title: {
+    },
+    tooltip: {
+        trigger: 'axis'
+    },
+    legend: {
+        data: ['新用户数', '授权注册']
+    },
+    toolbox: {
+        show: true,
+        feature: {
+            dataZoom: {
+                yAxisIndex: 'none'
+            },
+            dataView: {readOnly: false},
+            magicType: {type: ['line', 'bar']},
+            restore: {},
+            saveAsImage: {}
+        }
+    },
+    xAxis: {
+        type: 'category',
+        boundaryGap: false,
+        data: xData
+    },
+    yAxis: {
+        type: 'value',
+        axisLabel: {
+            formatter: '{value} °C'
+        }
+    },
+    series: [
+        {
+            name: '新用户数',
+            type: 'line',
+            data: fromData,
+            markPoint: {
+                data: [
+                    {type: 'max', name: '最大值'},
+                    {type: 'min', name: '最小值'}
+                ]
+            },
+            markLine: {
+                data: [
+                    {type: 'average', name: '平均值'}
+                ]
+            }
+        },
+        {
+            name: '授权注册',
+            type: 'line',
+            data: registerData,
+            markPoint: {
+                data: [
+                    {name: '周最低', value: -2, xAxis: 1, yAxis: -1.5}
+                ]
+            },
+            markLine: {
+                data: [
+                    {type: 'average', name: '平均值'},
+                    [{
+                        symbol: 'none',
+                        x: '90%',
+                        yAxis: 'max'
+                    }, {
+                        symbol: 'circle',
+                        label: {
+                            position: 'start',
+                            formatter: '最大值'
+                        },
+                        type: 'max',
+                        name: '最高点'
+                    }]
+                ]
+            }
+        }
+    ]
+}
+
+  const barstyle = {
+    width: '100%',
+    height: '480px',
+    minWidth: '400px'
+  }
+
+  return (
+    <>
+      <div>
+      <p onClick={()=>router.push('/statistical/userSource')}><span style={{borderBottom:'1px solid #f02d40',cursor: 'pointer',color:'#333',fontSize:'0.12rem',fontWeight:'600'}}>用户来源</span> {!props.BuildSelectHide && <span style={{ fontSize: '0.09rem', color: '#888', marginLeft: '0.06rem' }}>最近七天</span>}</p>
+
+        <EChart options={baroptions} style={barstyle} />
+
+      </div>
+
+    </>
+  )
+}
+
+export default UserSourceDetail;

src/pages/statistical/Monitor/components/indexEcharts/components/UserSourcepie.jsx

@@ -0,0 +1,103 @@
+import React, { Component, useState, useEffect } from 'react';
+import echarts from 'echarts/lib/echarts';
+import EChart from '@/components/EchartsTest/EChart';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+import moment from 'moment';
+import router from 'umi/router';
+import { Table, Select, Row, Col, Menu, Dropdown, Button, Icon, message } from 'antd';
+
+const formatDate = (start, end) => {
+  const startDate = moment(start).format('YYYY-MM-DDT00:00:00.000') + 'Z'
+  const endDate = moment(end).format('YYYY-MM-DDT23:59:59.999') + 'Z'
+  return { startDate, endDate }
+}
+const UserSource = (props) => {
+  const [data, setData] = useState({ records: [] })
+
+
+  useEffect(() => {
+    userResource(formatDate(props.startDate, props.endDate))
+  }, [props.startDate, props.endDate])
+
+  function userResource(params) {
+    request({
+      ...apis.indexEcharts.userResource,
+      params,
+    }).then((data) => {
+      setData(data)
+    })
+  }
+
+  function toEdit() {
+    router.push({
+      pathname: '/statistical/userSource',
+    });
+  }
+
+  const dataset = data || {};
+
+
+  const { person_estate_agent = 0, person_null = 0, person_realty_consultant = 0 } = dataset.pie || {};
+  const pieoptions = {
+    color: ['#6B82E6', '#F02D40', '#FF834E'],
+    legend: {
+      orient: 'vertical',
+      x: 'left',
+      data: ['来源置业', '来源客户', '其他'],
+    },
+    tooltip: {
+      // trigger: 'item',
+      // formatter: "{a} <br/>{b} : {c} ({d}%)"
+    },
+    series: [
+      {
+        name: '用户来源',
+        type: 'pie',
+        center: ['50%', '65%'],
+        radius: ['25%', '40%'],
+        label: {
+          formatter: '{b} {@value}',
+          emphasis: {
+            show: true,
+            formatter: '{d}%',
+            textStyle: {
+              fontSize: '22',
+              fontWeight: 'bold'
+            }
+          },
+        },
+      },
+
+    ],
+
+    dataset: {
+      id: 'pie',
+      source: [
+        { '用户来源': '来源置业', value: person_realty_consultant, },
+        { '用户来源': '来源客户', value: person_estate_agent },
+        { '用户来源': '其他', value: person_null },
+      ]
+    },
+  }
+
+
+  const piestyles = {
+    width: '100%',
+    height: '400px',
+    minWidth: '350px',
+  }
+
+  return (
+    <>
+      <div>
+
+        <EChart options={pieoptions} style={piestyles} />
+
+      </div>
+
+    </>
+  )
+}
+
+export default UserSource;

src/pages/statistical/Monitor/components/indexEcharts/components/charts/CityNums.jsx

@@ -0,0 +1,138 @@
+import React, { useState, useEffect } from 'react';
+import Echart from '@/components/EchartsTest/EChart';
+import { fetch, apis } from '@/utils/request';
+
+const geoOptions = {
+  backgroundColor: '#fff',
+  title: {
+    text: '城市分布',
+    subtext: '数据会存在一定时间延迟',
+    left: 40,
+    top: 40
+  },
+  tooltip : {
+      trigger: 'item',
+      formatter: (params) => {
+        return `${params.data.name}: ${params.data.value[2]}`
+      }
+  },
+  geo: {
+      map: 'china',
+      roam: true,
+      zoom: 1.2,
+      label: {
+        normal: {
+          show: true,
+          color: '#aaa',
+        },
+        emphasis: {
+          show: true
+        }
+      },
+      itemStyle: {
+          normal: {
+              areaColor: '#f3f3f3',
+              borderColor: '#ddd'
+          },
+          emphasis: {
+              areaColor: '#eee'
+          }
+      }
+  },
+}
+
+const getCityData = fetch(apis.indexEcharts.personCity)
+
+const mapDataRange = x => {
+  // 映射区间 [1, 100000] => [rangeStart, rangeEnd]
+  const min = 1
+  const max = 100000
+  const rangeStart = 16
+  const rangeEnd = 24
+
+  return rangeStart + (x - min) * (rangeEnd - rangeStart) / (max - min)
+}
+
+const CityNums = (props) => {
+  const [data, setData]= useState([])
+
+  useEffect(() => {
+    getCityData().then(response => {
+      const { selectCityUser = [] } = response || {}
+      const data = selectCityUser.map((item) => {
+        return {
+          name: item.name,
+          value: [item.lng - 0, item.lat - 0, item.cityCount]
+        }
+      })
+      setData(data)
+    })
+  }, [])
+
+  const options = {
+    ...geoOptions,
+    series: [
+      {
+        name: '人数',
+        type: 'scatter',
+        coordinateSystem: 'geo',
+        data,
+        symbolSize: 10,
+        label: {
+            normal: {
+                formatter: '{b}',
+                position: 'right',
+                show: false
+            },
+            emphasis: {
+                show: true
+            }
+        },
+        itemStyle: {
+            normal: {
+                color: '#DB3C4B'
+            }
+        }
+      },
+      {
+          name: '前三',
+          type: 'effectScatter',
+          coordinateSystem: 'geo',
+          data: data.sort(function (a, b) {
+              return b.value[2] - a.value[2];
+          }).slice(0, 3),
+          symbolSize: function (val) {
+              return mapDataRange(val[2]);
+          },
+          showEffectOn: 'render',
+          rippleEffect: {
+              brushType: 'stroke'
+          },
+          hoverAnimation: true,
+          label: {
+              normal: {
+                  formatter: '{b}',
+                  position: 'right',
+                  show: false
+              }
+          },
+          itemStyle: {
+              normal: {
+                  color: '#DB3C4B',
+                  shadowBlur: 10,
+                  shadowColor: '#333'
+              }
+          },
+          zlevel: 1
+      }
+    ],
+  }
+
+  return (
+    <div style={{ marginBottom:'40px', width: '100%', borderRadius: '12px', boxShadow: '0px 0px 9px 1px rgba(0,0,0,0.12)', overflow: 'hidden' }}>
+      <Echart options={options} style={{ width: '100%', height: '600px' }} ></Echart>
+    </div>
+  )
+}
+
+export default CityNums;

src/pages/statistical/Monitor/components/indexEcharts/index.jsx

@@ -0,0 +1,98 @@
+import React, { useState, useEffect } from 'react';
+import { Card } from 'antd';
+import UserSource from './components/UserSource.jsx';
+import UserSourcepie from './components/UserSourcepie.jsx';
+import UserBehaviorIndex from './components/UserBehaviorIndex.jsx';
+import UserActive from './components/UserActive';
+import UserSex from './components/UserSex';
+import NewUsers from './components/NewUsers';
+import UserConversion from './components/UserConversion';
+import IntentionalCustomers from './components/IntentionalCustomers';
+import styles from './styles.less';
+import moment from 'moment';
+import CityNums from './components/charts/CityNums';
+const indexEcharts = props => {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [checkData, setCheckData] = useState([]);
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    setCheckData(props.checkData);
+  }, [props.checkData]);
+
+  const endDate = new Date();
+
+  const startDate = moment()
+    .subtract(7, 'day')
+    .toDate();
+
+  function onTabledatas(e) {}
+
+  return (
+    <>
+      <div style={{ display: 'flex', width: '100%' }}>
+        {checkData.includes('user_source') && (
+          <div className={styles.bar}>
+            <UserSource
+              endDate={endDate}
+              startDate={startDate}
+              onSuccess={e => onTabledatas(e)}
+            ></UserSource>
+          </div>
+        )}
+        {checkData.includes('user_source') && (
+          <div className={styles.pie}>
+            <UserSourcepie endDate={endDate} startDate={startDate}></UserSourcepie>
+          </div>
+        )}
+      </div>
+      {checkData.includes('urban_distribution') && (
+        <div>
+          <CityNums></CityNums>
+        </div>
+      )}
+      {checkData.includes('user_behavior') && (
+        <div className={styles.behavior}>
+          <UserBehaviorIndex
+            tableShow={false}
+            endDate={endDate}
+            startDate={startDate}
+            dataZoom={false}
+          ></UserBehaviorIndex>
+        </div>
+      )}
+      <div style={{ display: 'flex' }}>
+        {checkData.includes('active_users') && (
+          <div className={styles.bar}>
+            <UserActive></UserActive>
+          </div>
+        )}
+        {checkData.includes('sex_ratio') && (
+          <div className={styles.pie}>
+            <UserSex></UserSex>{' '}
+          </div>
+        )}
+      </div>
+      <div style={{ display: 'flex' }}>
+        {checkData.includes('number_of_new_users') && (
+          <div className={styles.bar}>
+            <NewUsers endDate={endDate} startDate={startDate} dataZoom={false}></NewUsers>
+          </div>
+        )}
+        {checkData.includes('conversion_rate') && (
+          <div className={styles.pie}>
+            <UserConversion></UserConversion>{' '}
+          </div>
+        )}
+      </div>
+
+      {checkData.includes('intentional_user') && (
+        <div className={styles.customers}>
+          <IntentionalCustomers></IntentionalCustomers>
+        </div>
+      )}
+    </>
+  );
+};
+
+export default indexEcharts;

src/pages/statistical/Monitor/components/indexEcharts/newUsers.jsx

@@ -0,0 +1,191 @@
+import React, { Component, useState, useEffect } from 'react';
+import { Radio, DatePicker, Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, Breadcrumb } from 'antd';
+import { Row, Col, Menu, Dropdown } from 'antd';
+import NewUsers from './components/NewUsers'
+// import XForm, { FieldTypes } from '../../components/XForm';
+import moment from 'moment';
+import router from 'umi/router';
+import EChart from '../../components/EchartsTest/EChart';
+import request from '../../utils/request';
+import apis from '../../services/apis';
+
+
+// const formatDate = (start, end) => {
+//   const startDate = moment(start).format('YYYY-MM-DDT00:00:00.000') + 'Z'
+//   const endDate = moment(end).format('YYYY-MM-DDT23:59:59.999') + 'Z'
+//   return { startDate, endDate }
+// }
+
+let columns = [
+  {
+    title: '日期',
+    dataIndex: 'createTime',
+    key: 'createTime',
+  },
+]
+
+let daterange = []
+
+const header = props => {
+
+  const [tableData, setTableData] = useState([])
+  const [endDate, setEndDate] = useState({})
+  const [data, setDate] = useState({})
+  const [userType, setUserType] = useState({})
+  const [startDate, setStartDate] = useState({})
+
+
+  useEffect(() => {
+
+    setEndDate(new Date())
+    setStartDate(moment().subtract(7, 'day').toDate())
+    // setStartDate(moment().subtract(7, 'day').toDate())
+    userResource({ startDate: moment().subtract(7, 'day').toDate(), endDate: new Date() })
+  }, [])
+
+  const { RangePicker } = DatePicker;
+
+  function onChangetime(dates, dateStrings) {
+
+    daterange[1] = `${moment(dateStrings[1]).format('YYYY-MM-DDT00:00:00.000')}Z`
+    daterange[0] = `${moment(dateStrings[0]).format('YYYY-MM-DDT00:00:00.000')}Z`
+
+  }
+
+  const handleSubmit = (e, props) => {
+
+    e.preventDefault();
+
+  }
+
+  const getDataOf = (days) => () => {
+
+
+    setEndDate(new Date())
+    setStartDate(moment().subtract(days, 'day').toDate())
+    userResource({ startDate: moment().subtract(days, 'day').toDate(), endDate: new Date() })
+  }
+
+  function onChange(e) {
+
+
+  }
+
+  function datalist() {
+    setEndDate(daterange[1])
+    setStartDate(daterange[0])
+    userResource({ startDate, endDate })
+
+  }
+
+  function userResource(params) {
+    request({
+      ...apis.indexEcharts.selectPersonFrom,
+      params,
+    }).then((data) => {
+      setDate(data);
+      onTabledatas(data, "all")
+    })
+  }
+
+  const onTabledatas = (e, changeType) => {
+    e.tdWxDicts.map(x => {
+      columns = columns.filter(y => y.key != x.sceneType).concat({
+        title: x.sceneAlias,
+        dataIndex: x.sceneType,
+        key: x.sceneType,
+      })
+    })
+    const data = (e.list || []).reduce((acc, item) => {
+      const { sceneType, fromNum, registeredNum, createTime } = item
+      const num = changeType === 'registered' ? registeredNum : fromNum
+      acc[createTime] = { ...acc[createTime], ...item, [`${sceneType}`]: !num ? 0 : num }
+      return acc
+    }, {})
+
+    const dictData = e.tdWxDicts.reduce((acc, item, index) => {
+      const { sceneType } = item
+      acc[sceneType] = 0
+      return acc
+    }, {})
+
+    const tableData = Object.keys(data).map(k => data[k]).reduce((acc, item, index) => {
+      acc[index] = { ...dictData, ...item }
+      return acc
+    }, [])
+
+    setTableData(tableData)
+
+  }
+
+  function handleSelectChange(e) {
+    setUserType(e)
+    onTabledatas(data, e)
+  }
+
+  function exportUserStats() {
+    console.log(startDate, endDate, userType)
+    request({
+      ...apis.indexEcharts.exportUserStats,
+      params: { startDate, endDate, userType },
+    }).then((data) => {
+      if (!data) {
+        return
+      }
+      const url = window.URL.createObjectURL(new Blob([data]))
+      const link = document.createElement('a')
+      link.style.display = 'none'
+      link.href = url
+      link.setAttribute('download', '新增用户.xlsx')
+      document.body.append(link)
+      link.click()
+    })
+  }
+
+  const { Column, ColumnGroup } = Table;
+
+  return (<>
+    <div >
+      <Radio.Group onChange={onChange} buttonStyle="solid" defaultValue="a" style={{ marginBottom: '20px' }}>
+        {/* <Radio.Button value="c" onClick={getDataOf(0)}>今日</Radio.Button> */}
+        <Radio.Button value="a" onClick={getDataOf(7)}>最近7天</Radio.Button>
+        <Radio.Button value="b" onClick={getDataOf(30)}>最近1月</Radio.Button>
+      </Radio.Group>
+      <RangePicker
+        style={{ paddingLeft: '30px' }}
+        ranges={{
+          Today: [moment(), moment()],
+          'This Month': [moment().startOf('month'), moment().endOf('month')],
+        }}
+        // showTime
+        // format="YYYY/MM/DD HH:mm:ss"
+        onChange={onChangetime}
+      />
+      <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }} onClick={datalist}>
+        搜索
+          </Button>
+      <Button onClick={() => router.go(-1)} style={{ float: 'right' }}>返回</Button>
+      <div>
+        <NewUsers BuildSelectHide={true} endDate={endDate} startDate={startDate} dataZoom={true} ></NewUsers>
+        {/* */}
+
+        <Row>
+          <Col span={22}>
+            <Select style={{ width: '180px' }} placeholder="所有用户" onChange={(e) => handleSelectChange(e)}>
+              <Option value='all'>所有用户</Option>
+              <Option value='registered'>注册用户</Option>
+            </Select>
+          </Col>
+          <Col span={2}>
+            <Button type="primary" onClick={exportUserStats}>导出</Button>
+          </Col>
+        </Row>
+
+        <Table style={{ marginTop: '20px' }} dataSource={tableData} columns={columns} pagination={false} scroll={{ y: 500 }}></Table>
+      </div>
+    </div>
+  </>
+  )
+}
+
+export default header

src/pages/statistical/Monitor/components/indexEcharts/styles.less

@@ -0,0 +1,37 @@
+.bar {
+  width: 70%;
+  min-width: 400px;
+  min-height: 560px;
+  background: rgba(255, 255, 255, 1);
+  box-shadow: 0px 0px 16px 2px rgba(0, 0, 0, 0.12);
+  border-radius: 12px;
+  margin-right: 30px;
+}
+
+.pie {
+  width: 30%;
+  min-width: 370px;
+  background: rgba(255, 255, 255, 1);
+  box-shadow: 0px 0px 16px 2px rgba(0, 0, 0, 0.12);
+  border-radius: 12px;
+
+}
+
+.behavior {
+  width: 100%;
+  height: 586px;
+  background: rgba(255, 255, 255, 1);
+  box-shadow: 0px 0px 16px 2px rgba(0, 0, 0, 0.12);
+  border-radius: 12px;
+  margin-bottom: 40px;
+  padding: 40px;
+}
+
+.customers {
+  width: 100%;
+  height: 718px;
+  background: rgba(255, 255, 255, 1);
+  box-shadow: 0px 0px 16px 2px rgba(0, 0, 0, 0.12);
+  border-radius: 12px 12px 0px 0px;
+  padding: 40px;
+}

src/pages/statistical/Monitor/components/indexEcharts/userBehavior.jsx

@@ -0,0 +1,237 @@
+import React, { Component, useState, useEffect } from 'react';
+import { Radio, DatePicker, Form, Input, Button, Icon, Select, message, Table, Row, Col, Menu, Dropdown } from 'antd';
+
+import moment from 'moment';
+import UserBehavior from './components/UserBehavior'
+import EChart from '../../components/EchartsTest/EChart';
+import request from '../../utils/request';
+import apis from '../../services/apis';
+import BuildSelect from '../../components/SelectButton/BuildSelect'
+import { func } from 'prop-types';
+import router from 'umi/router';
+
+
+// const formatDate = (start, end) => {
+//   const startDate = moment(start).format('YYYY-MM-DDT00:00:00.000') + 'Z'
+//   const endDate = moment(end).format('YYYY-MM-DDT23:59:59.999') + 'Z'
+//   return { startDate, endDate }
+// }
+const { Option } = Select;
+
+const header = props => {
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [tableData, setTableData] = useState({ records: [] })
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [endDate, setEndDate] = useState({})
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [startDate, setStartDate] = useState({})
+  const daterange = []
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    window.scrollTo(0, 0)
+    setEndDate(new Date())
+    setStartDate(moment().subtract(7, 'day').toDate())
+    getBizEventType()
+    getBizEventList()
+    getProperties()
+    props.form.setFieldsValue({ radioGroup: 'a' })
+  }, [])
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [eventypes, setEventTypes] = useState([])
+  function getBizEventType(row) {
+    request({
+      ...apis.indexEcharts.bizEvent.dict,
+    }).then(data => {
+      const eventType = ['agent', 'main']
+      setEventTypes(data.records.filter(item => !eventType.includes(item.typeId)))
+    })
+  }
+  const [eventList, setEventList] = useState([])
+  function getBizEventList(row) {
+    request({
+      ...apis.indexEcharts.bizEvent.list,
+    }).then(data => {
+      setEventList(data.records)
+    })
+  }
+  const [properties, setProperties] = useState([])
+  function getProperties(row) {
+    request({
+      ...apis.indexEcharts.bizEvent.properties,
+    }).then(data => {
+      setProperties(data.records)
+    })
+  }
+
+  const { RangePicker } = DatePicker;
+
+
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        const { rangePicker } = values
+        console.log('Received values of form: ', values.rangePicker);
+        setEndDate(rangePicker[1])
+        setStartDate(rangePicker[0])
+      }
+    });
+  }
+
+  const getDataOf = days => () => {
+    setEndDate(new Date())
+    setStartDate(moment().subtract(days, 'day').toDate())
+  }
+
+
+  function redata(e) {
+    console.log('行为回调数据：', e)
+  }
+  const [eventType, setEventType] = useState('')
+  function handleChangeType(value) {
+    setEventType(value)
+  }
+  const [event, setEvent] = useState('')
+  function handleChangeEvent(value) {
+    setEvent(value)
+  }
+  const [activity, setActivity] = useState('')
+  function handleChangeProperty(value) {
+    setActivity(value)
+  }
+
+  const [buildingId, setBuildingId] = useState('')
+  function handleBuildingChange(value) {
+    setBuildingId(value)
+  }
+
+  // 重置
+  function resetQuery() {
+    props.form.resetFields()
+    props.form.setFieldsValue({ radioGroup: 'a' })
+  }
+
+  const columns = [
+    {
+      title: '访问事件',
+      dataIndex: 'personName',
+      key: 'personName',
+      width: '20%',
+    },
+    {
+      title: '访问用户',
+      dataIndex: 'phone',
+      key: 'phone',
+      width: '20%',
+    },
+    {
+      title: '访问次数',
+      dataIndex: 'buildingName',
+      key: 'buildingName',
+      width: '20%',
+    },
+    {
+      title: '首次访问时间',
+      dataIndex: 'intention',
+      key: 'intention',
+      width: '20%',
+    },
+    {
+      title: '离开时间',
+      dataIndex: 'stion',
+      key: 'stion',
+
+    },
+  ];
+
+  const dataSource = []
+
+  const { getFieldDecorator, getFieldsError, getFieldError, isFieldTouched } = props.form;
+  return (
+    <>
+      <div>
+        <div>
+          <Form layout="inline" onSubmit={handleSubmit}>
+            <Form.Item>
+              {getFieldDecorator('radioGroup')(
+                <Radio.Group buttonStyle="solid">
+                  <Radio.Button value="a" onClick={getDataOf(7)}>最近7天</Radio.Button>
+                  <Radio.Button value="b" onClick={getDataOf(30)}>最近1月</Radio.Button>
+                </Radio.Group>,
+              )}
+            </Form.Item>
+            <Form.Item>
+              {getFieldDecorator('rangePicker')(
+                <RangePicker
+                  style={{ paddingLeft: '30px', width: '400px' }}
+                  ranges={{
+                    Today: [moment(), moment()],
+                    'This Month': [moment().startOf('month'), moment().endOf('month')],
+                  }}
+                  // defaultValue={[moment(new Date(new Date().setDate((new Date().getDate() - 6))), 'YYYY-MM-DD HH:MM:SS'), moment(new Date(), 'YYYY-MM-DD HH:MM:SS')]}
+                  showTime
+                />,
+              )}
+            </Form.Item>
+
+            <Button type="primary" htmlType="submit" style={{ marginLeft: '30px', float: 'right' }}>
+              搜索
+            </Button>
+            <Button style={{ marginLeft: '30px', float: 'right' }} onClick={resetQuery}>
+              重置
+            </Button>
+
+            <Button style={{ float: 'right' }} onClick={() => router.go(-1)}>返回</Button>
+
+            <div style={{ display: 'flex', margin: '24px 0' }}>
+              <Form.Item>
+                {getFieldDecorator('buildingId')(
+                  <BuildSelect style={{ width: '14%', minWidth: '160px' }} slot="action" onChange={(e => handleBuildingChange(e))}></BuildSelect>,
+                )}
+              </Form.Item>
+              <Form.Item>
+                {getFieldDecorator('handleType')(
+                  <Select style={{ width: '14%', minWidth: '160px', marginLeft: '2%' }} placeholder="所有事件组" onChange={handleChangeType}>
+                    {eventypes.map(type => (
+                      <Option key={type.typeId}>{type.typeName}</Option>
+                    ))}
+                  </Select>,
+                )}
+              </Form.Item>
+              <Form.Item>
+                {getFieldDecorator('handleEvent')(
+                  <Select style={{ width: '14%', minWidth: '200px', marginLeft: '2%' }} placeholder="请选择事件" onChange={handleChangeEvent}>
+                    {eventList.map(event => (
+                      <Option key={event.eventId}>{event.eventName}</Option>
+                    ))}
+                  </Select>,
+                )}
+              </Form.Item>
+              <Form.Item>
+                {getFieldDecorator('handleProperty')(
+                  <Select style={{ width: '14%', minWidth: '160px', marginLeft: '2%' }} placeholder="请选择属性" onChange={handleChangeProperty}>
+                    {properties.map(property => (
+                      <Option key={property.propertyId}>{property.propertyName}</Option>
+                    ))}
+                  </Select>,
+                )}
+              </Form.Item>
+            </div>
+          </Form>
+        </div>
+
+        <div style={{ margin: '24px 0' }}>
+          <UserBehavior tableShow BuildSelectHide buildingId={buildingId} endDate={endDate} startDate={startDate} eventType={eventType} activity={activity} event={event} dataZoom onReData={e => redata(e)}></UserBehavior>
+        </div>
+
+        {/* <Table dataSource={dataSource} columns={columns} pagination={false} scroll={{ y: 500 }} /> */}
+      </div>
+    </>
+  )
+}
+
+const WrappedHorizontalLoginForm = Form.create({ name: 'header' })(header);
+export default WrappedHorizontalLoginForm

src/pages/statistical/Monitor/components/indexEcharts/userSource.jsx

@@ -0,0 +1,207 @@
+import React, { Component, useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Modal, Descriptions } from 'antd';
+import UserSource from './components/UserSource.jsx';
+import UserSourcepie from './components/UserSourcepie.jsx';
+// import XForm, { FieldTypes } from '../../components/XForm';
+import moment from 'moment';
+import EChart from '../../components/EchartsTest/EChart';
+import request from '../../utils/request';
+import apis from '../../services/apis';
+import router from 'umi/router';
+
+
+const { RangePicker } = DatePicker;
+const { Option } = Select
+
+
+// const formatDate = (start, end) => {
+//   const startDate = moment(start).format('YYYY-MM-DDT00:00:00.000') + 'Z'
+//   const endDate = moment(end).format('YYYY-MM-DDT23:59:59.999') + 'Z'
+//   return { startDate, endDate }
+// }
+
+let daterange = []
+let tableTitle = ['类型']
+
+let columns = [
+  {
+    title: '日期',
+    dataIndex: 'createTime',
+    key: 'createTime',
+  },
+  // {
+  //   title: '名片分享',
+  //   dataIndex: '名片分享',
+  //   key: '名片分享',
+  // },
+  // {
+  //   title: '生成海报',
+  //   dataIndex: '生成海报',
+  //   key: '生成海报',
+  // },
+  // {
+  //   title: '小程序搜索',
+  //   dataIndex: '小程序搜索',
+  //   key: '小程序搜索',
+  // },
+  // {
+  //   title: '好友分享',
+  //   dataIndex: '好友分享',
+  //   key: '好友分享',
+  // },
+]
+
+// let columns = [
+//   {
+//     title: '类型',
+//     dataIndex: 'value',
+//     key: 'value',
+//   }
+// ]
+
+class Header extends React.Component {
+
+  constructor(props) {
+    super(props)
+    this.state = {
+      dataSoures: [],
+      tableData: [],
+      userType: 'all',
+      endDate: {},
+      startDate: {}
+    }
+  }
+
+  componentDidMount() {
+    this.setState({ endDate: new Date(), startDate: moment().subtract(7, 'day').toDate() })
+  }
+
+  formatDate = (start, end) => {
+    const tempStartDate = `${moment(start).format('YYYY-MM-DDT00:00:00.000')}Z`
+    const tempEndDate = `${moment(end).format('YYYY-MM-DDT23:59:59.999')}Z`
+    return { startDate: tempStartDate, endDate: tempEndDate }
+  }
+
+  onChangetime = (_dates, dateStrings) => {
+    daterange[1] = dateStrings[1]
+    daterange[0] = dateStrings[0]
+  }
+
+  handleSubmit = (e, props) => {
+
+    e.preventDefault();
+
+  }
+
+  getDataOf = (days) => {
+    this.setState({ endDate: new Date(), startDate: moment().subtract(days, 'day').toDate() })
+  }
+
+  datalist = () => {
+    console.log()
+    this.setState({
+      endDate: daterange[1] === '' ? new Date() : daterange[1],
+      startDate: daterange[0] === '' ? moment().subtract(7, 'day').toDate() : daterange[0],
+    })
+  }
+
+  onSuccess = e => {
+    this.setState({ dataSoures: e }, () => {
+      this.onTabledatas(e)
+    })
+  }
+
+  onTabledatas = (e) => {
+    console.log('this.state.userType: ', this.state.userType)
+    e.tdWxDicts.map(x => {
+      columns = columns.filter(y => y.key != x.sceneType).concat({
+        title: x.sceneAlias,
+        dataIndex: x.sceneType,
+        key: x.sceneType,
+      })
+    })
+    const data = (e.list || []).reduce((acc, item) => {
+      const { sceneType, fromNum, registeredNum, createTime } = item
+      const num = this.state.userType === 'registered' ? registeredNum : fromNum
+      acc[createTime] = { ...acc[createTime], ...item, [`${sceneType}`]: !num ? 0 : num }
+      return acc
+    }, {})
+
+    const dictData = e.tdWxDicts.reduce((acc, item, index) => {
+      const { sceneType } = item
+      acc[sceneType] = 0
+      return acc
+    }, {})
+
+    const tableData = Object.keys(data).map(k => data[k]).reduce((acc, item, index) => {
+      acc[index] = { ...dictData, ...item }
+      return acc
+    }, [])
+
+    this.setState({ tableData })
+
+  }
+
+  handleSelectChange = (e) => {
+    this.setState({ userType: e }, () => {
+      this.onTabledatas(this.state.dataSoures)
+    })
+  }
+
+
+  render() {
+    return (
+      <>
+        <div>
+          <Radio.Group buttonStyle="solid" defaultValue="a">
+            <Radio.Button value="a" onClick={() => this.getDataOf(7)}>最近7天</Radio.Button>
+            <Radio.Button value="b" onClick={() => this.getDataOf(30)}>最近1月</Radio.Button>
+          </Radio.Group>
+          <RangePicker
+            style={{ paddingLeft: '30px' }}
+            ranges={{
+              Today: [moment(), moment()],
+              'This Month': [moment().startOf('month'), moment().endOf('month')],
+            }}
+            // showTime
+            // format="YYYY/MM/DD HH:mm:ss"
+            onChange={(_dates, dateStrings) => this.onChangetime(_dates, dateStrings)}
+          />
+          <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }} onClick={() => this.datalist()}>
+            搜索
+        </Button>
+          <Button onClick={() => router.go(-1)} style={{ float: 'right' }}>返回</Button>
+          <div>
+
+            <div style={{ display: 'flex' }}>
+              <div style={{
+                width: '1060px',
+                height: '560px',
+                paddingTop: '40px',
+                marginRight: ' 40px',
+              }}>
+                <UserSource BuildSelectHide={true} endDate={this.state.endDate} startDate={this.state.startDate} onSuccess={(e) => this.onSuccess(e)}></UserSource>
+              </div>
+              <div style={{
+                width: '509px',
+                height: '600px',
+                paddingTop: '40px',
+
+              }}>
+                <UserSourcepie endDate={this.state.endDate} startDate={this.state.startDate}></UserSourcepie>
+              </div>
+            </div>
+            <Select style={{ width: '180px' }} placeholder="所有用户" onChange={(e) => this.handleSelectChange(e)}>
+              <Option value='all'>所有用户</Option>
+              <Option value='registered'>注册用户</Option>
+            </Select>
+
+            <Table style={{ marginTop: '20px' }} dataSource={this.state.tableData} columns={columns} pagination={false} scroll={{ y: 500 }}></Table>
+          </div>
+        </div>
+      </>
+    )
+  }
+}
+
+export default Header

src/pages/statistical/Monitor/index.jsx

@@ -0,0 +1,88 @@
+import React, { Component, useState, useEffect } from 'react';
+import { Card } from 'antd';
+import IndexEcharts from './components/indexEcharts';
+// import Swiper from './swiper/index';
+import router from 'umi/router';
+import request from '@/utils/request';
+import apis from '@/services/apis';
+
+const Monitor = props => {
+
+  const [data, setData] = useState([])
+
+  const [checkData, setCheckData] = useState([])
+
+  useEffect(() => {
+    getIndexEcharts()
+    getBuildingReports()
+  }, [])
+
+  function getIndexEcharts(params) {
+    request({
+      ...apis.indexEcharts.list,
+      params
+    }).then((data) => {
+      setData(data)
+      console.log(data, '11111')
+    })
+  }
+
+  function getBuildingReports() {
+    request({ ...apis.system.taBuildingReports, }).then((data) => {
+      console.log(data,"22222222222222222")
+      setCheckData((data.records || []).map((x) => x.reportCode))
+    })
+  }
+
+  return (
+    <Card>
+      <div style={{ display: 'flex', marginBottom: '33px' }}>
+        {checkData.includes('total_number_of_users') &&
+          <div style={{
+            textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(241,43,62,1) 0%,rgba(254,144,155,1) 100%)', height: '100px',
+            boxShadow: '0px  0.106rem 14px -15px rgba(241,43,62,1)',
+            borderRadius: '12px', width: '32%', marginRight: '2%'
+          }}>
+            <span style={{ fontSize: '24px', color: '#fff' }}>总用户 </span>
+            <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{data.selectUserCount || '0'}</span>
+          </div>
+        }
+        {checkData.includes('total_number_of_registered_users') &&
+          <div style={{
+            textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(255,126,74,1) 0%,rgba(255,196,168,1) 100%)', height: '100px',
+            boxShadow: '0px  0.106rem 14px -15px rgba(255,126,74,1)',
+            borderRadius: '12px', width: '32%', marginRight: '2%'
+          }}>
+            <span style={{ fontSize: '24px', color: '#fff' }}>总注册用户 </span>
+            <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{data.selectRegisteredCount || '0'}</span>
+          </div>
+        }
+        {checkData.includes('total_number_of_visit_users') &&
+          <div style={{
+            textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(255,126,74,1) 0%,rgba(255,196,168,1) 100%)', height: '100px',
+            boxShadow: '0px  0.106rem 14px -15px rgba(255,126,74,1)',
+            borderRadius: '12px', width: '32%', marginRight: '2%'
+          }}>
+            <span style={{ fontSize: '24px', color: '#fff' }}>今日访问次数 </span>
+            <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy' }}>{data.selectVisitCount || '0'}</span>
+          </div>
+        }
+        {checkData.includes('number_of_new_users') &&
+          <div onClick={() => router.push('/statistical/newUsers')} style={{
+            textAlign: 'center', display: 'flex', justifyContent: 'center', background: 'linear-gradient(137deg,rgba(107,130,230,1) 0%,rgba(152,175,251,1) 100%)', height: '100px',
+            boxShadow: '0px  0.106rem 14px -15px rgba(107,130,230,1)',
+            borderRadius: '12px', width: '32%',
+          }}>
+            <span style={{ fontSize: '24px', color: '#fff', borderBottom: '1px solid #fff', margin: '30px 0', cursor: 'pointer' }}>今日新增用户 </span>
+            <span style={{ fontSize: '52px', color: '#fff', marginLeft: '26px', fontFamily: 'fantasy', lineHeight: '100px' }}>{data.selectRecentlyCount || '0'}</span>
+          </div>
+        }
+      </div>
+      {/* <Swiper /> */}
+      <IndexEcharts style={{ width: '100%' }} onReData={(e) => redata(e)} checkData={checkData}></IndexEcharts>
+    </Card>
+  )
+
+}
+export default Monitor
+

src/pages/system/Sellhouse/Edit.jsx

@@ -1,21 +1,171 @@
-import React, {  } from 'react';
-// import { PageHeaderWrapper } from '@ant-design/pro-layout'
-import { Card, Tabs } from 'antd';
-import Basic from './compents/Basic'
+import React, { useState, useEffect } from 'react';
+import { Card, message } from 'antd';
+import router from 'umi/router';
+import SelectCity from '@/components/SelectButton/CitySelect';
+import XForm, { FieldTypes } from '@/components/XForm';
+import Wangedit from '@/components/Wangedit/Wangedit';
+import apis from '@/services/apis';
+import request from '@/utils/request';
+import SelectPolicyType from '@/components/SelectButton/SelectPolicyType';
 
-const { TabPane } = Tabs;
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const Edit = props => {
+  const policyId = props.location.query.policyId;
+  const [policyData, setPolicyData] = useState({});
+  if (policyId) {
+    useEffect(() => {
+      getPolicyData(policyId);
+    }, []);
+
+    // 查询列表
+    const getPolicyData = policyId => {
+      request({ ...apis.system.taPolicy, urlData: { id: policyId } }).then(data => {
+        console.log(data);
+        setPolicyData(data);
+      });
+    };
+  }
+
+  const cancelPage = () => {
+    router.go('-1');
+  };
+  const fields = [
+    {
+      label: '城市',
+      name: 'cityId',
+      render: <SelectCity />,
+      value: policyData.cityId,
+      rules: [
+        {
+          required: true,
+          message: '请选择城市',
+        },
+      ],
+    },
+    {
+      label: '类型',
+      name: 'policyTypeId',
+      render: <SelectPolicyType />,
+      value: policyData.policyTypeId,
+      rules: [
+        {
+          required: true,
+          message: '请选类型',
+        },
+      ],
+    },
+    {
+      label: '购房须知封面图',
+      name: 'policyImg',
+      type: FieldTypes.ImageUploader,
+      value: policyData.policyImg,
+      help: '建议图片尺寸：220*176px，比例5:4,格式：jpg，用于购房须知列表',
+      rules: [
+        {
+          required: true,
+          message: '请选择购房须知封面图',
+        },
+      ],
+    },
+    {
+      label: '购房须知标题',
+      name: 'title',
+      type: FieldTypes.Text,
+      value: policyData.title,
+      rules: [
+        {
+          required: true,
+          message: '请输入购房须知标题',
+        },
+      ],
+    },
+    {
+      label: '副标题',
+      name: 'subtitle',
+      type: FieldTypes.Text,
+      value: policyData.subtitle,
+      rules: [
+        {
+          required: true,
+          message: '请输入副标题',
+        },
+        {
+          max: 8,
+          message: '最大可输入8个字符',
+        },
+      ],
+    },
+    {
+      label: '是否热点',
+      name: 'isHot',
+      type: FieldTypes.Switch,
+      value: policyData.isHot === 1 ? true : false,
+    },
+    {
+      label: '购房须知详情',
+      name: 'body',
+      render: <Wangedit />,
+      value: policyData.body,
+      rules: [
+        {
+          required: true,
+          message: '请输入购房须知详情',
+        },
+      ],
+    },
+
+    {
+      label: '状态',
+      name: 'publishStatus',
+      type: FieldTypes.Select,
+      dict: [
+        { label: '未发布', value: 0 },
+        { label: '已发布', value: 1 },
+      ],
+      value: policyData.publishStatus != null ? policyData.publishStatus : 1,
+    },
+  ];
+
+  const handleSubmit = val => {
+    console.log('submit data --->', val);
+    console.log(val.body, 'val.body');
+    if (val.body == '<p><br></p>') {
+      message.info('购房须知详情必填');
+      return;
+    }
+    val.isHot = val.isHot ? 1 : 0;
+    if (policyId) {
+      val.policyId = policyId;
+      request({ ...apis.system.updateTaPolicy, urlData: { id: policyId }, data: val })
+        .then(data => {
+          message.info('保存成功');
+          cancelPage();
+        })
+        .catch(err => {
+          message.info(err.msg || err.message);
+        });
+    } else {
+      request({ ...apis.system.addTaPolicy, data: val })
+        .then(data => {
+          message.info('保存成功');
+          cancelPage();
+        })
+        .catch(err => {
+          message.info(err.msg || err.message);
+        });
+    }
+  };
 
-export default props => {
-    const newsId = props.location.query.newsId
   return (
     <Card>
-      <Tabs defaultActiveKey="1">
-        <TabPane tab="基本信息" key="1">
-          {/* <div style={{ maxWidth: 1000 }}> */}
-            <Basic newsId={newsId} />
-          {/* </div> */}
-        </TabPane>
-      </Tabs>
+      <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
     </Card>
   );
 };
+
+export default Edit;

src/pages/system/Sellhouse/compents/Basic.jsx

@@ -1,148 +0,0 @@
-import React, { useEffect, useState } from 'react';
-
-import { message} from 'antd';
-import apis from '@/services/apis';
-import router from 'umi/router';
-import XForm, { FieldTypes } from '@/components/XForm';
-import Wangedit from '@/components/Wangedit/Wangedit';
-import request from '@/utils/request';
-import searchFields from '@/pages/building/Developers/searchFields';
-import QueryTable from '@/components/QueryTable'
-import BuildSelect from '@/components/SelectButton/BuildSelectHouse';
-
-
-
-const Basic = props => {
-  const { newsId } = props;
-  const [dynamicData, setDynamicData] = useState({});
-  const [changeBuildingId, setChangeBuildingIdData] = useState('');
-  const [newsDetailType, setNewsDetailType] = useState(1);
-
-  useEffect(() => {
-    if (newsId) {
-      getDynamicData(newsId);
-    }
-  }, [newsId]);
-
-  // 查询详情
-  const getDynamicData = newsId => {
-    request({ ...apis.news.get, urlData: { id: newsId } })
-      .then(data => {
-        setDynamicData(data);
-        console.log(data, 'sss');
-        setNewsDetailType(Number(data.newsDetailType));
-      })
-      .catch(err => {
-        console.log(err);
-        message.info(err.msg || err.message);
-      });
-  };
-
-  const handleBuildingChange = e => {
-    console.log(e);
-    setChangeBuildingIdData(e);
-  };
-
-
-  const fields = [
-
-
-    // {
-    //   label: '城市',
-    //   name: 'building',
-    //   option:[
-    //     {label:'南京',value:'1'},
-    //     {label:'北京',value:'2'},
-    //   ]
-    // },
-    {
-      label: '意向项目',
-      name: 'buildingId',
-      render: <BuildSelect  />,
-      // onChange={e => handleBuildingChange(e)}
-      // value: dynamicData.buildingId,
-      rules: [{ required: true, message: '请选择所属项目' }],
-    },
-    {
-      label: '类型',
-      name: 'typesId',
-      value: dynamicData.buildingId,
-      option:[
-        {label:'买房准备',value:'1'},
-        {label:'看房选房',value:'2'},
-        {label:'认筹签约',value:'3'},
-      ]
-    },
-    {
-      label: '购房百科封面图',
-      name: 'newsImg',
-      type: FieldTypes.ImageUploader,
-      value: dynamicData.newsImg,
-      help: '建议尺寸：220px*176px，比例5:4，格式：jpg，用于：购房百科列表',
-      rules: [{ required: true, message: '请选择购房百科封面图' }],
-    },
-    {
-      label: '政策标题',
-      name: 'newsName',
-      type: FieldTypes.Text,
-      value: dynamicData.newsName,
-      rules: [{ required: true, message: '请输入政策标题' }],
-    },
-
-    {
-      label: '政策详情',
-      name: 'newsDetail',
-      render: <Wangedit />,
-      hidden: newsDetailType == 0,
-      value: dynamicData.newsDetail,
-      rules: [{ required: true, message: '请输入政策详情' }],
-    },
-      {
-      label: '状态',
-      name: 'newsTypeId',
-      option:[
-        {label:'已发布',value:'1'},
-        {label:'未发布',value:'2'},
-      ]
-    },
-  ];
-
-  // const handleSubmit = val => {
-  //   console.log(dynamicData, '12312345');
-  //   let { ...submitValue } = val;
-
-  //   if (newsId) {
-  //     submitValue.newsId = newsId;
-  //     request({ ...apis.news.put, urlData: { id: newsId }, data: { ...submitValue } })
-  //       .then(data => {
-  //         // cancelPage();
-  //         message.info('保存成功');
-  //         console.log(data, 'data1');
-  //       })
-  //       .catch(err => {
-  //         message.info(err.msg || err.message);
-  //       });
-  //   } else {
-  //     request({ ...apis.news.post, data: { ...submitValue } })
-  //       .then(data => {
-  //         // cancelPage();
-  //         message.info('保存成功');
-  //         router.go(-1);
-  //         console.log(data, 'data2');
-  //       })
-  //       .catch(err => {
-  //         message.info(err.msg || err.message);
-  //       });
-  //   }
-  // };
-
-  const cancelPage = () => {
-    router.go(-1);
-  };
-
-  return <XForm  onCancel={cancelPage} searchFields={searchFields} fields={fields}></XForm>;
-  // onSubmit={handleSubmit}
-  
-};
-
-export default Basic;

src/pages/system/Sellhouse/houseTypes/Newindex.jsx

@@ -8,30 +8,110 @@ import apis from '@/services/apis';
 
 const { TextArea } = Input;
 
-const Backcom=()=>{
-  window.history.back(-1)
-}
+const Backcom = () => {
+  router.go('-1');
+};
 const Poster = props => {
+  const { id } = props.location.query;
+  const [data,setData] = useState({})
+
+  const getData = () => {
+
+    request({
+      ...apis.system.getPolicyTypeDetail,
+      urlData: { id: id },
+    })
+      .then(data => {
+        setData(data)
+      })
+      .catch(err => {
+        message.info(err.msg || err.message);
+      });
+  };
+
+
+
+  useEffect(() => {
+    if (id) {
+      getData();
+    }
+  }, [id]);
+
+  const handleSubmit = val => {
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        if (id) {
+          request({
+            ...apis.system.upDatePolicyType,
+            urlData: { id: id },
+            data: values,
+          })
+            .then(data => {
+              message.info('保存成功');
+              router.go('-1');
+            })
+            .catch(err => {
+              message.info(err.msg || err.message);
+            });
+        } else {
+          request({ ...apis.system.addPolicyType, data: { ...values } })
+            .then(data => {
+              // cancelPage();
+              message.info('保存成功');
+              router.go('-1');
+            })
+            .catch(err => {
+              message.info(err.msg || err.message);
+            });
+        }
+      }
+    });
+
+    // console.log(val, '------');
+
+    // let { ...submitValue } = val;
+
+    // if (id) {
+    //   request({ ...apis.news.put, urlData: { id: newsId }, data: { ...submitValue } })
+    //     .then(data => {
+    //       router.go('-1');
+    //       message.info('保存成功');
+    //     })
+    //     .catch(err => {
+    //       message.info(err.msg || err.message);
+    //     });
+    // } else {
+    //   request({ ...apis.system.addPolicyType, data: { ...submitValue } })
+    //     .then(data => {
+    //       // cancelPage();
+    //       message.info('保存成功');
+    //       router.go('-1');
+    //     })
+    //     .catch(err => {
+    //       message.info(err.msg || err.message);
+    //     });
+    // }
+  };
+
   const { getFieldDecorator } = props.form;
-  
+
   return (
     <Card>
-      <div>
-        <Form >
-          <Form.Item label="类型名称">
-            {getFieldDecorator('roleName', {})(<Input  style={{width:'500px'}} />)}
-
-          </Form.Item>
-            <Button  type="primary" htmlType="submit">
-              保存
-          </Button>
-            <Button style={{marginLeft:'20px'}} onClick={Backcom} >
-              取消
-          </Button>
-        </Form>
-      </div>
+      <Form onSubmit={handleSubmit}>
+        <Form.Item label="类型名称">
+          {getFieldDecorator('policyTypeName', {
+            initialValue:data.policyTypeName,
+          })(<Input style={{ width: '500px' }} />)}
+        </Form.Item>
+        <Button type="primary" htmlType="submit">
+          保存
+        </Button>
+        <Button style={{ marginLeft: '20px' }} onClick={Backcom}>
+          取消
+        </Button>
+      </Form>
     </Card>
-  )
-}
+  );
+};
 const WrappedNormalLoginForm = Form.create({ name: 'Poster' })(Poster);
 export default connect(({ user }) => ({ user }))(WrappedNormalLoginForm);

src/pages/system/Sellhouse/houseTypes/index.jsx

@@ -1,33 +1,40 @@
-
-import React, { useState, useEffect } from 'react';
+import React, { useRef, useState, useEffect } from 'react';
 import { Button, message, Table, Modal, Card } from 'antd';
 import withActions from '@/components/ActionList';
 import EditIcon from '@/components/EditIcon';
 import router from 'umi/router';
-import request from '@/utils/request'
+import request from '@/utils/request';
 import apis from '@/services/apis';
 import AuthButton from '@/components/AuthButton';
-
+import TableList from '@/components/TableList';
 
 const header = props => {
-  function addRole(roleId) {
+  const ref = useRef();
+
+
+  function addHouseTypes(id) {
+    console.log()
     router.push({
       pathname: '/system/Sellhouse/houseTypes/Newindex',
+      query: {id:id},
     });
   }
-  function stop(ids, status) {
+  function onDelete(ids, status) {
     Modal.confirm({
-      title: "确认要删除此条内容吗",
+      title: '确认要删除此条内容吗',
       okText: '确认',
       cancelText: '取消',
       onOk() {
-        request({ ...apis.role.stop, urlData: { id: ids } }).then((data) => {
-          getRoleList({ pageNum: 1, pageSize: 100 })
-        }).catch((err) => {
-          console.log(err)
-          message.info(err.msg || err.message)
-        })
-      }
+        request({ ...apis.system.deletePolicyType, urlData: { id: ids } })
+          .then(data => {
+            ref.current.reload();
+            message.info('操作成功');
+          })
+          .catch(err => {
+            console.log(err);
+            message.info(err?.msg || err?.message);
+          });
+      },
     });
   }
 
@@ -42,10 +49,9 @@ const header = props => {
     // },
     {
       title: '类型名称',
-      dataIndex: 'roleName',
-      key: 'roleName',
+      dataIndex: 'policyTypeName',
+      key: 'policyTypeName',
       align: 'center',
-
     },
 
     {
@@ -54,33 +60,45 @@ const header = props => {
       key: 'status',
       align: 'center',
 
-      render: withActions((text, record) => {
-        return record.isAdmin ? [] :
-          [
-            record.status === 1 ?
-            <AuthButton name="admin.role.publish" noRight={null}>
-              <EditIcon type="delete" text="删除" onClick={() => stop(record.roleId, record.status)} />
-            </AuthButton> : null,
+      render: withActions((text, record) => [
+     
+          <AuthButton name="admin.role.publish" noRight={null}>
+            <EditIcon type="delete" text="删除" onClick={() => onDelete(record.policyTypeId)} />
+          </AuthButton>
+       ,
 
-            <AuthButton name="admin.role.put" noRight={null}>
-              <EditIcon text="编辑" type="edit" onClick={() => toEditRole(record.roleId)} />
-            </AuthButton>,
-          ]
-      }),
+        <AuthButton name="admin.role.put" noRight={null}>
+          <EditIcon text="编辑" type="edit" onClick={() => addHouseTypes(record.policyTypeId)} />
+        </AuthButton>,
+      ]),
     },
   ];
+  //   <AuthButton name="admin.tdBuildingType.delete" noRight={null}>
+  //   <EditIcon text="删除" type="delete" onClick={() => deleteType(record)} />
+  // </AuthButton>,
+  // <AuthButton name="admin.tdBuildingType.update" noRight={null}>
+  //   <EditIcon text="编辑" type="edit" onClick={() => toEdi(record.buildingTypeId)} />
+  // </AuthButton>,
 
+  const actionRender = () => {
+    return (
+      <AuthButton name="admin.taPolicy.post" noRight={null}>
+        <Button type="primary" style={{ margin: '20px 0' }} onClick={()=>addHouseTypes()}>
+          新增
+        </Button>
+      </AuthButton>
+    );
+  };
 
   return (
     <Card>
-      <AuthButton name="admin.role.add" noRight={null}>
-        <Button type="primary"  onClick={addRole}>新增</Button>
-      </AuthButton>
-      <div style={{marginTop:'20px'}}>
-        <Table rowKey="roleList"  columns={columns} />
-      </div>
+      <TableList
+        ref={ref}
+        api={apis.system.getPolicyTypeList}
+        columns={columns}
+        actionRender={actionRender}
+      />
     </Card>
-
-  )
-}
-export default header
+  );
+};
+export default header;

src/pages/system/Sellhouse/index.jsx

@@ -1,259 +1,230 @@
-import React, { useMemo, useRef, useCallback, useState } from 'react';
-// import { PageHeaderWrapper } from '@ant-design/pro-layout'
-import { Button, notification, Spin, Modal, message } from 'antd';
-import { router } from 'umi';
-import QueryTable from '@/components/QueryTable';
-import request from '@/utils/request';
-import apis from '@/services/apis';
-import SelectCity from '@/components/SelectButton/CitySelect';
-import NewsTypeSelect from '../../../components/SelectButton/NewTypeSelect';
-import BuildSelect from '@/components/SelectButton/BuildSelect';
+import React, { useState, useEffect } from 'react';
+import { Form, Button, message, Card, Table, Pagination, Modal } from 'antd';
+
+import router from 'umi/router';
 import moment from 'moment';
-import OperButton from '@/components/OperButton';
 import AuthButton from '@/components/AuthButton';
 import withActions from '@/components/ActionList';
-import { number } from 'echarts/lib/export';
+import EditIcon from '@/components/EditIcon';
+import Navigate from '@/components/Navigate';
+import SelectCity from '@/components/SelectButton/CitySelect';
+import apis from '@/services/apis';
+import request from '@/utils/request';
+// import styles from '../style/GoodsList.less';
 
-export default props => {
-  const ref = useRef();
-  const [loading, setLoading] = useState(false);
-  const [page, setPage] = useState({ current: 1, pageSize: 10 });
-  const onPublish = useCallback(row => {
-    const buidingStatus = row.status === 1 ? 2 : 1;
-    request({ ...apis.building.updateStatus, data: { id: row.buildingId, status: buidingStatus } })
-      .then(() => {
-        notification.success({ message: '操作成功' });
-        setLoading(false);
-        ref.current.reload();
-      })
-      .catch(err => {
-        console.error(err);
-        setLoading(false);
-      });
-  }, []);
+const header = (props) => {
+  const [data, setData] = useState({})
 
-  // 跳转到新增/编辑购房百科列表
-  const toEditList = newsId => {
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10, cityId: '' });
+  }, [])
+
+  // 查询列表
+  const getList = (params) => {
+    request({ ...apis.system.getTaPolicy, params: { ...params,...props.form.getFieldsValue() }, }).then((data) => {
+      console.log(data)
+      setData(data)
+    })
+  }
+
+  // 跳转到编辑商品
+  const toEditPolicy = (policyId) => () => {
     router.push({
       pathname: '/system/Sellhouse/Edit',
       query: {
-        newsId,
+        policyId
       },
     });
-  };
-
-  const onDelete = useCallback(row => {
-    setLoading(true);
-    request({ ...apis.building.deleteBuilding, urlData: { id: row.buildingId } })
-      .then(() => {
-        notification.success({ message: '操作成功' });
-        setLoading(false);
-        ref.current.reload();
-      })
-      .catch(err => {
-        console.error(err);
-        setLoading(false);
-      });
-  }, []);
-
-  //   置顶
-  const topNews = (weightParam, newsId) => {
-    const weight = Math.abs(weightParam - 1);
-    request({ ...apis.news.weight, params: { newsId: newsId, weight } })
-      .then(data => {
-        console.log(data);
-        message.info('操作成功！');
-        ref.current.reload();
-      })
-      .catch(err => {
-        console.log(err);
-        message.info(err.msg || err.message);
-      });
-  };
-
-  //发布
-  function cancelRelease(newsId, newsStatus, buildingId, newsTypeId) {
-    console.log('newsId' + newsId + 'status' + newsStatus);
-    if (newsStatus === 1) {
-      Modal.confirm({
-        title: '确认发布',
-        okText: '确认',
-        cancelText: '取消',
-        onOk() {
-          request({
-            ...apis.news.cancel,
-            data: { newsStatus: newsStatus, buildingId: buildingId, newsTypeId: newsTypeId },
-            urlData: { id: newsId },
-          })
-            .then(data => {
-              message.info('操作成功！');
-              ref.current.reload();
-            })
-            .catch(err => {
-              console.log(err);
-              message.info(err.msg || err.message);
-            });
-        },
-        onCancel() {
-          console.log('Cancel');
-        },
-      });
-    } else if (newsStatus === 0) {
-      Modal.confirm({
-        title: '确认发布该资讯？',
-        okText: '确认',
-        cancelText: '取消',
-        onOk() {
-          request({
-            ...apis.news.cancel,
-            data: { newsStatus: newsStatus, buildingId: buildingId, newsTypeId: newsTypeId },
-            urlData: { id: newsId },
-          })
-            .then(data => {
-              message.info('操作成功！');
-              ref.current.reload();
-            })
-            .catch(err => {
-              console.log(err);
-              message.info(err.msg || err.message);
-            });
-        },
-        onCancel() {
-          console.log('Cancel');
-        },
-      });
-    }
   }
 
-  const searchFields = [
+  /**
+   *
+   *
+   * @param {*} props
+   * @returns
+   */
+  const columns = [
     {
-      name:'cityId',
-      label:'城市',
-      placeholder:'请选择城市',
-      type:'select',
-      // defaultValue:1,
-      options:[
-      {label:'南京',value:'1'},
-      {label:'北京',value:'2'},
-      {label:'上海',value:'3'},
-      ]
-
+      title: '购房须知主图',
+      dataIndex: 'policyImg',
+      key: 'policyImg',
+      align: 'center',
+      render: (policyImg,row) =><Navigate onClick={toEditPolicy(row.policyId)} ><img src={policyImg} width={93}/></Navigate> ,
     },
-    // {
-    //   name: 'cityId',
-    //   label: '城市',
-    //   placeholder: '请选择城市',
-    //   render: () => <SelectCity style={{ width: 160 }} />,
-    // },
-  ];
-
-  const tableColumns = [
     {
-      title: '购房政策主图',
-      key: 'houseImg',
-      //newsImg
-      dataIndex: 'houseImg',
+      title: '标题',
+      dataIndex: 'title',
+      key: 'title',
       align: 'center',
-      // render: t => <img src={t} width={128} height={72} style={{ borderRadius: '4px' }} alt="" />,
+      render: (text, record) => <Navigate to={`/system/Sellhouse/Edit?policyId=${record.policyId}`}>{text}</Navigate>
     },
     {
-      title: '标题',
-      key: 'huoseName',
-      dataIndex: 'huoseName',
+      title: '副标题',
+      dataIndex: 'subtitle',
+      key: 'subtitle',
       align: 'center',
-      with: 300,
-      // ellipsis: true,
-      // render:(_,record)=><span>{record.houseName='高奢生活，在遇到它之前你想象不到'}</span>
     },
     {
       title: '城市',
-      key: 'houseType',
-      dataIndex: 'houseType',
+      dataIndex: 'cityName',
+      key: 'cityName',
+      align: 'center',
+    },
+    {
+      title: '类型',
+      dataIndex: 'policyTypeName',
+      key: 'policyTypeName',
       align: 'center',
-      // render: t => t.newsTypeName,
-      // render:(_,record)=><span>{record.houseType='南京'}</span>
-
     },
     {
       title: '创建时间',
       dataIndex: 'createDate',
       key: 'createDate',
       align: 'center',
-      render: t => moment(t).format('YYYY-MM-DD HH:mm'),
+      render: (createDate) => <><span>{moment(createDate).format('YYYY-MM-DD')}</span></>
+    },
+    {
+      title: '热点',
+      dataIndex: 'isHot',
+      key: 'isHot',
+      align: 'center',
+      render: (x) => <><span>{x === 1 ? '是' : '否'}</span></>
     },
     {
       title: '状态',
-      dataIndex: 'newsStatus',
-      key: 'newsStatus',
+      dataIndex: 'publishStatus',
+      key: 'publishStatus',
       align: 'center',
-      render: t => (t == 0 ? '已发布' : '未发布'),
+      render: (publishStatus) => <><span>{publishStatus === 1 ? '已发布' : '未发布'}</span></>
     },
-
+    
     {
       title: '操作',
-      key: 'options',
+      dataIndex: 'handle',
+      key: 'handle',
       align: 'center',
-      render: withActions(
-        (_, row) => [
-          <AuthButton name="admin.taNews.publish" noRight={null}>
-            <OperButton
-              onClick={() =>
-                cancelRelease(
-                  row.newsId,
-                  row.newsStatus === 0 ? 1 : 0,
-                  row.buildingId,
-                  row.newsType.newsTypeId,
-                )
-              }
-            >
-              {row.newsStatus === 0 ? '取消发布' : '发布'}
-            </OperButton>
-          </AuthButton>,
-          //   <AuthButton name="admin.taNews.top" noRight={null}>
-          //   <span style={{ position: 'absolute', right: '83px', top: '16px', fontSize: ' 0.106rem', zIndex: 1, color: '#FF7E48', cursor: 'pointer' }} onClick={topNews(data.weight, data.newsId)}>{data.weight === 1 ? '取消置顶' : '置顶'}</span>
-          // </AuthButton>
-          row.newsStatus === 0 && (
-            <AuthButton name="admin.taNews.top" noRight={null}>
-              <OperButton onClick={() => topNews(row.weight, row.newsId)}>
-                {row.weight === 1 ? '取消置顶' : '置顶'}
-              </OperButton>
-            </AuthButton>
-          ),
-
-          <AuthButton name="admin.taNews.id.put" noRight={null}>
-            <OperButton onClick={() => toEditList(row.newsId)}>编辑</OperButton>
-          </AuthButton>,
+      render: withActions((x, row) => [
+        <AuthButton name="admin.taPolicy.publish" noRight={null}>
+          <EditIcon type={row.publishStatus === 0 ? 'publish' : 'cancel'} text={row.publishStatus === 0 ? '发布' : '取消发布'} onClick={publicOrNoPublic(row)}></EditIcon>
+        </AuthButton>,
+        
+        <AuthButton name="admin.taPolicy.top" noRight={null}>
+          <EditIcon type={row.weight === 1 ? 'cancel' : 'top'} text={row.weight === 1 ? '取消置顶' : '置顶'} onClick={topPolicy(row)}></EditIcon>
+        </AuthButton>,
+        
+        <AuthButton name="admin.taPolicy.id.put" noRight={null}>
+          <EditIcon type="edit" text="编辑" onClick={toEditPolicy(row.policyId)}></EditIcon>
+        </AuthButton>,
 
-          <AuthButton name="admin.taNews.id.delete" noRight={null}>
-            <OperButton.Confirm
-              title="确认删除?"
-              content="删除之后不可恢复"
-              onClick={() => onDelete(row)}
-            >
-              删除
-            </OperButton.Confirm>
-          </AuthButton>,
-        ],
-        { noMargin: true },
-      ),
+        <AuthButton name="admin.taPolicy.id.delete" noRight={null}>
+          <EditIcon type="delete" text="删除" onClick={deletePolicy(row.policyId)}></EditIcon>
+        </AuthButton>,
+      ])
     },
   ];
-  const actionRender = () => {
-    return (
-      <Button type="primary" icon="plus" onClick={() => toEditList()}>
-        新增
-      </Button>
-    );
-  };
 
+  // 删除
+  const deletePolicy = (policyId) => () => {
+    Modal.confirm({
+      title: '购房政策会被删除，小程序端和后台都无法再看到',
+      okText: '确定',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.system.deleteTaPolicy, urlData: { id: policyId }, }).then((data) => {
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10, cityId: '' });
+        }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
+      },
+    });
+  }
+
+
+  //   置顶
+  const topPolicy = (row) => () => {
+    const weight = Math.abs(row.weight - 1)
+    row.weight = weight
+    request({ ...apis.system.updateTaPolicy, urlData: { id: row.policyId }, data: row, }).then((data) => {
+      console.log(data)
+      message.info('操作成功！')
+      getList({ pageNum: 1, pageSize: 10, cityId: '' });
+    }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
+    })
+  }
+
+  const publicOrNoPublic = (row) => () => {
+    if (row.publishStatus === 1) {
+      row.publishStatus = 0
+    } else {
+      row.publishStatus = 1
+    }
+    const title = row.publishStatus === 0 ? '购房政策会在小程序端隐藏，后台可继续编辑重新发布' : '确认发布此数据'
+    Modal.confirm({
+      title: title,
+      okText: '确定',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.system.updateTaPolicy, urlData: { id: row.policyId }, data: row, }).then((data) => {
+          console.log(data)
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10, cityId: '' });
+        }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+        })
+      },
+    });
+
+
+  }
+
+  const changePageNum = (pageNumber) => {
+    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+  }
+
+  // 提交事件
+  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 (
-    <QueryTable
-      ref={ref}
-      rowKey="newsId"
-      api={apis.news.getList}
-      searchFields={searchFields}
-      columns={tableColumns}
-      actionRender={actionRender}
-    />
-  );
-};
+
+    <Card>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('cityId')(
+            <SelectCity allowClear/>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <AuthButton name="admin.taPolicy.search" noRight={null}>
+            <Button type="primary" htmlType="submit" >
+              搜索
+          </Button>
+          </AuthButton>
+        </Form.Item>
+      </Form>
+      <AuthButton name="admin.taPolicy.post" noRight={null}>
+        <Button type="primary" style={{margin:'20px 0'}} onClick={toEditPolicy()}>新增</Button>
+      </AuthButton>
+      <Table rowKey="housingPolicy" 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} current={data.current} />
+      </div>
+    </Card>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/services/apis.js

@@ -910,6 +910,41 @@ export default {
       method: 'DELETE',
       action: 'admin.taPolicy.id.delete',
     },
+  
+    getPolicyTypeList:{
+      url: `${prefix}/taPolicyType`,
+      method: 'GET',
+      action: 'admin.taPolicyType.get',
+    },
+    addPolicyType:{
+      url: `${prefix}/taPolicyType`,
+      method: 'Post',
+      action: 'admin.taPolicyType.Post',
+    },
+
+    getPolicyTypeDetail:{
+      url: `${prefix}/taPolicyType/:id`,
+      method: 'GET',
+      action: 'admin.taPolicyType.id.get',
+    },
+
+    upDatePolicyType:{
+      url: `${prefix}/taPolicyType/:id`,
+      method: 'PUT',
+      action: 'admin.taPolicyType.id.put',
+    },
+    deletePolicyType:{
+      url: `${prefix}/taPolicyType/:id`,
+      method: 'DELETE',
+      action: 'admin.taPolicyType.id.delete',
+    },
+ 
+    // getPolicyTypeList:{
+    //   url: `${prefix}/taPolicyType`,
+    //   method: 'GET',
+    //   action: 'admin.taPolicyType.get',
+    // },
+    // GET /api/taPolicyType
     tdBizEventIntention: {
       url: `${prefix}/tdBizEventIntention`,
       method: 'GET',