zls

src/pages/activity/drainage/Detail.jsx

@@ -7,7 +7,7 @@ import moment from 'moment';
 import apis from '../../../services/apis';
 import request from '../../../utils/request';
 import { SSL_OP_SSLEAY_080_CLIENT_DH_BUG } from 'constants';
-
+import AuthButton from '../../../components/AuthButton';
 
 
 const data = []
@@ -21,7 +21,7 @@ const header = (props) => {
   const [columns, setColumns] = useState([])
   const [startDate, setStartDate] = useState('')
   const [endDate, setEndDate] = useState('')
-  const [total,setTotal] = useState({})
+  const [total, setTotal] = useState({})
   let daterange = []
   // let content = {}
   useEffect(() => {
@@ -34,19 +34,19 @@ const header = (props) => {
     request({ ...apis.activity.taDrainageRecord, params: { ...params } }).then((data) => {
       // setDatas(data) 
       console.log(data.total, '3333333333333')
-      if(data.total!=0){
-      setTotal(data)
-      // console.log(data.total, '3333333333333')
-     
-      setDatas(tableData(data.records))
-      // content = data.records[0]
-      console.log('json: ', eval('(' + data.records[0].content + ')'))
-      setContent(eval('(' + data.records[0].content + ')'))
-      setColumns(tableTitle(eval('(' + data.records[0].content + ')')))
-    }
-    else{
-      message.info('数据为空')
-    }
+      if (data.total != 0) {
+        setTotal(data)
+        // console.log(data.total, '3333333333333')
+
+        setDatas(tableData(data.records))
+        // content = data.records[0]
+        console.log('json: ', eval('(' + data.records[0].content + ')'))
+        setContent(eval('(' + data.records[0].content + ')'))
+        setColumns(tableTitle(eval('(' + data.records[0].content + ')')))
+      }
+      else {
+        message.info('数据为空')
+      }
 
 
 
@@ -82,28 +82,31 @@ const header = (props) => {
   }
 
 
-  function datalist() {
+  function datalist () {
 
-    gettaDrainageRecord({ pageNum: 1, pageSize: 10, drainageId: drainageId ,startTime: fromTime(startDate) ,endTime: fromTime(endDate)  })
+    gettaDrainageRecord({ pageNum: 1, pageSize: 10, drainageId: drainageId, startTime: fromTime(startDate), endTime: fromTime(endDate) })
   }
 
-  function fromTime(str) {
+  function fromTime (str) {
     return str === '' ? null : `${moment(str).format('YYYY-MM-DDT00:00:00.000')}Z`
   }
 
-  function onChangetime(dates, dateStrings) {
- 
+  function onChangetime (dates, dateStrings) {
+
     setEndDate(dateStrings[1])
     setStartDate(dateStrings[0])
-    
+
   }
 
   const changePageNum = pageNumber => {
-    gettaDrainageRecord({ pageNum: pageNumber, pageSize: 10 ,drainageId: drainageId, startTime: fromTime(startDate) ,endTime: fromTime(endDate)})
-}
-  function excelPort(){
+    gettaDrainageRecord({ pageNum: pageNumber, pageSize: 10, drainageId: drainageId, startTime: fromTime(startDate), endTime: fromTime(endDate) })
+  }
+
+
+  function excelPort () {
     // const fieldsValue = getFieldsValue()
-    request({ ...apis.activity.exporttaDrainageRecord, params: { drainageId: drainageId ,startTime: fromTime(startDate) ,endTime: fromTime(endDate) }  })
+    console.log("111111")
+    request({ ...apis.activity.exporttaDrainageRecord, params: { drainageId: drainageId, startTime: fromTime(startDate), endTime: fromTime(endDate) } })
       .then(response => {
         download(response)
       }).catch(error => {
@@ -130,27 +133,29 @@ const header = (props) => {
   return (
     <>
 
-<RangePicker
-          style={{ width: '400px' }}
-          // ranges={{
-          //   Today: [moment(), moment()],
-          //   'This Month': [moment().startOf('month'), moment().endOf('month')],
-          // }}
-          // 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')]}
-          showTime
-          onChange={onChangetime}
-        />
-        <Button type="primary" htmlType="submit" style={{ marginLeft: '30px', float: 'right' }} onClick={datalist}>
-          搜索
+      <RangePicker
+        style={{ width: '400px' }}
+        // ranges={{
+        //   Today: [moment(), moment()],
+        //   'This Month': [moment().startOf('month'), moment().endOf('month')],
+        // }}
+        // 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')]}
+        showTime
+        onChange={onChangetime}
+      />
+      <Button type="primary" htmlType="submit" style={{ marginLeft: '30px', float: 'right' }} onClick={datalist}>
+        搜索
       </Button>
-    
+
       <div>
-        {/* H5项目名称 */}
-        {}  <Button type="primary" style={{ marginLeft: '30px', float: 'right', marginTop: '30px',marginBottom: '30px' }} onClick={excelPort}>导出数据</Button>
-        <Table columns={columns} dataSource={datas}  pagination={false} />
+        {/* H5项目名称 style={{ float: 'right', margin: '20px 0', zIndex: 1 }} */}
+        <AuthButton name="admin.taDrainageRecord.export.get" noRight={null}>
+          <Button type="primary" style={{ marginLeft: '30px', float: 'right', marginTop: '30px', marginBottom: '30px', zIndex: 1 }} onClick={excelPort}>导出数据</Button>
+        </AuthButton>
+        <Table columns={columns} dataSource={datas} pagination={false} />
         <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-       <Pagination showQuickJumper defaultCurrent={1} total={total.total} onChange={(e) => changePageNum(e)} />
-      </div>
+          <Pagination showQuickJumper defaultCurrent={1} total={total.total} onChange={(e) => changePageNum(e)} />
+        </div>
       </div>
 
 

src/pages/activity/drainage/DrainageList.jsx

@@ -7,9 +7,10 @@ import apis from '../../../services/apis';
 import request from '../../../utils/request';
 import XForm, { FieldTypes } from '../../../components/XForm';
 import moment from 'moment';
+import AuthButton from '../../../components/AuthButton';
 
 const toEditList = (drainageId) => () => {
-  console.log(drainageId,'12344567')
+  console.log(drainageId, '12344567')
   router.push({
     pathname: '/activity/drainage/Detail',
     query: {
@@ -47,11 +48,11 @@ const header = (props) => {
       visible: false,
       confirmLoading: false,
     })
-    
+
   }, [])
 
   function gettaDrainage (params) {
-    request({ ...apis.activity.taDrainage, params: params  }).then((data) => {
+    request({ ...apis.activity.taDrainage, params: params }).then((data) => {
       setDatas(data)
       console.log(data.records, '_213_')
     }).catch((err) => {
@@ -65,18 +66,18 @@ const header = (props) => {
       title: '确认删除该引流？',
       okText: '确认',
       cancelText: '取消',
-      onOk() {
-        request({ ...apis.activity.deletetaDrainage,urlData: { id: drainageIid }, }).then((data) => {
+      onOk () {
+        request({ ...apis.activity.deletetaDrainage, urlData: { id: drainageIid }, }).then((data) => {
           message.info('操作成功！')
           gettaDrainage({ pageNum: 1, pageSize: 10 })
         }).catch((err) => {
-          console.log('111111',err)
+          console.log('111111', err)
           message.info(err.msg || err.message)
         })
       }
     });
   }
-  
+
   const columns = [
     {
       title: 'H5项目编号',
@@ -89,7 +90,7 @@ const header = (props) => {
       dataIndex: 'name',
       key: 'name',
       align: 'center',
-      render: (text, datas) => <div style={ { color: '#66B3FF' } } onClick= {() => addshowModal(datas)} >{ datas.name }</div>,
+      render: (text, datas) => <AuthButton name="admin.taDrainage.id.put" noRight={null}><div style={{ color: '#66B3FF' }} onClick={() => addshowModal(datas)} >{datas.name}</div></AuthButton>
     },
     {
       title: 'appid',
@@ -112,7 +113,7 @@ const header = (props) => {
       align: 'center',
       render: (x, row) => (
         <>
-          <span>{ row.createDate && moment(row.createDate).format('YYYY-MM-DD hh:mm:ss') }</span>
+          <span>{row.createDate && moment(row.createDate).format('YYYY-MM-DD hh:mm:ss')}</span>
         </>
       ),
     },
@@ -123,7 +124,7 @@ const header = (props) => {
       align: 'center',
       render: (x, row) => (
         <>
-          <span>{ row.endDate && moment(row.endDate).format('YYYY-MM-DD hh:mm:ss') }</span>
+          <span>{row.endDate && moment(row.endDate).format('YYYY-MM-DD hh:mm:ss')}</span>
         </>
       ),
     },
@@ -140,28 +141,31 @@ const header = (props) => {
       align: 'center',
       render: (text, datas) => (
         <>
-          <span style={{ right: '20px', top: '20px', fontSize: ' 0.106rem', zIndex: 1, color: '#FF7E48', cursor: 'pointer' }} onClick={toEditList(datas.drainageId)}>
-            查看详情
+          <AuthButton name="admin.customer.recommend.edit.id.put" noRight={null}>
+            <span style={{ right: '20px', top: '20px', fontSize: ' 0.106rem', zIndex: 1, color: '#FF7E48', cursor: 'pointer' }} onClick={toEditList(datas.drainageId)}>
+              查看详情
             </span>
-  
-          <span style={{ right: '20px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', cursor: 'pointer', marginLeft: 20 }} onClick={deleteDrainage(datas.drainageId)}>
-            删除
+          </AuthButton>
+          <AuthButton name="admin.taDrainageRecord.get" noRight={null}>
+            <span style={{ right: '20px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', cursor: 'pointer', marginLeft: 20 }} onClick={deleteDrainage(datas.drainageId)}>
+              删除
             </span>
+          </AuthButton >
         </>
       ),
     },
   ];
   const Forms = props => {
-   
-    console.log(date,'---------------')
-    console.log(formsdate,'---------------')
-    console.log(formsdate,'22222222')
+
+    console.log(date, '---------------')
+    console.log(formsdate, '---------------')
+    console.log(formsdate, '22222222')
     const fields = [
       {
         label: 'H5项目名称',
         name: 'name',
         type: FieldTypes.Text,
-        placeholder:"请输入H5项目名称",
+        placeholder: "请输入H5项目名称",
         value: formsdate.name,
 
       },
@@ -169,7 +173,7 @@ const header = (props) => {
         label: '截止时间',
         name: 'endDate',
         type: FieldTypes.DatePicker,
-        value:formsdate.endDate ? moment(formsdate.endDate, 'YYYY-MM-DD HH:mm') : null
+        value: formsdate.endDate ? moment(formsdate.endDate, 'YYYY-MM-DD HH:mm') : null
         // render: <DatePicker placeholder="截止时间" value= {formsdate.endDate} />,
       },
 
@@ -177,30 +181,30 @@ const header = (props) => {
     ]
 
     const handleSubmit = val => {
-      console.log(date,'111---------------')
-    console.log(formsdate,'111---------------')
-    console.log(formsdate,'11122222222')
+      console.log(date, '111---------------')
+      console.log(formsdate, '111---------------')
+      console.log(formsdate, '11122222222')
       // data: { ...submitValue }
 
-      console.log(formsdate.drainageId,'9999999999999')
+      console.log(formsdate.drainageId, '9999999999999')
       if (formsdate.drainageId) {
         // { ...apis.activity.deletetaDrainage,urlData: { id: drainageIid }, }
-        request({ ...apis.activity.updatetaDrainage, urlData: { id: formsdate.drainageId }, data: val}).then((data) => {
+        request({ ...apis.activity.updatetaDrainage, urlData: { id: formsdate.drainageId }, data: val }).then((data) => {
           message.info('操作成功！')
           // gettaDrainage({ pageNum: 1, pageSize: 10 })
         }).catch((err) => {
-          console.log('111111',err)
+          console.log('111111', err)
           message.info(err.msg || err.message)
         })
-       
+
       } else {
 
-     
+
 
         request({ ...apis.activity.addtaDrainage, data: val }).then((data) => {
           message.info("保存成功")
           console.log(data, '22222')
-          
+
         }).catch((err) => {
           message.error(err.msg || err.message)
         })
@@ -217,8 +221,8 @@ const header = (props) => {
       });
     }
 
-    return <XForm onSubmit={handleSubmit} onCancel={handleCancel}  fields={fields}></XForm>
-    
+    return <XForm onSubmit={handleSubmit} onCancel={handleCancel} fields={fields}></XForm>
+
   }
 
 
@@ -229,27 +233,27 @@ const header = (props) => {
     props.form.resetFields();
   }
 
-  
+
 
   function addshowModal (datas) {
 
     // alert(datas.drainageId)
-console.log(datas,'22222222')
+    console.log(datas, '22222222')
     setFormsDate({
-      drainageId:datas.drainageId,
-      name:datas.name,
-      endDate:datas.endDate,
+      drainageId: datas.drainageId,
+      name: datas.name,
+      endDate: datas.endDate,
     })
-    console.log(formsdate,'22222222')
+    console.log(formsdate, '22222222')
     setDate({
       visible: true,
     });
   };
   function showModal () {
     setFormsDate({
-      drainageId:'',
-      name:'',
-      endDate:'',
+      drainageId: '',
+      name: '',
+      endDate: '',
     })
     setDate({
       visible: true,
@@ -257,7 +261,7 @@ console.log(datas,'22222222')
   };
   const changePageNum = pageNumber => {
     gettaDrainage({ pageNum: pageNumber, pageSize: 10 })
-}
+  }
 
   function handleOk () {
 
@@ -280,7 +284,7 @@ console.log(datas,'22222222')
       visible: false,
     });
   };
-  function handleSubmit(e) {
+  function handleSubmit (e) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       console.log('values', values)
@@ -324,9 +328,9 @@ console.log(datas,'22222222')
             </Button>
           </Form.Item>
         </Form>
-        {/* <AuthButton name="admin.buildingDynamic.add.post" noRight={null}> */}
-        <Button type="danger" className={styles.addBtn} onClick={showModal}>新增</Button>
-
+        <AuthButton name="admin.buildingDynamic.add.post" noRight={null}>
+          <Button type="danger" className={styles.addBtn} onClick={showModal}>新增</Button>
+        </AuthButton>
         <Modal
           title="新建H5项目"
           visible={visible}
@@ -337,10 +341,10 @@ console.log(datas,'22222222')
         >
           <Forms />
         </Modal>
-        <Table columns={columns} dataSource={datas.records} pagination={false} rowKey="drainageList"/>
+        <Table columns={columns} dataSource={datas.records} pagination={false} rowKey="drainageList" />
         <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-       <Pagination showQuickJumper defaultCurrent={1} total={datas.total} onChange={(e) => changePageNum(e)} />
-      </div>
+          <Pagination showQuickJumper defaultCurrent={1} total={datas.total} onChange={(e) => changePageNum(e)} />
+        </div>
       </div>
     </>
   )

src/pages/system/document/audit.jsx

@@ -1,10 +1,10 @@
 import React, { useState, useEffect } from 'react';
-import { Col, Row, Button, Modal} from 'antd'
+import { Col, Row, Button, Modal } from 'antd'
 import ZmageImg from '../../../components/ZmageImg/ZmageImg'
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import { router } from 'umi';
-
+import AuthButton from '../../../components/AuthButton';
 
 function body (props) {
   const documentVerifyId = props.location.query.id
@@ -14,11 +14,11 @@ function body (props) {
     getList()
 
   }, [])
-// , documentVerifyId: documentVerifyId
+  // , documentVerifyId: documentVerifyId
   function getList (params) {
     // 网路请求
-    console.log(props,'1111')
-    request({ ...apis.system.documentVerifyDetail, urlData:{ id:documentVerifyId }  }).then(data => {
+    console.log(props, '1111')
+    request({ ...apis.system.documentVerifyDetail, urlData: { id: documentVerifyId } }).then(data => {
       console.log('data:', data.imgList)
       setData(data.imgList)
     }).catch(err => {
@@ -26,13 +26,13 @@ function body (props) {
 
     })
   }
-  
+
   function onVerify (params) {
 
     alert(params)
     // 网路请求
-    request({ ...apis.system.updateTaPolicy, urlData:{ id:documentVerifyId }, data:  {  verifyStatus: params}  }).then(data => {
-    
+    request({ ...apis.system.updateTaPolicy, urlData: { id: documentVerifyId }, data: { verifyStatus: params } }).then(data => {
+
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
 
@@ -41,19 +41,19 @@ function body (props) {
 
 
 
-  const handleOk =  () => {
+  const handleOk = () => {
     Modal.confirm({
       title: '审核通过后，将给当前用户发放积分 确认审核通过？',
       okText: '确认',
       cancelText: '取消',
-      onOk() {
-       
+      onOk () {
+
         onVerify(2)
       }
     });
   }
 
-  const cancelPage = () =>{
+  const cancelPage = () => {
     router.push({
       pathname: '/system/document/list',
     });
@@ -65,24 +65,28 @@ function body (props) {
         <Row gutter={16}>
           {
             // data.consultant && data.consultant.projects.map((item, _) => <span>{item}</span>)
-            data.map((data, inx) => 
+            data.map((data, inx) =>
               <Col span={6}>
-               <ZmageImg style={{ width: '300px', height: '400px' }} src={data.img} />
+                <ZmageImg style={{ width: '300px', height: '400px' }} src={data.img} />
               </Col>
             )
           }
         </Row>
       </div>
       <div style={{ marginTop: '10px', display: 'flex', justifyContent: 'center' }}>
-        <Button type="primary" onClick={()=>handleOk()}>通过</Button>
+        <AuthButton name="admin.documentVerify.id.put" noRight={null}>
+          <Button type="primary" onClick={() => handleOk()}>通过</Button>
+        </AuthButton>
         &nbsp;&nbsp;&nbsp;&nbsp;
-        <Button onClick={()=>onVerify(2)}>不通过</Button>
+        <AuthButton name="admin.documentVerify.id.put" noRight={null}>
+          <Button onClick={() => onVerify(2)}>不通过</Button>
+        </AuthButton>
         &nbsp;&nbsp;&nbsp;&nbsp;
         <Button onClick={cancelPage}>返回</Button>
-        
+
       </div>
-     
-      
+
+
     </>
   )
 }

src/pages/system/document/list.jsx

@@ -4,7 +4,7 @@ import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import { router } from 'umi';
 import moment from 'moment';
-
+import AuthButton from '../../../components/AuthButton';
 
 function body(props) {
   // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -110,9 +110,9 @@ function body(props) {
       key: 'documentVerifyId',
       render: (x,row) => (
         <>
-          
+          <AuthButton name="admin.documentVerify.id.get" noRight={null}>
             <span style={{ color: '#1990FF',cursor: 'pointer' }} onClick={()=>audit(row)}>{ row.verifyStatus === 0 ? '审核' : '查看' }</span>
-           
+           </AuthButton>
         </>
       )
     },

src/services/apis.js

@@ -469,7 +469,7 @@ export default {
       exporttaDrainageRecord:{
         url: `${prefix}/taDrainageRecord/export`,
         method: 'GET',
-        action: 'admin.taDrainageRecord/export.get',
+        action: 'admin.taDrainageRecord.export.get',
       }
   },
   integralMall: {