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

config/config.js

@@ -23,11 +23,11 @@ const plugins = [
         // default true, when it is true, will use `navigator.language` overwrite default
         baseNavigator: true,
       },
-      // dynamicImport: {
-      //   loadingComponent: './components/PageLoading/index',
-      //   webpackChunkName: true,
-      //   level: 3,
-      // },
+      dynamicImport: {
+        loadingComponent: './components/PageLoading/index',
+        webpackChunkName: true,
+        level: 3,
+      },
       pwa: pwa
         ? {
           workboxPluginMode: 'InjectManifest',

src/components/SelectButton/BuildSelect.jsx

@@ -13,6 +13,7 @@ const { Option } = Select;
  */
 const BuildingSelect = (props) => {
   const [ data, setData ] = useState([])
+  const [ value, setValue ] = useState(props.value)
 
   useEffect(() => {
     getCityList();
@@ -28,8 +29,13 @@ const BuildingSelect = (props) => {
     })
   }
 
+  const handleChange = (e) => {
+    setValue(e)
+    props.onChange(e)
+  }
+
   return (
-      <Select value={props.value} style={{ width: '180px' }} placeholder="请选择项目" onChange={props.onChange}>
+      <Select value={value} style={{ width: '180px' }} placeholder="请选择项目" onChange={handleChange}>
           {data.map(building => (
             <Option key={building.buildingId}>{building.buildingName}</Option>
           ))}

src/layouts/SecurityLayout.jsx

@@ -25,6 +25,8 @@ class SecurityLayout extends React.Component {
     const { isReady } = this.state;
     const { children, loading, currentUser } = this.props;
 
+    console.log('------------>', loading, currentUser)
+
     if ((!currentUser.userId && loading) || !isReady) {
       return <PageLoading />;
     }

src/models/login.js

@@ -36,7 +36,6 @@ const Model = {
       }
 
       yield put(routerRedux.replace(redirect || '/'));
-      
     },
 
     *getCaptcha({ payload }, { call }) {
@@ -60,7 +59,7 @@ const Model = {
   },
   reducers: {
     changeLoginStatus(state, { payload }) {
-      setAuthority('admin');
+      setAuthority((payload.user.roles || []).map(x => x.roleId));
       return { ...state, status: 'ok', type: payload.type };
     },
   },

src/pages/system/intention.jsx

@@ -19,8 +19,10 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
  */
  const Edit = (props) => {
   const [ data, setData ] = useState([])
+  const [ buildingIdValue, setBuildingIdData ] = useState('')
 
   const changBuilding = (buildingId) => {
+    setBuildingIdData(buildingId)
     request({
       url: '/api/admin/tdBizEventIntention',
       method: 'GET',
@@ -31,6 +33,32 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
     })
   }
 
+  const changeBox = (x) => (e) => {
+    setData(data.map((item) => {
+      return x.eventId === item.eventId ? {...item, checkbox: e.target.checked} : item
+    }))
+  }
+
+  const changeInput = (x) => (e) => {
+    setData(data.map((item) => {
+      return x.eventId === item.eventId ? {...item, intention: e.target.value} : item
+    }))
+  }
+
+  const submitValue = () => {
+    console.log(buildingIdValue)
+    if(buildingIdValue === ''){
+      return
+    }
+    request({
+      url: '/api/admin/taBuildingIntentionAddOrUpdate/' + buildingIdValue,
+      method: 'POST',
+      data
+    }).then((data) => {
+      message.info("保存成功")
+    })
+  }
+
   return (
     <>
     <Row>
@@ -39,26 +67,25 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
       </Col>
     </Row>
     <Row>
-      <Col span={6} offset={6}>
+      <Col span={3} offset={3}>
         用户操作
       </Col>
-      <Col span={6} offset={6}>
+      <Col span={3} offset={3}>
         意向值
       </Col>
     </Row>
     {data.map((x) => {
-      console.log(x)
       return <Row>
-                <Col span={6} offset={6}>
-                {x.eventName}
+                <Col span={3} offset={3}>
+                  <Checkbox checked={x.checkbox} onChange={changeBox(x)}>{x.eventName}</Checkbox>
                 </Col>
-                <Col span={6} offset={6}>
-                  {x.intention}
+                <Col span={3} offset={3}>
+                  <Input value={x.intention} onChange={changeInput(x)}/>
                 </Col>
               </Row>
     })}
     <Row>
-      <Button type="primary" className={styles.searchBtn} >确定</Button>
+      <Button type="primary" className={styles.searchBtn} onClick={submitValue}>确定</Button>
     </Row>
     </>
   );

src/pages/system/report.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker,message,Checkbox } from 'antd';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker,message,Checkbox,Row, Col  } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../style/GoodsList.less';
 import moment from 'moment';
@@ -62,7 +62,9 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
   return (
     <>
-      <Checkbox.Group options={data} value={checkData} onChange={onChange} />
+      <Row>
+        <Checkbox.Group options={data} value={checkData} onChange={onChange} />
+      </Row>
       <Button type="primary" className={styles.searchBtn} onClick={saveCheckedReport}>提交</Button>
     </>
   );

src/utils/request.js

@@ -4,6 +4,8 @@
  */
 import request from 'umi-request';
 import { notification } from 'antd';
+import apis from '../services/apis';
+
 const codeMessage = {
   200: '服务器成功返回请求的数据。',
   201: '新建或修改数据成功。',
@@ -25,7 +27,7 @@ const codeMessage = {
 const replaceURLParams = (url, params = {}) => {
   return Object.keys(params).reduce((acc, k) => { // 此方法对每个元素进行处理
     const re = new RegExp(`:${k}(?!w)`, 'i')
-    return acc.replace(re, args[k])
+    return acc.replace(re, params[k])
   }, url)
 }
 
@@ -92,6 +94,9 @@ request.interceptors.response.use(async (response, options) => {
   }
 });
 
+
+const fetch = api => options => request(api.url, {...api, ...options || {}})
+
 export default config => {
   if (typeof config === 'string') {
     return request(config);
@@ -100,3 +105,5 @@ export default config => {
     return request(url, options);
   }
 };
+
+export { fetch, apis }