出入记录

accessControlSystem/src/views/trafficRecord/accessRecord/index.vue

@@ -6,7 +6,7 @@
             </div>
             <div class="leftBottom">
                 <div class="title">门禁机列表</div>
-                <list-organ></list-organ>
+                <list-organ @doorGuid="doorGuid"></list-organ>
             </div>
         </div>
         <div class="content-right">
@@ -17,9 +17,9 @@
                     class="search-input"
                     v-model.trim="mixins_query.likeValue"
                 ></el-input>
-                <el-select v-model="mixins_query.operateStyleName" placeholder="开门方式" clearable>
-                    <!-- <el-option v-for="(item, index) in communityArr" :key="index" :label="item.communityName" :value="item.id"></el-option> -->
-                </el-select>
+                <!-- <el-select v-model="mixins_query.operateStyleName" placeholder="开门方式" clearable>
+                    <el-option v-for="(item, index) in communityArr" :key="index" :label="item.communityName" :value="item.id"></el-option>
+                </el-select> -->
                 <el-date-picker
                     v-model="pickerTime"
                     value-format="yyyy-MM-dd"
@@ -48,6 +48,12 @@
                 :pageset="mixins_pageset"
                 @page-change="pageChange"
             >
+                <template slot="operate">已开门</template>
+                <template slot-scope="scope" slot="imageUrl">
+                    <div class="imgVdio">
+                        <el-image class="imgs" :src="scope.row.imageUrl" :preview-src-list="[scope.row.imageUrl]"></el-image>
+                    </div>
+                </template>
             </zz-table>
         </div>
     </div>
@@ -63,6 +69,7 @@ export default {
     },
     data() {
         return {
+            isLoadingTree: '',
             currentId: '',
             pickerTime: '',
             cols: [
@@ -92,7 +99,8 @@ export default {
                 },
                 {
                     label: '出入图片',
-                    prop: 'imageUrl'
+                    prop: 'imageUrl',
+                    slot: 'imageUrl'
                 },
                 {
                     label: '出入视频',
@@ -100,7 +108,8 @@ export default {
                 },
                 {
                     label: '开门状态',
-                    prop: 'operateStyleName'
+                    prop: 'operate',
+                    slot: 'operate'
                 },
                 {
                     label: '进出门类型',
@@ -120,6 +129,10 @@ export default {
         currentOrganId(data) {
             this.currentId = data || '';
         },
+        doorGuid({ id } = data) {
+            this.mixins_query.doorGuid = id;
+            this.mixins_search();
+        },
         CheckChinese(val, name) {
             var reg = new RegExp('[\\u4E00-\\u9FFF]+', 'g');
             let newVal = val;
@@ -160,13 +173,15 @@ export default {
             this.mixins_query.unitName = newValue.unitName;
             this.thisLeftData = newValue;
             this.mixins_search();
+            clearTimeout(this.isLoadingTree);
         }
     },
     created() {
-        // this.getorgTree();
         this.mixins_dataUrl = '/sc-gate-web/record/access/page'; // 分页查询接口
         this.mixins_query = {};
-        this.mixins_search('search');
+        this.isLoadingTree = setTimeout(() => {
+            this.mixins_search();
+        }, 1000);
     }
 };
 </script>
@@ -174,9 +189,11 @@ export default {
 @import '@assets/css/public-style.scss';
 .content {
     height: 100%;
+    display: flex;
+    justify-content: space-between;
     .content-left {
-        float: left;
-        height: 100%;
+        // height: 100%;
+        width: rem(260);
         .leftDi {
             height: calc(50% - #{rem(30)});
             .organ-tree {

accessControlSystem/src/views/trafficRecord/accessRecord/popups/listOrganTree.vue

@@ -41,20 +41,20 @@ export default {
         getOrgTreeList() {
             this.$http.get('/sc-gate-web/gate/list').then(({ status, data, msg }) => {
                 if (status === 0 && data) {
-                    this.organList = [{ deviceName: '全部', children: data }];
-                    this.$nextTick().then(() => {
-                        const firstNode = document.querySelector('.el-tree-node');
-                        firstNode.click();
-                    });
+                    this.organList = data;
+                    // this.$nextTick().then(() => {
+                    //     const firstNode = document.querySelector('.el-tree-node');
+                    //     firstNode.click();
+                    // });
                 }
             });
         },
         filterNode(value, data) {
             if (!value) return true;
-            return data.name.indexOf(value) !== -1;
+            return data.deviceName.indexOf(value) !== -1;
         },
         treeClick(e) {
-            // this.$emit('organId', e);
+            this.$emit('doorGuid', e);
         }
     },
     created() {