Merge branch 'master' of http://git_xt.jsxt.jsjtyxt.com/wenhongquan/VisualInspection

VisualInspection/view/statistics/personal_data_statistics.html

@@ -6,27 +6,27 @@
     <!--<div class="row-1"><span>个人数据统计</span></div>
     <div class="line-1"></div>-->
     <div class="row">
-            <!--<div class="name"><span>刘娟</span></div>
+        <!--<div class="name"><span>刘娟</span></div>
             <div class="div-select div-button"><button>选择人员</button></div>-->
-            <!--<div class="name1"><span  for="exampleInputAccount1">请选择收费站：</span></div>-->
-            <div class="div-select col-sm-2"><select class="form-control" id="select-dept"></select></button>
-            </div>
-            <div class="div-select col-sm-2"><select class="form-control" id="select-personal"></select></button>
+        <!--<div class="name1"><span  for="exampleInputAccount1">请选择收费站：</span></div>-->
+        <div class="div-select col-sm-2"><select class="form-control" id="select-dept"></select></button>
+        </div>
+        <div class="div-select col-sm-2"><select class="form-control" id="select-personal"></select></button>
+        </div>
+        <div class="col-sm-4">
+            <div class="div-start col-sm-5"><input class="form-control" placeholder="请选择考核开始时间"></input>
             </div>
-            <div class="col-sm-4">
-                <div class="div-start col-sm-5"><input class="form-control" placeholder="请选择考核开始时间"></input>
-                </div>
-                <div class="div-to col-sm-1"><label for="exampleInputAccount1">-</label></div>
-                <div class="div-end col-sm-5"><input class="form-control" placeholder="请选择考核结束时间"></input>
-                </div>
+            <div class="div-to col-sm-1"><label for="exampleInputAccount1">-</label></div>
+            <div class="div-end col-sm-5"><input class="form-control" placeholder="请选择考核结束时间"></input>
             </div>
-            <div class="div-select col-sm-1">
-                <select class="form-control score-select" id="score_select">
+        </div>
+        <div class="div-select col-sm-1">
+            <select class="form-control score-select" id="score_select">
                     <option value="2">全部</option><option value="1" selected>扣分</option><option value="0">不扣分</option>
                 </select>
-            </div>
-            <div class="query div-button col-sm-2"><button class="btn-info2">查询</button></div>
-            <!--<div class="export div-button"><button>导出</button></div>-->
+        </div>
+        <div class="query div-button col-sm-2"><button class="btn-info2">查询</button></div>
+        <!--<div class="export div-button"><button>导出</button></div>-->
     </div>
     <div class="line-1"></div>
     <div class="row-3" style="background: #fff;">
@@ -63,10 +63,7 @@
         </div>
     </div>
 
-    <div class="row" style="width:100%;margin:0 auto;">
-        <!-- 使用一个div来显示数据表格 -->
-        <div id="personal_data_table" style="margin-top:10px;" class="datatable" data-checkable="true" data-sortable="true"></div>
-    </div>
+
 
     <div class="row">
         <div class="col-sm-6" style="padding:0 5px;">
@@ -75,7 +72,7 @@
                 <div id="personal-score-statistics" style="width:100%;height:400px;float:left;background-color: #fff;"></div>
             </div>
         </div>
-            <!-- <div class="line-3"></div> -->
+        <!-- <div class="line-3"></div> -->
         <div class="col-sm-6" style="padding:0 5px;">
             <div class="border-no">
                 <div class="title-div"><span class="title-span">个人温馨服务检查问题类别占比</span></div>
@@ -83,12 +80,17 @@
             </div>
         </div>
     </div>
+
+    <div class="row" style="width:100%;margin:0 auto;">
+        <!-- 使用一个div来显示数据表格 -->
+        <div id="personal_data_table" style="margin-top:10px;" class="datatable" data-checkable="true" data-sortable="true"></div>
+    </div>
     <!-- <div class="border-line">
         <div class="row-7">
             <div class="col-1"><span style="font-family: '宋体';font-size:15px;">个人得分统计</span></div>
             <div class="line-2"></div>
             <div class="col-1"><span style="font-family: '宋体';font-size:15px;">个人温馨服务检查问题类别占比</span>
-               
+
             </div>
         </div>
         <div class="row-8">