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

src/pages/indexEcharts/userBehavior.jsx

@@ -13,6 +13,7 @@ import BuildSelect from '../../components/SelectButton/BuildSelect'
 //   const endDate = moment(end).format('YYYY-MM-DDT23:59:59.999') + 'Z'
 //   return { startDate, endDate }
 // }
+const { Option } = Select;
 
 const header = props => {
 
@@ -26,8 +27,42 @@ const header = props => {
 
     setEndDate(new Date())
     setStartDate(moment().subtract(7, 'day').toDate())
+    getBizEventType()
+    getBizEventList()
+    getProperties()
 
   }, [])
+  const [eventypes, setEventType] = useState([])
+  function getBizEventType(row) {
+
+    request({
+      ...apis.indexEcharts.bizEvent.dict,
+    }).then((data) => {
+      setEventType(data.records)
+
+    })
+  }
+  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;
 
@@ -105,45 +140,47 @@ const header = props => {
       borderRadius: '12px',
       minHeight: '60vh'
     }}>
-    <div>
-    <Radio.Group buttonStyle="solid" defaultValue="a">
-        <Radio.Button value="a" onClick={getDataOf(7)}>最近7天</Radio.Button>
-        <Radio.Button value="b" onClick={getDataOf(30)}>最近1月</Radio.Button>
-      </Radio.Group>
-      <RangePicker
-        style={{ paddingLeft: '30px' }}
-        ranges={{
-          Today: [moment(), moment()],
-          'This Month': [moment().startOf('month'), moment().endOf('month')],
-        }}
-        showTime
-        onChange={onChangetime}
-      />
-      <Button type="primary" htmlType="submit" style={{ marginLeft: '30px',float:'right' }} onClick={datalist}>
-        搜索
+      <div>
+        <Radio.Group buttonStyle="solid" defaultValue="a">
+          <Radio.Button value="a" onClick={getDataOf(7)}>最近7天</Radio.Button>
+          <Radio.Button value="b" onClick={getDataOf(30)}>最近1月</Radio.Button>
+        </Radio.Group>
+        <RangePicker
+          style={{ paddingLeft: '30px' }}
+          ranges={{
+            Today: [moment(), moment()],
+            'This Month': [moment().startOf('month'), moment().endOf('month')],
+          }}
+          showTime
+          onChange={onChangetime}
+        />
+        <Button type="primary" htmlType="submit" style={{ marginLeft: '30px', float: 'right' }} onClick={datalist}>
+          搜索
       </Button>
-    </div>
-     
+      </div>
+
       <div style={{ display: 'flex', margin: '24px 0' }}>
-      <BuildSelect slot='action' onChange={(e => handleBuildingChange(e))}></BuildSelect>
-        <Select placeholder="所有事件组" style={{ width: '14%',minWidth:'160px',marginLeft:'2%' }} onChange={handleChange}>
-          <Option value="jack">Jack</Option>
-          <Option value="lucy">Lucy</Option>
-          <Option value="Yiminghe">yiminghe</Option>
-        </Select>
-        <Select placeholder="请选择事件" style={{ width: '14%',minWidth:'160px',marginLeft:'2%' }} onChange={handleChange}>
-          <Option value="jack">Jack</Option>
-          <Option value="lucy">Lucy</Option>
-          <Option value="Yiminghe">yiminghe</Option>
-        </Select>
-        <Select placeholder="请选择属性" style={{ width: '14%',minWidth:'160px',marginLeft:'2%' }} onChange={handleChange}>
-          <Option value="jack">Jack</Option>
-          <Option value="lucy">Lucy</Option>
-          <Option value="Yiminghe">yiminghe</Option>
-        </Select>
+        <BuildSelect style={{ width: '14%', minWidth: '160px' }} slot='action' onChange={(e => handleBuildingChange(e))}></BuildSelect>
+       
+        <Select  style={{ width: '14%', minWidth: '160px', marginLeft: '2%' }} placeholder="所有事件组" onChange={handleChange}>
+          {eventypes.map(type => (
+            <Option key={type.typeId}>{type.typeName}</Option>
+          ))}
+      </Select>
+        <Select  style={{ width: '14%', minWidth: '200px', marginLeft: '2%' }} placeholder="请选择事件" onChange={handleChange}>
+          {eventList.map(event => (
+            <Option key={event.eventId}>{event.eventName}</Option>
+          ))}
+      </Select>
+        <Select  style={{ width: '14%', minWidth: '160px', marginLeft: '2%' }} placeholder="请选择属性" onChange={handleChange}>
+          {properties.map(property => (
+            <Option key={property.propertyId}>{property.propertyName}</Option>
+          ))}
+      </Select>
+     
       </div>
-      
-      
+
+
       <div style={{ margin: '24px 0' }}>
         <UserBehavior BuildSelectHide={true} endDate={endDate} startDate={startDate} dataZoom={true} onReData={(e) => redata(e)}></UserBehavior>
       </div>

src/services/apis.js

@@ -250,6 +250,23 @@ export default {
         action: 'behaviorIncident',
       },
     },
+    bizEvent: {
+      dict: {
+        method:'get',
+        url: `${prefix}/tdBizEventType`,
+        action:'select',
+      },
+      list: {
+        method:'get',
+        url: `${prefix}/tdBizEvent`,
+        action:'select',
+      },
+      properties: {
+        method:'get',
+        url: `${prefix}/taEventProperties`,
+        action:'select',
+      },
+    },
     userActive: {
       method: 'GET',
       url: `${prefix}/selectActiveUserCount`,