Merge branch 'master' of http://47.100.234.193:9527/wuhao/ems3.3

src/global.less

@@ -5,7 +5,6 @@ body,
 #root {
   height: 100%;
   overflow: hidden;
-
 }
 
 .colorWeak {
@@ -59,14 +58,13 @@ ol {
     width: 100%;
     overflow-x: auto;
 
-    &-thead>tr,
-    &-tbody>tr {
-
-      >th,
-      >td {
+    &-thead > tr,
+    &-tbody > tr {
+      > th,
+      > td {
         white-space: pre;
 
-        >span {
+        > span {
           display: block;
         }
       }
@@ -314,7 +312,7 @@ ol {
 }
 
 .lightblue {
-  >td:first-child {
+  > td:first-child {
     position: relative;
 
     &::before {
@@ -336,14 +334,14 @@ ol {
   width: 100%;
   padding-left: 0 !important;
 
-  >span:first-child {
+  > span:first-child {
     flex: 1;
 
-    >span:first-child {
+    > span:first-child {
       display: none !important;
     }
 
-    >.ant-spin-nested-loading {
+    > .ant-spin-nested-loading {
       width: 100%;
     }
   }
@@ -397,45 +395,54 @@ ol {
 }
 
 .runtime-keep-alive-layout {
-  >div {
+  > div {
     height: 100% !important;
   }
 }
 
-
 .page-title {
   margin-bottom: 0;
   font-weight: 700;
 }
 
 .page-title::before {
-  content: '|';
-  width: 4px;
   position: relative;
   top: 2px;
   left: 2px;
-  color: #1890FF;
-  background-color: #1890FF;
+  width: 4px;
   margin-right: 10px;
+  color: #1890ff;
+  background-color: #1890ff;
+  content: '|';
 }
 
 .fault-detail {
   display: flex;
   flex-direction: row;
-  border-left: 2px dashed #ccc;
   padding: 16px;
+  border-left: 2px dashed #ccc;
 }
 
 .fault-index {
   display: block;
+  flex-shrink: 0;
   width: 30px;
   height: 30px;
+  margin-right: 16px;
+  padding: 2px;
   font-weight: 500;
   text-align: center;
-  padding: 2px;
-  border: 2px solid #1890FF;
-  border-radius: 50%;
   background-color: white;
-  margin-right: 16px;
-  flex-shrink: 0;
-}
+  border: 2px solid #1890ff;
+  border-radius: 50%;
+}
\ No newline at end of file
+
+.runtime-keep-alive-layout,
+.runtime-keep-alive-layout-no {
+  height: auto !important;
+  min-height: 100% !important;
+  overflow: hidden !important;
+  > div {
+    height: 100%;
+  }
+}