From 39751485209de286301fab20ca523fe19af392cb Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Wed, 26 Jan 2022 15:02:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=B1=BB=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scss/modules/visual/basicInfoMain.scss     | 12 ++++++------
 .../modules/base/category/addCategory.vue      |  8 +++++---
 src/views/modules/base/category/main.vue       | 18 +++++++++++-------
 .../modules/visual/basicinfo/basicInfoMain.vue | 11 +++++------
 4 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/src/assets/scss/modules/visual/basicInfoMain.scss b/src/assets/scss/modules/visual/basicInfoMain.scss
index cfc5e25b..fddee657 100644
--- a/src/assets/scss/modules/visual/basicInfoMain.scss
+++ b/src/assets/scss/modules/visual/basicInfoMain.scss
@@ -37,7 +37,7 @@
     width: 100%;
     // padding: 10px 5px 13px;
     // margin-top: 8px;
-    height: calc(88vh - 5px);
+    height: calc(88vh - 15px);
     color: #fff;
     // background: url('../../../img/modules/visual/warning-box.png') no-repeat
     //   center;
@@ -105,7 +105,7 @@
       box-sizing: border-box;
       width: 100%;
       margin-top: 21px;
-      height: calc(88vh - 77px);
+      height: calc(88vh - 87px);
       color: #fff;
       background: url('../../../img/modules/visual/warning-box.png') no-repeat
         center;
@@ -193,7 +193,7 @@
   flex: 0 0 calc(100vw - 620px);
   // width: calc(100vw - 560px);
 
-  height: calc(88vh);
+  height: calc(88vh - 10px);
   color: #fff;
   background: url('../../../img/modules/visual/warning-box.png') no-repeat
     center;
@@ -246,9 +246,9 @@
     justify-content: flex-start;
     margin: 0 21px 0 21px;
 
-    // .item:hover {
-    //   cursor: pointer;
-    // }
+    .item:hover {
+      cursor: pointer;
+    }
     .item_sel {
       box-shadow: 0 0 10px inset #1a5afd;
     }
diff --git a/src/views/modules/base/category/addCategory.vue b/src/views/modules/base/category/addCategory.vue
index 181c32fe..b1667e89 100644
--- a/src/views/modules/base/category/addCategory.vue
+++ b/src/views/modules/base/category/addCategory.vue
@@ -196,8 +196,10 @@ export default {
   scoped
 ></style>
 
-<style lang=scss >
-.el-scrollbar__wrap {
-  overflow-x: hidden !important;
+<style lang="scss" scoped>
+.div_list {
+  /deep/ .el-scrollbar__wrap {
+    overflow-x: hidden !important;
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/modules/base/category/main.vue b/src/views/modules/base/category/main.vue
index a1d3fcf9..2dbf3b33 100644
--- a/src/views/modules/base/category/main.vue
+++ b/src/views/modules/base/category/main.vue
@@ -6,7 +6,8 @@
         类别信息
       </div>
       <div class="div_list">
-        <el-scrollbar style="height:100%">
+        <el-scrollbar class="scrollbar"
+                      style="height:100%">
           <div class="div_room">
 
             <div v-for="(item,index) in categoryList"
@@ -71,20 +72,21 @@ export default {
     }
   },
   async mounted () {
-    this.startLoading()
+
     await this.getCategoryList()
-    this.endLoading()
+
 
   },
   methods: {
     //获取分类信息
     async getCategoryList () {
+      this.startLoading()
       const url = "/oper/customize/icindividualcategorymanage/individualcategorylist"
 
       let params = {}
 
       const { data, code, msg } = await requestPost(url, params)
-
+      this.endLoading()
       if (code === 0) {
         this.categoryList = data
         let obj = {
@@ -173,8 +175,10 @@ export default {
   scoped
 ></style>
 
-<style lang=scss >
-.el-scrollbar__wrap {
-  overflow-x: hidden !important;
+<style lang="scss" scoped>
+.div_list {
+  /deep/ .el-scrollbar__wrap {
+    overflow-x: hidden !important;
+  }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/modules/visual/basicinfo/basicInfoMain.vue b/src/views/modules/visual/basicinfo/basicInfoMain.vue
index 51567981..67751271 100644
--- a/src/views/modules/visual/basicinfo/basicInfoMain.vue
+++ b/src/views/modules/visual/basicinfo/basicInfoMain.vue
@@ -324,9 +324,7 @@ const vueGis = {
 
     //下钻到下一级 type点击的类型:polygon 点击多边形（分为点击组织/小区）   search 点击搜索  people 点击详情
     async toSubAgency (type, e, searchName) {
-      if (!e) {
-        return false
-      }
+
 
       //点击小区neighborHood显示楼栋，点击非小区，进入下一级地图
       if (type === 'people') {
@@ -342,8 +340,6 @@ const vueGis = {
         }
         this.searchName = searchName
 
-
-
       } else if (type === 'search') {
         this.runNum++
         this.runAgencyArray.push(this.orgData)
@@ -359,6 +355,9 @@ const vueGis = {
         });
 
       } else {
+        if (!e) {
+          return false
+        }
         if (!e.selected[0]) {
           return false
         }
@@ -929,7 +928,7 @@ export default vueGis;
 }
 
 .el-scrollbar__wrap {
-  overflow-x: hidden !important;
+  // overflow-x: hidden !important;
 }
 
 .info_loading {