Merge remote-tracking branch 'origin/master'

device-manager-ui/admin/src/views/Home.vue

@@ -334,11 +334,11 @@ export default {
           if (res.code == 1) {
             this.statData = res.data.data[0];
           } else {
-            this.$message.error(res.msg);
+            this.$message.error(res.data);
           }
         })
         .catch((error) => {
-          this.$message.error(error.message);
+          this.$message.error('同步统计设备中，请稍后再统计！');
         });
     },
 

device-manager-ui/admin/src/views/sitestat/maplist.vue

@@ -9,7 +9,8 @@
               >切换为列表模式</el-button
             >
           </div>
-          <el-scrollbar style="height: 100%">
+          <div style="height: calc(100vh - 220px); overflow: auto;">
+            <el-scrollbar style="height: 100%;">
               <el-tree
                 size="mini"
                 ref="siteTree"
@@ -27,6 +28,8 @@
               >
               </el-tree>
             </el-scrollbar>
+
+          </div>
         </el-card>
       </el-row>
       <el-row :gutter="20" slot="rightTop" class="mytree">
@@ -368,7 +371,8 @@ export default {
   width: 0;
 }
 .listbody {
-  max-height: 700px;
+  // max-height: 700px;
+  max-height: calc(100vh - 220px);
   overflow: auto;
   .listtop {
     display: flex;
@@ -422,6 +426,9 @@ export default {
   border-bottom: 3px solid rgb(20, 134, 248);
   padding-bottom: 2px;
 }
+::v-deep .el-scrollbar__wrap{
+  overflow-x: unset !important;
+}
 .mytree ::v-deep {
   .el-tree--highlight-current
     ::v-deep