4444

smart/src/views/accessRecord/index.vue

@@ -149,6 +149,9 @@ export default {
             name: data.list[i].garageName,
             label: data.list[i].parkId
           })
+          this.parkName = data.list[0].garageName
+          this.mixins_query.parkId = data.list[0].parkId
+          this.lookDetails();
         }
       })
     },

smart/src/views/channelManagement/index.vue

@@ -121,12 +121,14 @@ export default {
             name: data.list[i].garageName,
             label: data.list[i].parkId
           })
+          this.nameParkingLotName = data.list[0].garageName;
+          this.mixins_query.parkId = data.list[0].parkId;
+          this.parkingsearch();
         }
       })
     },
     // 获取点击的停车场名称
     parkingLot (lotname) {
-      // console.log('lotname', lotname);
       this.nameParkingLotName = lotname;
     },
     parkingsearch () {
@@ -142,7 +144,6 @@ export default {
     // 开闸
     switchOn (row) {
       this.$http.post('/sc-community-web/parkingCar/operateChannel', { parkId: this.mixins_query.parkId, type: '0', nodeId: row.id }).then(({ data, status, msg }) => {
-        // console.log('status', status);
         if (status == 0) {
           this.$message.success('开闸成功');
         } else {
@@ -154,7 +155,6 @@ export default {
     // 关闸
     closeGate (row) {
       this.$http.post('/sc-community-web/parkingCar/operateChannel', { parkId: this.mixins_query.parkId, type: '1', nodeId: row.id }).then(({ data, status, msg }) => {
-        // console.log('status', status);
         if (status == 0) {
           this.$message.success('关闸成功');
         } else {
@@ -165,7 +165,6 @@ export default {
     // 强制常开
     forcedNormallyOpen (row) {
       this.$http.post('/sc-community-web/parkingCar/operateChannel', { parkId: this.mixins_query.parkId, type: '2', nodeId: row.id }).then(({ data, status, msg }) => {
-        // console.log('status', status);
         if (status == 0) {
           this.$message.success('强制常开成功');
         } else {
@@ -176,7 +175,6 @@ export default {
     // 结束常开
     endNormallyOpen (row) {
       this.$http.post('/sc-community-web/parkingCar/operateChannel', { parkId: this.mixins_query.parkId, type: '3', nodeId: row.id }).then(({ data, status, msg }) => {
-        // console.log('status', status);
         if (status == 0) {
           this.$message.success('强制常开成功');
         } else {
@@ -186,12 +184,6 @@ export default {
     }
   },
   created () {
-    // 默认查询
-    // this.mixins_dataUrl = '/sc-community-web/parkingCar/findChannelInfo';
-    // this.mixins_query = {};
-    // this.mixins_search();
-    // console.log(this.mixins_query);
-
     // 查询停车场名称
     this.nameParking();
   }

smart/src/views/onSiteVehicles/index.vue

@@ -134,6 +134,9 @@ export default {
             name: data.list[i].garageName,
             label: data.list[i].parkId
           })
+          this.nameParkingLotName = data.list[0].garageName;
+          this.mixins_query.parkId = data.list[0].parkId;
+          this.lookDetails();
         }
       })
     },
@@ -155,6 +158,7 @@ export default {
       }
     },
     lookDetails () {
+      debugger
       if (this.nameParkingLotName.length == 0) {
         this.$message.error('请选择停车场');
       } else {
@@ -181,6 +185,7 @@ export default {
 
     // 调用停车场
     this.nameParking();
+
   }
 }
 </script>

smart/src/views/rechargeRecord/index.js

@@ -59,10 +59,23 @@ export default {
                 //     label: '收费金额',
                 //     prop: '11'
                 // },
-                // {
-                //     label: '支付方式',
-                //     prop: '11'
-                // },
+                {
+                    label: '支付方式',
+                    prop: 'payType',
+                    format(val) {
+                        if (val == 1) {
+                            return '微信';
+                        } else if (val == 2) {
+                            return '支付宝';
+                        } else if (val == 3) {
+                            return '现金';
+                        } else if (val == 4) {
+                            return '预存';
+                        } else if (val == 5) {
+                            return '其他';
+                        }
+                    }
+                },
                 {
                     label: '状态',
                     prop: 'status',

smart/src/views/rechargeRecord/index.vue

@@ -90,7 +90,7 @@ export default {
     return {
       nameParkingLot: [],
       mixins_post: 'post',
-      parkName: '',
+      // parkName: '',
       parkingTime: ''
     }
   },
@@ -116,7 +116,7 @@ export default {
     lookDetails () {
       console.log(this.mixins_query)
       this.mixins_dataUrl = '/sc-community-web/parkingCar/queryChargeRecord';
-      this.mixins_query = { parkId: this.mixins_query.parkId, parkName: this.parkName, plateNo: this.mixins_query.plateNo, startTime: this.mixins_query.startTime, endTime: this.mixins_query.endTime };
+      this.mixins_query = { parkId: this.mixins_query.parkId, plateNo: this.mixins_query.plateNo, startTime: this.mixins_query.startTime, endTime: this.mixins_query.endTime };
       console.log(this.mixins_query)
       this.mixins_search();
     },

smart/src/views/vehicleInformation/index.js

@@ -65,18 +65,29 @@ export default {
                 // },
                 // {
                 //     label: '支付方式',
-                //     prop: '11'
+                //     prop: 'payType',
+                //     format(val) {
+                //         if (val == 1) {
+                //             return '微信';
+                //         } else if (val == 2) {
+                //             return '支付宝';
+                //         } else if (val == 3) {
+                //             return '现金';
+                //         } else if (val == 4) {
+                //             return '预存';
+                //         } else if (val == 5) {
+                //             return '其他';
+                //         }
+                //     }
                 // },
                 {
                     label: '状态',
-                    prop: 'auditStatus',
+                    prop: 'carStatus',
                     format(val) {
-                        if (val == 0) {
-                            return '未审核';
-                        } else if (val == 1) {
-                            return '已审核';
+                        if (val == 1) {
+                            return '已过期';
                         } else if (val == 2) {
-                            return '已拒绝';
+                            return '正常';
                         }
                     }
                 },

smart/src/views/vehicleInformation/setpPage/details.vue

@@ -165,7 +165,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="9">
+        <!-- <el-col :span="9">
           <el-form-item label="首充时间">
             <el-date-picker
               type="date"
@@ -177,7 +177,7 @@
             >
             </el-date-picker>
           </el-form-item>
-        </el-col>
+        </el-col> -->
       </el-row>
       <div class="formContent-item_title">
         <el-row>
@@ -867,8 +867,6 @@ export default {
               areaName: this.tableData[i].areaName,
               lotCount: this.num,
               lotName: this.tableData[i].positionInformation,
-
-              // ruleId: this.formDate.ruleId,//暂无
               parkingId: this.tableData[i].parkingId,
               // lotName: '',
               carType: '',
@@ -939,9 +937,17 @@ export default {
 
 
           }).then(({ data, status, msg }) => {
-            this.params.callback();
+            debugger
+            if (status != 0) {
+              this.$message.error(msg);
+            } else if (status == 0) {
+              this.$message.success('成功');
+              this.params.callback();
+              this.$emit('close');
+            }
+
           })
-          this.$emit('close');
+
         } else {
           return false;
         }

smart/src/views/vehicleInformation/setpPage/recharge.vue

@@ -10,7 +10,7 @@
         </el-col>
         <!-- 充值类型 -->
         <el-col :span="24">
-          <el-col :span="4">费用类型</el-col>
+          <el-col :span="4">充值规则</el-col>
           <el-col :span="20">
             <el-select v-model="valueselected">
               <el-option
@@ -107,15 +107,23 @@
             >
               <el-option
                 value="1"
-                label="现金"
+                label="微信"
               ></el-option>
               <el-option
                 value="2"
-                label="微信"
+                label="支付宝"
               ></el-option>
               <el-option
                 value="3"
-                label="支付宝"
+                label="现金"
+              ></el-option>
+              <el-option
+                value="4"
+                label="预存"
+              ></el-option>
+              <el-option
+                value="5"
+                label="其他"
               ></el-option>
             </el-select>
           </el-col>