Shannon_mu 3 lat temu
rodzic
commit
047ccfaffa

+ 1 - 1
accessControlSystem/src/components/common/organTree.vue

@@ -11,7 +11,7 @@
                 :props="defaultProps"
                 :expand-on-click-node="false"
                 @node-click="treeClick"
-                default-expand-all
+                accordion
                 :filter-node-method="filterNode"
             >
             </el-tree>

+ 23 - 16
accessControlSystem/src/views/trafficRecord/accessRecord/index.vue

@@ -1,7 +1,9 @@
 <template>
     <div class="content main">
         <div class="content-left">
-            <organ-tree @organId="currentOrganId" :buildingType="1" :clearRoom="true"></organ-tree>
+            <div class="leftDi">
+                <organ-tree @organId="currentOrganId" :buildingType="1" :clearRoom="true"></organ-tree>
+            </div>
             <div class="leftBottom">
                 <div class="title">门禁机列表</div>
                 <list-organ></list-organ>
@@ -15,8 +17,8 @@
                     class="search-input"
                     v-model.trim="mixins_query.likeValue"
                 ></el-input>
-                <el-select v-model="mixins_query.communityId" placeholder="开门方式" clearable>
-                    <el-option v-for="(item, index) in communityArr" :key="index" :label="item.communityName" :value="item.id"></el-option>
+                <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"
@@ -110,7 +112,7 @@ export default {
                 }
             ],
             thisLeftData: {},
-            communityArr: [],
+            // communityArr: [],
             mixins_post: 'post'
         };
     },
@@ -129,16 +131,16 @@ export default {
         checkDateType(time) {
             return !!time ? this.$moment(new Date(time)).format('YYYY-MM-DD') : '--';
         },
-        getorgTree() {
-            this.$http
-                .get('/sc-community/assets/community/list')
-                .then((data) => {
-                    this.communityArr = data.data;
-                    this.$store.commit('setAreaSelect', data.data);
-                })
+        // getorgTree() {
+        //     this.$http
+        //         .get('/sc-community/assets/community/list')
+        //         .then((data) => {
+        //             this.communityArr = data.data;
+        //             this.$store.commit('setAreaSelect', data.data);
+        //         })
 
-                .catch(function () {});
-        },
+        //         .catch(function () {});
+        // },
         timeToggle(e) {
             let start = '00:00:00',
                 end = '23:59:59';
@@ -161,7 +163,7 @@ export default {
         }
     },
     created() {
-        this.getorgTree();
+        // this.getorgTree();
         this.mixins_dataUrl = '/sc-gate-web/record/access/page'; // 分页查询接口
         this.mixins_query = {};
         this.mixins_search('search');
@@ -175,9 +177,14 @@ export default {
     .content-left {
         float: left;
         height: 100%;
-        .organ-tree {
+        .leftDi {
             height: calc(50% - #{rem(30)});
-            float: none;
+            .organ-tree {
+                height: 100%;
+                &::-webkit-scrollbar {
+                    display: none;
+                }
+            }
         }
         .leftBottom {
             margin-top: rem(20);