zls

src/components/ModalButton/ModalButton.jsx

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Modal, Button } from 'antd';
+import { Modal, Button, message } from 'antd';
 
 export default function ModalButton(props) {
   const {
@@ -9,12 +9,15 @@ export default function ModalButton(props) {
     modalConfigs = {},
     onClick,
     onCancel,
+    // 未选数据弹出提示
+    beforeCheck = '',
     okText = '确认',
     cancelText = '取消',
     ...btnProps
   } = props || {}
 
   const handleClick = e => {
+    if (!!beforeCheck) { message.info(beforeCheck); return }
     Modal[method]({
       title,
       content,

src/pages/qrcode/qrcodelist/dataRecord.jsx

@@ -89,9 +89,9 @@ const DataRecord = props => {
         </div>
         <div>
             <Tabs type="card" value={tab} buttonStyle="solid" onChange={e => tabsCallback(e)}>
-                <TabPane tab="访问人数" key="visitors" ></TabPane>
-                <TabPane tab="访问次数" key="visitNum" ></TabPane>
-                <TabPane tab="新增注册用户" key="newuser" ></TabPane>
+                <TabPane tab="访问人数" key="1" ></TabPane>
+                <TabPane tab="访问次数" key="2" ></TabPane>
+                <TabPane tab="新增注册用户" key="3" ></TabPane>
             </Tabs>
             <div style={{ marginTop: '20px' }}>
                 <Tables id={id} type={tab} />

src/pages/qrcode/qrcodelist/index.jsx

@@ -8,7 +8,6 @@ import EditIcon from '@/components/EditIcon';
 import Navigate from '@/components/Navigate';
 import QrcodeType from '@/components/SelectButton/QrcodeType'
 import { ConfirmButton } from '@/components/ModalButton';
-import styles from '../../style/GoodsList.less';
 import BuildSelect from '@/components/SelectButton/BuildSelect'
 import ChannelSelect from '@/components/SelectButton/channelSelect'
 import apis from '../../../services/apis';
@@ -28,24 +27,12 @@ const typeName = targetType => {
         case 'salesBatch': return '销售批次';
     }
 }
-// const typeName = {
-//     project: '项目',
-//     activity: '常规活动',
-//     help: '常规活动',
-//     group: '拼团活动',
-//     h5: 'H5活动',
-//     live: '直播活动',
-//     news: '资讯',
-//     salesBatch: '销售批次',
-// }
-
-
 
 const qrcodelist = props => {
     const [data, setData] = useState([])
     const [showHelp, setShowHelp] = useState(false)
     const [qrcodeList, setQrcodeList] = useState([])
-
+    const [beforeCheck, setBeforeCheck] = useState('请至少选择一条数据')
 
     // eslint-disable-next-line react-hooks/rules-of-hooks
     useEffect(() => {
@@ -61,8 +48,9 @@ const qrcodelist = props => {
     }
 
     const batchDelete = () => {
-        request({ ...apis.qrcode.batchDelete, data: qrcodeList, }).then((data) => {
-            message.info("操作成功")
+        request({ ...apis.qrcode.batchDelete, data: qrcodeList }).then(data => {
+            message.info('操作成功')
+            setBeforeCheck('请至少选择一条数据')
             getList({ pageNum: 1, pageSize: 10 });
         }).catch((err) => {
             // message.info(err.msg)
@@ -158,6 +146,11 @@ const qrcodelist = props => {
         onChange: (selectedRowKeys, selectedRows) => {
             console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
             setQrcodeList(selectedRows)
+            if (selectedRowKeys.length <= 0) {
+                setBeforeCheck('请至少选择一条数据')
+            } else {
+                setBeforeCheck('')
+            }
         },
     };
 
@@ -178,14 +171,6 @@ const qrcodelist = props => {
         getList({ pageNum: 1, pageSize: 10 })
     }
 
-    function before() {
-        if (qrcodeList.length <= 0) {
-            message.info('请至少选择一条数据');
-            return true
-        }
-
-        return false
-    }
 
     const { getFieldDecorator } = props.form
     return (
@@ -215,13 +200,13 @@ const qrcodelist = props => {
                     )}
                 </Form.Item>
                 <Form.Item>
-                    <Button type="primary" htmlType="submit" className={styles.searchBtn}>搜索</Button>
+                    <Button type="primary" htmlType="submit">搜索</Button>
                     <Button style={{ marginLeft: 8 }} onClick={handleReset}>重置</Button>
                 </Form.Item>
             </Form>
             {/* title="确认删除？" */}
             <Button type="danger" onClick={() => toAdd()}>新增</Button>
-            <ConfirmButton type="link" title="确认删除选中数据？" before={before} onClick={() => batchDelete()}>
+            <ConfirmButton type="link" title="确认删除选中数据？" beforeCheck={beforeCheck} onClick={() => batchDelete()}>
                 <Button type="primary" style={{ marginLeft: '30px' }}>删除</Button>
             </ConfirmButton>
             <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00', marginLeft: '30px' }} onClick={() => setShowHelp(true)} />
@@ -241,7 +226,7 @@ const qrcodelist = props => {
             </Modal>
 
             <Table rowSelection={rowSelection}
-                dataSource={data.records} columns={columns} pagination={false} rowKey={r => r.qrCodeId} style={{ marginTop: '20px' }}/>
+                dataSource={data.records} columns={columns} pagination={false} rowKey={r => r.qrCodeId} style={{ marginTop: '20px' }} />
             <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
                 <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e)} current={data.current} />
             </div>

src/pages/qrcode/qrcodelist/table/index.jsx

@@ -9,24 +9,24 @@ import moment from 'moment';
 
 const table = props => {
     const { id, type } = props
-    const [data, setData] = useState({})
+    const [data, setData] = useState([])
 
 
     useEffect(() => {
         // console.log(activityId, activityType)
-        // getList({ pageNum: 1, pageSize: 10 })
+        getList({ pageNum: 1, pageSize: 10, qrCodeId: id, type })
 
-    }, [])
+    }, [type])
 
     const getList = params => {
         // console.log(params)
-        // request({ ...apis.activityDataStatis.activityVisitNum, params: { ...params, activityId: activityId, activityType: activityType, ...date } }).then(data => {
-        //   console.log(data)
-        //   props.getData()
-        //   setData(data)
-        // }).catch(e => {
-        //   console.log(e)
-        // })
+        request({ ...apis.qrcode.getStatisticRecord, params: { ...params } }).then(data => {
+            console.log(data)
+
+            //   setData(data)
+        }).catch(e => {
+            console.log(e)
+        })
     }
 
     const visitNum = {
@@ -71,25 +71,52 @@ const table = props => {
             key: 'province',
         },
         // eslint-disable-next-line no-nested-ternary
-        type === 'visitNum' ? visitNum : type === 'visitors' ? visitors : newuser,
-        // visitNum,
-        // visitors,
-        // newuser,
+        type === '1' ? visitors : type === '2' ? visitNum : newuser,
     ]
 
 
     const changePageNum = pageNumber => {
-        getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+        getList({ pageNum: pageNumber, pageSize: 10 })
     }
 
+    // 下载文档
+    function download(data) {
+        if (!data) {
+            console.log('234')
+            return
+        }
+        const url = window.URL.createObjectURL(new Blob([data]))
+        const link = document.createElement('a')
+        link.style.display = 'none'
+        link.href = url
+        if (type === 1) {
+            link.setAttribute('download', '访问人数.xlsx')
+        } else if (type === 2) {
+            link.setAttribute('download', '访问次数.xlsx')
+        } else {
+            link.setAttribute('download', '新增注册用户.xlsx')
+        }
+
+        document.body.append(link)
+        link.click()
+    }
 
-
-    const exportActivityStats = () => {
-
-        // request({ ...apis.activityDataStatis.activityVisitNumExport, params: { activityId: activityId, activityType: activityType, ...props.form.getFieldsValue(), ...date } }).then(data => {
-        //   if (!data) {
-        //     return
-        //   }
+    const exportStatisticRecord = () => {
+
+        request({ ...apis.qrcode.getStatisticRecordExport, responseType: 'blob', params: { qrCodeId: id, type } }).then(data => {
+            console.log(data, '22222222')
+            download(data)
+
+            // const url = window.URL.createObjectURL(new Blob([data]))responseType: 'blob',
+            // const link = document.createElement('a')
+            // link.style.display = 'none'
+            // link.href = url
+            // link.setAttribute('download', '访问统计.xlsx')
+            // document.body.append(link)
+            // link.click()
+        }).catch((err) => {
+            console.log(err, '3333333333')
+        })
         //   const url = window.URL.createObjectURL(new Blob([data]))
         //   const link = document.createElement('a')
         //   link.style.display = 'none'
@@ -105,7 +132,7 @@ const table = props => {
             <div>
 
 
-                <Button type="primary" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={exportActivityStats} >
+                <Button type="primary" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={exportStatisticRecord} >
                     导出
             </Button>
 

src/pages/qrcode/qrcodelist/table/newuser.jsx

@@ -1,97 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
-import router from 'umi/router';
-import apis from '../../../../services/apis';
-import request from '../../../../utils/request';
-import AuthButton from '../../../../components/AuthButton';
-import WxDictSelect from '@/components/SelectButton/WxDictSelect';
-import moment from 'moment';
-
-
-const newuser = props => {
-  const [showHelp, setShowHelp] = useState(false)
-  const [data, setData] = useState({})
-
-
-  useEffect(() => {
-    // console.log(activityId, activityType)
-    // getList({ pageNum: 1, pageSize: 10 })
-
-  }, [])
-
-  const getList = params => {
-    // console.log(params)
-    // request({ ...apis.activityDataStatis.activityAddRegist, params: { ...params, activityId: activityId, activityType: activityType, ...date } }).then(data => {
-    //   console.log(data)
-    //   props.getData()
-    //   setData(data)
-    // }).catch(e => {
-    //   console.log(e)
-    // })
-  }
-
-  const columns = [
-    {
-      title: '姓名',
-      dataIndex: 'nickName',
-      key: 'nickName',
-    },
-    {
-      title: '电话',
-      dataIndex: 'phone',
-      key: 'phone',
-    },
-    {
-      title: '性别',
-      dataIndex: 'gender',
-      key: 'gender',
-    },
-    {
-      title: '归属地',
-      dataIndex: 'province',
-      key: 'province',
-    },
-    {
-      title: '注册时间',
-      dataIndex: 'visitDate',
-      key: 'visitDate',
-      render: (x, row) => <><span>{`${moment(row.visitDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
-    },
-  ]
-
-
-  const changePageNum = pageNumber => {
-    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
-  }
-
-
-  const exportActivityStats = () => {
-
-    request({ ...apis.activityDataStatis.activityAddRegistNumExport, params: { activityId: activityId, activityType: activityType, ...props.form.getFieldsValue(), ...date } }).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()
-    }).catch()
-  }
-
-  return <>
-    <div>
-      <div>
-        <Button type="primary" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={exportActivityStats}>导出</Button>
-      </div>
-      <Table style={{ marginTop: '30px' }} 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={changePageNum} current={data.current} />
-      </div>
-    </div>
-  </>
-}
-
-export default newuser

src/pages/qrcode/qrcodelist/table/visitNum.jsx

@@ -1,102 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
-import router from 'umi/router';
-import apis from '../../../../services/apis';
-import request from '../../../../utils/request';
-import AuthButton from '../../../../components/AuthButton';
-import WxDictSelect from '@/components/SelectButton/WxDictSelect';
-import moment from 'moment';
-
-const visitNum = props => {
-  const [data, setData] = useState({})
-
-
-  useEffect(() => {
-    // console.log(activityId, activityType)
-    // getList({ pageNum: 1, pageSize: 10 })
-
-  }, [])
-
-  const getList = params => {
-    // console.log(params)
-    // request({ ...apis.activityDataStatis.activityVisitNum, params: { ...params, activityId: activityId, activityType: activityType, ...date } }).then(data => {
-    //   console.log(data)
-    //   props.getData()
-    //   setData(data)
-    // }).catch(e => {
-    //   console.log(e)
-    // })
-  }
-
-
-  const columns = [
-    {
-      title: '姓名',
-      dataIndex: 'nickName',
-      key: 'nickName',
-    },
-    {
-      title: '电话',
-      dataIndex: 'phone',
-      key: 'phone',
-    },
-    {
-      title: '性别',
-      dataIndex: 'gender',
-      key: 'gender',
-    },
-    {
-      title: '归属地',
-      dataIndex: 'province',
-      key: 'province',
-    },
-    {
-      title: '访问时间',
-      dataIndex: 'visitDate',
-      key: 'visitDate',
-      render: (x, row) => <><span>{`${moment(row.visitDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
-    },
-  ]
-
-
-  const changePageNum = pageNumber => {
-    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
-  }
-
-
-
-  const exportActivityStats = () => {
-
-    request({ ...apis.activityDataStatis.activityVisitNumExport, params: { activityId: activityId, activityType: activityType, ...props.form.getFieldsValue(), ...date } }).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()
-    }).catch()
-  }
-
-  return <>
-    <div>
-      <div>
-
-
-        <Button type="primary" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={exportActivityStats} >
-          导出
-            </Button>
-
-      </div>
-      <Table style={{ marginTop: '30px' }} 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={changePageNum} current={data.current} />
-      </div>
-    </div>
-  </>
-}
-
-export default visitNum

src/pages/qrcode/qrcodelist/table/visitors.jsx

@@ -1,126 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
-import router from 'umi/router';
-import apis from '../../../../services/apis';
-import request from '../../../../utils/request';
-import AuthButton from '../../../../components/AuthButton';
-import WxDictSelect from '@/components/SelectButton/WxDictSelect';
-import moment from 'moment';
-
-
-
-const visitors = props => {
-
-  // const [id,type] = props
-
-  const [data, setData] = useState({})
-
-
-  useEffect(() => {
-
-    // getList({ pageNum: 1, pageSize: 10 })
-
-  }, [])
-
-  const getList = params => {
-    console.log(params)
-    // request({ ...apis.activityDataStatis.activityVisitPersonNum, params: { ...params, activityId: activityId, activityType: activityType, ...date } }).then(data => {
-    //   console.log(data)
-    //   props.getData()
-    //   setData(data)
-    // }).catch(e => {
-    //   console.log(e)
-    // })
-  }
-
-  // getTableList () {
-
-  //   console.log(formData)
-  //   request({ ...apis.activityDataStatis.activityVisitPersonNum, params: formData }).then(data => {
-  //     console.log(data)
-  //     this.setState({ tableData: data.records, total: data.total})
-  //   }).catch()
-  // }
-
-  const visitorsa = {
-    title: '访问次数',
-    dataIndex: 'visitNum',
-    key: 'visitNum',
-  }
-
-  const columns = [
-    {
-      title: '姓名',
-      dataIndex: 'nickName',
-      key: 'nickName',
-    },
-    {
-      title: '电话',
-      dataIndex: 'phone',
-      key: 'phone',
-    },
-    {
-      title: '性别',
-      dataIndex: 'gender',
-      key: 'gender',
-    },
-    {
-      title: '归属地',
-      dataIndex: 'province',
-      key: 'province',
-    },
-    visitorsa,
-  ]
-
-  // {
-  //   title: '访问时间',
-  //   dataIndex: 'visitDate',
-  //   key: 'visitDate',
-  //   render: (x, row) => <><span>{`${moment(row.visitDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
-  // },
-
-
-  const changePageNum = pageNumber => {
-    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
-  }
-
-
-
-  const exportActivityStats = () => {
-
-    request({ ...apis.activityDataStatis.activityVisitPersonNumExport, params: { activityId: activityId, activityType: activityType, ...props.form.getFieldsValue(), ...date } }).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()
-    }).catch()
-  }
-
-
-  return <>
-    <div >
-
-      <div>
-
-
-        <Button type="primary" style={{ float: 'right', marginBottom: '20px', zIndex: 1 }} onClick={exportActivityStats}>
-          导出
-            </Button>
-
-      </div>
-      <Table style={{ marginTop: '30px' }} 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={changePageNum} current={data.current} />
-      </div>
-    </div>
-  </>
-}
-
-
-export default visitors

src/services/apis.js

@@ -1826,5 +1826,15 @@ export default {
       url: `${prefix}/qrCode/getStatisticData`,
       action: 'admin.qrcode.getStatisticData.get',
     },
+    getStatisticRecord: {
+      method: 'GET',
+      url: `${prefix}/qrCode/getStatisticRecord`,
+      action: 'admin.qrcode.getStatisticRecord.get',
+    },
+    getStatisticRecordExport: {
+      method: 'GET',
+      url: `${prefix}/qrCode/getStatisticRecordExport`,
+      action: 'admin.qrcode.getStatisticRecordExport.get',
+    },
   },
 }