zls

src/components/SelectButton/QrcodeType.jsx

@@ -13,8 +13,7 @@ const qrcodeType = props => {
     const all = props.all || false
 
     const visible = useMemo(() => (props.visible), [props.visible]);
-    console.log(visible, '123213')
-
+    
     const data = [
         {
             name: '项目',

src/pages/qrcode/qrcodelist/add.jsx

@@ -1,8 +1,6 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Switch, Icon, Select, Option, message, Table, Divider, Tag, Pagination, Modal, DatePicker, Row, Col } from 'antd';
+import { Form, Button, Switch, message } from 'antd';
 import router from 'umi/router';
-import moment from 'moment';
-import AuthButton from '@/components/AuthButton';
 import BuildSelect from '@/components/SelectButton/BuildSelect2'
 import ChannelSelect from '@/components/SelectButton/channelSelect'
 import QrcodeType from '../../../components/SelectButton/QrcodeType'
@@ -10,28 +8,26 @@ import QrText from './components/qrText'
 import apis from '../../../services/apis';
 import request from '../../../utils/request';
 
-
-
 const header = props => {
-
-    // const id = props.location.query.id
-
-    const [data, setData] = useState({})
-
+    // eslint-disable-next-line react-hooks/rules-of-hooks
     const [visible, setVisible] = useState(true)
 
+    // eslint-disable-next-line react-hooks/rules-of-hooks
     const [targetType, setTargetType] = useState()
 
+    // eslint-disable-next-line react-hooks/rules-of-hooks
     const [buildingId, setBuildingId] = useState()
 
+    // eslint-disable-next-line react-hooks/rules-of-hooks
     const [targetName, setTargetName] = useState()
 
+    // eslint-disable-next-line react-hooks/rules-of-hooks
     useEffect(() => {
 
     }, [])
 
     function addQrcode(params) {
-        request({ ...apis.qrcode.add, data: { ...params } }).then((data) => {
+        request({ ...apis.qrcode.add, data: { ...params } }).then(() => {
             //   setData(data)
             router.go(-1)
         }).catch((err) => {
@@ -48,7 +44,7 @@ const header = props => {
                 if (targetType === 'project') {
                     values.targetId = values.buildingId
                     values.targetName = targetName
-                }else{
+                } else {
                     values.targetId = values.targetName.id
                     values.targetName = values.targetName.name
                 }
@@ -68,21 +64,26 @@ const header = props => {
     function onTtypeChange(values) {
         console.log(`onTtypeChange to ${values}`);
         setTargetType(values)
-        // props.form.setFields({
-        //     targetiId: values.id,
-        // })
+
+        props.form.setFieldsValue({
+            targetName: '',
+        });
     }
 
     // BuildingChange
-    function onBuildingChange(values, data) {
-        console.log(`onBuildingChange to ${values}`, data);
+    function onBuildingChange(values, e) {
+        console.log(`onBuildingChange to ${values}`, e);
         setBuildingId(values)
-        setTargetName(data.buildingName)
+        setTargetName(e.buildingName)
+
+        props.form.setFieldsValue({
+            targetName: '',
+        });
     }
 
     // BuildingChange
-    function onTargetName(values, data) {
-        console.log(`onTargetName to ${values}`, data);
+    function onTargetName(value, data) {
+        console.log(`onTargetName to ${value}`, data);
 
     }
 
@@ -112,7 +113,7 @@ const header = props => {
                 {targetType !== 'project' && <Form.Item label="二维码内容">
                     {getFieldDecorator('targetName', {
                         rules: [{ required: true, message: '' }],
-                    })(<QrText targetType={targetType} buildingId={buildingId} onChange={onTargetName}/>)}
+                    })(<QrText targetType={targetType} buildingId={buildingId} onChange={onTargetName} />)}
                 </Form.Item>}
                 {targetType === 'project' && <div>
                     {getFieldDecorator('targetName')}
@@ -136,6 +137,5 @@ const header = props => {
 }
 
 
-
 const WrappedNormalLoginForm = Form.create({ name: 'header' })(header);
-export default WrappedNormalLoginForm
+export default WrappedNormalLoginForm

src/pages/qrcode/qrcodelist/components/qrText.jsx

@@ -12,14 +12,7 @@ const getLiveList = fetch(apis.taliveActivity.taLiveActivity)
 const getNewsList = fetch(apis.news.getList)
 const getSalesBatchList = fetch(apis.house.taSalesBatch)
 
-const name = '324'
-
-const data = [
-    {
-        id: '12',
-        title: '234',
-    },
-]
+
 const qrText = props => {
     const {
         value,
@@ -30,7 +23,7 @@ const qrText = props => {
     } = props;
     const [data, setData] = useState([])
     const [visible, setVisible] = useState(false);
-    const [info, setInfo] = useState({ title: value });
+    const [info, setInfo] = useState({ name: value }, [value]);
 
     // activity
     const getActivitiesData = e => getActivities({
@@ -100,7 +93,7 @@ const qrText = props => {
             delete obj['activityName'];
             obj['id'] = item['groupActivityId'];
             delete obj['groupActivityId'];
-            
+
             list.push(obj)
         })
         setData(list)
@@ -124,11 +117,10 @@ const qrText = props => {
             obj = item;
             obj['id'] = item['drainageId'];
             delete obj['drainageId'];
-            
+
             list.push(obj)
         })
         setData(list)
-        // updateGroup(buildingId ? undefined : value);
     })
 
     //  live
@@ -152,7 +144,7 @@ const qrText = props => {
             list.push(obj)
         })
 
-        
+
         setData(list)
     })
 
@@ -178,7 +170,7 @@ const qrText = props => {
             list.push(obj)
         })
 
-        
+
         setData(list)
     })
 
@@ -207,8 +199,13 @@ const qrText = props => {
         // salesBatchNamesalesBatchId
     })
 
-    // getNewsList
+    useEffect(() => {
+        console.log(value, '23423333333334')
+        // eslint-disable-next-line default-case
+        setInfo({ name: value })
+    }, [value])
 
+    // getNewsList
     useEffect(() => {
         console.log(targetType, buildingId, '234234')
         // eslint-disable-next-line default-case
@@ -244,9 +241,10 @@ const qrText = props => {
     }
 
     const onChoice = e => {
+        console.log(e)
         setInfo(e)
         setVisible(false)
-        onChange(e)
+        props.onChange(e.name, e)
     }
 
     const columns = [

src/pages/qrcode/qrcodelist/index.jsx

@@ -1,11 +1,10 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker, notification } from 'antd';
+import { Form, Input, Button, Icon, message, Table, Pagination, Modal } from 'antd';
 import router from 'umi/router';
 import moment from 'moment';
 import AuthButton from '@/components/AuthButton';
 import withActions from '@/components/ActionList';
 import EditIcon from '@/components/EditIcon';
-import Navigate from '@/components/Navigate';
 import QrcodeType from '@/components/SelectButton/QrcodeType'
 import { ConfirmButton } from '@/components/ModalButton';
 import BuildSelect from '@/components/SelectButton/BuildSelect'
@@ -14,6 +13,7 @@ import apis from '../../../services/apis';
 import request from '../../../utils/request';
 
 // import RaiseHelpDoc from '../edit/components/RaiseHelpDoc';
+// eslint-disable-next-line consistent-return
 const typeName = targetType => {
     // eslint-disable-next-line default-case
     switch (targetType) {
@@ -36,6 +36,8 @@ const qrcodelist = props => {
 
     // eslint-disable-next-line react-hooks/rules-of-hooks
     useEffect(() => {
+        // eslint-disable-next-line @typescript-eslint/no-use-before-define
+        // eslint-disable-next-line no-use-before-define
         getList({ pageNum: 1, pageSize: 10 });
     }, [])
 
@@ -48,11 +50,11 @@ const qrcodelist = props => {
     }
 
     const batchDelete = () => {
-        request({ ...apis.qrcode.batchDelete, data: qrcodeList }).then(data => {
+        request({ ...apis.qrcode.batchDelete, data: qrcodeList }).then(() => {
             message.info('操作成功')
             setBeforeCheck('请至少选择一条数据')
             getList({ pageNum: 1, pageSize: 10 });
-        }).catch((err) => {
+        }).catch(() => {
             // message.info(err.msg)
         })
     }
@@ -64,14 +66,33 @@ const qrcodelist = props => {
         });
     }
 
-    const toDataRecord = (id) => {
+    const toDataRecord = id => {
+        // eslint-disable-next-line no-console
         console.log(id)
         router.push({
             pathname: '/qrcode/qrcodelist/dataRecord',
-            query: { id, }
+            query: { id },
         });
     }
 
+    const downloadQrcode = row => {
+        const x = new XMLHttpRequest();
+        const resourceUrl = row.qrCodeUrl
+        // const name = `${row.targetName}二维码.png`
+        console.log(resourceUrl);
+        x.open('GET', resourceUrl, true);
+        x.responseType = 'blob';
+        x.onload = function (e) {
+            const url = window.URL.createObjectURL(x.response)
+            const a = document.createElement('a');
+            a.href = url;
+            a.style.display = 'none'
+            a.download = `${row.targetName}二维码.png`
+            a.click();
+        }
+        x.send();
+    }
+
     /**
      *
      *
@@ -126,10 +147,14 @@ const qrcodelist = props => {
             dataIndex: '',
             key: '',
             align: 'center',
-            render: withActions((text, record) => [
-                <EditIcon type="download" text="下载二维码" ></EditIcon>,
-
-                <EditIcon type="data" text="数据" onClick={() => toDataRecord(record.qrCodeId)} ></EditIcon>,
+            render: withActions((text, row) => [
+                <AuthButton name="admin.qrcode.download" noRight={null}>
+                    <EditIcon type="download" text="下载二维码" onClick={() => downloadQrcode(row)}> </EditIcon>
+                </AuthButton>,
+                <AuthButton name="admin.qrcode.dataRecord" noRight={null}>
+                    <EditIcon type="data" text="数据" onClick={() => toDataRecord(row.qrCodeId)} ></EditIcon>
+                </AuthButton>,
+                
 
             ]),
         },
@@ -141,7 +166,6 @@ const qrcodelist = props => {
     }
 
 
-
     const rowSelection = {
         onChange: (selectedRowKeys, selectedRows) => {
             console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
@@ -205,10 +229,15 @@ const qrcodelist = props => {
                 </Form.Item>
             </Form>
             {/* title="确认删除？" */}
-            <Button type="danger" onClick={() => toAdd()}>新增</Button>
-            <ConfirmButton type="link" title="确认删除选中数据？" beforeCheck={beforeCheck} onClick={() => batchDelete()}>
-                <Button type="primary" style={{ marginLeft: '30px' }}>删除</Button>
-            </ConfirmButton>
+
+            <AuthButton name="admin.qrcode.add" noRight={null}>
+                <Button type="danger" onClick={() => toAdd()}>新增</Button>
+            </AuthButton>
+            <AuthButton name="admin.qrcode.delete" noRight={null}>
+                <ConfirmButton type="link" title="确认删除选中数据？" beforeCheck={beforeCheck} onClick={() => batchDelete()}>
+                    <Button type="primary" style={{ marginLeft: '30px' }}>删除</Button>
+                </ConfirmButton>
+            </AuthButton>
             <Icon type="question-circle" theme="filled" style={{ fontSize: '25px', color: '#F00', marginLeft: '30px' }} onClick={() => setShowHelp(true)} />
             <Modal
                 title="相关说明"
@@ -228,7 +257,10 @@ const qrcodelist = props => {
             <Table rowSelection={rowSelection}
                 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} />
+                <Pagination
+                    showQuickJumper
+                    defaultCurrent={1}
+                    total={data.total} onChange={e => changePageNum(e)} current={data.current} />
             </div>
         </>
     )

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

@@ -1,11 +1,9 @@
 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 { Button, Table, Pagination } from 'antd';
+import moment from 'moment';
 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 table = props => {
     const { id, type } = props
@@ -23,7 +21,7 @@ const table = props => {
         request({ ...apis.qrcode.getStatisticRecord, params: { ...params } }).then(data => {
             console.log(data)
 
-            //   setData(data)
+            setData(data)
         }).catch(e => {
             console.log(e)
         })

src/services/apis.js

@@ -1844,12 +1844,12 @@ export default {
     add: {
       method: 'post',
       url: `${prefix}/taQrcode`,
-      action: 'admin.qrcode.add.post',
+      action: 'admin.qrcode.add',
     },
     batchDelete: {
       method: 'DELETE',
       url: `${prefix}/qrCode/batchDelete`,
-      action: 'admin.qrcode.batchDelete.DELETE',
+      action: 'admin.qrcode.delete',
     },
     getStatisticData: {
       method: 'GET',