Merge branch 'master' of http://111.61.77.35:9999/gengdidi/gassafety into master

gassafety-web/src/views/videoMonitoring/video/index.vue

 <template>
   <div class="app-container">
     <el-row :gutter="5" type="flex" justify="space-around">
-      <el-col :xs="12" :sm="12" :md="6" :lg="4" :xl="4">
-        <div class="topBar">
+      <el-col :lg="4" :xl="4">
           <el-tree id="videoTree"
                    :data="treeData"
                    :props="treeProps"
@@ -22,10 +21,9 @@
               </span>
             </template>-->
           </el-tree>
-        </div>
       </el-col>
 
-      <el-col :xs="12" :sm="12" :md="18" :lg="20" :xl="20">
+      <el-col :lg="20" :xl="20">
         <el-row class="row">
           <div class="box" :class="[flag == 1 ? 'boxred' : 'boxblack']">
             <div id="newplay1" style="width:100%; height:100%;" @click="chooseWindow(1)">
@@ -86,7 +84,7 @@
   .novideo{
     /*padding: 147px 0px 147px 0px;
     display: block;*/
-    line-height: calc((100vh - 114px)/2);
+    line-height: calc((100vh - 130px)/2);
     color: white;
   }
   /*  .nodeImg1{