合并develop最新代码

src/assets/styles/common.scss

@@ -51,12 +51,12 @@
 .sbjk-card-container{
   .el-card__header {
     background-color: transparent;
-    padding: 10px 14px;
+    padding: 5px 14px;
     color: #ffffff;
     position: relative;
     border-radius: 5px 5px 0 0;
     .large-title{
-      font-size: 20px;
+      font-size: 18px;
       font-weight: 500;
       line-height: 40px;
       padding: 0 50px 0 11px;
@@ -78,6 +78,12 @@
       right: 25px;
       top: 50%;
       transform: translateY(-50%);
+      .alarm-icon{
+        font-size: 22px;
+        color: #fff;
+        display: block;
+        cursor: pointer;
+      }
     }
   }
   //红色背景颜色标题
@@ -157,6 +163,31 @@
     }
   }
 }
+//电表、液冷公共样式
+.device-info-row{
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  border-left: 1px solid #eee;
+  border-top: 1px solid #eee;
+  .device-info-col{
+    padding: 10px 0;
+    text-align: center;
+    font-size:12px;
+    color:#666666;
+    line-height: 14px;
+    border-bottom: 1px solid #eee;
+    border-right: 1px solid #eee;
+    .left{
+    }
+    .right{
+      display: block;
+      font-weight: 500;
+      font-size:16px;
+      line-height: 18px;
+      margin-top:10px;
+    }
+  }
+}
+
 
 //公共表格样式
 .common-table.el-table{