Merge remote-tracking branch 'origin/master'

gassafetyprogress-web/src/components/bigWindow/rightBar.vue

@@ -6,13 +6,13 @@
               <span class="dot">
                 <span class="dot-inner"></span>
               </span>
-              <span>用户安全监控设备</span>
+              <span>报警信息</span>
               <div class="fong-div" style="width: 8px;height: 12px;background-color: #2c888899;float: right;margin-top: 10px;transform: skewX(-25deg)"></div>
               <div class="fong-div" style="width: 8px;height: 12px;background-color: #24b1b1b3;float: right;margin-top: 10px;margin-right: 10px;transform: skewX(-25deg)"></div>
               <div class="fong-div" style="width: 8px;height: 12px;background-color: #11e9e9b3;float: right;margin-top: 10px;margin-right: 10px;transform: skewX(-25deg)"></div>
             </div>
         </div>
-        <div class="divfen" style="width: 95%;height: 30%;margin-left: 25px;">
+        <div class="divfen" style="width: 90%;height: 30%;margin-left: 40px;">
             <div class="left">
                 <div
                   class="bottom right-bottom-data-left"
@@ -22,7 +22,7 @@
                   <el-table
                     size="mini"
                     :data="tableData"
-                    style="width: 93%"
+                    style="width: 92%"
                     :height="tableHeight"
                     class="el-bottom"
                     ref="table"
@@ -48,7 +48,7 @@
                         </div>
                       </template>
                     </el-table-column>
-                    <el-table-column prop="alarmTime" label="预警时间" width="120">
+                    <el-table-column prop="alarmTime" label="预警时间" width="140">
                     </el-table-column>
                     <el-table-column prop="handledStatus" label="状态" width="">
                       <template slot-scope="scope">
@@ -877,7 +877,4 @@
     overflow-x: hidden !important;
     overflow-y: hidden !important;
   }
-  .left{
-      margin-left: 10px;
-  }
 </style>