Merge branch 'temp' of http://123.60.103.97:3000/xuziqiang/SaaS-lib into temp

hx-ai-intelligent/src/App.vue

@@ -75,4 +75,11 @@
       max-width: 1000px;
     }
   }
+
+  // 区域阴影
+  :deep(.ns-table-search),
+  :deep(.ns-part-tree),
+  :deep(.ns-table-main) {
+    box-shadow: @ns-content-box-shadow;
+  }
 </style>

hx-ai-intelligent/src/view/equipmentManage/group/index.vue

@@ -190,7 +190,7 @@
 <style lang="less" scoped>
   .groupContainer {
     height: 100%;
-    overflow-y: auto;
+    // overflow-y: auto;
     background-color: @ns-content-bg;
     display: flex;
     // gap: @ns-gap;
@@ -198,10 +198,10 @@
     .table {
       background-color: @white;
       border-radius: @ns-border-radius;
-      overflow-y: auto;
     }
 
     .tree {
+      overflow-y: auto;
       margin-right: @ns-gap;
       :deep(.ant-spin-nested-loading) {
         width: 300px;

hx-ai-intelligent/src/view/equipmentManage/ledger/index.vue

@@ -13,10 +13,4 @@
     name: 'LedgerIndex', // 与页面路由name一致缓存才可生效
   });
 </script>
-<style lang="less" scoped>
+<style lang="less" scoped></style>
-  :deep(.ns-table-search),
-  :deep(.ns-part-tree),
-  :deep(.ns-table-main) {
-    box-shadow: @ns-content-box-shadow;
-  }
-</style>