zls

src/pages/customer/customerlist/customerDetail.jsx

@@ -8,7 +8,7 @@ import moment from 'moment';
 import BuildSelect from '../../../components/SelectButton/BuildSelect'
 
 import router from 'umi/router';
-
+import Prompt from 'umi/prompt';
 
 function header(props) {
   /**
@@ -202,7 +202,10 @@ function header(props) {
         <Table dataSource={tableData.records} columns={columns} style={{marginTop: '15px'}} pagination={{ pageSize: 10, total: tableData.total, onChange }} />
         {/* <Pagination showQuickJumper defaultCurrent={1} total={data.records} onChange={e => changePageNum(e)} current={data.visitRecords.total}/> */}
       </div>
-
+      <Prompt message={location =>
+        location.pathname.startsWith("/customer/customerlist")
+          ? true
+          : (localStorage.removeItem("priPageParams"), localStorage.removeItem("pubPageParams"), localStorage.removeItem("state"))} />
     </>
   )
 }

src/pages/customer/customerlist/index.jsx

@@ -71,11 +71,18 @@ function body(props) {
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
+    // localStorage.setItem("state", JSON.stringify({ value }))
+    if (localStorage.getItem("state")) {
+      console.log(localStorage.getItem("state"), 'state')
+      if (JSON.parse(localStorage.getItem("state")) == 'private') {
+        props.form.setFieldsValue(JSON.parse(localStorage.getItem("priPageParams")));
+        getList({ ...JSON.parse(localStorage.getItem("priPageParams")) })
+      } else {
+        setCustomerType('public')
+        props.form.setFieldsValue(JSON.parse(localStorage.getItem("pubPageParams")));
+        getList({ ...JSON.parse(localStorage.getItem("pubPageParams")) })
+      }
 
-    if (localStorage.getItem("priPageParams")) {
-      props.form.setFieldsValue(JSON.parse(localStorage.getItem("priPageParams")));
-      // const { getFieldDecorator } = JSON.parse(localStorage.getItem("pageParams"))
-      getList({ customerType, ...JSON.parse(localStorage.getItem("priPageParams")) })
     } else {
       localStorage.setItem("priPageParams", JSON.stringify({ pageNumber: 1, pageSize: 10, customerType }))
       getList({ pageNumber: 1, pageSize: 10, customerType })
@@ -145,6 +152,7 @@ function body(props) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
     props.form.validateFields((err, values) => {
       if (!err) {
+        localStorage.setItem("state", JSON.stringify(customerType))
         if (customerType === 'private') {
           localStorage.setItem("priPageParams", JSON.stringify({ pageNumber: pageNum, pageSize: 10, customerType: 'private', ...props.form.getFieldsValue() }))
           getList(JSON.parse(localStorage.getItem("priPageParams")))
@@ -164,10 +172,17 @@ function body(props) {
     props.form.resetFields();
     const { value } = e.target
     setCustomerType(value)
+    localStorage.setItem("state", JSON.stringify(value))
     if (value === 'private') {
-      props.form.setFieldsValue(JSON.parse(localStorage.getItem("priPageParams")));
+      if (localStorage.getItem("priPageParams")) {
+        props.form.setFieldsValue(JSON.parse(localStorage.getItem("priPageParams")));
+
+        getList(JSON.parse(localStorage.getItem("priPageParams")))
+      }else{
+        localStorage.setItem("priPageParams", JSON.stringify({ pageNumber: 1, pageSize: 10, customerType: value }))
+      getList({ pageNumber: 1, pageSize: 10, customerType: value })
+      }
 
-      getList(JSON.parse(localStorage.getItem("priPageParams")))
     } else {
 
       if (localStorage.getItem("pubPageParams")) {
@@ -175,7 +190,8 @@ function body(props) {
         // const { getFieldDecorator } = JSON.parse(localStorage.getItem("pageParams"))
         getList({ customerType, ...JSON.parse(localStorage.getItem("pubPageParams")) })
       } else {
-        getList({ pageNumber: 1, pageSize: 10, customerType:value })
+        localStorage.setItem("pubPageParams", JSON.stringify({ pageNumber: 1, pageSize: 10, customerType: value }))
+        getList({ pageNumber: 1, pageSize: 10, customerType: value })
       }
     }
 
@@ -641,9 +657,9 @@ function body(props) {
       <BatchAssistConsultant visibleData={batchAssistVisibleData} onCancel={() => closeAll()} />
 
       <Prompt message={location =>
-        location.pathname.startsWith("/customer/customerlist/list")
+        location.pathname.startsWith("/customer/customerlist")
           ? true
-          : (localStorage.removeItem("priPageParams"), localStorage.removeItem("pubPageParams"))} />
+          : (localStorage.removeItem("priPageParams"), localStorage.removeItem("pubPageParams"), localStorage.removeItem("state"))} />
     </>
   );
 }

src/pages/customer/customerlist/publicCustomerDetail.jsx

@@ -8,7 +8,7 @@ import moment from 'moment';
 import BuildSelect from '../../../components/SelectButton/BuildSelect'
 
 import router from 'umi/router';
-
+import Prompt from 'umi/prompt';
 
 function header(props) {
   /**
@@ -169,6 +169,10 @@ function onChange(number) {
         <BuildSelect onChange={changBuilding} value={buildingIdValue} />
         <Table dataSource={tableData.records} columns={columns} style={{marginTop: '15px'}} pagination={{ pageSize: 10, total: tableData.total, onChange }} />
       </div>
+      <Prompt message={location =>
+        location.pathname.startsWith("/customer/customerlist")
+          ? true
+          : (localStorage.removeItem("priPageParams"), localStorage.removeItem("pubPageParams"), localStorage.removeItem("state"))} />
     </>
   )
 }

src/pages/indexEcharts/components/UserBehaviorIndex.jsx

@@ -27,7 +27,7 @@ const eventcolumns = [
     width: '18%',
     render: (x, row) => (
       <>
-        <span>{ moment(row.visitTime).format('YYYY-MM-DD hh:mm:ss') }</span>
+        <span>{moment(row.visitTime).format('YYYY-MM-DD hh:mm:ss')}</span>
       </>
     ),
   },
@@ -39,7 +39,7 @@ const eventcolumns = [
     width: '18%',
     render: (x, row) => (
       <>
-        <span>{ row.leaveTime && moment(row.leaveTime).format('YYYY-MM-DD hh:mm:ss') }</span>
+        <span>{row.leaveTime && moment(row.leaveTime).format('YYYY-MM-DD hh:mm:ss')}</span>
       </>
     ),
   },
@@ -69,7 +69,7 @@ class EventcoModal extends React.Component {
       ...apis.indexEcharts.userBehavior.profile,
       params: { event: row.event, personId: row.personId },
     }).then(data => {
-        this.setState({ eventList: data })
+      this.setState({ eventList: data })
     })
   }
 
@@ -91,7 +91,7 @@ class EventcoModal extends React.Component {
           onCancel={() => this.handleCancel()}
           footer={null}
         >
-         <Table rowKey="UserBehavior" dataSource={this.state.eventList} columns={eventcolumns} pagination={false} rowKey="eventall" scroll={{ y: 400 }} />
+          <Table rowKey="UserBehavior" dataSource={this.state.eventList} columns={eventcolumns} pagination={false} rowKey="eventall" scroll={{ y: 400 }} />
         </Modal>
       </>
     )
@@ -176,11 +176,11 @@ const UserBehaviorIndex = props => {
     yAxis: {},
     dataZoom,
     series: Object.keys(seriesMaker).map(x => ({
-        type: 'line',
-        smooth: true,
-        name: x,
-        data: seriesMaker[x],
-      })),
+      type: 'line',
+      smooth: true,
+      name: x,
+      data: seriesMaker[x],
+    })),
   }
   function handleBuildingChange(e) {
     const date = formatDate(props.startDate, props.endDate)
@@ -247,7 +247,7 @@ const UserBehaviorIndex = props => {
       width: '18%',
       render: (x, row) => (
         <>
-          <span>{ row.visitTime && moment(row.visitTime).format('YYYY-MM-DD hh:mm:ss') }</span>
+          <span>{row.visitTime && moment(row.visitTime).format('YYYY-MM-DD hh:mm:ss')}</span>
         </>
       ),
     },
@@ -259,7 +259,7 @@ const UserBehaviorIndex = props => {
       align: 'center',
       render: (x, row) => (
         <>
-          <span>{ row.leaveTime && moment(row.leaveTime).format('YYYY-MM-DD hh:mm:ss') }</span>
+          <span>{row.leaveTime && moment(row.leaveTime).format('YYYY-MM-DD hh:mm:ss')}</span>
         </>
       ),
     },
@@ -270,11 +270,13 @@ const UserBehaviorIndex = props => {
     <>
       <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', marginTop: '-40px', marginBottom: '20px' }}>
-          {!props.BuildSelectHide && <BuildSelect slot="action" onChange={(e => handleBuildingChange(e))} value={buildingId}></BuildSelect>}
+          {/* </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 &&

src/pages/statistical/activity/compenents/NewUsers.jsx

@@ -109,7 +109,7 @@ const NewUsers = (props) => {
   return (
     <>
       <div ><p><span style={{fontSize:'0.12rem',fontWeight:'600'}}>活动趋势图</span></p></div>
-      <div>
+      <div style={{marginTop:'30px'}}>
         <EChart options={options} style={piestyles}  />
       </div>
     </>

src/pages/statistical/activity/compenents/style.less

@@ -6,6 +6,7 @@
     box-shadow: 0px 0px 16px 2px rgba(0, 0, 0, 0.12);
     border-radius: 12px;
     margin-right: 30px;
+    padding: 40px;
   }
   
   .pie {