浏览代码

停车场管理和稽查管理(部分)

zbb 1 年之前
父节点
当前提交
ec56c3a2fe
共有 3 个文件被更改,包括 374 次插入167 次删除
  1. 96 0
      src/api/article_z.js
  2. 121 63
      src/pages/index/components/inspection_management.vue
  3. 157 104
      src/pages/index/components/pakking_lot.vue

+ 96 - 0
src/api/article_z.js

@@ -91,4 +91,100 @@ export default {
91 91
   queryParkingOrderByPage(params) {
92 92
     return axios.get(`/opt/parking/order/page`, {params})
93 93
   },
94
+  // 停车场管理——获取停车场信息分页
95
+  queryParkingLotByPage(params) {
96
+    return axios.get(`/opt/pakking/lot/page`, {params})
97
+  },
98
+  // 停车场管理——添加车牌修正记录
99
+  addParkingLot(params) {
100
+    return axios.post(`/opt/pakking/lot/add`, params)
101
+  },
102
+  // 停车场管理——编辑停车场信息
103
+  editParkingLot(params) {
104
+    return axios.post(`/opt/pakking/lot/edit`, params)
105
+  },
106
+  // 停车场管理——删除停车场信息
107
+  deleteParkingLot(params) {
108
+    return axios.post(`/opt/pakking/lot/delete`, params)
109
+  },
110
+  // 停车场管理——获取停车场计费规则分页
111
+  queryParkingChargingByPage(params) {
112
+    return axios.get(`/opt/pakking/charging/page`, {params})
113
+  },
114
+  // 停车场管理——添加停车场计费规则
115
+  addParkingCharging(params) {
116
+    return axios.post(`/opt/pakking/charging/add`, params)
117
+  },
118
+  // 停车场管理——编辑停车场计费规则
119
+  editParkingCharging(params) {
120
+    return axios.post(`/opt/pakking/charging/edit`, params)
121
+  },
122
+  // 停车场管理——删除停车场计费规则
123
+  deleteParkingCharging(params) {
124
+    return axios.post(`/opt/pakking/charging/delete`, params)
125
+  },
126
+  // 停车场管理——获取停车场欠费规则分页
127
+  queryParkingArrearByPage(params) {
128
+    return axios.get(`/opt/pakking/arrear/page`, {params})
129
+  },
130
+  // 停车场管理——添加停车场欠费规则
131
+  addParkingArrear(params) {
132
+    return axios.post(`/opt/pakking/arrear/add`, params)
133
+  },
134
+  // 停车场管理——编辑停车场欠费规则
135
+  editParkingArrear(params) {
136
+    return axios.post(`/opt/pakking/arrear/edit`, params)
137
+  },
138
+  // 停车场管理——删除停车场欠费规则
139
+  deleteParkingArrear(params) {
140
+    return axios.post(`/opt/pakking/arrear/delete`, params)
141
+  },
142
+  // 停车场管理——获取僵尸车管理规则分页
143
+  queryParkingCarByPage(params) {
144
+    return axios.get(`/opt/pakking/car/page`, {params})
145
+  },
146
+  // 停车场管理——添加僵尸车管理规则
147
+  addParkingCar(params) {
148
+    return axios.post(`/opt/pakking/car/add`, params)
149
+  },
150
+  // 停车场管理——编辑僵尸车管理规则
151
+  editParkingCar(params) {
152
+    return axios.post(`/opt/pakking/car/edit`, params)
153
+  },
154
+  // 停车场管理——删除僵尸车管理规则
155
+  deleteParkingCar(params) {
156
+    return axios.post(`/opt/pakking/car/delete`, params)
157
+  },
158
+  // 稽查管理——获取稽查配置分页
159
+  queryInspectionEvidenceByPage(params) {
160
+    return axios.get(`/opt/inspection/evidence/page`, {params})
161
+  },
162
+  // 稽查管理——添加稽查配置
163
+  addInspectionEvidence(params) {
164
+    return axios.post(`/opt/inspection/evidence/add`, params)
165
+  },
166
+  // 稽查管理——编辑稽查配置
167
+  editInspectionEvidence(params) {
168
+    return axios.post(`/opt/inspection/evidence/edit`, params)
169
+  },
170
+  // 稽查管理——删除稽查配置
171
+  deleteInspectionEvidence(params) {
172
+    return axios.post(`/opt/inspection/evidence/delete`, params)
173
+  },
174
+  // 稽查管理——获取稽查管理分页
175
+  queryInspectionManagementByPage(params) {
176
+    return axios.get(`/opt/inspection/management/page`, {params})
177
+  },
178
+  // 稽查管理——添加稽查管理
179
+  addInspectionManagement(params) {
180
+    return axios.post(`/opt/inspection/management/add`, params)
181
+  },
182
+  // 稽查管理——编辑稽查管理
183
+  editInspectionManagement(params) {
184
+    return axios.post(`/opt/inspection/management/edit`, params)
185
+  },
186
+  // 稽查管理——删除稽查管理
187
+  deleteInspectionManagement(params) {
188
+    return axios.post(`/opt/inspection/management/delete`, params)
189
+  },
94 190
 }

+ 121 - 63
src/pages/index/components/inspection_management.vue

@@ -38,10 +38,16 @@
38 38
           <div class="form-div">
39 39
             <el-form label-position="left" label-width="85px" :model="formLabelAlign">
40 40
               <el-form-item label="稽查地点">
41
-                <el-input v-model="formLabelAlign.parkingCardName"></el-input>
41
+                <el-select v-model="formLabelAlign.parkId" placeholder="请选择">
42
+                  <el-option
43
+                    v-for="(item,index) in carParkingNameOptions"
44
+                    :key="index"
45
+                    :label="item.carParkName"
46
+                    :value="item.parkId" />
47
+                </el-select>
42 48
               </el-form-item>
43 49
               <el-form-item label="取证类型">
44
-                <el-input v-model="formLabelAlign.type"></el-input>
50
+                <el-input v-model="formLabelAlign.evidenceType"></el-input>
45 51
               </el-form-item>
46 52
             </el-form>
47 53
           </div>
@@ -55,19 +61,43 @@
55 61
         <div class="form-div">
56 62
           <el-form label-position="left" label-width="85px" :model="formLabelAlign1">
57 63
             <el-form-item label="稽查地点">
58
-              <el-input v-model="formLabelAlign1.parkingCardName"></el-input>
64
+              <el-select v-model="formLabelAlign1.parkId" placeholder="请选择">
65
+                <el-option
66
+                  v-for="(item,index) in carParkingNameOptions"
67
+                  :key="index"
68
+                  :label="item.carParkName"
69
+                  :value="item.parkId" />
70
+              </el-select>
59 71
             </el-form-item>
60 72
             <el-form-item label="稽查对象">
61
-              <el-input v-model="formLabelAlign1.inspectObject"></el-input>
73
+              <el-select v-model="formLabelAlign1.evidenceTollmanId" placeholder="请选择">
74
+                <el-option
75
+                  v-for="(item,index) in tollmanOptions"
76
+                  :key="index"
77
+                  :label="item.tollmanName"
78
+                  :value="item.id" />
79
+              </el-select>
62 80
             </el-form-item>
63 81
             <el-form-item label="取证类型">
64
-              <el-input v-model="formLabelAlign1.type"></el-input>
82
+              <el-select v-model="formLabelAlign1.evidenceId" placeholder="请选择">
83
+                <el-option
84
+                  v-for="(item,index) in evidenceOptions"
85
+                  :key="index"
86
+                  :label="item.evidenceType"
87
+                  :value="item.id" />
88
+              </el-select>
65 89
             </el-form-item>
66 90
             <el-form-item label="问题描述">
67
-              <el-input v-model="formLabelAlign1.questionDescription"></el-input>
91
+              <el-input v-model="formLabelAlign1.problemDescription"></el-input>
68 92
             </el-form-item>
69 93
             <el-form-item label="稽查员">
70
-              <el-input v-model="formLabelAlign1.inspector"></el-input>
94
+              <el-select v-model="formLabelAlign1.auditTollmanId" placeholder="请选择">
95
+                <el-option
96
+                  v-for="(item,index) in tollmanOptions"
97
+                  :key="index"
98
+                  :label="item.tollmanName"
99
+                  :value="item.id" />
100
+              </el-select>
71 101
             </el-form-item>
72 102
           </el-form>
73 103
           <span slot="footer" class="dialog-footer">
@@ -80,8 +110,14 @@
80 110
         <el-form class="form-wrapper" :inline="true" :model="formInline2" style="margin-bottom: 20px;">
81 111
           <el-row>
82 112
             <el-col :span="8">
83
-              <el-form-item label="订单号: ">
84
-                <el-input v-model="formInline2.orderCode" placeholder="请输入"></el-input>
113
+              <el-form-item label="稽查对象: ">
114
+                <el-select clearable v-model="formInline2.evidenceTollmanId" placeholder="请选择">
115
+                  <el-option
116
+                    v-for="(item,index) in tollmanOptions"
117
+                    :key="index"
118
+                    :label="item.tollmanName"
119
+                    :value="item.id" />
120
+                </el-select>
85 121
               </el-form-item>
86 122
             </el-col>
87 123
             <el-col :span="8">
@@ -129,8 +165,14 @@
129 165
         <el-form class="form-wrapper" :inline="true" :model="formInline3" style="margin-bottom: 20px;">
130 166
           <el-row>
131 167
             <el-col :span="8">
132
-              <el-form-item label="停车卡名称:">
133
-                <el-input v-model="formInline3.parkingCardName" placeholder="请输入"></el-input>
168
+              <el-form-item label="稽查对象: ">
169
+                <el-select clearable v-model="formInline3.evidenceTollmanId" placeholder="请选择">
170
+                  <el-option
171
+                    v-for="(item,index) in tollmanOptions"
172
+                    :key="index"
173
+                    :label="item.tollmanName"
174
+                    :value="item.id" />
175
+                </el-select>
134 176
               </el-form-item>
135 177
             </el-col>
136 178
             <el-col :span="8">
@@ -156,6 +198,7 @@
156 198
 <script>
157 199
 import api from "@/api/audit.js";
158 200
 import dictionary from "@/util/dictionary";
201
+import api_z from "@/api/article_z.js";
159 202
 
160 203
 export default {
161 204
   components: {},
@@ -165,101 +208,99 @@ export default {
165 208
       columns1: [
166 209
         {
167 210
           label: '稽查对象',
168
-          key: 'parkingCardName'
211
+          key: 'parkId'
169 212
         },
170 213
         {
171 214
           label: '取证类型',
172
-          key: 'type'
215
+          key: 'evidenceType'
173 216
         },
174 217
         {
175 218
           label: '创建日期',
176
-          key: 'creatTime'
219
+          key: 'createTime'
177 220
         },
178 221
       ],
179
-      tableData1: [{parkingCardName: '昌建东外滩西南停车场', type: '实地考察', creatTime: '2023-12-30'}],
222
+      tableData1: [],
180 223
       total1: 0,
181 224
       pageSize1: 10,
182 225
       pageNum1: 1,
226
+      carParkingNameValue: '',
227
+      carParkingNameOptions: [],
228
+      tollmanOptions: [],
229
+      evidenceValue: '',
230
+      evidenceOptions: [],
183 231
       title: '',
184 232
       dialogVisible: false,
185 233
       formLabelAlign: {
186 234
         id: '',
187
-        parkingCardName: '',
188
-        type: '',
235
+        parkId: '',
236
+        evidenceType: '',
189 237
       },
190 238
       formLabelAlign1: {
191 239
         id: '',
192
-        parkingCardName: '',
193
-        inspectObject: '',
194
-        type: '',
195
-        questionDescription: '',
196
-        inspector: '',
240
+        parkId: '',
241
+        evidenceTollmanId: '',
242
+        evidenceId: '',
243
+        problemDescription: '',
244
+        auditTollmanId: '',
197 245
       },
198 246
       columns2: [
199 247
         {
200 248
           label: '稽查对象',
201
-          key: 'parkingCardName'
249
+          key: 'evidenceTollmanId'
202 250
         },
203 251
         {
204 252
           label: '取证类型',
205
-          key: 'type'
253
+          key: 'evidenceId'
206 254
         },
207 255
         {
208 256
           label: '问题描述',
209
-          key: 'questionDescription'
257
+          key: 'problemDescription'
210 258
         },
211 259
         {
212 260
           label: '创建日期',
213
-          key: 'creatTime'
261
+          key: 'createTime'
214 262
         },
215 263
       ],
216
-      tableData2: [{
217
-        parkingCardName: '昌建东外滩西南停车场',
218
-        type: '实地考察',
219
-        questionDescription: '部分车位存在一车多位的占用现象',
220
-        creatTime: '2023-12-30'
221
-      }],
264
+      tableData2: [],
222 265
       total2: 0,
223 266
       radio: '2',
224 267
       pageSize2: 10,
225 268
       pageNum2: 1,
226 269
       formInline2: {
227
-        orderCode: '',
228
-        orderStatus: '',
229
-        orderWay: ''
270
+        evidenceTollmanId: ''
230 271
       },
231 272
       title2: '',
232 273
       dialogVisible2: false,
233 274
       formLabelAlign2: {
234 275
         id: '',
235
-        parkingCardName: '',
236
-        type: '',
237
-        questionDescription: '',
276
+        evidenceTollmanId: '',
277
+        evidenceId: '',
278
+        problemDescription: '',
238 279
       },
239 280
       columns3: [
240 281
         {
241 282
           label: '稽查对象',
242
-          key: 'parkingCardName'
283
+          key: 'evidenceTollmanId'
243 284
         },
244 285
         {
245 286
           label: '取证类型',
246
-          key: 'type'
287
+          key: 'evidenceId'
247 288
         },
248 289
         {
249 290
           label: '问题描述',
250
-          key: 'questionDescription'
291
+          key: 'problemDescription'
251 292
         },
252 293
         {
253 294
           label: '审核日期',
254
-          key: ''
295
+          key: 'auditTime'
255 296
         },
256 297
         {
257
-          label: '审核日期',
258
-          key: ''
298
+          label: '审核状态',
299
+          key: 'auditStatus'
259 300
         },
260 301
         {
261 302
           label: '处理人',
262
-          key: ''
303
+          key: 'updateUser'
263 304
         },
264 305
       ],
265 306
       tableData3: [],
@@ -267,22 +308,22 @@ export default {
267 308
       pageSize3: 10,
268 309
       pageNum3: 1,
269 310
       formInline3: {
270
-        parkingCardName: ''
311
+        evidenceTollmanId: ''
271 312
       },
272 313
     }
273 314
   },
274 315
   mounted() {
275
-    // this.getTableData1()
276
-    // this.getTableData2()
277
-    // this.getTableData3()
316
+    this.getTableData1()
317
+    this.getCarParkingName()
318
+    this.getTollmanList()
319
+    this.getTableData2()
320
+    this.getTableData3()
278 321
   },
279 322
   watch: {},
280 323
   methods: {
281 324
     handleAdd() {
282 325
       this.title = '添加配置'
283
-      this.formLabelAlign.parkingCardName = ''
284
-      this.formLabelAlign.type = ''
285
-      this.formLabelAlign.questionDescription = ''
326
+      this.formLabelAlign = {}
286 327
       this.dialogVisible = true
287 328
     },
288 329
     handleEdit(row) {
@@ -291,7 +332,7 @@ export default {
291 332
       this.dialogVisible = true
292 333
     },
293 334
     deleteRow(record) {
294
-      api.deleteWhiteIp({id: record.id}).then(res => {
335
+      api_z.deleteInspectionEvidence([{id: record.id}]).then(res => {
295 336
         if (res.code === 200) {
296 337
           this.$message({type: 'success', message: '删除成功!'})
297 338
           this.getTableData1()
@@ -300,7 +341,7 @@ export default {
300 341
     },
301 342
     handleConfirm() {
302 343
       if (this.title === '修改配置') {
303
-        api.addWhiteIp({ipAddr: this.formLabelAlign.ipAddr, id: this.formLabelAlign.id}).then(res => {
344
+        api_z.editInspectionEvidence({...this.formLabelAlign}).then(res => {
304 345
           if (res.code === 200) {
305 346
             this.dialogVisible = false
306 347
             this.$message({
@@ -311,7 +352,7 @@ export default {
311 352
           }
312 353
         })
313 354
       } else {
314
-        api.addWhiteIp({ipAddr: this.formLabelAlign.ipAddr}).then(res => {
355
+        api_z.addInspectionEvidence({...this.formLabelAlign}).then(res => {
315 356
           if (res.code === 200) {
316 357
             this.dialogVisible = false
317 358
             this.$message({
@@ -323,14 +364,30 @@ export default {
323 364
         })
324 365
       }
325 366
     },
367
+    //车场
368
+    getCarParkingName() {
369
+      api_z.querySelectParkListByPage().then(res => {
370
+        this.carParkingNameOptions=res.data
371
+      })
372
+    },
373
+    //收费员
374
+    getTollmanList() {
375
+      api_z.querySelectTollmanListByPage().then(res => {
376
+        this.tollmanOptions=res.data
377
+      })
378
+    },
379
+
326 380
     handleConfirm1() {
327 381
       //这个添加是审核部分的添加
328
-      api.addWhiteIp({ipAddr: this.formLabelAlign.ipAddr}).then(res => {
382
+      api_z.addInspectionManagement({...this.formLabelAlign1}).then(res => {
329 383
         if (res.code === 200) {
384
+          this.formLabelAlign1 = {}
330 385
           this.$message({
331
-            message: '添加成功!',
386
+            message: '上传成功!',
332 387
             type: 'success'
333 388
           })
389
+          this.getTableData2()
390
+          this.getTableData3()
334 391
         }
335 392
       })
336 393
     },
@@ -346,7 +403,7 @@ export default {
346 403
     handleConfirm2() {
347 404
       const {id} = this.formLabelAlign2.id
348 405
       console.log('radio', this.radio)
349
-      api.applyResource({id, applyType: this.radio}).then(res => {
406
+      api_z.applyResource({...this.formLabelAlign2}).then(res => {
350 407
         if (res.code === 200) {
351 408
           this.dialogVisible2 = false
352 409
           this.$message({
@@ -366,9 +423,10 @@ export default {
366 423
     },
367 424
     getTableData1() {
368 425
       const {pageNum1, pageSize1} = this
369
-      api.carListByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
370
-        this.tableData1 = (res.data.records || []).map(item => ({...item, carType: dictionary.typeMap[item.carType]}))
426
+      api_z.queryInspectionEvidenceByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
427
+        this.tableData1 = res.data.records || []
371 428
         this.total1 = res.data.total
429
+        this.evidenceOptions=res.data.records || []
372 430
       })
373 431
     },
374 432
     handlePageChange2() {
@@ -376,7 +434,7 @@ export default {
376 434
     },
377 435
     getTableData2() {
378 436
       const {pageNum2, pageSize2} = this
379
-      api.gjListByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
437
+      api_z.queryInspectionManagementByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
380 438
         this.tableData2 = res.data.records || []
381 439
         this.total2 = res.data.total
382 440
       })
@@ -386,7 +444,7 @@ export default {
386 444
     },
387 445
     getTableData3() {
388 446
       const {pageNum3, pageSize3} = this
389
-      api.tcjlListByPage({current: pageNum3, size: pageSize3, ...this.formInline3}).then(res => {
447
+      api_z.queryInspectionManagementByPage({current: pageNum3, size: pageSize3, ...this.formInline3}).then(res => {
390 448
         this.tableData3 = res.data.records || []
391 449
         this.total3 = res.data.total
392 450
       })
@@ -428,7 +486,7 @@ export default {
428 486
     .form-div {
429 487
       /deep/ .el-input__inner {
430 488
         height: 35px;
431
-        width: 90%;
489
+        width: 99%;
432 490
         border: 1px solid #a6a5a5;
433 491
       }
434 492
     }

+ 157 - 104
src/pages/index/components/pakking_lot.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.carParkingName" placeholder="请输入"></el-input>
9
+                <el-select clearable v-model="formInline1.parkName" placeholder="请选择">
10
+                  <el-option
11
+                    v-for="(item,index) in carParkingNameOptions"
12
+                    :key="index"
13
+                    :label="item.carParkName"
14
+                    :value="item.carParkName" />
15
+                </el-select>
10 16
               </el-form-item>
11 17
             </el-col>
12 18
             <el-col :span="8">
@@ -46,16 +52,32 @@
46 52
           <div class="form-div">
47 53
             <el-form label-position="left" label-width="100px" :model="formLabelAlign">
48 54
               <el-form-item label="车场名称">
49
-                <el-input v-model="formLabelAlign.carParkingName"></el-input>
55
+                <el-select v-model="formLabelAlign.parkName" placeholder="请选择">
56
+                  <el-option
57
+                    v-for="(item,index) in carParkingNameOptions"
58
+                    :key="index"
59
+                    :label="item.carParkName"
60
+                    :value="item.carParkName" />
61
+                </el-select>
50 62
               </el-form-item>
51 63
               <el-form-item label="入场时间">
52
-                <el-input v-model="formLabelAlign.inTime"></el-input>
64
+                <el-time-picker
65
+                  v-model="formLabelAlign.inTime"
66
+                  :picker-options="{selectableRange: '0:00:00 - 23:59:59'}"
67
+                  value-format='HH:mm:ss'
68
+                  placeholder="选择时间">
69
+                </el-time-picker>
53 70
               </el-form-item>
54 71
               <el-form-item label="离场时间">
55
-                <el-input v-model="formLabelAlign.outTime"></el-input>
72
+                <el-time-picker
73
+                  v-model="formLabelAlign.outTime"
74
+                  :picker-options="{selectableRange: '12:00:00 - 23:59:59'}"
75
+                  value-format='HH:mm:ss'
76
+                  placeholder="选择时间">
77
+                </el-time-picker>
56 78
               </el-form-item>
57 79
               <el-form-item label="停车场管理员">
58
-                <el-input v-model="formLabelAlign.parkAdmin"></el-input>
80
+                <el-input v-model="formLabelAlign.managerName"></el-input>
59 81
               </el-form-item>
60 82
             </el-form>
61 83
           </div>
@@ -70,7 +92,13 @@
70 92
           <el-row>
71 93
             <el-col :span="8">
72 94
               <el-form-item label="车场名称: ">
73
-                <el-input v-model="formInline2.carParkingName" placeholder="请输入"></el-input>
95
+                <el-select clearable v-model="formInline2.parkLotId" placeholder="请选择">
96
+                  <el-option
97
+                    v-for="(item,index) in carParkingNameOptions"
98
+                    :key="index"
99
+                    :label="item.carParkName"
100
+                    :value="item.parkId" />
101
+                </el-select>
74 102
               </el-form-item>
75 103
             </el-col>
76 104
             <el-col :span="6">
@@ -110,16 +138,22 @@
110 138
           <div class="form-div">
111 139
             <el-form label-position="left" label-width="110px" :model="formLabelAlign2">
112 140
               <el-form-item label="车场名称">
113
-                <el-input v-model="formLabelAlign2.carParkingName"></el-input>
141
+                <el-select v-model="formLabelAlign2.parkLotId" placeholder="请选择">
142
+                  <el-option
143
+                    v-for="(item,index) in carParkingNameOptions"
144
+                    :key="index"
145
+                    :label="item.carParkName"
146
+                    :value="item.parkId" />
147
+                </el-select>
114 148
               </el-form-item>
115 149
               <el-form-item label="计费方式">
116
-                <el-input v-model="formLabelAlign2.billingMode"></el-input>
150
+                <el-input v-model="formLabelAlign2.billingMethod"></el-input>
117 151
               </el-form-item>
118 152
               <el-form-item label="收费标准(元/h)">
119
-                <el-input v-model="formLabelAlign2.chargeStandard"></el-input>
153
+                <el-input v-model="formLabelAlign2.chargingStandard"></el-input>
120 154
               </el-form-item>
121 155
               <el-form-item label="收费方式">
122
-                <el-input v-model="formLabelAlign2.chargeMethod"></el-input>
156
+                <el-input v-model="formLabelAlign2.chargingMethod"></el-input>
123 157
               </el-form-item>
124 158
             </el-form>
125 159
           </div>
@@ -134,7 +168,13 @@
134 168
           <el-row>
135 169
             <el-col :span="8">
136 170
               <el-form-item label="车场名称:">
137
-                <el-input v-model="formInline3.carParkingName" placeholder="请输入"></el-input>
171
+                <el-select clearable v-model="formInline3.parkLotId" placeholder="请选择">
172
+                  <el-option
173
+                    v-for="(item,index) in carParkingNameOptions"
174
+                    :key="index"
175
+                    :label="item.carParkName"
176
+                    :value="item.parkId" />
177
+                </el-select>
138 178
               </el-form-item>
139 179
             </el-col>
140 180
             <el-col :span="8">
@@ -175,22 +215,28 @@
175 215
           <div class="form-div">
176 216
             <el-form label-position="left" label-width="100px" :model="formLabelAlign3">
177 217
               <el-form-item label="车场名称">
178
-                <el-input v-model="formLabelAlign3.carParkingName"></el-input>
218
+                <el-select v-model="formLabelAlign3.parkLotId" placeholder="请选择">
219
+                  <el-option
220
+                    v-for="(item,index) in carParkingNameOptions"
221
+                    :key="index"
222
+                    :label="item.carParkName"
223
+                    :value="item.parkId" />
224
+                </el-select>
179 225
               </el-form-item>
180 226
               <el-form-item label="欠费期限(h)">
181
-                <el-input v-model="formLabelAlign3.arrears"></el-input>
227
+                <el-input v-model="formLabelAlign3.paymentLimit"></el-input>
182 228
               </el-form-item>
183 229
               <el-form-item label="逾期费用">
184
-                <el-input v-model="formLabelAlign3.overdueCharge"></el-input>
230
+                <el-input v-model="formLabelAlign3.chargingStandard"></el-input>
185 231
               </el-form-item>
186 232
               <el-form-item label="支付方式">
187 233
                 <el-input v-model="formLabelAlign3.paymentMethod"></el-input>
188 234
               </el-form-item>
189 235
               <el-form-item label="通知方式">
190
-                <el-input v-model="formLabelAlign3.notificationMode"></el-input>
236
+                <el-input v-model="formLabelAlign3.notificationMethod"></el-input>
191 237
               </el-form-item>
192 238
               <el-form-item label="处理措施">
193
-                <el-input v-model="formLabelAlign3.treatmentMeasure"></el-input>
239
+                <el-input v-model="formLabelAlign3.handlingMeasures"></el-input>
194 240
               </el-form-item>
195 241
             </el-form>
196 242
           </div>
@@ -205,7 +251,13 @@
205 251
           <el-row>
206 252
             <el-col :span="8">
207 253
               <el-form-item label="车场名称:">
208
-                <el-input v-model="formInline4.carParkingName" placeholder="请输入"></el-input>
254
+                <el-select clearable v-model="formInline4.parkLotId" placeholder="请选择">
255
+                  <el-option
256
+                    v-for="(item,index) in carParkingNameOptions"
257
+                    :key="index"
258
+                    :label="item.carParkName"
259
+                    :value="item.parkId" />
260
+                </el-select>
209 261
               </el-form-item>
210 262
             </el-col>
211 263
             <el-col :span="8">
@@ -246,22 +298,28 @@
246 298
           <div class="form-div">
247 299
             <el-form label-position="left" label-width="100px" :model="formLabelAlign4">
248 300
               <el-form-item label="车场名称">
249
-                <el-input v-model="formLabelAlign4.carParkingName"></el-input>
301
+                <el-select v-model="formLabelAlign4.parkLotId" placeholder="请选择">
302
+                  <el-option
303
+                    v-for="(item,index) in carParkingNameOptions"
304
+                    :key="index"
305
+                    :label="item.carParkName"
306
+                    :value="item.parkId" />
307
+                </el-select>
250 308
               </el-form-item>
251 309
               <el-form-item label="标识通知">
252
-                <el-input v-model="formLabelAlign4.identificationNotice"></el-input>
310
+                <el-input v-model="formLabelAlign4.identificationNotification"></el-input>
253 311
               </el-form-item>
254 312
               <el-form-item label="跟踪通知">
255
-                <el-input v-model="formLabelAlign4.traceNotification"></el-input>
313
+                <el-input v-model="formLabelAlign4.trackingNotifications"></el-input>
256 314
               </el-form-item>
257 315
               <el-form-item label="公告">
258 316
                 <el-input v-model="formLabelAlign4.announcement"></el-input>
259 317
               </el-form-item>
260 318
               <el-form-item label="最终处理">
261
-                <el-input v-model="formLabelAlign4.finalTreatment"></el-input>
319
+                <el-input v-model="formLabelAlign4.finalProcessing"></el-input>
262 320
               </el-form-item>
263 321
               <el-form-item label="法律程序">
264
-                <el-input v-model="formLabelAlign4.legalProcedure"></el-input>
322
+                <el-input v-model="formLabelAlign4.legalProceedings"></el-input>
265 323
               </el-form-item>
266 324
             </el-form>
267 325
           </div>
@@ -277,6 +335,7 @@
277 335
 <script>
278 336
 import api from "@/api/audit.js";
279 337
 import dictionary from "@/util/dictionary";
338
+import api_z from "@/api/article_z.js";
280 339
 
281 340
 export default {
282 341
   components: {},
@@ -286,7 +345,7 @@ export default {
286 345
       columns1: [
287 346
         {
288 347
           label: '车场名称',
289
-          key: 'carParkingName'
348
+          key: 'parkName'
290 349
         },
291 350
         {
292 351
           label: '入场时间',
@@ -298,71 +357,73 @@ export default {
298 357
         },
299 358
         {
300 359
           label: '停车场管理员',
301
-          key: 'parkAdmin'
360
+          key: 'managerName'
302 361
         },
303 362
       ],
304
-      tableData1: [{carParkingName: 'sasa'}],
363
+      carParkingNameValue: '',
364
+      carParkingNameOptions: [],
365
+      tableData1: [{parkName: 'sasa'}],
305 366
       total1: 0,
306 367
       pageSize1: 10,
307 368
       pageNum1: 1,
308 369
       formInline1: {
309
-        carParkingName: '',
370
+        parkName: '',
310 371
       },
311 372
       title: '',
312 373
       dialogVisible: false,
313 374
       formLabelAlign: {
314 375
         id: '',
315
-        carParkingName: '',
376
+        parkName: '',
316 377
         inTime: '',
317 378
         outTime: '',
318
-        parkAdmin: '',
379
+        managerName: '',
319 380
       },
320 381
       columns2: [
321 382
         {
322 383
           label: '车场名称',
323
-          key: 'carParkingName'
384
+          key: 'parkLotId'
324 385
         },
325 386
         {
326 387
           label: '计费方式',
327
-          key: 'billingMode'
388
+          key: 'billingMethod'
328 389
         },
329 390
         {
330 391
           label: '收费标准(元/h)',
331
-          key: 'chargeStandard'
392
+          key: 'chargingStandard'
332 393
         },
333 394
         {
334 395
           label: '收费方式',
335
-          key: 'chargeMethod'
396
+          key: 'chargingMethod'
336 397
         },
337 398
       ],
338
-      tableData2: [{carParkingName: 'sasa1'}],
399
+      tableData2: [{parkLotId: 'sasa1'}],
339 400
       total2: 0,
340 401
       pageSize2: 10,
341 402
       pageNum2: 1,
342 403
       formInline2: {
343
-        carParkingName: '',
404
+        parkLotId: '',
344 405
       },
345 406
       title2: '',
346 407
       dialogVisible2: false,
347 408
       formLabelAlign2: {
348 409
         id: '',
349
-        carParkingName: '',
350
-        billingMode: '',
351
-        chargeStandard: '',
352
-        chargeMethod: '',
410
+        parkLotId: '',
411
+        billingMethod: '',
412
+        chargingStandard: '',
413
+        chargingMethod: '',
353 414
       },
354 415
       columns3: [
355 416
         {
356 417
           label: '停车场名称',
357
-          key: 'carParkingName'
418
+          key: 'parkLotId'
358 419
         },
359 420
         {
360 421
           label: '欠费期限(h)',
361
-          key: 'arrears'
422
+          key: 'paymentLimit'
362 423
         },
363 424
         {
364 425
           label: '逾期费用',
365
-          key: 'overdueCharge'
426
+          key: 'chargingStandard'
366 427
         },
367 428
         {
368 429
           label: '支付方式',
@@ -370,43 +431,43 @@ export default {
370 431
         },
371 432
         {
372 433
           label: '通知方式',
373
-          key: 'notificationMode'
434
+          key: 'notificationMethod'
374 435
         },
375 436
         {
376 437
           label: '处理措施',
377
-          key: 'treatmentMeasure'
438
+          key: 'handlingMeasures'
378 439
         },
379 440
       ],
380
-      tableData3: [{carParkingName: 'sasa111'}],
441
+      tableData3: [{parkLotId: 'sasa111'}],
381 442
       total3: 0,
382 443
       pageSize3: 10,
383 444
       pageNum3: 1,
384 445
       formInline3: {
385
-        carParkingName: ''
446
+        parkLotId: ''
386 447
       },
387 448
       title3: '',
388 449
       dialogVisible3: false,
389 450
       formLabelAlign3: {
390 451
         id: '',
391
-        carParkingName: '',
392
-        arrears: '',
393
-        overdueCharge: '',
452
+        parkLotId: '',
453
+        paymentLimit: '',
454
+        chargingStandard: '',
394 455
         paymentMethod: '',
395
-        notificationMode: '',
396
-        treatmentMeasure: '',
456
+        notificationMethod: '',
457
+        handlingMeasures: '',
397 458
       },
398 459
       columns4: [
399 460
         {
400 461
           label: '停车场名称',
401
-          key: 'carParkingName'
462
+          key: 'parkLotId'
402 463
         },
403 464
         {
404 465
           label: '标识通知',
405
-          key: 'identificationNotice'
466
+          key: 'identificationNotification'
406 467
         },
407 468
         {
408 469
           label: '跟踪通知',
409
-          key: 'traceNotification'
470
+          key: 'trackingNotifications'
410 471
         },
411 472
         {
412 473
           label: '公告',
@@ -414,38 +475,39 @@ export default {
414 475
         },
415 476
         {
416 477
           label: '最终处理',
417
-          key: 'finalTreatment'
478
+          key: 'finalProcessing'
418 479
         },
419 480
         {
420 481
           label: '法律程序',
421
-          key: 'legalProcedure'
482
+          key: 'legalProceedings'
422 483
         },
423 484
       ],
424
-      tableData4: [{carParkingName: 'sasa1111'}],
485
+      tableData4: [{parkLotId: 'sasa1111'}],
425 486
       total4: 0,
426 487
       pageSize4: 10,
427 488
       pageNum4: 1,
428 489
       formInline4: {
429
-        carParkingName: ''
490
+        parkLotId: ''
430 491
       },
431 492
       title4: '',
432 493
       dialogVisible4: false,
433 494
       formLabelAlign4: {
434 495
         id: '',
435
-        carParkingName: '',
436
-        identificationNotice: '',
437
-        traceNotification: '',
496
+        parkLotId: '',
497
+        identificationNotification: '',
498
+        trackingNotifications: '',
438 499
         announcement: '',
439
-        finalTreatment: '',
440
-        legalProcedure: '',
500
+        finalProcessing: '',
501
+        legalProceedings: '',
441 502
       },
442 503
     }
443 504
   },
444 505
   mounted() {
445
-    // this.getTableData1()
446
-    // this.getTableData2()
447
-    // this.getTableData3()
448
-    // this.getTableData4()
506
+    this.getTableData1()
507
+    this.getCarParkingName()
508
+    this.getTableData2()
509
+    this.getTableData3()
510
+    this.getTableData4()
449 511
   },
450 512
   watch: {},
451 513
   methods: {
@@ -455,10 +517,7 @@ export default {
455 517
     },
456 518
     handleAdd() {
457 519
       this.title = '添加车场'
458
-      this.formLabelAlign.carParkingName = ''
459
-      this.formLabelAlign.inTime = ''
460
-      this.formLabelAlign.outTime = ''
461
-      this.formLabelAlign.parkAdmin = ''
520
+      this.formLabelAlign = {}
462 521
       this.dialogVisible = true
463 522
     },
464 523
     handleEdit(row) {
@@ -467,7 +526,7 @@ export default {
467 526
       this.dialogVisible = true
468 527
     },
469 528
     deleteRow(record) {
470
-      api.deleteWhiteIp({id: record.id}).then(res => {
529
+      api_z.deleteParkingLot([{id: record.id}]).then(res => {
471 530
         if (res.code === 200) {
472 531
           this.$message({type: 'success', message: '删除成功!'})
473 532
           this.getTableData1()
@@ -476,7 +535,7 @@ export default {
476 535
     },
477 536
     handleConfirm() {
478 537
       if (this.title === '修改车场') {
479
-        api.addWhiteIp({ipAddr: this.formLabelAlign.ipAddr, id: this.formLabelAlign.id}).then(res => {
538
+        api_z.editParkingLot({...this.formLabelAlign}).then(res => {
480 539
           if (res.code === 200) {
481 540
             this.dialogVisible = false
482 541
             this.$message({
@@ -487,7 +546,7 @@ export default {
487 546
           }
488 547
         })
489 548
       } else {
490
-        api.addWhiteIp({ipAddr: this.formLabelAlign.ipAddr}).then(res => {
549
+        api_z.addParkingLot({...this.formLabelAlign}).then(res => {
491 550
           if (res.code === 200) {
492 551
             this.dialogVisible = false
493 552
             this.$message({
@@ -499,16 +558,20 @@ export default {
499 558
         })
500 559
       }
501 560
     },
561
+
562
+    //车场
563
+    getCarParkingName() {
564
+      api_z.querySelectParkListByPage().then(res => {
565
+        this.carParkingNameOptions=res.data
566
+      })
567
+    },
502 568
     onSubmit2() {
503 569
       this.pageNum2 = 1
504 570
       this.getTableData2()
505 571
     },
506 572
     handleAdd2() {
507 573
       this.title2 = '添加'
508
-      this.formLabelAlign2.carParkingName = ''
509
-      this.formLabelAlign2.billingMode = ''
510
-      this.formLabelAlign2.chargeStandard = ''
511
-      this.formLabelAlign2.chargeMethod = ''
574
+      this.formLabelAlign2 = {}
512 575
       this.dialogVisible2 = true
513 576
     },
514 577
 
@@ -518,7 +581,7 @@ export default {
518 581
       this.dialogVisible2 = true
519 582
     },
520 583
     deleteRow2(record) {
521
-      api.deleteWhiteIp({id: record.id}).then(res => {
584
+      api_z.deleteParkingCharging([{id: record.id}]).then(res => {
522 585
         if (res.code === 200) {
523 586
           this.$message({type: 'success', message: '删除成功!'})
524 587
           this.getTableData2()
@@ -527,7 +590,7 @@ export default {
527 590
     },
528 591
     handleConfirm2() {
529 592
       if (this.title2 === '修改') {
530
-        api.addWhiteIp({ipAddr: this.formLabelAlign2.ipAddr, id: this.formLabelAlign2.id}).then(res => {
593
+        api_z.editParkingCharging({...this.formLabelAlign2}).then(res => {
531 594
           if (res.code === 200) {
532 595
             this.dialogVisible2 = false
533 596
             this.$message({
@@ -538,7 +601,7 @@ export default {
538 601
           }
539 602
         })
540 603
       } else {
541
-        api.addWhiteIp({ipAddr: this.formLabelAlign2.ipAddr}).then(res => {
604
+        api_z.addParkingCharging({...this.formLabelAlign2}).then(res => {
542 605
           if (res.code === 200) {
543 606
             this.dialogVisible2 = false
544 607
             this.$message({
@@ -556,12 +619,7 @@ export default {
556 619
     },
557 620
     handleAdd3() {
558 621
       this.title3 = '添加'
559
-      this.formLabelAlign3.carParkingName = ''
560
-      this.formLabelAlign3.arrears = ''
561
-      this.formLabelAlign3.overdueCharge = ''
562
-      this.formLabelAlign3.paymentMethod = ''
563
-      this.formLabelAlign3.notificationMode = ''
564
-      this.formLabelAlign3.treatmentMeasure = ''
622
+      this.formLabelAlign3 = {}
565 623
       this.dialogVisible3 = true
566 624
     },
567 625
 
@@ -571,7 +629,7 @@ export default {
571 629
       this.dialogVisible3 = true
572 630
     },
573 631
     deleteRow3(record) {
574
-      api.deleteWhiteIp({id: record.id}).then(res => {
632
+      api_z.deleteParkingArrear([{id: record.id}]).then(res => {
575 633
         if (res.code === 200) {
576 634
           this.$message({type: 'success', message: '删除成功!'})
577 635
           this.getTableData3()
@@ -580,7 +638,7 @@ export default {
580 638
     },
581 639
     handleConfirm3() {
582 640
       if (this.title3 === '修改') {
583
-        api.addWhiteIp({ipAddr: this.formLabelAlign3.ipAddr, id: this.formLabelAlign3.id}).then(res => {
641
+        api_z.editParkingArrear({...this.formLabelAlign3}).then(res => {
584 642
           if (res.code === 200) {
585 643
             this.dialogVisible3 = false
586 644
             this.$message({
@@ -591,7 +649,7 @@ export default {
591 649
           }
592 650
         })
593 651
       } else {
594
-        api.addWhiteIp({ipAddr: this.formLabelAlign3.ipAddr}).then(res => {
652
+        api_z.addParkingArrear({...this.formLabelAlign3}).then(res => {
595 653
           if (res.code === 200) {
596 654
             this.dialogVisible3 = false
597 655
             this.$message({
@@ -609,12 +667,7 @@ export default {
609 667
     },
610 668
     handleAdd4() {
611 669
       this.title4 = '添加'
612
-      this.formLabelAlign4.carParkingName = ''
613
-      this.formLabelAlign4.identificationNotice = ''
614
-      this.formLabelAlign4.traceNotification = ''
615
-      this.formLabelAlign4.announcement = ''
616
-      this.formLabelAlign4.finalTreatment = ''
617
-      this.formLabelAlign4.legalProcedure = ''
670
+      this.formLabelAlign4 = {}
618 671
       this.dialogVisible4 = true
619 672
     },
620 673
 
@@ -624,7 +677,7 @@ export default {
624 677
       this.dialogVisible4 = true
625 678
     },
626 679
     deleteRow4(record) {
627
-      api.deleteWhiteIp({id: record.id}).then(res => {
680
+      api_z.deleteParkingCar([{id: record.id}]).then(res => {
628 681
         if (res.code === 200) {
629 682
           this.$message({type: 'success', message: '删除成功!'})
630 683
           this.getTableData4()
@@ -633,7 +686,7 @@ export default {
633 686
     },
634 687
     handleConfirm4() {
635 688
       if (this.title4 === '修改') {
636
-        api.addWhiteIp({ipAddr: this.formLabelAlign4.ipAddr, id: this.formLabelAlign4.id}).then(res => {
689
+        api_z.editParkingCar({...this.formLabelAlign4}).then(res => {
637 690
           if (res.code === 200) {
638 691
             this.dialogVisible4 = false
639 692
             this.$message({
@@ -644,7 +697,7 @@ export default {
644 697
           }
645 698
         })
646 699
       } else {
647
-        api.addWhiteIp({ipAddr: this.formLabelAlign4.ipAddr}).then(res => {
700
+        api_z.addParkingCar({...this.formLabelAlign4}).then(res => {
648 701
           if (res.code === 200) {
649 702
             this.dialogVisible4 = false
650 703
             this.$message({
@@ -661,8 +714,8 @@ export default {
661 714
     },
662 715
     getTableData1() {
663 716
       const {pageNum1, pageSize1} = this
664
-      api.carListByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
665
-        this.tableData1 = (res.data.records || []).map(item => ({...item, carType: dictionary.typeMap[item.carType]}))
717
+      api_z.queryParkingLotByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
718
+        this.tableData1 = res.data.records || []
666 719
         this.total1 = res.data.total
667 720
       })
668 721
     },
@@ -671,7 +724,7 @@ export default {
671 724
     },
672 725
     getTableData2() {
673 726
       const {pageNum2, pageSize2} = this
674
-      api.gjListByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
727
+      api_z.queryParkingChargingByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
675 728
         this.tableData2 = res.data.records || []
676 729
         this.total2 = res.data.total
677 730
       })
@@ -681,7 +734,7 @@ export default {
681 734
     },
682 735
     getTableData3() {
683 736
       const {pageNum3, pageSize3} = this
684
-      api.tcjlListByPage({current: pageNum4, size: pageSize4, ...this.formInline4}).then(res => {
737
+      api_z.queryParkingArrearByPage({current: pageNum3, size: pageSize3, ...this.formInline3}).then(res => {
685 738
         this.tableData3 = res.data.records || []
686 739
         this.total3 = res.data.total
687 740
       })
@@ -691,7 +744,7 @@ export default {
691 744
     },
692 745
     getTableData4() {
693 746
       const {pageNum4, pageSize4} = this
694
-      api.tcjlListByPage({current: pageNum4, size: pageSize4, ...this.formInline4}).then(res => {
747
+      api_z.queryParkingCarByPage({current: pageNum4, size: pageSize4, ...this.formInline4}).then(res => {
695 748
         this.tableData4 = res.data.records || []
696 749
         this.total4 = res.data.total
697 750
       })
@@ -733,7 +786,7 @@ export default {
733 786
     .form-div {
734 787
       /deep/ .el-input__inner {
735 788
         height: 35px;
736
-        width: 90%;
789
+        width: 99%;
737 790
         border: 1px solid #a6a5a5;
738 791
       }
739 792
     }