Merge branch 'develop' of http://39.106.8.246:3003/web/wanda-bm-guide into develop

src/views/equipment/table/equipDetail.vue

@@ -7,7 +7,7 @@
             <div class='qdxq-top'>
                 <div class='gdqd-dialog-top'></div>
                 <div class='gdqd-dialog-bottom'>
-                    <el-table @row-click='innerTable' :data='tableData' :border='true' style='width: 100%;margin-bottom:30px'>
+                    <el-table @row-click='innerTable' :data='tableData' :border='true' style='width: 100%'>
                         <el-table-column type='index' label='序号' width='60'></el-table-column>
                         <el-table-column prop='sbjc' label='设备名称' show-overflow-tooltip resizable min-width='338'>
                             <template slot-scope='{row}'>{{row.sbjc || '--'}}</template>
@@ -191,7 +191,7 @@ export default {
 </script>
 <style lang="less" scoped>
 .gdqd-dialog1 {
-    //height: 100vh;
+    height: 100vh;
     display: flex;
     flex-direction: column;
     .qdxq-top {
@@ -204,7 +204,7 @@ export default {
         }
     }
     .qdxq-bottom {
-        //max-height: 76vh;
+        height: 80vh;
         flex: 1;
         .wb-title {
             display: flex;
@@ -273,7 +273,7 @@ export default {
             // height: 95vh;
         }
         .el-tabs__content {
-            height: calc(100% - 45px);
+            height: 50vh !important;
             /deep/ .el-tab-pane > div {
                 height: 100% !important;
             }