接口联调

src/api/article_z.js

@@ -5,10 +5,10 @@ export default {
 
   // 订单查询
   queryProductOrderSearchByPage(params) {
-    return axios.get(`/dash/product/order/search/page`, {params})
+    return axios.get(`/opt/product/order/search/page`, {params})
   },
   // 泊位列表
   queryBerthListByPage(params) {
-    return axios.get(`/dash/berth/list/page`, {params})
+    return axios.get(`/opt/berth/list/page`, {params})
   },
 }

src/api/audit.js

@@ -17,24 +17,120 @@ export default {
   tccqkView(params) {
     return axios.get('/dash/parking/lot/situation/view', {params})
   },
-  // 预约停车-分页列表
+  // 停车场码表
+  parkDic(params) {
+    return axios.get('/opt/common/select/park', {params})
+  },
+  // 预约停车-规则分页列表
   yytcListByPage(params) {
-    return axios.get('/opt/reservation/rules/page', {params})
+    return axios.get('/opt/appointment/rules/page', {params})
   },
   // 预约停车-添加规则
   addRule(params) {
-    return axios.post('/opt/reservation/rules/add', params)
+    return axios.post('/opt/appointment/rules/add', params)
   },
   // 预约停车-修改规则
   editRule(params) {
-    return axios.post('/opt/reservation/rules/luohe/configuration/edit', params)
+    return axios.post('/opt/appointment/rules/edit', params)
   },
   // 预约停车-删除规则
   deleteRule(params) {
-    return axios.post('/opt/reservation/rules/delete', params)
+    return axios.post('/opt/appointment/rules/deleteById', params)
   },
-  // 预约订单-分页列表
+  // 预约订单-预约订单分页列表
   orderListByPage(params) {
-    return axios.get('/opt/reservation/orders/page', {params})
-  }
+    return axios.get('/opt/appointment/rules/order/page', {params})
+  },
+  // 预约订单-退款记录
+  refundListByPage(params) {
+    return axios.get('/opt/appointment/rules/refund/page', {params})
+  },
+  // 概览系统_概览
+  glxtView(params) {
+    return axios.get('/opt/parking/index/view', {params})
+  },
+  // 概览系统_停车收入概览
+  glxt1(params) {
+    return axios.post('/opt/parking/index/stat1', params)
+  },
+  // 概览系统_停车记录
+  glxt2(params) {
+    return axios.post('/opt/parking/index/stat2', params)
+  },
+  // todo 停车订单查询_支付订单查询
+  tcddcx1(params) {
+
+  },
+  // todo 停车订单查询_欠费订单查询
+  tcddcx2(params) {
+
+  },
+  // todo 停车订单查询_查询欠费订单信息
+  tcddcx3(params) {
+
+  },
+  // todo 停车订单查询_查询预付订单信息
+  tcddcx4(params) {
+
+  },
+  // 停车纠错_分页列表
+  tcjc(params) {
+    return axios.get('/opt/parking/correction/page', {params})
+  },
+  // 停车纠错_详情
+  tcjcDetail(params) {
+    return axios.get('/opt/parking/correction/detail', {params})
+  },
+  // 泊位列表__分页列表
+  berthListByPage(params) {
+    return axios.get('/opt/berth/list/page', {params})
+  },
+  // 停车卡_规则分页列表
+  tckListByPage(params) {
+    return axios.get('/opt/parking/card/page', {params})
+  },
+  // 停车卡_添加规则
+  addTckRule(params) {
+    return axios.post('/opt/parking/card/add', params)
+  },
+  // 停车卡_修改规则
+  editTckRule(params) {
+    return axios.post('/opt/parking/card/edit', params)
+  },
+  // 停车卡_删除规则
+  deleteEckRule(params) {
+    return axios.post('/opt/parking/card/deleteById', params)
+  },
+  // 停车卡_查看订单分页列表
+  tckOrderListByPage(params) {
+    return axios.get('/opt/parking/card/order/page', {params})
+  },
+  // 停车卡_统计信息
+  tckTjxxListByPage(params) {
+    return axios.get('/opt/parking/card/stat/page', {params})
+  },
+  // 错峰停车_规则分页列表
+  cftcListByPage(params) {
+    return axios.get('/opt/parking/unpeak/page', {params})
+  },
+  // 错峰停车_添加规则
+  addCftcRule(params) {
+    return axios.post('/opt/parking/unpeak/add', params)
+  },
+  // 错峰停车_修改规则
+  editCftcRule(params) {
+    return axios.post('/opt/parking/unpeak/edit', params)
+  },
+  // 错峰停车_删除规则
+  deleteCftcRule(params) {
+    return axios.post('/opt/parking/unpeak/deleteById', params)
+  },
+  // 错峰停车_查看订单分页列表
+  cftcOrderListByPage(params) {
+    return axios.get('/opt/parking/unpeak/order/page', {params})
+  },
+  // 错峰停车_统计信息
+  cftcTjxxListByPage(params) {
+    return axios.get('/opt/parking/card/stat/page', {params})
+  },
 }

src/pages/index/components/appointment_rules.vue

@@ -201,6 +201,10 @@ export default {
     return {
       activeName: '预约规则',
       columns1: [
+        {
+          label: '规则名称',
+          key: 'ruleName'
+        },
         {
           label: '停车场名称',
           key: 'carParkName'
@@ -227,7 +231,7 @@ export default {
       pageSize1: 10,
       pageNum1: 1,
       formInline1: {
-        parkingName: '',
+        parkId: '',
         startTime:'',
         endTime:''
       },
@@ -243,7 +247,7 @@ export default {
       columns2: [
         {
           label: '车牌号',
-          key: 'code'
+          key: 'plateNo'
         },
         {
           label: '停车场名称',
@@ -254,12 +258,12 @@ export default {
           key: 'appointmentTime'
         },
         {
-          label: '预约费用',
-          key: 'payAmount'
+          label: '支付状态',
+          key: 'payStatus'
         },
         {
-          label: '状态',
-          key: 'orderStatus'
+          label: '退款状态',
+          key: 'refundStatus'
         },
       ],
       tableData2: [],
@@ -284,8 +288,8 @@ export default {
           key: 'orderStatus'
         },
         {
-          label: '退款金额',
-          key: 'payAmount'
+          label: '退款状态',
+          key: 'refundStatus'
         },
       ],
       tableData3: [],
@@ -307,6 +311,7 @@ export default {
     }
   },
   mounted() {
+    this.getParkDic()
     this.getTableData1()
     this.getTableData2()
     this.getTableData3()
@@ -314,6 +319,11 @@ export default {
   watch: {
   },
   methods: {
+    getParkDic() {
+      api.parkDic().then(res => {
+        this.parkDic = res.data || []
+      })
+    },
     onSubmit1() {
       this.pageNum1 = 1
       this.getTableData1()
@@ -399,7 +409,7 @@ export default {
     },
     getTableData3() {
       const {pageNum3, pageSize3} = this
-      api.orderListByPage({current: pageNum3, size: pageSize3, ...this.formInline3, orderStatus: '已退款'}).then(res => {
+      api.refundListByPage({current: pageNum3, size: pageSize3, ...this.formInline3}).then(res => {
         this.tableData3 = res.data.records || []
         this.total3 = res.data.total
       })

src/pages/index/components/berth_list.vue

@@ -4,10 +4,24 @@
       <div style="width: 100%">
         <h4>泊位列表</h4>
         <br>
-        <el-form class="form-wrapper" :inline="true">
-        <el-form-item>
-          <el-button type="success" @click="handleAdd">添加白名单</el-button>
-        </el-form-item>
+        <el-form class="form-wrapper" :inline="true" :model="formInline" style="margin-bottom: 20px;">
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="停车场名称:">
+                <el-input v-model="formInline.parkName" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="泊位编号:">
+                <el-input v-model="formInline.berthCode" placeholder="请输入"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item>
+                <el-button type="primary" class="query-btn" @click="onSubmit">查询</el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
         <br>
         <el-table :data="tableData">
@@ -20,30 +34,12 @@
                          :current-page.sync="pageNum" :page-size.sync="pageSize">
           </el-pagination>
       </div>
-        <el-dialog
-          :title="title"
-          :visible.sync="dialogVisible"
-          width="60%"
-          custom-class="audit-dialog">
-          <el-form label-position="left" label-width="80px" :model="formLabelAlign">
-            <el-form-item label="泊位号">
-              <el-input v-model="formLabelAlign.berthCode"></el-input>
-            </el-form-item>
-            <el-form-item label="泊车状态">
-              <el-input v-model="formLabelAlign.berthIsorno"></el-input>
-            </el-form-item>
-          </el-form>
-          <span slot="footer" class="dialog-footer">
-            <el-button @click="dialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="handleConfirm">确 定</el-button>
-        </span>
-        </el-dialog>
     </div>
   </div>
   </div>
 </template>
 <script>
-import api from "@/api/article_z";
+import api from "@/api/audit";
 
 
 export default {
@@ -52,6 +48,10 @@ export default {
   },
   data() {
     return {
+      formInline: {
+        parkName: '',
+        berthCode: ''
+      },
       columns: [
         {
           label: '停车场',
@@ -78,14 +78,7 @@ export default {
           key: 'isSharePark'
         },
       ],
-      formLabelAlign: {
-        berthCode: '',
-        berthIsorno: ''
-      },
       tableData:[],
-      value: '',
-      dialogVisible: false,
-      title: '',
       total: 0,
       pageSize: 5,
       pageNum: 1,
@@ -96,19 +89,17 @@ export default {
   },
   watch: {},
   methods: {
-    handleAdd () {
-      this.title = '添加泊位列表'
-      this.tableData.berthCode = ''
-      this.tableData.berthIsorno = ''
-      this.dialogVisible = true
+    onSubmit() {
+      this.pageNum = 1
+      this.getTableData()
     },
     handlePageChange() {
       this.getTableData()
     },
     getTableData() {
       const {pageNum, pageSize} = this
-      api.queryBerthListByPage({current: pageNum, size: pageSize}).then(res => {
-        this.tableData = res.data.records || []
+      api.berthListByPage({current: pageNum, size: pageSize, ...this.formInline}).then(res => {
+        this.tableData = (res.data.records || []).map(item => ({...item, berthIsorno: (item.berthIsorno === '0' ? '否':'是'),isTidalPark: (item.isTidalPark === '0' ? '否':'是'),hasChargingPile: (item.hasChargingPile === '0' ? '否':'是'),isSharePark: (item.isSharePark === '0' ? '否':'是'),}))
         this.total = res.data.total
       })
     },
@@ -116,92 +107,26 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.form-wrapper {
-  margin-bottom: 20px;
-}
-/deep/ .el-input__inner {
-  background: #2d3744;
-  border: none;
-  border-radius: 0;
-}
-/deep/ .el-select {
-  height: 40px;
-  .el-input__inner {
-    height: 40px;
-  }
-  .el-input__prefix, .el-input__suffix {
-    height: 40px;
-  }
-
-  /* 下面设置右侧按钮居中 */
-  .el-input__suffix {
-    top: 0px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    flex-wrap: nowrap;
-    flex-direction: row;
-    align-content: flex-start;
-  }
-  /* 输入框加上上下边是 32px + 2px =34px */
-  .el-input__icon {
-    line-height: 0px;
-  }
-}
-/deep/ .form-wrapper .el-button {
-  background: linear-gradient(90deg,#0158d9,#3c97e4);
-  width: 100px;
-  height: 40px;
-}
 .body-wrapper {
-  width: 100%;
-  height: 100%;
-  box-sizing: border-box;
+  padding: 20px;
 
-}
-
-.model-pie-body {
-  width: 100%;
-  height: 99%;
-}
-
-.form-wrapper {
-  margin-bottom: 20px;
-}
-/deep/ .el-input__inner {
-  background: #2d3744;
-  border: none;
-  border-radius: 0;
-}
-/deep/ .el-select {
-  height: 40px;
-  .el-input__inner {
-    height: 40px;
-  }
-  .el-input__prefix, .el-input__suffix {
-    height: 40px;
+  .button-block {
+    text-align: right;
+    margin-bottom: 20px;
   }
 
-  /* 下面设置右侧按钮居中 */
-  .el-input__suffix {
-    top: 0px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    flex-wrap: nowrap;
-    flex-direction: row;
-    align-content: flex-start;
+  .table-pagination {
+    text-align: right;
   }
-  /* 输入框加上上下边是 32px + 2px =34px */
-  .el-input__icon {
-    line-height: 0px;
+
+  .search-card {
+    margin-bottom: 20px;
+    text-align: center;
+
+    .input-wrapper {
+      width: 40%;
+    }
   }
 }
-/deep/ .form-wrapper .el-button {
-  background: linear-gradient(90deg,#0158d9,#3c97e4);
-  width: 100px;
-  height: 40px;
-}
-
 
 </style>

src/pages/index/components/parking_card.vue

@@ -6,7 +6,7 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="停车卡名称: ">
-                <el-input v-model="formInline1.parkingCardName" placeholder="请输入"></el-input>
+                <el-input v-model="formInline1.cardName" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -46,15 +46,16 @@
           <div class="form-div">
             <el-form label-position="left" label-width="85px" :model="formLabelAlign">
               <el-form-item label="停车卡名称">
-                <el-input v-model="formLabelAlign.parkingCardName"></el-input>
+                <el-input v-model="formLabelAlign.cardName"></el-input>
               </el-form-item>
               <el-form-item label="可用次数">
-                <el-input v-model="formLabelAlign.totalEnable"></el-input>
+                <el-input v-model="formLabelAlign.useTimes"></el-input>
               </el-form-item>
               <el-form-item label="有效期至">
                 <el-date-picker
-                  v-model="formLabelAlign.validity"
+                  v-model="formLabelAlign.effectTime"
                   type="date"
+                  value-format="yyyy-MM-dd HH:mm:ss"
                   placeholder="选择日期">
                 </el-date-picker>
               </el-form-item>
@@ -71,7 +72,7 @@
           <el-row>
             <el-col :span="5">
               <el-form-item label="订单号: ">
-                <el-input v-model="formInline2.orderCode" placeholder="请输入"></el-input>
+                <el-input v-model="formInline2.orderNo" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="5">
@@ -79,16 +80,7 @@
                 <el-select clearable v-model="formInline2.orderStatus" placeholder="订单状态" popper-class="cur-select">
                   <el-option label="全部" value=""></el-option>
                   <el-option label="已完成" value="已完成"></el-option>
-                  <el-option label="未支付" value="未支付"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="5">
-              <el-form-item label="购买方式:">
-                <el-select clearable v-model="formInline2.orderWay" placeholder="购买方式" popper-class="cur-select">
-                  <el-option label="全部" value=""></el-option>
-                  <el-option label="客户端录入" value="客户端录入"></el-option>
-                  <el-option label="后台录入" value="后台录入"></el-option>
+                  <el-option label="使用中" value="使用中"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -122,10 +114,10 @@
                 <el-input v-model="formLabelAlign2.parkingCardName"></el-input>
               </el-form-item>
               <el-form-item label="下单人">
-                <el-input v-model="formLabelAlign2.placeOrderPerson"></el-input>
+                <el-input v-model="formLabelAlign2.memberId"></el-input>
               </el-form-item>
               <el-form-item label="支付金额">
-                <el-input v-model="formLabelAlign2.payMoney"></el-input>
+                <el-input v-model="formLabelAlign2.payAmount"></el-input>
               </el-form-item>
             </el-form>
           </div>
@@ -140,7 +132,7 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="停车卡名称:">
-                <el-input v-model="formInline3.parkingCardName" placeholder="请输入"></el-input>
+                <el-input v-model="formInline3.cardName" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -175,52 +167,51 @@ export default {
       columns1: [
         {
           label: '停车卡名称',
-          key: 'parkingCardName'
+          key: 'cardName'
         },
         {
           label: '可用次数',
-          key: 'totalEnable'
+          key: 'useTimes'
         },
         {
           label: '有效期至',
-          key: 'validity'
+          key: 'effectTime'
         },
       ],
-      tableData1: [{parkingCardName:'十次停车次卡',totalEnable:'十次停车次卡',validity:'2024-12-31'}],
+      tableData1: [],
       total1: 0,
       pageSize1: 10,
       pageNum1: 1,
       formInline1: {
-        parkingCardName: ''
+        cardName: ''
       },
       title:'',
       dialogVisible:false,
       formLabelAlign: {
-        id: '',
-        parkingCardName: '',
-        totalEnable: '',
-        validity: '',
+        cardName: '',
+        useTimes: '',
+        effectTime: '',
       },
       columns2: [
         {
           label: '订单号',
-          key: 'id'
+          key: 'orderNo'
         },
         {
-          label: '停车卡名称',
-          key: 'parkingCardName'
+          label: '停车卡编号',
+          key: 'cardId'
         },
         {
           label: '下单人',
-          key: 'placeOrderPerson'
-        },
-        {
-          label: '下单时间',
-          key: 'placeOrderTime'
+          key: 'memberId'
         },
+        // {
+        //   label: '下单时间',
+        //   key: 'placeOrderTime'
+        // },
         {
           label: '支付金额',
-          key: 'payMoney'
+          key: 'buyWay'
         },
         {
           label: '订单状态',
@@ -236,9 +227,8 @@ export default {
       pageSize2: 10,
       pageNum2: 1,
       formInline2: {
-        orderCode: '',
+        orderNo: '',
         orderStatus:'',
-        orderWay:''
       },
       title2:'',
       dialogVisible2:false,
@@ -251,27 +241,27 @@ export default {
       columns3: [
         {
           label: '停车卡名称',
-          key: ''
+          key: 'cardName'
         },
         {
           label: '购买数量',
-          key: ''
+          key: 'buyCount'
         },
         {
           label: '客户端购买数量',
-          key: ''
+          key: 'clientBuyCount'
         },
         {
           label: '后台录入数量',
-          key: ''
+          key: 'adminRecordCount'
         },
         {
           label: '使用中数量',
-          key: ''
+          key: 'usedCount'
         },
         {
           label: '金额总计',
-          key: ''
+          key: 'totalFee'
         },
       ],
       tableData3: [],
@@ -284,9 +274,9 @@ export default {
     }
   },
   mounted() {
-    // this.getTableData1()
-    // this.getTableData2()
-    // this.getTableData3()
+    this.getTableData1()
+    this.getTableData2()
+    this.getTableData3()
   },
   watch: {
   },
@@ -297,9 +287,7 @@ export default {
     },
     handleAdd () {
       this.title = '添加规则'
-      this.formLabelAlign.parkingCardName= ''
-      this.formLabelAlign.totalEnable= ''
-      this.formLabelAlign.validity= ''
+      this.formLabelAlign = {}
       this.dialogVisible = true
     },
     handleEdit(row) {
@@ -317,7 +305,7 @@ export default {
     },
     handleConfirm() {
       if (this.title === '修改规则') {
-        api.addWhiteIp({ipAddr: this.formLabelAlign.ipAddr, id: this.formLabelAlign.id}).then(res => {
+        api.editTckRule({...this.formLabelAlign}).then(res => {
           if (res.code === 200) {
             this.dialogVisible = false
             this.$message({
@@ -328,7 +316,7 @@ export default {
           }
         })
       } else {
-        api.addWhiteIp({ipAddr: this.formLabelAlign.ipAddr}).then(res => {
+        api.addTckRule({...this.formLabelAlign, effectTime: this.formLabelAlign.effectTime ? this.formLabelAlign.effectTime.substring(0, 10) + " 23:59:59" :''}).then(res => {
           if (res.code === 200) {
             this.dialogVisible = false
             this.$message({
@@ -373,7 +361,7 @@ export default {
     },
     getTableData1() {
       const {pageNum1, pageSize1} = this
-      api.carListByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
+      api.tckListByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
         this.tableData1 = (res.data.records || []).map(item => ({...item, carType: dictionary.typeMap[item.carType]}))
         this.total1 = res.data.total
       })
@@ -383,7 +371,7 @@ export default {
     },
     getTableData2() {
       const {pageNum2, pageSize2} = this
-      api.gjListByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
+      api.tckOrderListByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
         this.tableData2 = res.data.records || []
         this.total2 = res.data.total
       })
@@ -393,7 +381,7 @@ export default {
     },
     getTableData3() {
       const {pageNum3, pageSize3} = this
-      api.tcjlListByPage({current: pageNum3, size: pageSize3, ...this.formInline3}).then(res => {
+      api.tckTjxxListByPage({current: pageNum3, size: pageSize3, ...this.formInline3}).then(res => {
         this.tableData3 = res.data.records || []
         this.total3 = res.data.total
       })

src/pages/index/components/parking_correction.vue

@@ -1,38 +1,43 @@
 <template>
   <div class="body-wrapper">
-    <el-form class="form-wrapper" :inline="true" :model="formInline1" style="margin-bottom: 20px;">
+    <el-form class="form-wrapper" :inline="true" :model="formInline" style="margin-bottom: 20px;">
       <el-row>
         <el-col :span="6">
           <el-form-item label="停车场名称:">
-            <el-input v-model="formInline1.parkingName" placeholder="请输入"></el-input>
+            <el-input v-model="formInline.carParkName" placeholder="请输入"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="错误类型:">
-            <el-select clearable v-model="formInline1.mistakeType" placeholder="错误类型" popper-class="cur-select">
+            <el-select clearable v-model="formInline.errorType" placeholder="错误类型" popper-class="cur-select">
               <el-option label="全部" value=""></el-option>
               <el-option label="位置错误" value="位置错误"></el-option>
               <el-option label="信息错误" value="信息错误"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <el-col :span="8">
           <el-form-item label="纠错时间:">
             <el-date-picker
-              v-model="formInline1.mistakeTime"
-              type="date"
-              placeholder="选择日期">
+              v-model="formInline.correctionTime"
+              type="daterange"
+              align="right"
+              unlink-panels
+              range-separator="-"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期">
             </el-date-picker>
           </el-form-item>
         </el-col>
-        <el-col :span="5">
+        <el-col :span="4">
           <el-form-item>
             <el-button type="primary" class="query-btn" @click="onSubmit1">查询</el-button>
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
-    <el-table :data="tableData1">
+    <el-table :data="tableData">
       <el-table-column v-for="(item, index) in columns1" :key="index" :label="item.label" :prop="item.key">
       </el-table-column>
       <el-table-column
@@ -44,30 +49,27 @@
       </el-table-column>
     </el-table>
     <div class="table-pagination">
-      <el-pagination layout="prev, pager, next" :total="total1" @current-change="handlePageChange1"
-                     :current-page.sync="pageNum1" :page-size.sync="pageSize1">
+      <el-pagination layout="prev, pager, next" :total="total" @current-change="handlePageChange"
+                     :current-page.sync="pageNum" :page-size.sync="pageSize">
       </el-pagination>
     </div>
     <el-dialog
-      title="退款详情"
+      title="停车纠错详情"
       :visible.sync="dialogVisible"
       width="50%"
       custom-class="audit-dialog">
       <el-form disabled style="height: 350px" class="form-div" label-position="left" label-width="90px" :model="formLabelAlign">
-        <el-form-item label="id">
-          <el-input v-model="formLabelAlign.parkingName"/>
-        </el-form-item>
-        <el-form-item label="车牌号">
-          <el-input  v-model="formLabelAlign.plateNo"/>
+        <el-form-item label="停车场ID">
+          <el-input v-model="formLabelAlign.parkId"/>
         </el-form-item>
         <el-form-item label="停车场名称">
-          <el-input v-model="formLabelAlign.mistakeType"/>
+          <el-input v-model="formLabelAlign.carParkName"/>
         </el-form-item>
-        <el-form-item label="退款日期">
-          <el-input v-model="formLabelAlign.mistakeTime"/>
+        <el-form-item label="错误类型">
+          <el-input v-model="formLabelAlign.errorType"/>
         </el-form-item>
-        <el-form-item label="退款金额">
-          <el-input v-model="formLabelAlign.submitPerson"/>
+        <el-form-item label="纠错时间">
+          <el-input v-model="formLabelAlign.correctionTime"/>
         </el-form-item>
       </el-form>
     </el-dialog>
@@ -84,66 +86,65 @@ export default {
       columns1: [
         {
           label: '停车场名称',
-          key: 'parkingName'
-        },
-        {
-          label: '车牌号',
-          key: 'plateNo'
+          key: 'carParkName'
         },
         {
           label: '错误类型',
-          key: 'mistakeType'
+          key: 'errorType'
         },
         {
           label: '纠错时间',
-          key: 'mistakeTime'
-        },
-        {
-          label: '提交人',
-          key: 'submitPerson'
-        },
+          key: 'correctionTime'
+        }
       ],
-      tableData1: [{parkingName:'万宝手机城新东店',plateNo:'豫LU5698',mistakeType:'位置错误',mistakeTime:'2024-01-01 12:15:00',submitPerson:'赵鹏'}],
-      total1: 0,
-      pageSize1: 10,
-      pageNum1: 1,
-      formInline1: {
-        parkingName: '',
-        mistakeType: '',
-        mistakeTime: '',
+      tableData: [],
+      total: 0,
+      pageSize: 10,
+      pageNum: 1,
+      formInline: {
+        carParkName: '',
+        errorType: '',
+        correctionTime: '',
       },
       dialogVisible:false,
       formLabelAlign: {
-        id: '',
-        parkingName: '',
-        plateNo: '',
-        mistakeType: '',
-        mistakeTime: '',
-        submitPerson:''
+        carParkName: '',
+        errorType: '',
+        correctionTime: '',
       },
     }
   },
   mounted() {
-    // this.getTableData1()
+    this.getTableData()
   },
   watch: {},
   methods: {
     onSubmit1() {
-      this.pageNum1 = 1
-      this.getTableData1()
+      this.pageNum = 1
+      this.getTableData()
     },
     handleDetail(row) {
       this.formLabelAlign = row
       this.dialogVisible = true
     },
-    handlePageChange1() {
-      this.getTableData1()
+    handlePageChange() {
+      this.getTableData()
     },
-    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]}))
-        this.total1 = res.data.total
+    getTableData() {
+      const {pageNum, pageSize} = this
+      let params = {...this.formInline}
+      if (
+        this.formInline.correctionTime && this.formInline.correctionTime.length === 2 &&
+        this.formInline.correctionTime[1] !== ""
+      ) {
+        this.formInline.correctionTime[1] = this.formInline.correctionTime[1].substring(0, 10) + " 23:59:59";
+        params.startCorrectionTime = this.formInline.correctionTime[0]
+        params.endCorrectionTime = this.formInline.correctionTime[1]
+      }
+      delete params.correctionTime
+      api.tcjc({current: pageNum, size: pageSize, ...params}).then(res => {
+        this.tableData = (res.data.records || []).map(item => ({...item, carType: dictionary.typeMap[item.carType]}))
+        this.total = res.data.total
       })
     },
 

src/pages/index/components/parking_index.vue

@@ -5,19 +5,19 @@
         <h2>概览</h2>
         <div class="box-item" style="border: 2px dotted #a1a1a1;border-radius: 5px;padding: 20px 20px 40px 20px;margin-top: 15px">
           <h4 style="float: left">停车场总数</h4>
-          <span style="float: right;color: red">{{viewData.totalParking}}</span>
+          <span style="float: right;color: red">{{viewData.totalPark}}</span>
         </div>
         <div class="box-item" style="border: 2px dotted #757575;border-radius: 5px;padding: 20px 20px 40px 20px;margin-top: 15px">
           <h4 style="float: left">今日停车记录数</h4>
-          <span style="float: right;color: #fc6969">{{viewData.todayTotal}}</span>
+          <span style="float: right;color: red">{{viewData.totalRecord}}</span>
         </div>
         <div class="box-item" style="border: 2px dotted #757575;border-radius: 5px;padding: 20px 20px 40px 20px;margin-top: 15px">
           <h4 style="float: left">今日实收总额</h4>
-          <span style="float: right;color: #fc6969">{{viewData.todayInput}}</span>
+          <span style="float: right;color: red">{{viewData.totalFee || 0}}</span>
         </div>
         <div class="box-item" style="border: 2px dotted #757575;border-radius: 5px;padding: 20px 20px 40px 20px;margin-top: 15px">
           <h4 style="float: left">日均时长泊位利用率</h4>
-          <span style="float: right;color: #fc6969">{{viewData.dailyBerth}}</span>
+          <span style="float: right;color: red">{{viewData.dayBerthRate}}%</span>
         </div>
       </div>
       <div class="body-box" style="width: 48%;height:400px;border-radius: 5px;background-color: #f6f5f5;padding: 20px;color: #525252;">
@@ -29,7 +29,7 @@
           :radiusArr="['30%', '70%']"
           :colorArr="modelPieColor"
           :labelFormat="['{name|{b}}', '{sub|{d}%}', '{hr|}']"
-          :dataset="modelData.list"
+          :dataset="modelData"
           :encode="{ itemName: 'name', value: 'value' }"
         />
       </div>
@@ -45,11 +45,11 @@
           :bottom="30"
           :xlabelFormat="xLabelFormat"
           :top="60"
-          yAxisName="(个)"
+          yAxisName="(辆)"
           :tooltip="tooltipFormat"
           :dataset="bardata"
           :encode="[
-            {x: 'month', y: 'hs', seriesName: '接入数量'}]"
+            {x: 'mouth', y: 'hs', seriesName: '停车数量'}]"
           :labelSize="15"
           id="fxdqhszzt"
         />
@@ -70,30 +70,46 @@ export default {
   data() {
     return {
       viewData:{
-        totalParking:"0",
-        todayTotal:"0",
-        todayInput:"0",
-        dailyBerth:"0"
+        totalPark: 0,
+        totalRecord:0,
+        totalFee:0,
+        dayBerthRate:0
       },
       modelPieColor: ["#4382f6", "#81f878", "#f2ff90", "#FF9800", "#9C27B0"],
-      modelData: {
-        list: [{name: '源汇区',value:'38.4'},{name:'郾城区',value:'26.4'}, {name:'召陵区',value:'35.2'}]
-      },
-      bardata: [{month:'源汇区',hs:'600'},{month:'郾城区',hs:'685'},{month:'召陵区',hs:'843'},],
+      modelData: [],
+      bardata: [],
     }
   },
   mounted() {
+    this.getView();
+    this.getPieData();
+    this.getLineData();
   },
   watch: {
   },
   methods: {
+    getView() {
+      api.glxtView().then(res => {
+        this.viewData = res.data
+      })
+    },
+    getPieData() {
+      api.glxt1().then(res => {
+        this.modelData = res.data || []
+      })
+    },
+    getLineData() {
+      api.glxt2().then(res => {
+        this.bardata = res.data || []
+      })
+    },
     tooltipFormat(params) {
       const type = params[0].seriesType;
       const data = params[0].data;
       // ${params[0].name || "--"}月：
       return `<div class="line-tooltip">
 <div>${params[0].seriesName}: ${
-        params[0].data.hs || "--"}个</div>
+        params[0].data.hs || "--"}辆</div>
 </div>`;
     },
     xLabelFormat(name) {

src/pages/index/components/parking_unpeak.vue

@@ -50,9 +50,10 @@
               </el-form-item>
               <el-form-item label="生效日期">
                 <el-date-picker
-                  v-model="formLabelAlign.effectiveTime"
+                  v-model="formLabelAlign.time"
                   type="daterange"
                   range-separator="至"
+                  value-format="yyyy-MM-dd HH:mm:ss"
                   start-placeholder="开始日期"
                   end-placeholder="结束日期">
                 </el-date-picker>
@@ -60,18 +61,22 @@
               <el-form-item label="生效时段">
                 <el-time-picker
                   is-range
-                  v-model="formLabelAlign.effectivePeriod"
+                  v-model="formLabelAlign.effectInterval"
                   range-separator="至"
                   start-placeholder="开始时间"
                   end-placeholder="结束时间"
+                  value-format="HH:mm:ss"
                   placeholder="选择时间范围">
                 </el-time-picker>
               </el-form-item>
               <el-form-item label="计费档位">
-                <el-input v-model="formLabelAlign.billingStation"></el-input>
+                <el-input v-model="formLabelAlign.billingLevel"></el-input>
+              </el-form-item>
+              <el-form-item label="计费单位">
+                <el-input v-model="formLabelAlign.timeUnit"></el-input>
               </el-form-item>
               <el-form-item label="收费价格">
-                <el-input v-model="formLabelAlign.chargePrice"></el-input>
+                <el-input v-model="formLabelAlign.price"></el-input>
               </el-form-item>
             </el-form>
           </div>
@@ -90,11 +95,11 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="停泊状态:">
-                <el-select clearable v-model="formInline2.parkingTime" placeholder="停泊状态" popper-class="cur-select">
+              <el-form-item label="订单状态:">
+                <el-select clearable v-model="formInline2.orderStatus" placeholder="订单状态" popper-class="cur-select">
                   <el-option label="全部" value=""></el-option>
-                  <el-option label="已出场" value="已出场"></el-option>
-                  <el-option label="停泊中" value="停泊中"></el-option>
+                  <el-option label="已完成" value="已完成"></el-option>
+                  <el-option label="已付款" value="已付款"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -167,20 +172,28 @@ export default {
           key: 'ruleName'
         },
         {
-          label: '生效日期',
-          key: 'effectiveTime'
+          label: '生效日期起',
+          key: 'startTime'
+        },
+        {
+          label: '生效日期终',
+          key: 'endTime'
         },
         {
           label: '生效时段',
-          key: 'effectivePeriod'
+          key: 'effectInterval'
         },
         {
           label: '计费档位',
-          key: 'billingStation'
+          key: 'billingLevel'
+        },
+        {
+          label: '计费单位',
+          key: 'timeUnit'
         },
         {
           label: '收费价格',
-          key: 'chargePrice'
+          key: 'price'
         },
       ],
       tableData1: [],
@@ -193,33 +206,29 @@ export default {
       title:'',
       dialogVisible:false,
       formLabelAlign: {
-        id: '',
         ruleName: '',
-        effectiveTime: '',
-        effectivePeriod: '',
-        billingStation: '',
-        chargePrice: '',
+        time: [],
+        effectInterval: [],
+        billingLevel: '',
+        timeUnit: '',
+        price: '',
       },
       columns2: [
         {
-          label: '车牌号',
-          key: 'plateNo'
+          label: '订单编号',
+          key: 'orderNo'
         },
         {
-          label: '入场时间',
-          key: ''
+          label: '车牌号',
+          key: 'plateNo'
         },
         {
-          label: '停车时长',
-          key: ''
+          label: '泊位号',
+          key: 'parkingNo'
         },
         {
-          label: '停泊状态',
-          key: 'parkingTime'
-        },
-        {
-          label: '金额',
-          key: ''
+          label: '订单状态',
+          key: 'orderStatus'
         },
       ],
       tableData2: [],
@@ -263,8 +272,8 @@ export default {
     }
   },
   mounted() {
-    // this.getTableData1()
-    // this.getTableData2()
+    this.getTableData1()
+    this.getTableData2()
     // this.getTableData3()
   },
   watch: {
@@ -276,20 +285,18 @@ export default {
     },
     handleAdd () {
       this.title = '添加规则'
-      this.formLabelAlign.ruleName= ''
-      this.formLabelAlign.effectiveTime= ''
-      this.formLabelAlign.effectivePeriod= ''
-      this.formLabelAlign.billingStation= ''
-      this.formLabelAlign.chargePrice= ''
+      this.formLabelAlign = {}
       this.dialogVisible = true
     },
     handleEdit(row) {
       this.title = '修改规则'
-      this.formLabelAlign = row
+      console.log(row.effectInterval.split('-'), '00000')
+      this.formLabelAlign = {...row, time: [row.startTime, row.endTime],effectInterval: row.effectInterval.split('-')}
+      console.log(this.formLabelAlign, '888888')
       this.dialogVisible = true
     },
     deleteRow (record) {
-      api.deleteWhiteIp({id: record.id}).then(res => {
+      api.deleteCftcRule({id: record.id}).then(res => {
         if (res.code === 200) {
           this.$message({type: 'success', message: '删除成功!'})
           this.getTableData1()
@@ -297,8 +304,20 @@ export default {
       })
     },
     handleConfirm() {
+      let params = {...this.formLabelAlign}
+      if (
+        this.formLabelAlign.time && this.formLabelAlign.time.length === 2 &&
+        this.formLabelAlign.time[1] !== ""
+      ) {
+        this.formLabelAlign.time[1] = this.formLabelAlign.time[1].substring(0, 10) + " 23:59:59";
+        params.startTime = this.formLabelAlign.time[0]
+        params.endTime = this.formLabelAlign.time[1]
+      }
+      delete params.time
+      console.log(this.formLabelAlign, '333333')
+      params.effectInterval = this.formLabelAlign.effectInterval ?  `${this.formLabelAlign.effectInterval[0]}-${this.formLabelAlign.effectInterval[1]}` : ''
       if (this.title === '修改规则') {
-        api.addWhiteIp({ipAddr: this.formLabelAlign.ipAddr, id: this.formLabelAlign.id}).then(res => {
+        api.editCftcRule({...params}).then(res => {
           if (res.code === 200) {
             this.dialogVisible = false
             this.$message({
@@ -309,7 +328,7 @@ export default {
           }
         })
       } else {
-        api.addWhiteIp({ipAddr: this.formLabelAlign.ipAddr}).then(res => {
+        api.addCftcRule({...params}).then(res => {
           if (res.code === 200) {
             this.dialogVisible = false
             this.$message({
@@ -334,7 +353,7 @@ export default {
     },
     getTableData1() {
       const {pageNum1, pageSize1} = this
-      api.carListByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
+      api.cftcListByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
         this.tableData1 = (res.data.records || []).map(item => ({...item, carType: dictionary.typeMap[item.carType]}))
         this.total1 = res.data.total
       })
@@ -344,7 +363,7 @@ export default {
     },
     getTableData2() {
       const {pageNum2, pageSize2} = this
-      api.gjListByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
+      api.cftcOrderListByPage({current: pageNum2, size: pageSize2, ...this.formInline2}).then(res => {
         this.tableData2 = res.data.records || []
         this.total2 = res.data.total
       })

src/pages/index/components/product_order_search.vue

@@ -6,14 +6,15 @@
           <el-form-item label="选择订单状态:">
             <el-select clearable v-model="formInline1.orderStatus" placeholder="订单状态" popper-class="cur-select">
               <el-option label="全部" value=""></el-option>
-              <el-option label="未处理" value="未处理"></el-option>
+              <el-option label="已完成" value="已完成"></el-option>
               <el-option label="已处理" value="已处理"></el-option>
+              <el-option label="已退款" value="已退款"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item>
-            <el-button type="primary" class="query-btn" @click="onSubmit1">查询</el-button>
+            <el-button type="primary" class="query-btn" @click="onSubmit">查询</el-button>
           </el-form-item>
         </el-col>
       </el-row>
@@ -40,28 +41,20 @@ export default {
       columns1: [
         {
           label: '订单编号',
-          key: 'code'
-        },
-        {
-          label: '支付金额(元)',
-          key: 'payAmount'
-        },
-        {
-          label: '下单时间',
-          key: 'orderTime'
+          key: 'orderNo'
         },
         {
           label: '订单状态',
-          key: 'orderType'
+          key: 'orderStatus'
         },
         {
           label: '修改日期',
-          key: 'updateTime'
-        },
-        {
-          label: '修改人',
-          key: 'updateUser'
+          key: 'createTime'
         },
+        // {
+        //   label: '下单时间',
+        //   key: 'createUser'
+        // },
       ],
       tableData1: [],
       total1: 0,
@@ -77,7 +70,7 @@ export default {
   },
   watch: {},
   methods: {
-    onSubmit1() {
+    onSubmit() {
       this.pageNum1 = 1
       this.getTableData1()
     },
@@ -86,7 +79,7 @@ export default {
     },
     getTableData1() {
       const {pageNum1, pageSize1} = this
-      api.queryProductOrderSearchByPage({current: pageNum1, size: pageSize1, orderType:this.formInline1.orderStatus}).then(res => {
+      api.queryProductOrderSearchByPage({current: pageNum1, size: pageSize1, ...this.formInline1}).then(res => {
         this.tableData1 = res.data.records || []
         this.total1 = res.data.total
       })