duwendi il y a 1 an
Parent
commit
ba9ef4a6f6

+ 2 - 1
src/api/article_z.js

@@ -1,5 +1,6 @@
1 1
 // 文章
2 2
 import axios from "../util/ajax";
3
+import axios1 from "../util/ajax1";
3 4
 
4 5
 export default {
5 6
   // 订单查询
@@ -209,7 +210,7 @@ export default {
209 210
   },
210 211
   // 业务记录——获取停车记录分页
211 212
   queryBusinessRecordInoutByPage(params) {
212
-    return axios.get(`/opt/business/record/inout/page`, {params})
213
+    return axios1.post('/reformer-blessing-b/IntoOutQuery/intoOutRecord/query.do', params, {headers: {'Cookie': 'JSESSIONID=2397D873DA3984B3F4AC580916D66D19; UID=b6d61c0d4ed7447985ad9a3ac27912a2; appkey=n8lv05uWWnRcGwnwegpMqlQCKvg4', 'Content-Type': 'application/x-www-form-urlencoded;' }})
213 214
   },
214 215
   // 业务记录——添加停车记录
215 216
   addBusinessRecordInout(params) {

+ 13 - 13
src/pages/index/components/business_record.vue

@@ -322,23 +322,23 @@ export default {
322 322
           key: 'parkName'
323 323
         },
324 324
         {
325
-          label: '车牌号',
326
-          key: 'plateNo'
325
+          label: '车牌号颜色',
326
+          key: 'plateColor'
327 327
         },
328 328
         {
329
-          label: '入场时间',
330
-          key: 'inTime'
329
+          label: '车牌号',
330
+          key: 'plateNo'
331 331
         },
332 332
         {
333
-          label: '离场时间',
334
-          key: 'outTime'
333
+          label: '进出类型',
334
+          key: 'ioTypeName'
335 335
         },
336 336
         {
337
-          label: '车位号',
338
-          key: 'parkingNo'
339
-        },
337
+          label: '进出场时间',
338
+          key: 'ioDatetime'
339
+        }
340 340
       ],
341
-      tableData1: [{parkLotId: 'sasa'}],
341
+      tableData1: [],
342 342
       total1: 0,
343 343
       pageSize1: 10,
344 344
       pageNum1: 1,
@@ -715,9 +715,9 @@ export default {
715 715
     getTableData1() {
716 716
       this.loading1 = true
717 717
       const {pageNum1, pageSize1} = this
718
-      api_z.queryBusinessRecordInoutByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
719
-        this.tableData1 = res.data.records || []
720
-        this.total1 = res.data.total
718
+      api_z.queryBusinessRecordInoutByPage('carno=&parkId=100105547,100105554,100105564,100105577,100105585,100106097,100106280,31290002&regionId=&inTime=2024-04-03 00:00:00&outTime=2024-04-03 23:59:59&ioFlag=&parkingSpaceNo=&plateColor=&pageSize=15&curPage=1&sortName=&sortOrder=').then(res => {
719
+        this.tableData1 = res.data.data || []
720
+        this.total1 = res.data.totalRows
721 721
         this.loading1 = false
722 722
       })
723 723
     },

+ 3 - 3
src/util/dictionary.js

@@ -25,8 +25,8 @@ export default {
25 25
     '411104': '召陵区',
26 26
     '411121': '舞阳县',
27 27
     '411122': '临颍县',
28
-    '462003': '经济技术开发区',
29
-    '462033': '西城区',
30
-    '462300': '城乡一体化示范区'
28
+    '411171': '经济技术开发区',
29
+    '411123': '西城区',
30
+    '411124': '城乡一体化示范区'
31 31
   }
32 32
 }

+ 3 - 3
src/util/options.js

@@ -9,13 +9,13 @@ export default {
9 9
     value: '411104',
10 10
     label: '召陵区'
11 11
   },{
12
-    value: '462033',
12
+    value: '411123',
13 13
     label: '西城区'
14 14
   },{
15
-    value: '462003',
15
+    value: '411171',
16 16
     label: '经济技术开发区'
17 17
   },{
18
-    value: '462300',
18
+    value: '411124',
19 19
     label: '城乡一体化示范区'
20 20
   }, {
21 21
     value: '411121',