周立森 5 jaren geleden
bovenliggende
commit
0cea0fb500
2 gewijzigde bestanden met toevoegingen van 38 en 4 verwijderingen
  1. 12
    2
      src/pages/activity/drainage/Detail.jsx
  2. 26
    2
      src/pages/activity/drainage/DrainageList.jsx

+ 12
- 2
src/pages/activity/drainage/Detail.jsx Bestand weergeven

32
 
32
 
33
   function gettaDrainageRecord (params) {
33
   function gettaDrainageRecord (params) {
34
     request({ ...apis.activity.taDrainageRecord, params: { ...params } }).then((data) => {
34
     request({ ...apis.activity.taDrainageRecord, params: { ...params } }).then((data) => {
35
-      // setDatas(data)
36
-      setTotal(data)
35
+      // setDatas(data) 
37
       console.log(data.total, '3333333333333')
36
       console.log(data.total, '3333333333333')
37
+      if(data.total!=0){
38
+      setTotal(data)
39
+      // console.log(data.total, '3333333333333')
40
+     
38
       setDatas(tableData(data.records))
41
       setDatas(tableData(data.records))
39
       // content = data.records[0]
42
       // content = data.records[0]
40
       console.log('json: ', eval('(' + data.records[0].content + ')'))
43
       console.log('json: ', eval('(' + data.records[0].content + ')'))
41
       setContent(eval('(' + data.records[0].content + ')'))
44
       setContent(eval('(' + data.records[0].content + ')'))
42
       setColumns(tableTitle(eval('(' + data.records[0].content + ')')))
45
       setColumns(tableTitle(eval('(' + data.records[0].content + ')')))
46
+    }
47
+    else{
48
+      message.info('数据为空')
49
+    }
50
+
51
+
52
+
43
     }).catch((err) => {
53
     }).catch((err) => {
44
       console.log(err)
54
       console.log(err)
45
       message.info(err.msg || err.message)
55
       message.info(err.msg || err.message)

+ 26
- 2
src/pages/activity/drainage/DrainageList.jsx Bestand weergeven

91
       align: 'center',
91
       align: 'center',
92
       render: (text, datas) => <div style={ { color: '#66B3FF' } } onClick= {() => addshowModal(datas)} >{ datas.name }</div>,
92
       render: (text, datas) => <div style={ { color: '#66B3FF' } } onClick= {() => addshowModal(datas)} >{ datas.name }</div>,
93
     },
93
     },
94
+    {
95
+      title: 'appid',
96
+      dataIndex: 'appid',
97
+      key: 'appid',
98
+      align: 'center',
99
+      // render: (text, datas) => <div style={ { color: '#66B3FF' } } onClick= {() => addshowModal(datas)} >{ datas.name }</div>,
100
+    },
101
+    {
102
+      title: 'secret',
103
+      dataIndex: 'appSecret',
104
+      key: 'appSecret',
105
+      align: 'center',
106
+      // render: (text, datas) => <div style={ { color: '#66B3FF' } } onClick= {() => addshowModal(datas)} >{ datas.name }</div>,
107
+    },
94
     {
108
     {
95
       title: '新建时间',
109
       title: '新建时间',
96
       dataIndex: 'createDate',
110
       dataIndex: 'createDate',
167
     console.log(formsdate,'111---------------')
181
     console.log(formsdate,'111---------------')
168
     console.log(formsdate,'11122222222')
182
     console.log(formsdate,'11122222222')
169
       // data: { ...submitValue }
183
       // data: { ...submitValue }
170
-      alert(val)
184
+
171
       console.log(formsdate.drainageId,'9999999999999')
185
       console.log(formsdate.drainageId,'9999999999999')
172
       if (formsdate.drainageId) {
186
       if (formsdate.drainageId) {
173
         // { ...apis.activity.deletetaDrainage,urlData: { id: drainageIid }, }
187
         // { ...apis.activity.deletetaDrainage,urlData: { id: drainageIid }, }
191
           message.error(err.msg || err.message)
205
           message.error(err.msg || err.message)
192
         })
206
         })
193
       }
207
       }
208
+      setDate({
209
+        visible: false,
210
+      });
211
+      gettaDrainage({ pageNum: 1, pageSize: 10 })
212
+    }
213
+
214
+    const handleCancel = val => {
215
+      setDate({
216
+        visible: false,
217
+      });
194
     }
218
     }
195
 
219
 
196
-    return <XForm onSubmit={handleSubmit} fields={fields}></XForm>
220
+    return <XForm onSubmit={handleSubmit} onCancel={handleCancel}  fields={fields}></XForm>
197
     
221
     
198
   }
222
   }
199
 
223