zls

src/pages/activity/drainage/Detail.jsx

@@ -13,7 +13,7 @@ import AuthButton from '../../../components/AuthButton';
 const data = []
 
 const header = (props) => {
-  const drainageId = props.location.query.drainageId
+  const { drainageId, name } = props.location.query
 
 
   const [datas, setDatas] = useState([])
@@ -43,6 +43,7 @@ const header = (props) => {
         setColumns(tableTitle(data.records))
       }
       else {
+        setDatas([])
         message.info('数据为空')
       }
 
@@ -155,16 +156,18 @@ const header = (props) => {
       </Button>
 
       <div>
-        {/* 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>
-        {
-         console.log("datas", datas)}
+        <div style={{ display: 'flex', justifyContent: 'space-between' }}>
+         <div style={{ lineHeight: '92px', width: '600px', fontWeight: 'bold', fontSize: '18px' }}>
+            H5项目：{ name }
+         </div>
+          {/* 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>
+        </div>
         <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)} current={total.current}
-/>
+          <Pagination showQuickJumper defaultCurrent={1} total={total.total} onChange={(e) => changePageNum(e)} current={total.current}/>
         </div>
       </div>
 

src/pages/activity/drainage/DrainageList.jsx

@@ -9,12 +9,12 @@ import XForm, { FieldTypes } from '../../../components/XForm';
 import moment from 'moment';
 import AuthButton from '../../../components/AuthButton';
 
-const toEditList = (drainageId) => () => {
-  console.log(drainageId, '12344567')
+const toEditList = (row) => () => {
   router.push({
     pathname: '/activity/drainage/Detail',
     query: {
-      drainageId
+      drainageId: row.drainageId,
+      name: row.name,
     },
   });
 }
@@ -142,7 +142,7 @@ const header = (props) => {
       render: (text, datas) => (
         <>
           <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 style={{ right: '20px', top: '20px', fontSize: ' 0.106rem', zIndex: 1, color: '#FF7E48', cursor: 'pointer' }} onClick={toEditList(datas)}>
               查看详情
             </span>
           </AuthButton>

src/pages/news/type/NewsType.jsx

@@ -114,6 +114,10 @@ function header(props) {
       ),
     },
   ];
+  function handleReset() {
+    props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 10 })
+  }
 
   const { getFieldDecorator } = props.form
   return (
@@ -121,13 +125,18 @@ function header(props) {
     <>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
         <Form.Item>
-          {getFieldDecorator('status')(
-            <Select style={{ width: '180px' }} placeholder="请选择">
-              <Option value="1">已上架</Option>
-              <Option value="0">已下架</Option>
-            </Select>,
+          {getFieldDecorator('buildingId')(
+            <BuildSelect />,
           )}
         </Form.Item>
+        <Form.Item>
+            <Button type="primary" htmlType="submit" >
+              查询
+            </Button>
+            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
+        </Form.Item>
       </Form>
       <AuthButton name="admin.taNewsType.post" noRight={null}>
         <Button type="danger" className={styles.addBtn} onClick={toEditNews()}>新增</Button>

src/services/apis.js

@@ -730,6 +730,11 @@ export default {
   },
  },
  helpActivity: {
+  effectiveList: {
+    url: `${prefix}/helpActivityEffective/list`,
+    method: 'GET',
+    action: 'admin.helpActivityEffective.list.get',
+  },
   list: {
     url: `${prefix}/helpActivity/list`,
     method: 'GET',