修改ui

VisualInspection/css/main.css

@@ -60,8 +60,13 @@ footer p {
     overflow: auto;
 }
 
-#main_panel {
+/* #main_panel {
+     overflow: auto; 
+} */
+
+#main_panel_body {
     overflow: auto;
+    background: #fff;
 }
 .btn-info1{
     padding: 5px 5px;
@@ -112,4 +117,9 @@ footer p {
 .btn-info3:focus {
     color:#38b03f;
     background-color: #fff;
-}
+}
+
+/* .statistic-panel{
+    margin: -15px -15px -30px -15px;
+    background-color: #ecf0f5;
+} */

VisualInspection/css/statistics/total_company_statistics.css

@@ -43,7 +43,7 @@
 }
 .div-month{
     width:80px;
-    height:50px;
+    /* height:50px; */
     float:left;
     margin-left: 20px;
     line-height: 50px;
@@ -57,7 +57,7 @@
 }
 .div-button{
     width:80px;
-    height:50px;
+    /* height:50px; */
     float:left;
     margin-left: 20px;
 }
@@ -203,8 +203,34 @@
     background-color: #fff;
 }
 .border-line{
-    width:100%;
+    /* width:100%; */
     height: 442px;
     margin:15px auto;
-    border:1px solid #328dc7;
+    border:0px solid #328dc7;
+    background-color: #ecf0f5;
+    /* box-shadow: 0 1px 1px rgba(0,0,0,0.1); */
+     /* box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);  */
+}
+
+.border-no{
+    /* width:100%; */
+    height: 442px;
+    margin:15px 5px;
+    border:0px solid #328dc7;
+    background-color: #ecf0f5;
+    box-shadow: 0 1px 1px rgba(0,0,0,0.1);
+    /* background-color: #ecf0f5; */
+    /* box-shadow: 1px 1px 3px 0 rgba(0, 0, 0, 0.16), 1px 1px 5px 0 rgba(0, 0, 0, 0.12);  */
+    text-align: center;
+}
+
+.title-div{
+    background-color: #529AC5;
+    text-align: center;
+    padding: 5px;
+}
+.title-div span{
+    color:#fff;
+    margin-left: 20px;
+    line-height: 35px;
 }

VisualInspection/js/main.js

@@ -6,6 +6,7 @@ $(document).ready(function() {
     // $('#mum_left').perfectScrollbar();
     $('#mum_left').height($(document).height() - 60);
     $('#main_panel').height($(document).height() - 100);
+    $('#main_panel_body').height($(document).height() - 180);
     // $('#mum_right .panel').height($(document).height()-100);
     initUserinfo();
     setletftime();

VisualInspection/js/mytask/check.js

@@ -159,7 +159,7 @@ function fullscreen() {
         '                                        <button type="button" class="btn btn-info1" style="width:41px;height:41px" onclick="doAction(\'stop\')"><i class="icon icon-pause icon-2x"></i></button>' +
         '                                        <button type="button" class="btn btn-info1" style="width:41px;height:41px" onclick="doAction(\'fast\')"><i class="icon icon-forward icon-2x"></i><span id=\"full_fast_info\"></span></button>' +
         '                                        <button type="button" class="btn btn-info1" style="width:41px;height:41px" onclick="doAction(\'slow\')"><span id=\"full_slow_info\"></span><i class="icon icon-backward icon-2x"></i></button>' +
-        '                                        <button type="button" class="btn btn-info1" style="width:41px;height:41px" style="width:51px;height:42px" id="full_video_btn_start" onclick="doAction(\'video_start\')"><img id="full_video_btn_start_img" style="width:30px" src="/images/movie.png"></img></i></button>' +
+        '                                        <button type="button" class="btn btn-info1" style="width:41px;height:41px" style="width:51px;height:42px" id="full_video_btn_start" onclick="doAction(\'video_start\')"><img id="full_video_btn_start_img" style="width:30px" src="/images/video.png"></img></i></button>' +
         '                                        <button type="button" class="btn btn-info1 hidden" style="width:41px;height:41px" id="full_video_btn_stop" onclick="doAction(\'video_stop\')"><i class="icon icon-stop icon-2x"></i></button>' +
         '                                        <button type="button" class="btn btn-info1" style="width:41px;height:41px" onclick="doAction(\'screenshot\')"><i class="icon icon-camera icon-2x"></i></button>' +
         '                                    </div>' +

VisualInspection/js/statistics/assess_ranking.js

@@ -206,7 +206,7 @@ function getEmployeeInfosClick(url, param, start_score, end_score, start_num, en
                     "<td width='4%;'>" + getItemScore(data[i], '动作') + "</td><td width='4%;'>" + getItemScore(data[i], '文明用语') + "</td>" +
                     "<td width='4%;'>" + getItemScore(data[i], '工作纪律') + "</td><td width='4%'>" + getItemScore(data[i], '便民服务') + "</td><td width='4%;'>" +
                     getItemScore(data[i], '安全管理') + "</td><td width='4%;'>" + data[i].check_all_score + "</td>" +
-                    "<td width='6%;'>" + (isshownumber ? (filter(data[i].checked_num, '0') + (data[i].checked_num < 6 ? html : "")) : "-") + "</td><td width='4%;'>" + filterSlash(filterByZeroHandle(data[i].check_score_avg, '0'), filter(data[i].checked_num + data[i].checked_m_num, '0')) + "</td>" +
+                    "<td width='6%;'>" + (isshownumber ? (filter(data[i].checked_num, '0') + (data[i].checked_num < 16 ? html : "")) : "-") + "</td><td width='4%;'>" + filterSlash(filterByZeroHandle(data[i].check_score_avg, '0'), filter(data[i].checked_num + data[i].checked_m_num, '0')) + "</td>" +
                     "<td width='4%;'>" + filterSlash(score, filter(data[i].checked_num + data[i].checked_m_num, '0')) + "</td><td width='4%;'>" + "</td><td width='4%;'>" + "</td></tr>";
                 count++;
             }

VisualInspection/view/main.html

@@ -60,7 +60,9 @@
                                
                             </ol>
                         </div>
-                        <div class="panel-body" id="main_content">
+                        <div class="panel-body"  id="main_panel_body">
+                            <div id="main_content">
+                            </div>
                             <!--<link rel="import" href="/view/mytask/unchecked.html?__inline">-->
                         </div>
                     </div>

VisualInspection/view/statistics/road_manage_statistics.html

@@ -31,7 +31,7 @@
             </select></div>
         <div class="div-button"><button class="btn btn-primary">查询</button></div></div>
     </div>
-    <div class="line-1"></div>
+    <!-- <div class="line-1"></div> -->
 
     <div class="border-line">
     <div class="row-3"><div><span>道管中心12个月考核得分总体变化趋势分析</span></div></div>

VisualInspection/view/statistics/toll_station_statistics.html

@@ -37,7 +37,7 @@
         </div>
         </form>
     </div>
-    <div class="line-1"></div>
+    <!-- <div class="line-1"></div> -->
 
     <div class="border-line">
     <div class="row-3"><div><span>收费站12个月考核得分总体变化趋势分析</span></div></div>

VisualInspection/view/statistics/total_company_statistics.html

@@ -2,7 +2,7 @@
 <script src="/js/statistics/common_statistic.js?__inline"></script>
 <script src="/js/statistics/total_company_statistics.js"></script>
 <link rel="stylesheet" type="text/css" href="/css/statistics/total_company_statistics.css">
-<div class="container-fluid">
+<div class="container-fluid statistic-panel">
     <!--<div class="row-1"><span>公司统计</span></div>
     <div class="line-1"></div>-->
     <div class="row">
@@ -27,7 +27,7 @@
             <div class="div-button"><button class="query-company">查询</button></div>
         </div>
     </div>
-    <div class="line-1"></div>
+    <!-- <div class="line-1"></div> -->
 
     <div class="border-line">
         <div class="row-3">
@@ -36,18 +36,34 @@
         <div id="company-year-assess" style="height: 100%;height:400px;"></div>
     </div>
 
-    <div class="border-line">
+    <div class="row">
+        <div class="col-sm-6">
+            <div class="border-no">
+                <div class="title-div"><span>公司考核扣分情况占比</span></div>
+                <div id="company-points-assess" style="width:100%;height:400px;float:left;background-color: #fff;"></div>
+            </div>
+        </div>
+            <!-- <div class="line-3"></div> -->
+        <div class="col-sm-6">
+            <div class="border-no">
+                <div class="title-div"><span class="title-span">道管中心得分排名</span></div>
+                <div id="roadManager-score-rank" style="width:100%;height:400px;float:left;background-color: #fff;"></div>
+            </div>
+        </div>
+    </div>
+    <!-- <div class="border-line">
         <div class="row-4">
-            <div class="col-1"><span>公司考核扣分情况占比</span></div>
-            <div class="line-2"></div>
-            <div class="col-1"><span>道管中心得分排名</span></div>
+            <div class="col-sm-6"><span>公司考核扣分情况占比</span></div>
+             <div class="line-2"></div> 
+            <div class="col-sm-6"><span>道管中心得分排名</span></div>
         </div>
         <div class="row-5">
             <div id="company-points-assess" style="width:49%;height:400px;float:left;"></div>
-            <div class="line-3"></div>
+             <div class="line-3"></div> 
             <div id="roadManager-score-rank" style="width:49%;height:400px;float:left;"></div>
         </div>
-    </div>
+    </div> -->
+    
 
 
     <div class="border-line">
@@ -57,7 +73,21 @@
         <div id="company-stationAll-rank" style="height: 100%;height:400px;"></div>
     </div>
 
-    <div class="border-line">
+     <div class="row">
+         <div class="col-sm-6">
+            <div class="border-no">
+                <div class="title-div"><span>温馨服务检查问题类别占比</span></div>
+                <div id="server-check-type" style="width:100%;height:400px;float:left;"></div>
+            </div>
+        </div>
+        <div class="col-sm-6">
+            <div class="border-no">
+                <div class="title-div"><span>各个问题类别的扣分情况</span></div>
+                <div id="each-people-points" style="width:100%;height:400px;float:left;"></div>
+            </div>
+        </div>
+    </div>
+    <!-- <div class="border-line">
         <div class="row-7">
             <div class="col-1"><span>温馨服务检查问题类别占比</span></div>
             <div class="line-2"></div>
@@ -68,7 +98,7 @@
             <div class="line-3"></div>
             <div id="each-people-points" style="width:49%;height:400px;float:left;"></div>
         </div>
-    </div>
+    </div> -->
 
 </div>
 <script>