接口联调

src/api/audit.js

@@ -17,4 +17,24 @@ export default {
   tccqkView(params) {
     return axios.get('/dash/parking/lot/situation/view', {params})
   },
+  // 预约停车-分页列表
+  yytcListByPage(params) {
+    return axios.get('/opt/reservation/rules/page', {params})
+  },
+  // 预约停车-添加规则
+  addRule(params) {
+    return axios.post('/opt/reservation/rules/add', params)
+  },
+  // 预约停车-修改规则
+  editRule(params) {
+    return axios.post('/opt/reservation/rules/luohe/configuration/edit', params)
+  },
+  // 预约停车-删除规则
+  deleteRule(params) {
+    return axios.post('/opt/reservation/rules/delete', params)
+  },
+  // 预约订单-分页列表
+  orderListByPage(params) {
+    return axios.get('/opt/reservation/orders/page', {params})
+  }
 }

src/pages/index/components/appointment_rules.vue

@@ -6,7 +6,7 @@
           <el-row>
             <el-col :span="6">
               <el-form-item label="停车场名称:">
-                <el-input v-model="formInline1.parkingName" placeholder="请输入"></el-input>
+                <el-input v-model="formInline1.carParkName" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -14,6 +14,7 @@
                 <el-date-picker
                   v-model="formInline1.startTime"
                   type="date"
+                  value-format="yyyy-MM-dd HH:mm:ss"
                   placeholder="选择日期">
                 </el-date-picker>
               </el-form-item>
@@ -23,6 +24,7 @@
                 <el-date-picker
                   v-model="formInline1.endTime"
                   type="date"
+                  value-format="yyyy-MM-dd HH:mm:ss"
                   placeholder="选择日期">
                 </el-date-picker>
               </el-form-item>
@@ -64,12 +66,13 @@
           <div class="form-div">
             <el-form label-position="left" label-width="85px" :model="formLabelAlign">
               <el-form-item label="停车场名称">
-                <el-input v-model="formLabelAlign.parkingName"></el-input>
+                <el-input v-model="formLabelAlign.carParkName"></el-input>
               </el-form-item>
               <el-form-item label="起始时间">
                 <el-date-picker
                   v-model="formLabelAlign.startTime"
                   type="date"
+                  value-format="yyyy-MM-dd HH:mm:ss"
                   placeholder="选择日期">
                 </el-date-picker>
               </el-form-item>
@@ -77,14 +80,15 @@
                 <el-date-picker
                   v-model="formLabelAlign.endTime"
                   type="date"
+                  value-format="yyyy-MM-dd HH:mm:ss"
                   placeholder="选择日期">
                 </el-date-picker>
               </el-form-item>
               <el-form-item label="预约费用">
-                <el-input v-model="formLabelAlign.appointmentPrice"></el-input>
+                <el-input v-model="formLabelAlign.price"></el-input>
               </el-form-item>
               <el-form-item label="最大预约数">
-                <el-input v-model="formLabelAlign.appointmentNumber"></el-input>
+                <el-input v-model="formLabelAlign.largeTimes"></el-input>
               </el-form-item>
             </el-form>
           </div>
@@ -104,16 +108,7 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="停车场名称:">
-                <el-input v-model="formInline2.parkingName" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="预约日期:">
-                <el-date-picker
-                  v-model="formInline2.appointmentTime"
-                  type="date"
-                  placeholder="选择日期">
-                </el-date-picker>
+                <el-input v-model="formInline2.carParkName" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="5">
@@ -136,13 +131,14 @@
       <el-tab-pane label="退款记录" name="退款记录">
         <el-form class="form-wrapper" :inline="true" :model="formInline3" style="margin-bottom: 20px;">
           <el-row>
-            <el-col :span="8">
-              <el-form-item label="退款日期:">
-                <el-date-picker
-                  v-model="formInline3.refundTime"
-                  type="date"
-                  placeholder="选择日期">
-                </el-date-picker>
+            <el-col :span="6">
+              <el-form-item label="车牌号:">
+                <el-input v-model="formInline3.plateNo" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="停车场名称:">
+                <el-input v-model="formInline3.carParkName" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="6">
@@ -207,7 +203,7 @@ export default {
       columns1: [
         {
           label: '停车场名称',
-          key: 'parkingName'
+          key: 'carParkName'
         },
         {
           label: '起始时间',
@@ -218,12 +214,12 @@ export default {
           key: 'endTime'
         },
         {
-          label: '预约费用',
-          key: 'appointmentPrice'
+          label: '预约费用（每小时）',
+          key: 'price'
         },
         {
           label: '最大预约数',
-          key: 'appointmentNumber'
+          key: 'largeTimes'
         },
       ],
       tableData1: [],
@@ -238,33 +234,32 @@ export default {
       title:'',
       dialogVisible:false,
       formLabelAlign: {
-        id: '',
-        parkingName: '',
+        carParkName: '',
         startTime: '',
         endTime: '',
-        appointmentPrice: '',
-        appointmentNumber: '',
+        price: '',
+        largeTimes: ''
       },
       columns2: [
         {
           label: '车牌号',
-          key: 'plateNo'
+          key: 'code'
         },
         {
           label: '停车场名称',
-          key: 'parkingName'
+          key: 'carParkName'
         },
         {
-          label: '预约日期',
+          label: '预约时间',
           key: 'appointmentTime'
         },
         {
           label: '预约费用',
-          key: ''
+          key: 'payAmount'
         },
         {
           label: '状态',
-          key: ''
+          key: 'orderStatus'
         },
       ],
       tableData2: [],
@@ -273,8 +268,7 @@ export default {
       pageNum2: 1,
       formInline2: {
         plateNo: '',
-        parkingName:'',
-        appointmentTime:''
+        carParkName:'',
       },
       columns3: [
         {
@@ -283,23 +277,24 @@ export default {
         },
         {
           label: '停车场名称',
-          key: 'parkingName'
+          key: 'carParkName'
         },
         {
-          label: '退款日期',
-          key: 'refundTime'
+          label: '订单状态',
+          key: 'orderStatus'
         },
         {
           label: '退款金额',
-          key: 'refundMoney'
+          key: 'payAmount'
         },
       ],
-      tableData3: [{plateNo:'豫LU5698',parkingName:'市中心医院停车场',refundTime:'2023-12-31',refundMoney:'20.00'}],
+      tableData3: [],
       total3: 0,
       pageSize3: 10,
       pageNum3: 1,
       formInline3: {
-        refundTime: ''
+        plateNo: '',
+        carParkName:'',
       },
       dialogVisible3:false,
       formLabelAlign3: {
@@ -312,9 +307,9 @@ export default {
     }
   },
   mounted() {
-    // this.getTableData1()
-    // this.getTableData2()
-    // this.getTableData3()
+    this.getTableData1()
+    this.getTableData2()
+    this.getTableData3()
   },
   watch: {
   },
@@ -325,11 +320,7 @@ export default {
     },
     handleAdd () {
       this.title = '添加规则'
-      this.formLabelAlign.parkingName= ''
-      this.formLabelAlign.startTime= ''
-      this.formLabelAlign.endTime= ''
-      this.formLabelAlign.appointmentPrice= ''
-      this.formLabelAlign.appointmentNumber= ''
+      this.formLabelAlign = {}
       this.dialogVisible = true
     },
     handleEdit(row) {
@@ -338,7 +329,7 @@ export default {
       this.dialogVisible = true
     },
     deleteRow (record) {
-      api.deleteWhiteIp({id: record.id}).then(res => {
+      api.deleteRule({id: record.id}).then(res => {
         if (res.code === 200) {
           this.$message({type: 'success', message: '删除成功!'})
           this.getTableData1()
@@ -347,7 +338,7 @@ export default {
     },
     handleConfirm() {
       if (this.title === '修改规则') {
-        api.addWhiteIp({ipAddr: this.formLabelAlign.ipAddr, id: this.formLabelAlign.id}).then(res => {
+        api.editRule({...this.formLabelAlign, endTime: this.formLabelAlign.endTime.substring(0, 10) + " 23:59:59"}).then(res => {
           if (res.code === 200) {
             this.dialogVisible = false
             this.$message({
@@ -358,7 +349,8 @@ export default {
           }
         })
       } else {
-        api.addWhiteIp({ipAddr: this.formLabelAlign.ipAddr}).then(res => {
+        console.log(this.formLabelAlign, '33333')
+        api.addRule({...this.formLabelAlign, endTime: this.formLabelAlign.endTime.substring(0, 10) + " 23:59:59"}).then(res => {
           if (res.code === 200) {
             this.dialogVisible = false
             this.$message({
@@ -387,8 +379,8 @@ export default {
     },
     getTableData1() {
       const {pageNum1, pageSize1} = this
-      api.carListByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
-        this.tableData1 = (res.data.records || []).map(item => ({...item, carType: dictionary.typeMap[item.carType]}))
+      api.yytcListByPage({current: pageNum1, size: pageSize1, ...this.formInline1, endTime: this.formInline1.endTime ? this.formInline1.endTime.substring(0, 10) + " 23:59:59" : ''}).then(res => {
+        this.tableData1 = (res.data.records || [])
         this.total1 = res.data.total
       })
     },
@@ -397,7 +389,7 @@ export default {
     },
     getTableData2() {
       const {pageNum2, pageSize2} = this
-      api.gjListByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
+      api.orderListByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
         this.tableData2 = res.data.records || []
         this.total2 = res.data.total
       })
@@ -407,7 +399,7 @@ export default {
     },
     getTableData3() {
       const {pageNum3, pageSize3} = this
-      api.tcjlListByPage({current: pageNum3, size: pageSize3, ...this.formInline3}).then(res => {
+      api.orderListByPage({current: pageNum3, size: pageSize3, ...this.formInline3, orderStatus: '已退款'}).then(res => {
         this.tableData3 = res.data.records || []
         this.total3 = res.data.total
       })