Merge remote-tracking branch 'origin/master'

@@ -151,6 +151,9 @@ ol, ul { list-style:none; }
     border-bottom: 1px solid #F1F1F1;
     background: #6f94f5;
 }
+.el-dialog__headerbtn:focus .el-dialog__close, .el-dialog__headerbtn:hover .el-dialog__close{
+    color: #fff;
+}
 .el-dialog__title{
     line-height: 24px;
     font-size: 18px;
@@ -224,34 +227,6 @@ ol, ul { list-style:none; }
     right: 6px;
     top: 4px;
 }
-// 增删操作按钮样式
-.addMinus{
-    border-radius:50%;
-    width: 30px !important;
-    height: 30px !important;
-    font-size: 22px!important;
-    padding: 4px 6px;
-}
-.outAdd,.outAdd:hover:focus{
-    background-color: #2FA5FF!important;
-    border: 1px solid #2FA5FF!important;
-    color: #fff!important;
-}
-.inAdd,.inAdd:hover:focus{
-    border: 1px solid #2FA5FF!important;
-    background-color: #fff!important;
-    color: #2FA5FF!important;
-}
-.outMinus,.outMinus:hover:focus{
-    background-color: #FA6400!important;
-    border: 1px solid #FA6400!important;
-    color: #fff!important;
-}
-.inMinus,.inMinus:hover:focus{
-    border: 1px solid #FA6400!important;
-    background-color: #fff!important;
-    color: #FA6400!important;
-}
 .import{
     background-color: #00CACD!important;
     border-color: #00CACD!important;

@@ -325,18 +325,17 @@
         /*border: 1px solid red;*/
     }
     .log-search{
-        margin-top: 10px;
-        padding-left: 15px;
-        padding-top: 20px;
         width: 100%;
-        border: 1px solid #a8adad;
-        height: 60px;
+        border: 1px solid #E6E6E6;
+        height: 80px;
         background-color: white;
+        box-sizing: border-box;
+        padding: 20px 15px;
     }
     .log-detail{
         margin-top: 10px;
         width: 100%;
-        border: 1px solid #a8adad;
+        border: 1px solid #E6E6E6;
         height: 900px;
         overflow: scroll;
         background-color: white;
@@ -347,7 +346,7 @@
         float: left;
         height: 900px;
         overflow: scroll;
-        border-right: 1px solid #a8adad;
+        border-right: 1px solid #E6E6E6;
     }
 
     .log-table{

@@ -181,18 +181,17 @@
         /*border: 1px solid red;*/
     }
     .log-search{
-        margin-top: 10px;
-        padding-left: 15px;
-        padding-top: 20px;
         width: 100%;
-        border: 1px solid #a8adad;
-        height: 60px;
+        border: 1px solid #E6E6E6;
+        height: 80px;
         background-color: white;
+        box-sizing: border-box;
+        padding: 20px 15px;
     }
     .log-table{
         margin-top: 10px;
         width: 100%;
-        border: 1px solid #a8adad;
+        border: 1px solid #E6E6E6;
     }
     .el-button {
         width: 100px;

@@ -506,7 +506,6 @@ export default {
 		},
 		//切换房屋状态
 		handleChoosedH(bsms,color) {
-			debugger
 			//每次切换房屋状态，将之前高亮的户边框颜色重置为默认
 			this.$refs.lpbContent.choosedList = [];
 			this.$refs.lpbContent.$refs.hBsm.forEach((item) => {