Merge branch 'new_web' of http://39.108.172.131:3000/Shannon_mu/SmartCommunity into new_web

operationSupport/src/views/ownerManagement/details.vue

@@ -39,6 +39,7 @@
             </div>
             <div class="content-item" v-show="tabsIndex === 2">
                 <div class="formContent-item_title">车辆信息</div>
+                <vehicle></vehicle>
             </div>
             <div class="content-item" v-show="tabsIndex === 3">
                 <div class="widthFlex" v-for="item in parkingData" :key="item">
@@ -50,15 +51,17 @@
                 <div class="formContent-item_title">人员进出记录</div>
             </div>
             <div class="content-item" v-show="tabsIndex === 5">
-                <div class="formContent-item_title">车辆进出记录</div>
+                <vehicleOutToIn></vehicleOutToIn>
             </div>
         </div>
     </div>
 </template>
 <script>
 import householdTable from './stepPage/householdTable.vue';
+import vehicle from './vehicle.vue';
+import vehicleOutToIn from './vehicleOutToIn.vue'
 export default {
-    components: { householdTable },
+    components: { householdTable, vehicle,vehicleOutToIn },
     name: 'ownerManagementDetails',
     data() {
         let _this = this;

operationSupport/src/views/ownerManagement/stepPage/vehicleOutToInDetails.vue

@@ -0,0 +1,205 @@
+<template>
+    <div class="popDetails">
+        <div class="leftImg">
+            <div class="imgName">{{ params.data['imgName'] }}</div>
+            <el-image :src="params.data['imgInfo']" fit="cover"></el-image>
+        </div>
+        <div class="rightText">
+            <div class="list" v-for="item in textArr" :key="item">
+                <span class="list-name">{{ item.lable }}</span>
+                <span class="list-text" v-if="!!item.format">{{ item.format(params.data[item['prop']]) || '--' }}</span>
+                <span class="list-text" v-else>{{ params.data[item['prop']] || '--' }}</span>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+export default {
+    props: ['params'],
+    data() {
+        return {
+            textArr: [
+                {
+                    lable: '车场名称',
+                    prop: 'name'
+                },
+                {
+                    lable: '车牌号码',
+                    prop: 'plateNo'
+                },
+                {
+                    lable: '识别车牌',
+                    prop: 'plateNo'
+                },
+                {
+                    lable: '进场地点',
+                    prop: 'capPlace'
+                },
+                {
+                    lable: '进场时间',
+                    prop: 'capTime'
+                },
+                {
+                    lable: '放行渠道',
+                    prop: 'passType',
+                    format(val) {
+                        if (val == 0) {
+                            return '正常放行';
+                        } else if (val == 1) {
+                            return '免费放行';
+                        } else if (val == 2) {
+                            return '异常放行';
+                        } else if (val == 3) {
+                            return '遥控放行';
+                        } else if (val == 4) {
+                            return '跟车放行';
+                        } else if (val == 5) {
+                            return '补录放行';
+                        } else if (val == 6) {
+                            return '长杆放行';
+                        } else if (val == 7) {
+                            return '临时车异常放行';
+                        } else if (val == 8) {
+                            return '远程放行';
+                        } else if (val == 9) {
+                            return '相机缓存放行';
+                        }
+                    }
+                },
+                {
+                    lable: '车牌类型',
+                    prop: 'carType',
+                    format(val) {
+                        if (val == 0) {
+                            return '临时车';
+                        } else if (val == 1) {
+                            return 'VIP车';
+                        } else if (val == 2) {
+                            return '月租车';
+                        } else if (val == 3) {
+                            return '充值车';
+                        } else if (val == 4) {
+                            return '时租车';
+                        } else if (val == 5) {
+                            return '产权车';
+                        } else if (val == 6) {
+                            return '计次车';
+                        } else if (val == 7) {
+                            return '贵宾卡';
+                        } else if (val == 8) {
+                            return '员工卡';
+                        } else if (val == 9) {
+                            return '大客车';
+                        }
+                    }
+                },
+                {
+                    lable: '车辆类型',
+                    prop: 'carStyle',
+                    format(val) {
+                        if (val == 0) {
+                            return '小轿车';
+                        } else if (val == 1) {
+                            return '大型车';
+                        } else if (val == 2) {
+                            return '货车(中型车)';
+                        } else if (val == 3) {
+                            return '摩托车';
+                        } else if (val == 4) {
+                            return '其他';
+                        }
+                    }
+                },
+                {
+                    lable: '凭据号码',
+                    prop: 'cardNo'
+                },
+                {
+                    lable: '进场凭据',
+                    prop: 'cardNo'
+                },
+                {
+                    lable: '旅行类型',
+                    prop: 'passType',
+                    format(val) {
+                        if (val == 0) {
+                            return '正常放行';
+                        } else if (val == 1) {
+                            return '免费放行';
+                        } else if (val == 2) {
+                            return '异常放行';
+                        } else if (val == 3) {
+                            return '遥控放行';
+                        } else if (val == 4) {
+                            return '跟车放行';
+                        } else if (val == 5) {
+                            return '补录放行';
+                        } else if (val == 6) {
+                            return '长杆放行';
+                        } else if (val == 7) {
+                            return '临时车异常放行';
+                        } else if (val == 8) {
+                            return '远程放行';
+                        } else if (val == 9) {
+                            return '相机缓存放行';
+                        }
+                    }
+                },
+                {
+                    lable: '操作人员',
+                    prop: 'name'
+                },
+                {
+                    lable: '进场备注',
+                    prop: 'passRemark'
+                }
+            ]
+        };
+    },
+    computed: {},
+    mounted() {},
+    methods: {},
+    created() {
+        console.log(this.params.data);
+    }
+};
+</script>
+<style lang="scss" scoped>
+.popDetails {
+    display: flex;
+    justify-content: space-between;
+    font-size: 12px;
+    .leftImg {
+        position: relative;
+        width: 560px;
+        .imgName {
+            position: absolute;
+            top: 0;
+            left: 0;
+            width: 100%;
+            height: 30px;
+            line-height: 30px;
+            background: #0eaeffa6;
+            color: white;
+            z-index: 10;
+            text-align: center;
+        }
+    }
+    .rightText {
+        line-height: 25px;
+        width: calc(100% - 600px);
+        .list {
+            display: flex;
+            .list-name {
+                width: 70px;
+                font-weight: 500;
+                color: #424656;
+            }
+            .list-text {
+                width: calc(100% - 70px);
+                color: #000000a9;
+            }
+        }
+    }
+}
+</style>

operationSupport/src/views/ownerManagement/vehicle.vue

@@ -0,0 +1,70 @@
+<template>
+    <zz-table :settings="{ showIndex: true, stripe: true, hideFoot: true }" :cols="cols" :data="mixins_list"> </zz-table>
+</template>
+
+<script>
+import list from '@utils/list.js';
+
+export default {
+    mixins: [list],
+    data() {
+        return {
+            id: '',
+            cols: [
+                {
+                    label: '车牌号',
+                    prop: 'fullCarNoStr'
+                },
+                {
+                    label: '车辆类型',
+                    prop: 'cardType',
+                    format(val) {
+                        if (val == 0) {
+                            return '临时车';
+                        } else if (val == 1) {
+                            return 'VIP车';
+                        } else if (val == 2) {
+                            return '月租车';
+                        } else if (val == 3) {
+                            return '充值车';
+                        } else if (val == 4) {
+                            return '时租车';
+                        } else if (val == 5) {
+                            return '产权车';
+                        } else if (val == 6) {
+                            return '计次车';
+                        } else if (val == 7) {
+                            return '贵宾卡';
+                        } else if (val == 8) {
+                            return '员工卡';
+                        } else if (val == 9) {
+                            return '大客车';
+                        }
+                    }
+                },
+                {
+                    label: '颜色',
+                    prop: 'cardColor'
+                },
+                {
+                    label: '车型',
+                    prop: '2'
+                },
+                {
+                    label: '品牌',
+                    prop: '3'
+                }
+            ],
+            mixins_post: 'get'
+        };
+    },
+    methods: {},
+    created() {
+        this.mixins_dataUrl = '/sc-community/parkingCar/findResidentCar';
+        this.mixins_query = {
+            userId: this.$route.query.id
+        };
+        this.mixins_search();
+    }
+};
+</script>

operationSupport/src/views/ownerManagement/vehicleOutToIn.vue

@@ -0,0 +1,179 @@
+<template>
+    <div class="main">
+        <div class="search">
+            <el-input placeholder="输入车牌号" class="search-input" clearable v-model="mixins_query.platNo"></el-input>
+            <el-date-picker
+                v-model="times"
+                type="datetimerange"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                :editable="false"
+                @change="timeToggle"
+            ></el-date-picker>
+            <el-button type="primary" class="search-btn" @click="mixins_search" icon="el-icon-search">查询 </el-button>
+        </div>
+        <div class="roles-wrap">
+            <zz-table
+                :cols="cols"
+                :settings="{ showIndex: true, stripe: true }"
+                :loading="mixins_onQuery"
+                :data="mixins_list"
+                :pageset="mixins_pageset"
+                @page-change="pageChange"
+            >
+                <template slot-scope="scope" slot="opt">
+                    <div class="opt">
+                        <el-tooltip class="item" effect="light" placement="bottom" content="查看">
+                            <i class="zoniot_font zoniot-icon-xiangqing" @click="lookPage(scope.row)"></i>
+                        </el-tooltip>
+                    </div>
+                </template>
+            </zz-table>
+        </div>
+    </div>
+</template>
+
+<script>
+import list from '@utils/list.js';
+
+export default {
+    mixins: [list],
+    data() {
+        return {
+            id: '',
+            cols: [
+                {
+                    label: '车牌号',
+                    prop: 'plateNo'
+                },
+                {
+                    label: '车牌类型',
+                    prop: 'carType',
+                    format(val) {
+                        if (val == 0) {
+                            return '临时车';
+                        } else if (val == 1) {
+                            return 'VIP车';
+                        } else if (val == 2) {
+                            return '月租车';
+                        } else if (val == 3) {
+                            return '充值车';
+                        } else if (val == 4) {
+                            return '时租车';
+                        } else if (val == 5) {
+                            return '产权车';
+                        } else if (val == 6) {
+                            return '计次车';
+                        } else if (val == 7) {
+                            return '贵宾卡';
+                        } else if (val == 8) {
+                            return '员工卡';
+                        } else if (val == 9) {
+                            return '大客车';
+                        }
+                    }
+                },
+                {
+                    label: '进/出地点',
+                    prop: 'capPlace'
+                },
+                {
+                    label: '进/出时间',
+                    prop: 'capTime'
+                },
+                {
+                    label: '车辆类型',
+                    prop: 'carStyle',
+                    format(val) {
+                        if (val == 0) {
+                            return '小轿车';
+                        } else if (val == 1) {
+                            return '大型车';
+                        } else if (val == 2) {
+                            return '货车(中型车)';
+                        } else if (val == 3) {
+                            return '摩托车';
+                        } else if (val == 4) {
+                            return '其他';
+                        }
+                    }
+                },
+                {
+                    label: '旅行类型',
+                    prop: 'passType',
+                    format(val) {
+                        if (val == 0) {
+                            return '正常放行';
+                        } else if (val == 1) {
+                            return '免费放行';
+                        } else if (val == 2) {
+                            return '异常放行';
+                        } else if (val == 3) {
+                            return '遥控放行';
+                        } else if (val == 4) {
+                            return '跟车放行';
+                        } else if (val == 5) {
+                            return '补录放行';
+                        } else if (val == 6) {
+                            return '长杆放行';
+                        } else if (val == 7) {
+                            return '临时车异常放行';
+                        } else if (val == 8) {
+                            return '远程放行';
+                        } else if (val == 9) {
+                            return '相机缓存放行';
+                        }
+                    }
+                },
+                {
+                    label: '操作人',
+                    prop: 'updateBy'
+                },
+                {
+                    label: '备注',
+                    prop: 'passRemark'
+                },
+                {
+                    label: '操作',
+                    prop: 'opt',
+                    slot: 'opt'
+                }
+            ],
+            mixins_post: 'post',
+            times: []
+        };
+    },
+    methods: {
+        timeToggle(val) {
+            this.mixins_query.startTime = val[0];
+            this.mixins_query.endTime = val[1];
+        },
+        lookPage(row) {
+            new Promise((resolve) => {
+                this.$store.dispatch('addPopup', {
+                    url: '/ownerManagement/stepPage/vehicleOutToInDetails.vue',
+                    width: '839px',
+                    height: '500px',
+                    props: {
+                        data:row,
+                        callback: resolve
+                    },
+                    title: '车辆通行记录详情',
+                    notip: true,
+                    showCancelButton:true,
+                    showConfirmButton:true
+                });
+            }).then((res) => {});
+        }
+    },
+    created() {
+        this.mixins_dataUrl = '/sc-community/parkingCar/findCarInOutInfo';
+        this.mixins_query = {
+            userId: this.$route.query.id
+        };
+        this.mixins_search();
+    }
+};
+</script>