Browse Source

添加loading效果

duwendi 1 year ago
parent
commit
5d93502540
27 changed files with 285 additions and 104 deletions
  1. 12 3
      src/pages/index/components/appointment_rules.vue
  2. 14 5
      src/pages/index/components/basic_configuration.vue
  3. 4 1
      src/pages/index/components/berth_list.vue
  4. 12 3
      src/pages/index/components/business_record.vue
  5. 4 1
      src/pages/index/components/defaulting_subscrlber.vue
  6. 5 1
      src/pages/index/components/exception_handing.vue
  7. 12 3
      src/pages/index/components/inspection_management.vue
  8. 20 5
      src/pages/index/components/lead_system.vue
  9. 12 3
      src/pages/index/components/message_management.vue
  10. 20 5
      src/pages/index/components/pakking_lot.vue
  11. 12 3
      src/pages/index/components/parking_card.vue
  12. 4 1
      src/pages/index/components/parking_correction.vue
  13. 13 4
      src/pages/index/components/parking_order.vue
  14. 21 6
      src/pages/index/components/parking_outside_operation.vue
  15. 12 3
      src/pages/index/components/parking_unpeak.vue
  16. 4 1
      src/pages/index/components/pay_configuration.vue
  17. 4 1
      src/pages/index/components/payment_merchant.vue
  18. 33 38
      src/pages/index/components/performance_assess.vue
  19. 11 3
      src/pages/index/components/personnel_management.vue
  20. 4 1
      src/pages/index/components/platform_merchant.vue
  21. 12 3
      src/pages/index/components/product_order.vue
  22. 4 1
      src/pages/index/components/product_order_search.vue
  23. 12 3
      src/pages/index/components/service_configuration.vue
  24. 8 2
      src/pages/index/components/task_audit.vue
  25. 8 2
      src/pages/index/components/task_recovery.vue
  26. 4 1
      src/pages/index/components/task_report.vue
  27. 4 1
      src/pages/index/components/telephone_management.vue

+ 12 - 3
src/pages/index/components/appointment_rules.vue

@@ -39,7 +39,7 @@
39 39
             </el-col>
40 40
           </el-row>
41 41
         </el-form>
42
-        <el-table :data="tableData1">
42
+        <el-table :data="tableData1"  v-loading="loading1">
43 43
           <el-table-column v-for="(item, index) in columns1" :key="index" :label="item.label" :prop="item.key">
44 44
           </el-table-column>
45 45
           <el-table-column
@@ -127,7 +127,7 @@
127 127
             </el-col>
128 128
           </el-row>
129 129
         </el-form>
130
-        <el-table :data="tableData2">
130
+        <el-table :data="tableData2" v-loading="loading2">
131 131
           <el-table-column v-for="(item, index) in columns2" :key="index" :label="item.label" :prop="item.key">
132 132
           </el-table-column>
133 133
         </el-table>
@@ -157,7 +157,7 @@
157 157
             </el-col>
158 158
           </el-row>
159 159
         </el-form>
160
-        <el-table :data="tableData3">
160
+        <el-table :data="tableData3" v-loading="loading3">
161 161
           <el-table-column v-for="(item, index) in columns3" :key="index" :label="item.label" :prop="item.key">
162 162
           </el-table-column>
163 163
           <el-table-column
@@ -208,6 +208,9 @@ export default {
208 208
   components: {},
209 209
   data() {
210 210
     return {
211
+      loading1: false,
212
+      loading2: false,
213
+      loading3: false,
211 214
       carParkingNameOptions: [],
212 215
       activeName: '预约规则',
213 216
       columns1: [
@@ -400,20 +403,24 @@ export default {
400 403
       this.getTableData1()
401 404
     },
402 405
     getTableData1() {
406
+      this.loading1 = true
403 407
       const {pageNum1, pageSize1} = this
404 408
       api.yytcListByPage({current: pageNum1, size: pageSize1, ...this.formInline1, endTime: this.formInline1.endTime ? this.formInline1.endTime.substring(0, 10) + " 23:59:59" : ''}).then(res => {
405 409
         this.tableData1 = (res.data.records || [])
406 410
         this.total1 = res.data.total
411
+        this.loading1 = false
407 412
       })
408 413
     },
409 414
     handlePageChange2() {
410 415
       this.getTableData2()
411 416
     },
412 417
     getTableData2() {
418
+      this.loading2 = true
413 419
       const {pageNum2, pageSize2} = this
414 420
       api.orderListByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
415 421
         this.tableData2 = res.data.records || []
416 422
         this.total2 = res.data.total
423
+        this.loading2 = false
417 424
       })
418 425
     },
419 426
     handlePageChange3() {
@@ -421,9 +428,11 @@ export default {
421 428
     },
422 429
     getTableData3() {
423 430
       const {pageNum3, pageSize3} = this
431
+      this.loading3 = true
424 432
       api.refundListByPage({current: pageNum3, size: pageSize3, ...this.formInline3}).then(res => {
425 433
         this.tableData3 = res.data.records || []
426 434
         this.total3 = res.data.total
435
+        this.loading3 = false
427 436
       })
428 437
     },
429 438
   }

+ 14 - 5
src/pages/index/components/basic_configuration.vue

@@ -5,7 +5,7 @@
5 5
         <el-form class="form-wrapper" :inline="true" :model="formInline1" style="margin-bottom: 20px;">
6 6
           <el-row>
7 7
             <el-col :span="8">
8
-              <el-form-item label="配置名称:: ">
8
+              <el-form-item label="配置名称:">
9 9
                 <el-input v-model="formInline1.configName" placeholder="请输入"></el-input>
10 10
               </el-form-item>
11 11
             </el-col>
@@ -19,7 +19,7 @@
19 19
             </el-col>
20 20
           </el-row>
21 21
         </el-form>
22
-        <el-table :data="tableData1">
22
+        <el-table :data="tableData1" v-loading="loading1">
23 23
           <el-table-column v-for="(item, index) in columns1" :key="index" :label="item.label" :prop="item.key">
24 24
           </el-table-column>
25 25
           <el-table-column
@@ -77,7 +77,7 @@
77 77
             </el-col>
78 78
           </el-row>
79 79
         </el-form>
80
-        <el-table :data="tableData2">
80
+        <el-table :data="tableData2" v-loading="loading2">
81 81
           <el-table-column v-for="(item, index) in columns2" :key="index" :label="item.label" :prop="item.key">
82 82
           </el-table-column>
83 83
           <el-table-column
@@ -140,7 +140,7 @@
140 140
             </el-col>
141 141
           </el-row>
142 142
         </el-form>
143
-        <el-table :data="tableData3">
143
+        <el-table :data="tableData3" v-loading="loading3">
144 144
           <el-table-column v-for="(item, index) in columns3" :key="index" :label="item.label" :prop="item.key">
145 145
           </el-table-column>
146 146
           <el-table-column
@@ -180,7 +180,7 @@
180 180
                 <el-input v-model="formLabelAlign3.deviceState"></el-input>
181 181
               </el-form-item>
182 182
               <el-form-item label="停车场">
183
-                <el-select filterable v-model="formLabelAlign3.parkName" filterable placeholder="请选择">
183
+                <el-select filterable v-model="formLabelAlign3.parkName" placeholder="请选择">
184 184
                   <el-option
185 185
                     v-for="(item,index) in carParkingNameOptions"
186 186
                     :key="index"
@@ -208,6 +208,9 @@ export default {
208 208
   components: {},
209 209
   data() {
210 210
     return {
211
+      loading1: false,
212
+      loading2: false,
213
+      loading3: false,
211 214
       activeName: '系统配置',
212 215
       columns1: [
213 216
         {
@@ -462,30 +465,36 @@ export default {
462 465
       this.getTableData1()
463 466
     },
464 467
     getTableData1() {
468
+      this.loading1 = true
465 469
       const {pageNum1, pageSize1} = this
466 470
       api_z.queryBasicConfigurationSystemByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
467 471
         this.tableData1 = (res.data.records || []).map(item => ({...item, carType: dictionary.typeMap[item.carType]}))
468 472
         this.total1 = res.data.total
473
+        this.loading1 = false
469 474
       })
470 475
     },
471 476
     handlePageChange2() {
472 477
       this.getTableData2()
473 478
     },
474 479
     getTableData2() {
480
+      this.loading2 = true
475 481
       const {pageNum2, pageSize2} = this
476 482
       api_z.queryBasicConfigurationLaneByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
477 483
         this.tableData2 = res.data.records || []
478 484
         this.total2 = res.data.total
485
+        this.loading2 = false
479 486
       })
480 487
     },
481 488
     handlePageChange3() {
482 489
       this.getTableData3()
483 490
     },
484 491
     getTableData3() {
492
+      this.loading3 = true
485 493
       const {pageNum3, pageSize3} = this
486 494
       api_z.queryBasicConfigurationDeviceByPage({current: pageNum3, size: pageSize3, ...this.formInline3}).then(res => {
487 495
         this.tableData3 = res.data.records || []
488 496
         this.total3 = res.data.total
497
+        this.loading3 = false
489 498
       })
490 499
     },
491 500
   }

+ 4 - 1
src/pages/index/components/berth_list.vue

@@ -24,7 +24,7 @@
24 24
           </el-row>
25 25
         </el-form>
26 26
         <br>
27
-        <el-table :data="tableData">
27
+        <el-table :data="tableData" v-loading="loading">
28 28
           <el-table-column v-for="(item, index) in columns" :key="index" :label="item.label" :prop="item.key">
29 29
           </el-table-column>
30 30
         </el-table>
@@ -48,6 +48,7 @@ export default {
48 48
   },
49 49
   data() {
50 50
     return {
51
+      loading: false,
51 52
       formInline: {
52 53
         parkName: '',
53 54
         berthCode: ''
@@ -97,10 +98,12 @@ export default {
97 98
       this.getTableData()
98 99
     },
99 100
     getTableData() {
101
+      this.loading = true
100 102
       const {pageNum, pageSize} = this
101 103
       api.berthListByPage({current: pageNum, size: pageSize, ...this.formInline}).then(res => {
102 104
         this.tableData = (res.data.records || []).map(item => ({...item, berthIsorno: (item.berthIsorno === '0' ? '否':'是'),isTidalPark: (item.isTidalPark === '0' ? '否':'是'),hasChargingPile: (item.hasChargingPile === '0' ? '否':'是'),isSharePark: (item.isSharePark === '0' ? '否':'是'),}))
103 105
         this.total = res.data.total
106
+        this.loading = false
104 107
       })
105 108
     },
106 109
   }

+ 12 - 3
src/pages/index/components/business_record.vue

@@ -35,7 +35,7 @@
35 35
             </el-col>
36 36
           </el-row>
37 37
         </el-form>
38
-        <el-table :data="tableData1">
38
+        <el-table :data="tableData1" v-loading="loading1">
39 39
           <el-table-column v-for="(item, index) in columns1" :key="index" :label="item.label" :prop="item.key">
40 40
           </el-table-column>
41 41
           <el-table-column
@@ -129,7 +129,7 @@
129 129
             </el-col>
130 130
           </el-row>
131 131
         </el-form>
132
-        <el-table :data="tableData2">
132
+        <el-table :data="tableData2" v-loading="loading2">
133 133
           <el-table-column v-for="(item, index) in columns2" :key="index" :label="item.label" :prop="item.key">
134 134
           </el-table-column>
135 135
           <el-table-column
@@ -230,7 +230,7 @@
230 230
             </el-col>
231 231
           </el-row>
232 232
         </el-form>
233
-        <el-table :data="tableData3">
233
+        <el-table :data="tableData3" v-loading="loading3">
234 234
           <el-table-column v-for="(item, index) in columns3" :key="index" :label="item.label" :prop="item.key">
235 235
           </el-table-column>
236 236
           <el-table-column
@@ -311,6 +311,9 @@ export default {
311 311
   components: {},
312 312
   data() {
313 313
     return {
314
+      loading1: false,
315
+      loading2: false,
316
+      loading3: false,
314 317
       paymentMethodOptions: options.paymentMethodOptions,
315 318
       activeName: '停车记录查询',
316 319
       columns1: [
@@ -708,30 +711,36 @@ export default {
708 711
       this.getTableData1()
709 712
     },
710 713
     getTableData1() {
714
+      this.loading1 = true
711 715
       const {pageNum1, pageSize1} = this
712 716
       api_z.queryBusinessRecordInoutByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
713 717
         this.tableData1 = res.data.records || []
714 718
         this.total1 = res.data.total
719
+        this.loading1 = false
715 720
       })
716 721
     },
717 722
     handlePageChange2() {
718 723
       this.getTableData2()
719 724
     },
720 725
     getTableData2() {
726
+      this.loading2 = true
721 727
       const {pageNum2, pageSize2} = this
722 728
       api_z.queryBusinessRecordPaymentByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
723 729
         this.tableData2 = res.data.records || []
724 730
         this.total2 = res.data.total
731
+        this.loading2 = false
725 732
       })
726 733
     },
727 734
     handlePageChange3() {
728 735
       this.getTableData3()
729 736
     },
730 737
     getTableData3() {
738
+      this.loading3 = true
731 739
       const {pageNum3, pageSize3} = this
732 740
       api_z.queryBusinessRecordArrearsByPage({current: pageNum3, size: pageSize3, ...this.formInline3}).then(res => {
733 741
         this.tableData3 = res.data.records || []
734 742
         this.total3 = res.data.total
743
+        this.loading3 = false
735 744
       })
736 745
     },
737 746
   }

+ 4 - 1
src/pages/index/components/defaulting_subscrlber.vue

@@ -30,7 +30,7 @@
30 30
           </el-row>
31 31
         </el-form>
32 32
         <br>
33
-        <el-table :data="tableData">
33
+        <el-table :data="tableData" :loading="loading">
34 34
           <el-table-column v-for="(item, index) in columns" :key="index" :label="item.label" :prop="item.key">
35 35
           </el-table-column>
36 36
         </el-table>
@@ -56,6 +56,7 @@ export default {
56 56
   },
57 57
   data() {
58 58
     return {
59
+      loading: false,
59 60
       formInline: {
60 61
         memberId: '',
61 62
         parkName: '',
@@ -123,10 +124,12 @@ export default {
123 124
       this.getTableData()
124 125
     },
125 126
     getTableData() {
127
+      this.loading = true
126 128
       const {pageNum, pageSize} = this
127 129
       api_l.optDefaultingSubscrlberPage({}).then(res => {
128 130
         this.tableData = (res.data.records || []).map(item => ({...item, berthIsorno: (item.berthIsorno === '0' ? '否':'是'),isTidalPark: (item.isTidalPark === '0' ? '否':'是'),hasChargingPile: (item.hasChargingPile === '0' ? '否':'是'),isSharePark: (item.isSharePark === '0' ? '否':'是'),}))
129 131
         this.total = res.data.total
132
+        this.loading = false
130 133
       })
131 134
     },
132 135
     //车场

+ 5 - 1
src/pages/index/components/exception_handing.vue

@@ -30,7 +30,7 @@
30 30
             </el-col>
31 31
           </el-row>
32 32
         </el-form>
33
-        <el-table :data="tableData1">
33
+        <el-table :data="tableData1" :loading="loading1">
34 34
           <el-table-column v-for="(item, index) in columns1" :key="index" :label="item.label" :prop="item.key">
35 35
           </el-table-column>
36 36
           <el-table-column
@@ -363,6 +363,10 @@ export default {
363 363
   components: {},
364 364
   data() {
365 365
     return {
366
+      loading1: false,
367
+      loading2: false,
368
+      loading3: false,
369
+      loading4: false,
366 370
       activeName: '抬杆记录',
367 371
       columns1: [
368 372
         {

+ 12 - 3
src/pages/index/components/inspection_management.vue

@@ -11,7 +11,7 @@
11 11
             </el-col>
12 12
           </el-row>
13 13
         </el-form>
14
-        <el-table :data="tableData1">
14
+        <el-table :data="tableData1" v-loading="loading1">
15 15
           <el-table-column v-for="(item, index) in columns1" :key="index" :label="item.label" :prop="item.key">
16 16
           </el-table-column>
17 17
           <el-table-column
@@ -127,7 +127,7 @@
127 127
             </el-col>
128 128
           </el-row>
129 129
         </el-form>
130
-        <el-table :data="tableData2">
130
+        <el-table :data="tableData2" v-loading="loading2">
131 131
           <el-table-column v-for="(item, index) in columns2" :key="index" :label="item.label" :prop="item.key">
132 132
           </el-table-column>
133 133
           <el-table-column
@@ -188,7 +188,7 @@
188 188
             </el-col>
189 189
           </el-row>
190 190
         </el-form>
191
-        <el-table :data="tableData3">
191
+        <el-table :data="tableData3" v-loading="loading3">
192 192
           <el-table-column v-for="(item, index) in columns3" :key="index" :label="item.label" :prop="item.key">
193 193
           </el-table-column>
194 194
         </el-table>
@@ -210,6 +210,9 @@ export default {
210 210
   components: {},
211 211
   data() {
212 212
     return {
213
+      loading1: false,
214
+      loading2: false,
215
+      loading3: false,
213 216
       activeName: '稽查配置',
214 217
       columns1: [
215 218
         {
@@ -436,30 +439,36 @@ export default {
436 439
       this.getTableData1()
437 440
     },
438 441
     getTableData1() {
442
+      this.loading1 = true
439 443
       const {pageNum1, pageSize1} = this
440 444
       api_z.queryInspectionEvidenceByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
441 445
         this.tableData1 = res.data.records || []
442 446
         this.total1 = res.data.total
447
+        this.loading1 = false
443 448
       })
444 449
     },
445 450
     handlePageChange2() {
446 451
       this.getTableData2()
447 452
     },
448 453
     getTableData2() {
454
+      this.loading2 = true
449 455
       const {pageNum2, pageSize2} = this
450 456
       api_z.queryInspectionManagementByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
451 457
         this.tableData2 = res.data.records || []
452 458
         this.total2 = res.data.total
459
+        this.loading2 = false
453 460
       })
454 461
     },
455 462
     handlePageChange3() {
456 463
       this.getTableData3()
457 464
     },
458 465
     getTableData3() {
466
+      this.loading3 = true
459 467
       const {pageNum3, pageSize3} = this
460 468
       api_z.queryInspectionManagementByPage1({current: pageNum3, size: pageSize3, ...this.formInline3}).then(res => {
461 469
         this.tableData3 = res.data.records || []
462 470
         this.total3 = res.data.total
471
+        this.loading3 = false
463 472
       })
464 473
     },
465 474
   }

+ 20 - 5
src/pages/index/components/lead_system.vue

@@ -32,7 +32,7 @@
32 32
 <!--        </el-form>-->
33 33
         <h4>停车场数量和分布</h4>
34 34
         <br>
35
-        <el-table :data="tableData1">
35
+        <el-table :data="tableData1" v-loading="loading1">
36 36
           <el-table-column v-for="(item, index) in columns1" :key="index" :label="item.label" :prop="item.key">
37 37
           </el-table-column>
38 38
         </el-table>
@@ -44,21 +44,21 @@
44 44
         <br>
45 45
         <h4>停车位利用率</h4>
46 46
         <br>
47
-        <el-table :data="tableData2" height="300px">
47
+        <el-table :data="tableData2" height="300px" v-loading="loading2">
48 48
           <el-table-column v-for="(item, index) in columns2" :key="index" :label="item.label" :prop="item.key">
49 49
           </el-table-column>
50 50
         </el-table>
51 51
         <br>
52 52
         <h4>停车时长分布</h4>
53 53
         <br>
54
-        <el-table :data="tableData3" height="300px">
54
+        <el-table :data="tableData3" height="300px" v-loading="loading3">
55 55
           <el-table-column v-for="(item, index) in columns3" :key="index" :label="item.label" :prop="item.key">
56 56
           </el-table-column>
57 57
         </el-table>
58 58
         <br>
59 59
         <h4>停车场运营效率</h4>
60 60
         <br>
61
-        <el-table :data="tableData4" height="300px">
61
+        <el-table :data="tableData4" height="300px" v-loading="loading4">
62 62
           <el-table-column v-for="(item, index) in columns4" :key="index" :label="item.label" :prop="item.key">
63 63
           </el-table-column>
64 64
         </el-table>
@@ -83,7 +83,7 @@
83 83
 <!--            </el-col>-->
84 84
 <!--          </el-row>-->
85 85
 <!--        </el-form>-->
86
-        <el-table :data="tableData5" >
86
+        <el-table :data="tableData5" v-loading="loading5">
87 87
           <el-table-column v-for="(item, index) in columns5" :key="index" :label="item.label" :prop="item.key">
88 88
           </el-table-column>
89 89
         </el-table>
@@ -139,6 +139,11 @@ export default {
139 139
   components: {},
140 140
   data() {
141 141
     return {
142
+      loading1: false,
143
+      loading2: false,
144
+      loading3: false,
145
+      loading4: false,
146
+      loading5: false,
142 147
       activeName: '停车业务分析',
143 148
       columns1: [
144 149
         {
@@ -276,28 +281,38 @@ export default {
276 281
       this.getTableData1()
277 282
     },
278 283
     getTableData1() {
284
+      this.loading1 = true
279 285
       api.leadSystem1().then(res => {
280 286
         this.tableData1 = (res.data || [])
287
+        this.loading1 = false
281 288
       })
282 289
     },
283 290
     getTableData2() {
291
+      this.loading2 = true
284 292
       api.leadSystem2().then(res => {
285 293
         this.tableData2 = res.data || []
294
+        this.loading2 = false
286 295
       })
287 296
     },
288 297
     getTableData3() {
298
+      this.loading3 = true
289 299
       api.leadSystem3().then(res => {
290 300
         this.tableData3 = res.data || []
301
+        this.loading3 = false
291 302
       })
292 303
     },
293 304
     getTableData4() {
305
+      this.loading4 = true
294 306
       api.leadSystem4().then(res => {
295 307
         this.tableData4 = res.data || []
308
+        this.loading4 = false
296 309
       })
297 310
     },
298 311
     getTableData5() {
312
+      this.loading5 = true
299 313
       api.leadSystem5().then(res => {
300 314
         this.tableData5 = res.data || []
315
+        this.loading5 = false
301 316
       })
302 317
     },
303 318
     handlePageChange3() {

+ 12 - 3
src/pages/index/components/message_management.vue

@@ -33,7 +33,7 @@
33 33
             </el-col>
34 34
           </el-row>
35 35
         </el-form>
36
-        <el-table :data="tableData2">
36
+        <el-table :data="tableData2" v-loading="loading2">
37 37
           <el-table-column v-for="(item, index) in columns2" :key="index" :label="item.label" :prop="item.key">
38 38
           </el-table-column>
39 39
           <el-table-column
@@ -84,7 +84,7 @@
84 84
             </el-col>
85 85
           </el-row>
86 86
         </el-form>
87
-        <el-table :data="tableData3">
87
+        <el-table :data="tableData3" v-loading="loading3">
88 88
           <el-table-column v-for="(item, index) in columns3" :key="index" :label="item.label" :prop="item.key">
89 89
           </el-table-column>
90 90
           <el-table-column
@@ -147,7 +147,7 @@
147 147
             </el-col>
148 148
           </el-row>
149 149
         </el-form>
150
-        <el-table :data="tableData4">
150
+        <el-table :data="tableData4" v-loading="loading4">
151 151
           <el-table-column v-for="(item, index) in columns4" :key="index" :label="item.label" :prop="item.key">
152 152
           </el-table-column>
153 153
           <el-table-column
@@ -198,6 +198,9 @@ export default {
198 198
   components: {},
199 199
   data() {
200 200
     return {
201
+      loading2: false,
202
+      loading3: false,
203
+      loading4: false,
201 204
       activeName: '配置消息',
202 205
       formLabelAlign: {
203 206
         id: '',
@@ -439,30 +442,36 @@ export default {
439 442
       this.getTableData2()
440 443
     },
441 444
     getTableData2() {
445
+      this.loading2 = true
442 446
       const {pageNum2, pageSize2} = this
443 447
       api_l.gjListByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
444 448
         this.tableData2 = res.data.records || []
445 449
         this.total2 = res.data.total
450
+        this.loading2 = false
446 451
       })
447 452
     },
448 453
     handlePageChange3() {
449 454
       this.getTableData3()
450 455
     },
451 456
     getTableData3() {
457
+      this.loading3 = true
452 458
       const {pageNum3, pageSize3} = this
453 459
       api_l.optMessageManagementDevicePage({current: pageNum3, size: pageSize3}).then(res => {
454 460
         this.tableData3 = res.data.records
455 461
         this.total3 = res.data.total
462
+        this.loading3 = false
456 463
       })
457 464
     },
458 465
     handlePageChange4() {
459 466
       this.getTableData4()
460 467
     },
461 468
     getTableData4() {
469
+      this.loading4 = true
462 470
       const {pageNum4, pageSize4} = this
463 471
       api_l.optMessageManagementVehiclePage({current: pageNum4, size: pageSize4, ...this.formInline4}).then(res => {
464 472
         this.tableData4 = res.data.records
465 473
         this.total4 = res.data.total
474
+        this.loading4 = false
466 475
       })
467 476
     },
468 477
   }

+ 20 - 5
src/pages/index/components/pakking_lot.vue

@@ -25,7 +25,7 @@
25 25
             </el-col>
26 26
           </el-row>
27 27
         </el-form>
28
-        <el-table :data="tableData1">
28
+        <el-table :data="tableData1" v-loading="loading1">
29 29
           <el-table-column v-for="(item, index) in columns1" :key="index" :label="item.label" :prop="item.key">
30 30
           </el-table-column>
31 31
           <el-table-column
@@ -111,7 +111,7 @@
111 111
             </el-col>
112 112
           </el-row>
113 113
         </el-form>
114
-        <el-table :data="tableData2">
114
+        <el-table :data="tableData2" v-loading="loading2">
115 115
           <el-table-column v-for="(item, index) in columns2" :key="index" :label="item.label" :prop="item.key">
116 116
           </el-table-column>
117 117
           <el-table-column
@@ -187,7 +187,7 @@
187 187
             </el-col>
188 188
           </el-row>
189 189
         </el-form>
190
-        <el-table :data="tableData3">
190
+        <el-table :data="tableData3" v-loading="loading3">
191 191
           <el-table-column v-for="(item, index) in columns3" :key="index" :label="item.label" :prop="item.key">
192 192
           </el-table-column>
193 193
           <el-table-column
@@ -270,7 +270,7 @@
270 270
             </el-col>
271 271
           </el-row>
272 272
         </el-form>
273
-        <el-table :data="tableData4">
273
+        <el-table :data="tableData4" v-loading="loading4">
274 274
           <el-table-column v-for="(item, index) in columns4" :key="index" :label="item.label" :prop="item.key">
275 275
           </el-table-column>
276 276
           <el-table-column
@@ -353,7 +353,7 @@
353 353
             </el-col>
354 354
           </el-row>
355 355
         </el-form>
356
-        <el-table :data="tableData5">
356
+        <el-table :data="tableData5" v-loading="loading5">
357 357
           <el-table-column v-for="(item, index) in columns5" :key="index" :label="item.label" :prop="item.key">
358 358
           </el-table-column>
359 359
           <el-table-column
@@ -436,6 +436,11 @@ export default {
436 436
   components: {},
437 437
   data() {
438 438
     return {
439
+      loading1: false,
440
+      loading2: false,
441
+      loading3: false,
442
+      loading4: false,
443
+      loading5: false,
439 444
       fileList: [],
440 445
       activeName: '停车场管理',
441 446
       columns1: [
@@ -908,50 +913,60 @@ export default {
908 913
       this.getTableData1()
909 914
     },
910 915
     getTableData1() {
916
+      this.loading1 = true
911 917
       const {pageNum1, pageSize1} = this
912 918
       api_z.queryParkingLotByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
913 919
         this.tableData1 = res.data.records || []
914 920
         this.total1 = res.data.total
921
+        this.loading1 = false
915 922
       })
916 923
     },
917 924
     handlePageChange2() {
918 925
       this.getTableData2()
919 926
     },
920 927
     getTableData2() {
928
+      this.loading2 = true
921 929
       const {pageNum2, pageSize2} = this
922 930
       api_z.queryParkingChargingByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
923 931
         this.tableData2 = res.data.records || []
924 932
         this.total2 = res.data.total
933
+        this.loading2 = false
925 934
       })
926 935
     },
927 936
     handlePageChange3() {
928 937
       this.getTableData3()
929 938
     },
930 939
     getTableData3() {
940
+      this.loading3 = true
931 941
       const {pageNum3, pageSize3} = this
932 942
       api_z.queryParkingArrearByPage({current: pageNum3, size: pageSize3, ...this.formInline3}).then(res => {
933 943
         this.tableData3 = res.data.records || []
934 944
         this.total3 = res.data.total
945
+        this.loading3 = false
935 946
       })
936 947
     },
937 948
     handlePageChange4() {
938 949
       this.getTableData4()
939 950
     },
940 951
     getTableData4() {
952
+      this.loading4 = true
941 953
       const {pageNum4, pageSize4} = this
942 954
       api_z.queryParkingCarByPage({current: pageNum4, size: pageSize4, ...this.formInline4}).then(res => {
943 955
         this.tableData4 = res.data.records || []
944 956
         this.total4 = res.data.total
957
+        this.loading4 = false
945 958
       })
946 959
     },
947 960
     handlePageChange5() {
948 961
       this.getTableData5()
949 962
     },
950 963
     getTableData5() {
964
+      this.loading5 = true
951 965
       const {pageNum5, pageSize5} = this
952 966
       api_z.queryBazyByPage({current: pageNum5, size: pageSize5, ...this.formInline5}).then(res => {
953 967
         this.tableData5 = res.data.records || []
954 968
         this.total5 = res.data.total
969
+        this.loading5 = false
955 970
       })
956 971
     },
957 972
 

+ 12 - 3
src/pages/index/components/parking_card.vue

@@ -19,7 +19,7 @@
19 19
             </el-col>
20 20
           </el-row>
21 21
         </el-form>
22
-        <el-table :data="tableData1">
22
+        <el-table :data="tableData1" v-loading="loading1">
23 23
           <el-table-column v-for="(item, index) in columns1" :key="index" :label="item.label" :prop="item.key">
24 24
           </el-table-column>
25 25
           <el-table-column
@@ -94,7 +94,7 @@
94 94
             </el-col>
95 95
           </el-row>
96 96
         </el-form>
97
-        <el-table :data="tableData2">
97
+        <el-table :data="tableData2" v-loading="loading2">
98 98
           <el-table-column v-for="(item, index) in columns2" :key="index" :label="item.label" :prop="item.key">
99 99
           </el-table-column>
100 100
         </el-table>
@@ -142,7 +142,7 @@
142 142
             </el-col>
143 143
           </el-row>
144 144
         </el-form>
145
-        <el-table :data="tableData3">
145
+        <el-table :data="tableData3" v-loading="loading3">
146 146
           <el-table-column v-for="(item, index) in columns3" :key="index" :label="item.label" :prop="item.key">
147 147
           </el-table-column>
148 148
         </el-table>
@@ -163,6 +163,9 @@ export default {
163 163
   components: {},
164 164
   data() {
165 165
     return {
166
+      loading1: false,
167
+      loading2: false,
168
+      loading3: false,
166 169
       activeName: '规则配置',
167 170
       columns1: [
168 171
         {
@@ -360,30 +363,36 @@ export default {
360 363
       this.getTableData1()
361 364
     },
362 365
     getTableData1() {
366
+      this.loading1 = true
363 367
       const {pageNum1, pageSize1} = this
364 368
       api.tckListByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
365 369
         this.tableData1 = (res.data.records || []).map(item => ({...item, carType: dictionary.typeMap[item.carType]}))
366 370
         this.total1 = res.data.total
371
+        this.loading1 = false
367 372
       })
368 373
     },
369 374
     handlePageChange2() {
370 375
       this.getTableData2()
371 376
     },
372 377
     getTableData2() {
378
+      this.loading2 = true
373 379
       const {pageNum2, pageSize2} = this
374 380
       api.tckOrderListByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
375 381
         this.tableData2 = res.data.records || []
376 382
         this.total2 = res.data.total
383
+        this.loading2 = false
377 384
       })
378 385
     },
379 386
     handlePageChange3() {
380 387
       this.getTableData3()
381 388
     },
382 389
     getTableData3() {
390
+      this.loading3 = true
383 391
       const {pageNum3, pageSize3} = this
384 392
       api.tckTjxxListByPage({current: pageNum3, size: pageSize3, ...this.formInline3}).then(res => {
385 393
         this.tableData3 = res.data.records || []
386 394
         this.total3 = res.data.total
395
+        this.loading3 = false
387 396
       })
388 397
     },
389 398
   }

+ 4 - 1
src/pages/index/components/parking_correction.vue

@@ -37,7 +37,7 @@
37 37
         </el-col>
38 38
       </el-row>
39 39
     </el-form>
40
-    <el-table :data="tableData">
40
+    <el-table :data="tableData" v-loading="loading">
41 41
       <el-table-column v-for="(item, index) in columns1" :key="index" :label="item.label" :prop="item.key">
42 42
       </el-table-column>
43 43
       <el-table-column
@@ -83,6 +83,7 @@ export default {
83 83
   components: {},
84 84
   data() {
85 85
     return {
86
+      loading: false,
86 87
       columns1: [
87 88
         {
88 89
           label: '停车场名称',
@@ -131,6 +132,7 @@ export default {
131 132
       this.getTableData()
132 133
     },
133 134
     getTableData() {
135
+      this.loading = true
134 136
       const {pageNum, pageSize} = this
135 137
       let params = {...this.formInline}
136 138
       if (
@@ -145,6 +147,7 @@ export default {
145 147
       api.tcjc({current: pageNum, size: pageSize, ...params}).then(res => {
146 148
         this.tableData = (res.data.records || []).map(item => ({...item, carType: dictionary.typeMap[item.carType]}))
147 149
         this.total = res.data.total
150
+        this.loading = false
148 151
       })
149 152
     },
150 153
 

+ 13 - 4
src/pages/index/components/parking_order.vue

@@ -35,7 +35,7 @@
35 35
             </el-col>
36 36
           </el-row>
37 37
         </el-form>
38
-        <el-table :data="tableData1">
38
+        <el-table :data="tableData1" v-loading="loading1">
39 39
           <el-table-column v-for="(item, index) in columns1" :key="index" :label="item.label" :prop="item.key">
40 40
           </el-table-column>
41 41
         </el-table>
@@ -65,7 +65,7 @@
65 65
             </el-col>
66 66
           </el-row>
67 67
         </el-form>
68
-        <el-table :data="tableData2">
68
+        <el-table :data="tableData2" v-loading="loading2">
69 69
           <el-table-column v-for="(item, index) in columns2" :key="index" :label="item.label" :prop="item.key">
70 70
           </el-table-column>
71 71
         </el-table>
@@ -95,7 +95,7 @@
95 95
             </el-col>
96 96
           </el-row>
97 97
         </el-form>
98
-        <el-table :data="tableData4">
98
+        <el-table :data="tableData4" v-loading="loading4">
99 99
           <el-table-column v-for="(item, index) in columns4" :key="index" :label="item.label" :prop="item.key">
100 100
           </el-table-column>
101 101
         </el-table>
@@ -117,6 +117,9 @@ export default {
117 117
   components: {},
118 118
   data() {
119 119
     return {
120
+      loading1: false,
121
+      loading2: false,
122
+      loading4: false,
120 123
       activeName: '支付订单查询',
121 124
       columns1: [
122 125
         {
@@ -254,30 +257,36 @@ export default {
254 257
       this.getTableData1()
255 258
     },
256 259
     getTableData1() {
260
+      this.loading1 = true
257 261
       const {pageNum1, pageSize1} = this
258 262
       api_z.queryParkingOrderByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
259 263
         this.tableData1 = (res.data.records || []).map(item => ({...item, carType: dictionary.typeMap[item.carType]}))
260 264
         this.total1 = res.data.total
265
+        this.loading1 = false
261 266
       })
262 267
     },
263 268
     handlePageChange2() {
264 269
       this.getTableData2()
265 270
     },
266 271
     getTableData2() {
272
+      this.loading2 = true
267 273
       const {pageNum2, pageSize2} = this
268 274
       api_z.queryParkingOrderArrearsByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
269 275
         this.tableData2 = res.data.records || []
270 276
         this.total2 = res.data.total
277
+        this.loading2 = false
271 278
       })
272 279
     },
273 280
     handlePageChange4() {
274
-      this.getTableData3()
281
+      this.getTableData4()
275 282
     },
276 283
     getTableData4() {
284
+      this.loading4= true
277 285
       const {pageNum4, pageSize4} = this
278 286
       api.orderListByPage({current: pageNum4, size: pageSize4, ...this.formInline4}).then(res => {
279 287
         this.tableData4 = res.data.records || []
280 288
         this.total4 = res.data.total
289
+        this.loading4 = false
281 290
       })
282 291
     }
283 292
   }

+ 21 - 6
src/pages/index/components/parking_outside_operation.vue

@@ -30,7 +30,7 @@
30 30
             </el-col>
31 31
           </el-row>
32 32
         </el-form>
33
-        <el-table :data="tableData1">
33
+        <el-table :data="tableData1" v-loading="loading1">
34 34
           <el-table-column v-for="(item, index) in columns1" :key="index" :label="item.label" :prop="item.key">
35 35
           </el-table-column>
36 36
           <el-table-column
@@ -121,7 +121,7 @@
121 121
             </el-col>
122 122
           </el-row>
123 123
         </el-form>
124
-        <el-table :data="tableData2">
124
+        <el-table :data="tableData2" v-loading="loading2">
125 125
           <el-table-column v-for="(item, index) in columns2" :key="index" :label="item.label" :prop="item.key">
126 126
           </el-table-column>
127 127
           <el-table-column
@@ -207,7 +207,7 @@
207 207
             </el-col>
208 208
           </el-row>
209 209
         </el-form>
210
-        <el-table :data="tableData3">
210
+        <el-table :data="tableData3" v-loading="loading3">
211 211
           <el-table-column v-for="(item, index) in columns3" :key="index" :label="item.label" :prop="item.key">
212 212
           </el-table-column>
213 213
           <el-table-column
@@ -294,7 +294,7 @@
294 294
             </el-col>
295 295
           </el-row>
296 296
         </el-form>
297
-        <el-table :data="tableData4">
297
+        <el-table :data="tableData4" v-loading="loading4">
298 298
           <el-table-column v-for="(item, index) in columns4" :key="index" :label="item.label" :prop="item.key">
299 299
           </el-table-column>
300 300
           <el-table-column
@@ -380,7 +380,7 @@
380 380
             </el-col>
381 381
           </el-row>
382 382
         </el-form>
383
-        <el-table :data="tableData5">
383
+        <el-table :data="tableData5" v-loading="loading5">
384 384
           <el-table-column v-for="(item, index) in columns5" :key="index" :label="item.label" :prop="item.key">
385 385
           </el-table-column>
386 386
           <el-table-column
@@ -458,6 +458,11 @@ export default {
458 458
   components: {},
459 459
   data() {
460 460
     return {
461
+      loading1: false,
462
+      loading2: false,
463
+      loading3: false,
464
+      loading4: false,
465
+      loading5: false,
461 466
       activeName: '出入管理',
462 467
       columns1: [
463 468
         {
@@ -625,7 +630,7 @@ export default {
625 630
           key: 'parkName'
626 631
         },
627 632
       ],
628
-      tableData5: [{tollmanName: 'sasa1111'}],
633
+      tableData5: [],
629 634
       total5: 0,
630 635
       pageSize5: 10,
631 636
       pageNum5: 1,
@@ -910,50 +915,60 @@ export default {
910 915
       this.getTableData1()
911 916
     },
912 917
     getTableData1() {
918
+      this.loading1 = true
913 919
       const {pageNum1, pageSize1} = this
914 920
       api_z.queryParkingOutsideOperationInoutByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
915 921
         this.tableData1 = res.data.records || []
916 922
         this.total1 = res.data.total
923
+        this.loading1 = false
917 924
       })
918 925
     },
919 926
     handlePageChange2() {
920 927
       this.getTableData2()
921 928
     },
922 929
     getTableData2() {
930
+      this.loading2 = true
923 931
       const {pageNum2, pageSize2} = this
924 932
       api_z.queryParkingOutsideOperationParkingrecordByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
925 933
         this.tableData2 = res.data.records || []
926 934
         this.total2 = res.data.total
935
+        this.loading2 = false
927 936
       })
928 937
     },
929 938
     handlePageChange3() {
930 939
       this.getTableData3()
931 940
     },
932 941
     getTableData3() {
942
+      this.loading3 = true
933 943
       const {pageNum3, pageSize3} = this
934 944
       api_z.queryParkingOutsideOperationInrecordByPage({current: pageNum3, size: pageSize3, ...this.formInline3}).then(res => {
935 945
         this.tableData3 = res.data.records || []
936 946
         this.total3 = res.data.total
947
+        this.loading3 = false
937 948
       })
938 949
     },
939 950
     handlePageChange4() {
940 951
       this.getTableData4()
941 952
     },
942 953
     getTableData4() {
954
+      this.loading4 = true
943 955
       const {pageNum4, pageSize4} = this
944 956
       api_z.queryParkingOutsideOperationSpecialByPage({current: pageNum4, size: pageSize4, ...this.formInline4}).then(res => {
945 957
         this.tableData4 = res.data.records || []
946 958
         this.total4 = res.data.total
959
+        this.loading4 = false
947 960
       })
948 961
     },
949 962
     handlePageChange5() {
950 963
       this.getTableData5()
951 964
     },
952 965
     getTableData5() {
966
+      this.loading5 = true
953 967
       const {pageNum5, pageSize5} = this
954 968
       api_z.queryParkingOutsideOperationLiftByPage({current: pageNum5, size: pageSize5, ...this.formInline5}).then(res => {
955 969
         this.tableData5 = res.data.records || []
956 970
         this.total5 = res.data.total
971
+        this.loading5 = false
957 972
       })
958 973
     },
959 974
   }

+ 12 - 3
src/pages/index/components/parking_unpeak.vue

@@ -19,7 +19,7 @@
19 19
             </el-col>
20 20
           </el-row>
21 21
         </el-form>
22
-        <el-table :data="tableData1">
22
+        <el-table :data="tableData1" v-loading="loading1">
23 23
           <el-table-column v-for="(item, index) in columns1" :key="index" :label="item.label" :prop="item.key">
24 24
           </el-table-column>
25 25
           <el-table-column
@@ -110,7 +110,7 @@
110 110
             </el-col>
111 111
           </el-row>
112 112
         </el-form>
113
-        <el-table :data="tableData2">
113
+        <el-table :data="tableData2" v-loading="loading2">
114 114
           <el-table-column v-for="(item, index) in columns2" :key="index" :label="item.label" :prop="item.key">
115 115
           </el-table-column>
116 116
         </el-table>
@@ -144,7 +144,7 @@
144 144
             </el-col>
145 145
           </el-row>
146 146
         </el-form>
147
-        <el-table :data="tableData3">
147
+        <el-table :data="tableData3" v-loading="loading3">
148 148
           <el-table-column v-for="(item, index) in columns3" :key="index" :label="item.label" :prop="item.key">
149 149
           </el-table-column>
150 150
         </el-table>
@@ -165,6 +165,9 @@ export default {
165 165
   components: {},
166 166
   data() {
167 167
     return {
168
+      loading1: false,
169
+      loading2: false,
170
+      loading3: false,
168 171
       activeName: '规则配置',
169 172
       columns1: [
170 173
         {
@@ -352,30 +355,36 @@ export default {
352 355
       this.getTableData1()
353 356
     },
354 357
     getTableData1() {
358
+      this.loading1 = true
355 359
       const {pageNum1, pageSize1} = this
356 360
       api.cftcListByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
357 361
         this.tableData1 = (res.data.records || []).map(item => ({...item, carType: dictionary.typeMap[item.carType]}))
358 362
         this.total1 = res.data.total
363
+        this.loading1 = false
359 364
       })
360 365
     },
361 366
     handlePageChange2() {
362 367
       this.getTableData2()
363 368
     },
364 369
     getTableData2() {
370
+      this.loading2 = true
365 371
       const {pageNum2, pageSize2} = this
366 372
       api.cftcOrderListByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
367 373
         this.tableData2 = res.data.records || []
368 374
         this.total2 = res.data.total
375
+        this.loading2 = false
369 376
       })
370 377
     },
371 378
     handlePageChange3() {
372 379
       this.getTableData3()
373 380
     },
374 381
     getTableData3() {
382
+      this.loading3 = true
375 383
       const {pageNum3, pageSize3} = this
376 384
       api.tcjlListByPage({current: pageNum3, size: pageSize3, ...this.formInline3}).then(res => {
377 385
         this.tableData3 = res.data.records || []
378 386
         this.total3 = res.data.total
387
+        this.loading3 = false
379 388
       })
380 389
     },
381 390
   }

+ 4 - 1
src/pages/index/components/pay_configuration.vue

@@ -38,7 +38,7 @@
38 38
           </el-row>
39 39
         </el-form>
40 40
         <br>
41
-        <el-table :data="tableData">
41
+        <el-table :data="tableData" v-loading="loading">
42 42
           <el-table-column v-for="(item, index) in columns" :key="index" :label="item.label" :prop="item.key">
43 43
           </el-table-column>
44 44
           <el-table-column
@@ -104,6 +104,7 @@ export default {
104 104
   },
105 105
   data() {
106 106
     return {
107
+      loading: false,
107 108
       carParkingNameOptions: [],
108 109
       formInline: {
109 110
         merchantId: '',
@@ -174,10 +175,12 @@ export default {
174 175
       this.dialogVisible = true
175 176
     },
176 177
     getTableData() {
178
+      this.loading = true
177 179
       const {pageNum, pageSize} = this
178 180
       api.yypzListByPage({current: pageNum, size: pageSize, ...this.formInline}).then(res => {
179 181
         this.tableData = (res.data.records || [])
180 182
         this.total = res.data.total
183
+        this.loading = false
181 184
       })
182 185
     },
183 186
     deleteRow(record) {

+ 4 - 1
src/pages/index/components/payment_merchant.vue

@@ -32,7 +32,7 @@
32 32
           </el-row>
33 33
         </el-form>
34 34
         <br>
35
-        <el-table :data="tableData">
35
+        <el-table :data="tableData" v-loading="loading">
36 36
           <el-table-column v-for="(item, index) in columns" :key="index" :label="item.label" :prop="item.key">
37 37
           </el-table-column>
38 38
           <el-table-column
@@ -91,6 +91,7 @@ export default {
91 91
   },
92 92
   data() {
93 93
     return {
94
+      loading: false,
94 95
       formInline: {
95 96
         merchantId: '',
96 97
         merchantName: '',
@@ -153,10 +154,12 @@ export default {
153 154
       this.dialogVisible = true
154 155
     },
155 156
     getTableData() {
157
+      this.loading = true
156 158
       const {pageNum, pageSize} = this
157 159
       api.zfshListByPage({current: pageNum, size: pageSize, ...this.formInline}).then(res => {
158 160
         this.tableData = (res.data.records || [])
159 161
         this.total = res.data.total
162
+        this.loading = false
160 163
       })
161 164
     },
162 165
     handleConfirm() {

+ 33 - 38
src/pages/index/components/performance_assess.vue

@@ -6,7 +6,13 @@
6 6
           <el-row>
7 7
             <el-col :span="8">
8 8
               <el-form-item label="收费员: ">
9
-                <el-input v-model="formInline1.tollCollector" placeholder="请输入"></el-input>
9
+                <el-select filterable clearable v-model="formInline1.rollmanId" placeholder="请选择">
10
+                  <el-option
11
+                    v-for="(item,index) in peopleOptions"
12
+                    :key="index"
13
+                    :label="item.tollmanName"
14
+                    :value="item.id" />
15
+                </el-select>
10 16
               </el-form-item>
11 17
             </el-col>
12 18
             <el-col :span="8">
@@ -16,7 +22,7 @@
16 22
             </el-col>
17 23
           </el-row>
18 24
         </el-form>
19
-        <el-table :data="tableData1">
25
+        <el-table :data="tableData1" :loading="loading1">
20 26
           <el-table-column v-for="(item, index) in columns1" :key="index" :label="item.label" :prop="item.key">
21 27
           </el-table-column>
22 28
         </el-table>
@@ -31,7 +37,7 @@
31 37
           <el-row>
32 38
             <el-col :span="8">
33 39
               <el-form-item label="稽查员姓名: ">
34
-                <el-select filterable clearable v-model="formInline2.id" placeholder="请选择">
40
+                <el-select filterable clearable v-model="formInline2.inspectionmanId" placeholder="请选择">
35 41
                   <el-option
36 42
                     v-for="(item,index) in peopleOptions"
37 43
                     :key="index"
@@ -47,12 +53,12 @@
47 53
             </el-col>
48 54
           </el-row>
49 55
         </el-form>
50
-        <el-table :data="tableData2">
56
+        <el-table :data="tableData2" v-loading="loading2">
51 57
           <el-table-column v-for="(item, index) in columns2" :key="index" :label="item.label" :prop="item.key">
52 58
           </el-table-column>
53 59
         </el-table>
54 60
         <div class="table-pagination">
55
-          <el-pagination layout="prev, pager, next" :total="total1" @current-change="handlePageChange2"
61
+          <el-pagination layout="prev, pager, next" :total="total2" @current-change="handlePageChange2"
56 62
                          :current-page.sync="pageNum2" :page-size.sync="pageSize2">
57 63
           </el-pagination>
58 64
         </div>
@@ -62,7 +68,7 @@
62 68
           <el-row>
63 69
             <el-col :span="8">
64 70
               <el-form-item label="收费员: ">
65
-                <el-select filterable clearable v-model="formInline3.id" placeholder="请选择">
71
+                <el-select filterable clearable v-model="formInline3.rollmanId" placeholder="请选择">
66 72
                   <el-option
67 73
                     v-for="(item,index) in peopleOptions"
68 74
                     :key="index"
@@ -73,7 +79,7 @@
73 79
             </el-col>
74 80
             <el-col :span="8">
75 81
               <el-form-item label="稽查员: ">
76
-                <el-select filterable clearable v-model="formInline3.id2" placeholder="请选择">
82
+                <el-select filterable clearable v-model="formInline3.inspectionmanId" placeholder="请选择">
77 83
                   <el-option
78 84
                     v-for="(item,index) in peopleOptions"
79 85
                     :key="index"
@@ -89,7 +95,7 @@
89 95
             </el-col>
90 96
           </el-row>
91 97
         </el-form>
92
-        <el-table :data="tableData3">
98
+        <el-table :data="tableData3" v-loading="loading3">
93 99
           <el-table-column v-for="(item, index) in columns3" :key="index" :label="item.label" :prop="item.key">
94 100
           </el-table-column>
95 101
         </el-table>
@@ -111,6 +117,9 @@ export default {
111 117
   components: {},
112 118
   data() {
113 119
     return {
120
+      loading1: false,
121
+      loading2: false,
122
+      loading3: false,
114 123
       activeName: '收费员工作统计',
115 124
       columns1: [
116 125
         {
@@ -144,7 +153,7 @@ export default {
144 153
       pageSize1: 10,
145 154
       pageNum1: 1,
146 155
       formInline1: {
147
-        tollCollector: ''
156
+        rollmanId: ''
148 157
       },
149 158
       columns2: [
150 159
         {
@@ -165,13 +174,7 @@ export default {
165 174
       pageSize2: 10,
166 175
       pageNum2: 1,
167 176
       formInline2: {
168
-        inspector: '',
169
-        inspectionmanId:'',
170
-        rollmanId:'',
171
-        inspectionManName:'',
172
-        inspectionCount:'',
173
-        perMinutes:'',
174
-        tollmanName:'',
177
+        inspectionmanId: ''
175 178
       },
176 179
       columns3: [
177 180
         {
@@ -192,10 +195,8 @@ export default {
192 195
       pageSize3: 10,
193 196
       pageNum3: 1,
194 197
       formInline3: {
195
-        tollCollector: '',
196
-        inspector:'',
197
-        id:'',
198
-        id2:''
198
+        rollmanId: '',
199
+        inspectionmanId: ''
199 200
       },
200 201
     }
201 202
   },
@@ -209,33 +210,27 @@ export default {
209 210
   },
210 211
   methods: {
211 212
     onSubmit1() {
212
-      this.pageNum1 = 1
213
-      api_l.optPerformanceassesspage({rollmanId: this.formInline1.tollCollector}).then(res => {
214
-        this.tableData1 = res.data.records
215
-      })
213
+      this.pageNum1 = 1;
214
+      this.getTableData1()
216 215
     },
217 216
     onSubmit2() {
218
-      const {pageNum2, pageSize2} = this
219
-      api_l.optPerformanceAssessStat1page({inspectionmanId:this.formInline2.id}).then(res => {
220
-        this.tableData2 = res.data.records
221
-        this.total2 = res.data.total
222
-      })
217
+      this.pageNum2 = 1;
218
+      this.getTableData2()
223 219
     },
224 220
     onSubmit3() {
225
-      const {pageNum3, pageSize3} = this
226
-      api_l.optPerformanceAssessStat2page({inspectionmanId:this.formInline3.id,rollmanId:this.formInline3.id2}).then(res => {
227
-        this.tableData3 = res.data.records
228
-        this.total3 = res.data.total
229
-      })
221
+      this.pageNum3 = 1;
222
+      this.getTableData3()
230 223
     },
231 224
     handlePageChange1() {
232
-      this.getTableData1()
225
+      this.getTableData3()
233 226
     },
234 227
     getTableData1() {
228
+      this.loading1 = true
235 229
       const {pageNum1, pageSize1} = this
236
-      api_l.optPerformanceassesspage({}).then(res => {
230
+      api_l.optPerformanceassesspage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
237 231
         this.tableData1 = res.data.records
238 232
         this.total1 = res.data.total
233
+        this.loading1 = false
239 234
       })
240 235
     },
241 236
     //人员
@@ -249,7 +244,7 @@ export default {
249 244
     },
250 245
     getTableData2() {
251 246
       const {pageNum2, pageSize2} = this
252
-      api_l.optPerformanceAssessStat1page({}).then(res => {
247
+      api_l.optPerformanceAssessStat1page({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
253 248
         this.tableData2 = res.data.records
254 249
         this.total2 = res.data.total
255 250
       })
@@ -259,7 +254,7 @@ export default {
259 254
     },
260 255
     getTableData3() {
261 256
       const {pageNum3, pageSize3} = this
262
-      api_l.optPerformanceAssessStat2page({}).then(res => {
257
+      api_l.optPerformanceAssessStat2page({current: pageNum3, size: pageSize3, ...this.formInline3}).then(res => {
263 258
         this.tableData3 = res.data.records
264 259
         this.total3 = res.data.total
265 260
       })

+ 11 - 3
src/pages/index/components/personnel_management.vue

@@ -6,7 +6,7 @@
6 6
           <el-row>
7 7
             <el-col :span="8">
8 8
               <el-form-item label="车场名称: ">
9
-                <el-select filterable clearable filterable v-model="formInline1.parkId" placeholder="请选择">
9
+                <el-select clearable filterable v-model="formInline1.parkId" placeholder="请选择">
10 10
                   <el-option
11 11
                     v-for="(item,index) in carParkingNameOptions"
12 12
                     :key="index"
@@ -25,7 +25,7 @@
25 25
             </el-col>
26 26
           </el-row>
27 27
         </el-form>
28
-        <el-table :data="tableData1">
28
+        <el-table :data="tableData1" v-loading="loading1">
29 29
           <el-table-column v-for="(item, index) in columns1" :key="index" :label="item.label" :prop="item.key">
30 30
           </el-table-column>
31 31
           <el-table-column
@@ -119,7 +119,7 @@
119 119
             </el-col>
120 120
           </el-row>
121 121
         </el-form>
122
-        <el-table :data="tableData2">
122
+        <el-table :data="tableData2" v-loading="loading2">
123 123
           <el-table-column v-for="(item, index) in columns2" :key="index" :label="item.label" :prop="item.key">
124 124
           </el-table-column>
125 125
           <el-table-column
@@ -180,6 +180,8 @@ export default {
180 180
   components: {},
181 181
   data() {
182 182
     return {
183
+      loading1: false,
184
+      loading2: false,
183 185
       activeName: '交接班报表',
184 186
       columns1: [
185 187
         {
@@ -288,8 +290,11 @@ export default {
288 290
   watch: {},
289 291
   methods: {
290 292
     onSubmit1() {
293
+      this.loading1 = true
291 294
       api_l.optPersonnelManagementShiftPage({parkId: this.formInline1.parkId}).then(res => {
292 295
         this.tableData1 = res.data.records
296
+        this.total1 = res.data.total
297
+        this.loading1 = false
293 298
       })
294 299
       },
295 300
     handleAdd() {
@@ -328,8 +333,11 @@ export default {
328 333
       }
329 334
     },
330 335
     onSubmit2() {
336
+      this.loading2 = true
331 337
       api_l.optPersonnelManagementBasicDetail({tollmanName: this.formInline2.tollCollectorName}).then(res => {
332 338
         this.tableData2 = res.data.records
339
+        this.total2 = res.data.total
340
+        this.loading2 = false
333 341
       })
334 342
 
335 343
     },

+ 4 - 1
src/pages/index/components/platform_merchant.vue

@@ -27,7 +27,7 @@
27 27
           </el-row>
28 28
         </el-form>
29 29
         <br>
30
-        <el-table :data="tableData">
30
+        <el-table :data="tableData" v-loading="loading">
31 31
           <el-table-column v-for="(item, index) in columns" :key="index" :label="item.label" :prop="item.key">
32 32
           </el-table-column>
33 33
           <el-table-column
@@ -89,6 +89,7 @@ export default {
89 89
   },
90 90
   data() {
91 91
     return {
92
+      loading: false,
92 93
       formInline: {
93 94
         merchantName: '',
94 95
         paymentMerchantName: '',
@@ -155,10 +156,12 @@ export default {
155 156
       this.dialogVisible = true
156 157
     },
157 158
     getTableData() {
159
+      this.loading = true
158 160
       const {pageNum, pageSize} = this
159 161
       api.ptshpzListByPage({current: pageNum, size: pageSize, ...this.formInline}).then(res => {
160 162
         this.tableData = (res.data.records || []).map(item => ({...item, berthIsorno: (item.berthIsorno === '0' ? '否':'是'),isTidalPark: (item.isTidalPark === '0' ? '否':'是'),hasChargingPile: (item.hasChargingPile === '0' ? '否':'是'),isSharePark: (item.isSharePark === '0' ? '否':'是'),}))
161 163
         this.total = res.data.total
164
+        this.loading = false
162 165
       })
163 166
     },
164 167
     deleteRow(record) {

+ 12 - 3
src/pages/index/components/product_order.vue

@@ -16,7 +16,7 @@
16 16
             </el-col>
17 17
           </el-row>
18 18
         </el-form>
19
-        <el-table :data="tableData1">
19
+        <el-table :data="tableData1" v-loading="loading1">
20 20
           <el-table-column v-for="(item, index) in columns1" :key="index" :label="item.label" :prop="item.key">
21 21
           </el-table-column>
22 22
         </el-table>
@@ -46,7 +46,7 @@
46 46
             </el-col>
47 47
           </el-row>
48 48
         </el-form>
49
-        <el-table :data="tableData2">
49
+        <el-table :data="tableData2" v-loading="loading2">
50 50
           <el-table-column v-for="(item, index) in columns2" :key="index" :label="item.label" :prop="item.key">
51 51
           </el-table-column>
52 52
         </el-table>
@@ -76,7 +76,7 @@
76 76
             </el-col>
77 77
           </el-row>
78 78
         </el-form>
79
-        <el-table :data="tableData3">
79
+        <el-table :data="tableData3" v-loading="loading3">
80 80
           <el-table-column v-for="(item, index) in columns3" :key="index" :label="item.label" :prop="item.key">
81 81
           </el-table-column>
82 82
         </el-table>
@@ -98,6 +98,9 @@ export default {
98 98
   components: {},
99 99
   data() {
100 100
     return {
101
+      loading1: false,
102
+      loading2: false,
103
+      loading3: false,
101 104
       activeName: '停车卡订单查询',
102 105
       columns1: [
103 106
         {
@@ -236,30 +239,36 @@ export default {
236 239
       this.getTableData1()
237 240
     },
238 241
     getTableData1() {
242
+      this.loading1 = true
239 243
       const {pageNum1, pageSize1} = this
240 244
       api_z.queryProductOrderParkingByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
241 245
         this.tableData1 = res.data.records || []
242 246
         this.total1 = res.data.total
247
+        this.loading1 = false
243 248
       })
244 249
     },
245 250
     handlePageChange2() {
246 251
       this.getTableData2()
247 252
     },
248 253
     getTableData2() {
254
+      this.loading2 = true
249 255
       const {pageNum2, pageSize2} = this
250 256
       api_z.queryProductOrderUnpeakByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
251 257
         this.tableData2 = res.data.records || []
252 258
         this.total2 = res.data.total
259
+        this.loading2 = false
253 260
       })
254 261
     },
255 262
     handlePageChange3() {
256 263
       this.getTableData3()
257 264
     },
258 265
     getTableData3() {
266
+      this.loading3 = true
259 267
       const {pageNum3, pageSize3} = this
260 268
       api.orderListByPage({current: pageNum3, size: pageSize3, ...this.formInline3}).then(res => {
261 269
         this.tableData3 = res.data.records || []
262 270
         this.total3 = res.data.total
271
+        this.loading3 = false
263 272
       })
264 273
     },
265 274
   }

+ 4 - 1
src/pages/index/components/product_order_search.vue

@@ -19,7 +19,7 @@
19 19
         </el-col>
20 20
       </el-row>
21 21
     </el-form>
22
-    <el-table :data="tableData1">
22
+    <el-table :data="tableData1" v-loading="loading">
23 23
       <el-table-column v-for="(item, index) in columns1" :key="index" :label="item.label" :prop="item.key">
24 24
       </el-table-column>
25 25
     </el-table>
@@ -38,6 +38,7 @@ export default {
38 38
   components: {},
39 39
   data() {
40 40
     return {
41
+      loading: false,
41 42
       columns1: [
42 43
         {
43 44
           label: '订单编号',
@@ -78,10 +79,12 @@ export default {
78 79
       this.getTableData1()
79 80
     },
80 81
     getTableData1() {
82
+      this.loading = true
81 83
       const {pageNum1, pageSize1} = this
82 84
       api.queryProductOrderSearchByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
83 85
         this.tableData1 = res.data.records || []
84 86
         this.total1 = res.data.total
87
+        this.loading = false
85 88
       })
86 89
     },
87 90
 

+ 12 - 3
src/pages/index/components/service_configuration.vue

@@ -26,7 +26,7 @@
26 26
             </el-col>
27 27
           </el-row>
28 28
         </el-form>
29
-        <el-table :data="tableData1">
29
+        <el-table :data="tableData1" v-loading="loading1">
30 30
           <el-table-column v-for="(item, index) in columns1" :key="index" :label="item.label" :prop="item.key">
31 31
           </el-table-column>
32 32
           <el-table-column
@@ -99,7 +99,7 @@
99 99
             </el-col>
100 100
           </el-row>
101 101
         </el-form>
102
-        <el-table :data="tableData2">
102
+        <el-table :data="tableData2" v-loading="loading2">
103 103
           <el-table-column v-for="(item, index) in columns2" :key="index" :label="item.label" :prop="item.key">
104 104
           </el-table-column>
105 105
           <el-table-column
@@ -172,7 +172,7 @@
172 172
             </el-col>
173 173
           </el-row>
174 174
         </el-form>
175
-        <el-table :data="tableData3">
175
+        <el-table :data="tableData3" v-loading="loading3">
176 176
           <el-table-column v-for="(item, index) in columns3" :key="index" :label="item.label" :prop="item.key">
177 177
           </el-table-column>
178 178
           <el-table-column
@@ -306,6 +306,9 @@ export default {
306 306
   components: {},
307 307
   data() {
308 308
     return {
309
+      loading1: false,
310
+      loading2: false,
311
+      loading3: false,
309 312
       districtOptions: options.districtOptions,
310 313
       areaCodeMap: dictionary.areaCodeMap,
311 314
       activeName: '业务参数配置',
@@ -668,30 +671,36 @@ export default {
668 671
       this.getTableData1()
669 672
     },
670 673
     getTableData1() {
674
+      this.loading1 = true
671 675
       const {pageNum1, pageSize1} = this
672 676
       api_z.queryServiceConfigurationConfigByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
673 677
         this.tableData1 = res.data.records || []
674 678
         this.total1 = res.data.total
679
+        this.loading1 = false
675 680
       })
676 681
     },
677 682
     handlePageChange2() {
678 683
       this.getTableData2()
679 684
     },
680 685
     getTableData2() {
686
+      this.loading2 = true
681 687
       const {pageNum2, pageSize2} = this
682 688
       api_z.queryServiceConfigurationHolidayByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
683 689
         this.tableData2 = res.data.records || []
684 690
         this.total2 = res.data.total
691
+        this.loading2 = false
685 692
       })
686 693
     },
687 694
     handlePageChange3() {
688 695
       this.getTableData3()
689 696
     },
690 697
     getTableData3() {
698
+      this.loading3 = true
691 699
       const {pageNum3, pageSize3} = this
692 700
       api_z.queryServiceConfigurationDistrictByPage({current: pageNum3, size: pageSize3, ...this.formInline3}).then(res => {
693 701
         this.tableData3 = res.data.records || []
694 702
         this.total3 = res.data.total
703
+        this.loading3 = false
695 704
       })
696 705
     },
697 706
     handlePageChange4() {

+ 8 - 2
src/pages/index/components/task_audit.vue

@@ -21,7 +21,7 @@
21 21
             </el-col>
22 22
           </el-row>
23 23
         </el-form>
24
-        <el-table :data="tableData1">
24
+        <el-table :data="tableData1" v-loading="loading1">
25 25
           <el-table-column v-for="(item, index) in columns1" :key="index" :label="item.label" :prop="item.key">
26 26
           </el-table-column>
27 27
           <el-table-column
@@ -86,7 +86,7 @@
86 86
             </el-col>
87 87
           </el-row>
88 88
         </el-form>
89
-        <el-table :data="tableData2">
89
+        <el-table :data="tableData2" v-loading="loading2">
90 90
           <el-table-column v-for="(item, index) in columns2" :key="index" :label="item.label" :prop="item.key">
91 91
           </el-table-column>
92 92
           <el-table-column
@@ -143,6 +143,8 @@ export default {
143 143
   components: {},
144 144
   data() {
145 145
     return {
146
+      loading1: false,
147
+      loading2: false,
146 148
       activeName: '电话追缴',
147 149
       columns1: [
148 150
         {
@@ -252,20 +254,24 @@ export default {
252 254
       this.getTableData1()
253 255
     },
254 256
     getTableData1() {
257
+      this.loading1 = true
255 258
       const {pageNum1, pageSize1} = this
256 259
       api_z.queryTaskAuditPhoneByPage({current: pageNum1, size: pageSize1, ...this.formInline1, auditStatus: '未审核'}).then(res => {
257 260
         this.tableData1 = res.data.records || []
258 261
         this.total1 = res.data.total
262
+        this.loading1 = false
259 263
       })
260 264
     },
261 265
     handlePageChange2() {
262 266
       this.getTableData2()
263 267
     },
264 268
     getTableData2() {
269
+      this.loading2 = true
265 270
       const {pageNum2, pageSize2} = this
266 271
       api_z.queryTaskAuditSmsByPage({current: pageNum2, size: pageSize2, ...this.formInline2, auditStatus: '未审核'}).then(res => {
267 272
         this.tableData2 = res.data.records || []
268 273
         this.total2 = res.data.total
274
+        this.loading2 = false
269 275
       })
270 276
     },
271 277
   }

+ 8 - 2
src/pages/index/components/task_recovery.vue

@@ -22,7 +22,7 @@
22 22
             </el-col>
23 23
           </el-row>
24 24
         </el-form>
25
-        <el-table :data="tableData1">
25
+        <el-table :data="tableData1" v-loading="loading1">
26 26
           <el-table-column v-for="(item, index) in columns1" :key="index" :label="item.label" :prop="item.key">
27 27
           </el-table-column>
28 28
           <el-table-column
@@ -114,7 +114,7 @@
114 114
             </el-col>
115 115
           </el-row>
116 116
         </el-form>
117
-        <el-table :data="tableData2">
117
+        <el-table :data="tableData2" v-loading="loading2">
118 118
           <el-table-column v-for="(item, index) in columns2" :key="index" :label="item.label" :prop="item.key">
119 119
           </el-table-column>
120 120
           <el-table-column
@@ -196,6 +196,8 @@ export default {
196 196
   components: {},
197 197
   data() {
198 198
     return {
199
+      loading1: false,
200
+      loading2: false,
199 201
       carParkingNameOptions: [],
200 202
       activeName: '电话追缴',
201 203
       columns1: [
@@ -420,20 +422,24 @@ export default {
420 422
       this.getTableData1()
421 423
     },
422 424
     getTableData1() {
425
+      this.loading1 = true
423 426
       const {pageNum1, pageSize1} = this
424 427
       api_z.queryTaskRecoveryPhoneByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
425 428
         this.tableData1 = res.data.records || []
426 429
         this.total1 = res.data.total
430
+        this.loading1 = false
427 431
       })
428 432
     },
429 433
     handlePageChange2() {
430 434
       this.getTableData2()
431 435
     },
432 436
     getTableData2() {
437
+      this.loading2 = true
433 438
       const {pageNum2, pageSize2} = this
434 439
       api_z.queryTaskRecoverySmsByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
435 440
         this.tableData2 = res.data.records || []
436 441
         this.total2 = res.data.total
442
+        this.loading2 = false
437 443
       })
438 444
     },
439 445
   }

+ 4 - 1
src/pages/index/components/task_report.vue

@@ -28,7 +28,7 @@
28 28
           </el-row>
29 29
         </el-form>
30 30
         <br>
31
-        <el-table :data="tableData">
31
+        <el-table :data="tableData" v-loading="loading">
32 32
           <el-table-column v-for="(item, index) in columns" :key="index" :label="item.label" :prop="item.key">
33 33
           </el-table-column>
34 34
         </el-table>
@@ -53,6 +53,7 @@ export default {
53 53
   },
54 54
   data() {
55 55
     return {
56
+      loading: false,
56 57
       formInline: {
57 58
         plateNo: '',
58 59
         recoveryType: '',
@@ -102,10 +103,12 @@ export default {
102 103
       this.getTableData()
103 104
     },
104 105
     getTableData() {
106
+      this.loading = true
105 107
       const {pageNum, pageSize} = this
106 108
       api_z.queryTaskReportByPage({current: pageNum, size: pageSize, ...this.formInline, auditStatus: '通过'}).then(res => {
107 109
         this.tableData = res.data.records || []
108 110
         this.total = res.data.total
111
+        this.loading = false
109 112
       })
110 113
     },
111 114
   }

+ 4 - 1
src/pages/index/components/telephone_management.vue

@@ -33,7 +33,7 @@
33 33
           </el-row>
34 34
         </el-form>
35 35
         <br>
36
-        <el-table :data="tableData">
36
+        <el-table :data="tableData" v-loading="loading">
37 37
           <el-table-column v-for="(item, index) in columns" :key="index" :label="item.label" :prop="item.key">
38 38
           </el-table-column>
39 39
         </el-table>
@@ -57,6 +57,7 @@ export default {
57 57
   },
58 58
   data() {
59 59
     return {
60
+      loading: false,
60 61
       formInline: {
61 62
         plateNo: '',
62 63
         phoneNo: '',
@@ -99,10 +100,12 @@ export default {
99 100
       this.getTableData()
100 101
     },
101 102
     getTableData() {
103
+      this.loading = true
102 104
       const {pageNum, pageSize} = this
103 105
       api_z.queryTelephoneManagementByPage({current: pageNum, size: pageSize, ...this.formInline}).then(res => {
104 106
         this.tableData = res.data.records || []
105 107
         this.total = res.data.total
108
+        this.loading = false
106 109
       })
107 110
     },
108 111
   }