魏熙美 5 år sedan
förälder
incheckning
a126d2962e

+ 8
- 1
src/pages/indexEcharts/components/UserBehavior.jsx Visa fil

@@ -182,7 +182,14 @@ const UserBehavior = props => {
182 182
       })),
183 183
   }
184 184
   function handleBuildingChange(e) {
185
-    getUserBehaviorSummary({ buildingId: e })
185
+    const date = formatDate(props.startDate, props.endDate)
186
+    getUserBehaviorSummary({
187
+      ...date,
188
+      activity: props.activity,
189
+      event: props.event,
190
+      eventType: props.eventType,
191
+      buildingId: e,
192
+    })
186 193
   }
187 194
 
188 195
   function showDetails(row) {

+ 5
- 21
src/pages/indexEcharts/userBehavior.jsx Visa fil

@@ -34,18 +34,6 @@ const header = props => {
34 34
     
35 35
   }, [])
36 36
  
37
-
38
-function getUserBehaviorSummary(params) {
39
-
40
-
41
-  request({
42
-    ...apis.indexEcharts.userBehavior.summary,
43
-    params
44
-  }).then((data) => {
45
-    setData(data || {})
46
-
47
-  })
48
-}
49 37
   const [eventypes, setEventTypes] = useState([])
50 38
   function getBizEventType(row) {
51 39
 
@@ -101,23 +89,18 @@ function getUserBehaviorSummary(params) {
101 89
   }
102 90
 
103 91
   function redata(e) {
104
-
105
-
106 92
     console.log('行为回调数据:', e)
107 93
   }
108 94
   const [eventType, setEventType] = useState('')
109 95
   function handleChangeType(value) {
110
-    console.log(value,"1111111111111");
111 96
     setEventType(value)
112 97
   }
113 98
   const [event, setEvent] = useState('')
114 99
   function handleChangeEvent(value) {
115
-    console.log(value,"222222222222");
116 100
     setEvent(value)
117 101
   }
118 102
   const [activity, setActivity] = useState('')
119 103
   function handleChangeProperty(value) {
120
-    console.log(value,"33333333333333");
121 104
     setActivity(value)
122 105
   }
123 106
 
@@ -169,11 +152,12 @@ function getUserBehaviorSummary(params) {
169 152
           <Radio.Button value="b" onClick={getDataOf(30)}>最近1月</Radio.Button>
170 153
         </Radio.Group>
171 154
         <RangePicker
172
-          style={{ paddingLeft: '30px' }}
155
+          style={{ paddingLeft: '30px', width: '400px' }}
173 156
           ranges={{
174 157
             Today: [moment(), moment()],
175 158
             'This Month': [moment().startOf('month'), moment().endOf('month')],
176 159
           }}
160
+          // 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')]}
177 161
           showTime
178 162
           onChange={onChangetime}
179 163
         />
@@ -185,17 +169,17 @@ function getUserBehaviorSummary(params) {
185 169
       <div style={{ display: 'flex', margin: '24px 0' }}>
186 170
         <BuildSelect style={{ width: '14%', minWidth: '160px' }} slot='action' onChange={(e => handleBuildingChange(e))}></BuildSelect>
187 171
        
188
-        <Select  style={{ width: '14%', minWidth: '160px', marginLeft: '2%' }} placeholder="所有事件组" onChange={handleChangeType}>
172
+        <Select style={{ width: '14%', minWidth: '160px', marginLeft: '2%' }} placeholder="所有事件组" onChange={handleChangeType}>
189 173
           {eventypes.map(type => (
190 174
             <Option key={type.typeId}>{type.typeName}</Option>
191 175
           ))}
192 176
       </Select>
193
-        <Select  style={{ width: '14%', minWidth: '200px', marginLeft: '2%' }} placeholder="请选择事件" onChange={handleChangeEvent}>
177
+        <Select style={{ width: '14%', minWidth: '200px', marginLeft: '2%' }} placeholder="请选择事件" onChange={handleChangeEvent}>
194 178
           {eventList.map(event => (
195 179
             <Option key={event.eventId}>{event.eventName}</Option>
196 180
           ))}
197 181
       </Select>
198
-        <Select  style={{ width: '14%', minWidth: '160px', marginLeft: '2%' }} placeholder="请选择属性" onChange={handleChangeProperty}>
182
+        <Select style={{ width: '14%', minWidth: '160px', marginLeft: '2%' }} placeholder="请选择属性" onChange={handleChangeProperty}>
199 183
           {properties.map(property => (
200 184
             <Option key={property.propertyId}>{property.propertyName}</Option>
201 185
           ))}