Merge branch 'master' of http://h.gemho.cn:7099/18963165066/ziboyingji

public/datav/detail/people-monitor.html

@@ -53,8 +53,8 @@
             <div class="f20 color-theme ml10">后台管理</div>
         </div> -->
 
-        <div class="flex-text ml10 mr10 mt15" style="align-items: start;">
-            <div style="width: 490px;height: calc(100vh - 110px);">
+        <div class="flex ml10 mr10 mt15" style="align-items: start;">
+            <div style="width:25%;height: calc(100vh - 110px);">
                 <!-- 通知公告 -->
                 <div style="background: linear-gradient(to bottom, rgba(13,27,48,.7), rgba(13,27,48,0));">
                
@@ -75,7 +75,7 @@
                 </div>
 
                 <!-- 视频监控列表 -->
-                <div class="relative mt20" style="width: 490px;height: calc(100vh - 170px);">
+                <div class="relative mt20" style="width: 100%;height: calc(100vh - 170px);overflow: hidden;">
                     <section>
                         <div class="list-wrapper" v-show="showMenu4bianpo">
                             <div class="list-item active" @click="location.href='people-monitor.html'"><i class="el-icon-caret-right"></i><span style="margin-left: 10px;">人员数据统计</span></div>
@@ -86,7 +86,7 @@
             </div>
 
             <!-- 右侧容器 -->
-            <div>
+            <div style="width:75%">
                 <div class="flex-1 ml15 flex-text ovh">
                     <!-- 视频监控 -->
                     <div class="flex-1">