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

* 'master' of http://git_xt.jsxt.jsjtyxt.com/wenhongquan/VisualInspection:
  调整ui
  调整ui
  修改UI和解决手工补任务人员无法选择的bug

# Conflicts:
#	VisualInspection/js/config.js
#	VisualInspection/js/statistics/assess_ranking.js

VisualInspection/css/main.css

@@ -122,6 +122,24 @@ footer p {
     background-color: #fff;
 }
 
+.btn-table{
+    color:#fff;
+    background-color: #2196F3;
+    border-radius: 4px;
+    border-color: #2196F3;
+    text-shadow: none;
+    padding: 2px 4px 2px 6px;
+}
+.btn-table:hover {
+    color:#2196F3;
+    background-color: #fff;
+    border-color: #2196F3;
+}
+.btn-table:focus {
+    color:#2196F3;
+    background-color: #fff;
+}
+
 /* .statistic-panel{
     margin: -15px -15px -30px -15px;
     background-color: #ecf0f5;
@@ -146,6 +164,19 @@ footer p {
 }
 .table>thead>tr>th {
     vertical-align: bottom;
-    background-color: #d2d6de;
+    background-color: #61707D;
     border-bottom: 0px solid #ddd;
+    color:#fff;
+}
+.table-thead{
+    background-color: #d2d6de;
+    border-color: #C7C6C5;
+    /* border-bottom: 0px solid #ddd; */
+}
+.table-head  thead tr th{
+    background-color: #d2d6de;
+    border-color: #C7C6C5;
+}
+.calendar-views{
+    background-color: #fff;
 }

VisualInspection/css/statistics/assess_situation.css

@@ -66,10 +66,17 @@
     width:100%;
 }
 
+.table-head table{
+    border: 1px solid #C7C6C5;
+}
+#scrollTable table{
+    border: 1px solid #C7C6C5;
+}
 .table-head table tr th{
     font-size: 12px;
     color:#333;
     text-align:center;
+    border: 1px solid #C7C6C5;
 }
 .table-tbody tr td{
     height:43px;

VisualInspection/css/statistics/check_workload_statistics.css

@@ -2,7 +2,7 @@
     width:98%;
     padding-bottom: 0px;
     margin:15px auto;
-    border:1px solid #d9d9d9;
+    border:0px solid #d9d9d9;
     font-family: '宋体';
     border-radius: 4px;
     font-size: 12px;
@@ -127,8 +127,8 @@
     width:80px;
     height:30px;
     color: #fff;
-    background-color: #3280fc;
-    border-color: #1970fc;
+    /* background-color: #3280fc;
+    border-color: #1970fc; */
     border:1px solid transparent;
     border-radius: 4px;
     margin-top: 10px;
@@ -144,11 +144,12 @@
     height: 100%;
     height:400px;
     background-color: #f5f5f5;
-}.container-right{
+}
+.container-right{
     width:98%;
     padding-bottom: 0px;
     margin:15px auto;
-    border:1px solid #d9d9d9;
+    border:0px solid #d9d9d9;
     font-family: '宋体';
 }
 .row-1{
@@ -205,4 +206,11 @@
     height: 442px;
     margin:15px auto;
     border:1px solid #328dc7;
+}
+.table th {
+    border-bottom: 1px solid #f5f5f5;
+    text-align: center;
+}
+.table td{
+    border-bottom: none;
 }

VisualInspection/css/statistics/personal_data_statistics.css

@@ -104,15 +104,15 @@
 }
 
 .div-start {
-    width: 120px;
+    /* width: 120px; */
     height: 50px;
     float: left;
-    margin-left: 30px;
+    /* margin-left: 30px; */
     line-height: 50px;
 }
 
 .div-to {
-    width: 20px;
+    /* width: 20px; */
     height: 50px;
     float: left;
     /*line-height: 50px;*/
@@ -120,7 +120,7 @@
 
 .div-start input,
 .div-end input {
-    width: 100px;
+    /* width: 100px; */
     height: 30px;
     border: 1px solid #ccc;
     font-size: 14px;
@@ -129,7 +129,7 @@
 }
 
 .div-end {
-    width: 120px;
+    /* width: 120px; */
     height: 50px;
     float: left;
     margin-left: 5px;
@@ -137,7 +137,7 @@
 }
 
 .div-check {
-    width: 160px;
+    /* width: 160px; */
     height: 50px;
     float: left;
     margin-left: 10px;
@@ -146,14 +146,14 @@
 }
 
 .div-check select {
-    width: 160px;
+    /* width: 160px; */
     height: 30px;
     border: 1px solid #ccc;
     border-radius: 4px;
 }
 
 .div-select {
-    width: 120px;
+    /* width: 120px; */
     height: 50px;
     float: left;
     margin-left: 5px;
@@ -161,7 +161,7 @@
 }
 
 .div-select select {
-    width: 120px;
+    /* width: 120px; */
     height: 30px;
     border: 1px solid #ccc;
     border-radius: 4px;
@@ -193,8 +193,8 @@
     width: 80px;
     height: 30px;
     color: #fff;
-    background-color: #3280fc;
-    border-color: #1970fc;
+    /* background-color: #3280fc;
+    border-color: #1970fc; */
     border: 1px solid transparent;
     border-radius: 4px;
     /*margin-top: 10px;*/
@@ -286,4 +286,31 @@
 
 .s_d_name {
     color: #3280fc
+}
+.border-no{
+    /* width:100%; */
+    height: 442px;
+    margin:15px 5px;
+    border:0px solid #328dc7;
+    background-color: #fff;
+    /* 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: 15px;
+}
+.title-div span{
+    color:#fff;
+    margin-left: 20px;
+    line-height: 35px;
+    font-size: 20px;
+}
+.table td{
+    border-bottom: none;
 }

VisualInspection/css/statistics/road_manage_statistics.css

@@ -37,7 +37,7 @@
     width:80px;
     /* height:50px; */
     float:left;
-    margin-left: 20px;
+    /* margin-left: 10px; */
     line-height: 50px;
 }
 #month_date
@@ -65,25 +65,25 @@
 }
 
 .div-button{
-    width:80px;
+    /* width:80px; */
     /* height:50px; */
     float:left;
     margin-left: 20px;
 }
 
 .div-button button{
-    width:80px;
+    /* width:80px;
     height:30px;
     color: #fff;
     background-color: #3280fc;
     border-color: #1970fc;
     border:1px solid transparent;
-    border-radius: 4px;
+    border-radius: 4px; */
     /*margin-top: 10px;*/
 }
 .row-3,.row-4,.row-6,.row-7{
     width:100%;
-    height:40px;
+    /* height:40px; */
     background-color: #328dc7;
     color: white;
 }
@@ -244,7 +244,7 @@
 .title-div{
     background-color: #529AC5;
     text-align: center;
-    padding: 15px;
+    padding: 10px;
 }
 .title-div span{
     color:#fff;

VisualInspection/css/statistics/toll_station_statistics.css

@@ -34,35 +34,35 @@
 
 }
 .div-month{
-    width:80px;
+    /* width:80px; */
     /* height:50px; */
     float:left;
-    margin-left: 20px;
+    /* margin-left: 20px; */
     line-height: 50px;
 }
 .div-roadManage{
-    width:140px;
+    /* width:140px; */
     /* height:50px; */
     float:left;
     margin-left: 20px;
     line-height: 50px;
 }
 .div-station{
-    width:120px;
+    /* width:120px; */
     /* height:50px; */
     float:left;
     margin-left: 20px;
     line-height: 50px;
 }
 .div-roadManage select{
-    width:140px;
+    /* width:140px; */
     height:30px;
     border: 1px solid #ccc;
     border-radius: 4px;
     font-size: 14px;
 }
 .div-station select{
-    width:110px;
+    /* width:110px; */
     height:30px;
     border: 1px solid #ccc;
     border-radius: 4px;
@@ -84,20 +84,20 @@
     font-size: 14px;
 }
 .div-button{
-    width:80px;
+    /* width:80px; */
     /* height:50px; */
     float:left;
     margin-left: 10px;
 }
 
 .div-button button{
-    width:80px;
+    /* width:80px;
     height:30px;
     color: #fff;
     background-color: #3280fc;
     border-color: #1970fc;
     border:1px solid transparent;
-    border-radius: 4px;
+    border-radius: 4px; */
     /*margin-top: 10px;*/
 }
 .btn-change{
@@ -120,7 +120,7 @@
 
 .row-3,.row-4,.row-6,.row-7{
     width:100%;
-    height:40px;
+    /* height:40px; */
     background-color: #328dc7;
     color: white;
 }
@@ -277,7 +277,7 @@
 .title-div{
     background-color: #529AC5;
     text-align: center;
-    padding: 15px;
+    padding: 10px;
 }
 .title-div span{
     color:#fff;

VisualInspection/css/statistics/total_company_statistics.css

@@ -42,21 +42,21 @@
 
 }
 .div-month{
-    width:80px;
+    /* width:80px; */
     /* height:50px; */
     float:left;
-    margin-left: 20px;
+    /* margin-left: 20px; */
     line-height: 50px;
 }
 .div-month select{
-    width: 80px;
-    height: 30px;
+    /* width: 80px; */
+    /* height: 30px; */
     border: 1px solid #ccc;
     border-radius: 4px; 
     font-size: 14px;
 }
 .div-button{
-    width:80px;
+    /* width:80px; */
     /* height:50px; */
     float:left;
     margin-left: 20px;
@@ -74,7 +74,7 @@
 }
 .row-3,.row-4,.row-6,.row-7{
     width:100%;
-    height:40px;
+    /* height:40px; */
     background-color: #328dc7;
     color: white;
 }
@@ -229,7 +229,7 @@
 .title-div{
     background-color: #529AC5;
     text-align: center;
-    padding: 15px;
+    padding: 10px;
 }
 .title-div span{
     color:#fff;

VisualInspection/js/config.js

@@ -18,8 +18,8 @@ function getserveraddr() {
     } else if (base_ui_url.indexOf("file_release_yanhai") != -1) {
         return "http://server_release_yanhai.jsxt.jsjtyxt.com/";
     } else if (base_ui_url.indexOf("localhost") != -1) {
-        return "http://server_yanhai.jsxt.jsjtyxt.com/";
-        // return "http://localhost:8089/"
+        return "http://server_release_yanhai.jsxt.jsjtyxt.com/"
+            // return "http://localhost:8089/"
     } else if (base_ui_url.indexOf("192.168.8.236") != -1) {
         return "http://192.168.8.236:8089/"
     } else {

VisualInspection/js/lib/mytable.js

@@ -186,7 +186,7 @@ String.prototype.replaceAll = function(s1, s2) {
                         var oper = cols[i].oper;
                         var operStr = "";
                         for (var j = 0; j < oper.length; j++) {
-                            operStr += '<a href="javascript:void(0)" onclick="' + oper[j].func + '(' + obj[cols[i].field] + ',' + obj[cols[i].field_other] + ')"><i class="icon ' + oper[j].icon_class + '"></i>' + oper[j].text + ' </a>&nbsp;';
+                            operStr += '<a href="javascript:void(0)" class="btn-table" onclick="' + oper[j].func + '(' + obj[cols[i].field] + ',' + obj[cols[i].field_other] + ')"><i class="icon ' + oper[j].icon_class + '"></i>' + oper[j].text + ' </a>&nbsp;';
                         }
                         dArr.push(operStr);
                     } else {

VisualInspection/js/statistics/assess_ranking.js

@@ -219,7 +219,7 @@ function getEmployeeInfosClick(url, param, start_score, end_score, start_num, en
 }
 
 
-function showAddTaskListView(data, widthtemp, heighttemp, start_date, end_date) {
+function showAddTaskListView(data, widthtemp, heighttemp, start_date, end_date, checknum) {
 
     var tasklist = data.teamClasseList;
     var userclasslist = data.userClassCountList;
@@ -491,10 +491,14 @@ function showAddTaskListView(data, widthtemp, heighttemp, start_date, end_date)
 
     }
 
-    var html = css + '<div class="row row_alert" style="padding-left:10px;padding-right:10px;">' + table1 + '</div><div class="row row_alert" style="bottom: 0;position: absolute;width: 100%;text-align: right;}">' +
+    var btn_html = "";
+    if (checknum < 6) {
+        btn_html = '<button class="btn btn-primary" style="margin:20px;margin-right:10px" onclick="creatTask()" type="button">生成任务</button>';
+    }
+    var html = css + '<div class="row row_alert" style="padding-left:10px;padding-right:10px;">' + table1 + '</div><div class="row row_alert" style="bottom: 0;position: absolute;width: 100%;text-align: center;}">' +
         '<div class="col-xs-4">' + tips + '</div><div class="col-xs-3">' + selectdiv + '</div><div class="col-xs-3"><span class="selecttag" style="text-align: right;">请分配对应的稽查人员：</span></div><div class="col-xs-2  class="selecttag""><select data-placeholder="选择稽查员" id="selectusers" class="chosen-select form-control" >' +
         optlist +
-        '</select></div><div class="row row_alert"><button class="btn btn-primary" style="margin:20px;margin-right:10px" onclick="creatTask()" type="button">生成任务</button></div></div>';
+        '</select></div><div class="row row_alert">' + btn_html + '</div></div>';
 
     return html;
 }
@@ -528,7 +532,7 @@ function addTask(userid, username, stationname, checknum, start_date, end_date)
         var allwidth = 1200;
 
 
-        var html = showAddTaskListView(data, allwidth, allheight, start_date, end_date);
+        var html = showAddTaskListView(data, allwidth, allheight, start_date, end_date, checknum);
 
 
 
@@ -546,6 +550,13 @@ function addTask(userid, username, stationname, checknum, start_date, end_date)
             }
         });
 
+        $('#selectusers').chosen({
+            // width:'200px',
+            height: '100px',
+            no_results_text: '没有找到', // 当检索时没有找到匹配项时显示的提示文本
+            disable_search_threshold: 10, // 10 个以下的选择项则不显示检索框
+            search_contains: true // 从任意位置开始检索
+        });
     });
 
 
@@ -605,7 +616,7 @@ function creatTask() {
                             var height = allheight - 150 - 45;
                             var allwidth = 1200;
 
-                            var html = showAddTaskListView(data, allwidth, allheight, data_p.start_date, data_p.end_date);
+                            var html = showAddTaskListView(data, allwidth, allheight, data_p.start_date, data_p.end_date, data_p.checknum);
 
                             $("#layerhtml").html(html);
                             data_p.checknum = parseInt(data_p.checknum) + 1;

VisualInspection/view/appeal_management/appeal_checked.html

@@ -27,7 +27,7 @@
                     </div>
                 </div>
                 <div class="col-sm-2">
-                    <button class="btn btn-primary " type="button" onclick="queryCheckedAppealTask()">查询</button>
+                    <button class="btn btn-info2" style="width:80px;" type="button" onclick="queryCheckedAppealTask()">查询</button>
                 </div>
             </div>
             <div class="form-group">

VisualInspection/view/appeal_management/appeal_list.html

@@ -29,7 +29,7 @@
                         </div>
                     </div>
                     <div class="col-sm-2">
-                        <button class="btn btn-primary " type="button" id="conditional_query" onclick="queryAppeal()">查询</button>
+                        <button class="btn btn-info2" style="width:80px;" type="button" id="conditional_query" onclick="queryAppeal()">查询</button>
                     </div>
                 </div>
                 <div class="form-group">

VisualInspection/view/appeal_management/appeal_submited.html

@@ -27,7 +27,7 @@
                     </div>
                 </div>
                 <div class="col-sm-2">
-                    <button class="btn btn-primary " type="button" onclick="querySubmitedAppealTask()">查询</button>
+                    <button class="btn btn-binfo2" style="width:80px;" type="button" onclick="querySubmitedAppealTask()">查询</button>
                 </div>
             </div>
              <div class="form-group">

VisualInspection/view/mytask/apply_task.html

@@ -23,9 +23,9 @@
                     </div>
                 </div>
                 <div class="col-sm-2">
-                    <button class="btn btn-primary " type="button" onclick="queryUnexaminedTask()">查询</button>
+                    <button class="btn btn-info2" style="width:80px;" type="button" onclick="queryUnexaminedTask()">查询</button>
                     <div id="agreePatchBtn" style="float:right;display:none;">
-                        <button class="btn btn-success" type="button" onclick="agreeApplyTaskPatch()"><i class="icon icon-plus-sign"></i> 一键同意</button>
+                        <button class="btn btn-info3" type="button" onclick="agreeApplyTaskPatch()"><i class="icon icon-plus-sign"></i> 一键同意</button>
                     </div>
                 </div>
             </div>

VisualInspection/view/mytask/task_list.html

@@ -28,12 +28,12 @@
                 </div>
                 
                 <div class="form-group col-sm-2">
-                    <button class="btn btn-primary " type="button" onclick="queryTask()">查询</button>
+                    <button class="btn btn-info2" style="width:80px;" type="button" onclick="queryTask()">查询</button>
                     <div id="dispatchPatchBtn" style="float:right;display:none;">
-                        <button class="btn btn-success" type="button" onclick="dispatchTaskPatch()"><i class="icon icon-plus-sign"></i> 一键下发</button>
+                        <button class="btn btn-info3" type="button" onclick="dispatchTaskPatch()"><i class="icon icon-plus-sign"></i> 一键下发</button>
                     </div>
                     <div id="confirmPatchBtn" style="float:right;display:none;">
-                        <button class="btn btn-success" type="button" onclick="confirmTaskPatch()"><i class="icon icon-plus-sign"></i> 一键确认</button>
+                        <button class="btn btn-info3" type="button" onclick="confirmTaskPatch()"><i class="icon icon-plus-sign"></i> 一键确认</button>
                     </div>
                 </div>
             </div>

VisualInspection/view/statistics/appeal.html

@@ -36,10 +36,10 @@
                     <select class="form-control" id="fs_station"></select>
                 </div>
                 <div class="col-sm-2">
-                    <button class="btn btn-primary" id="searchBtn" type="button" >查询</button>
+                    <button class="btn btn-info2" id="searchBtn" type="button" >查询</button>
                 </div>
                 <div class="col-sm-2">
-                    <button class="btn btn-primary" id="exportExcel" type="button" >导出</button>
+                    <button class="btn btn-info3" id="exportExcel" type="button" >导出</button>
                 </div>
             </div>
         </form>

VisualInspection/view/statistics/assess_situation.html

@@ -15,10 +15,10 @@
                 </div>
                 <div  class="form-group col-sm-3">
                     <div class="col-sm-6">
-                        <button class="btn btn-primary " type="button" onclick="querySituationClick()">查询</button>
+                        <button class="btn btn-info2 " type="button" onclick="querySituationClick()">查询</button>
                     </div>
                     <div class="col-sm-6">
-                        <button class="btn btn-primary " type="button" onclick="exportExcel()">导出Excel</button>
+                        <button class="btn btn-info3 " type="button" onclick="exportExcel()">导出Excel</button>
                     </div>
                 </div>
             </div>

VisualInspection/view/statistics/assess_type.html

@@ -15,10 +15,10 @@
                 </div>
                 <div  class="form-group col-sm-3">
                     <div class="col-sm-6">
-                        <button class="btn btn-primary " type="button" onclick="queryTypeClick()">查询</button>
+                        <button class="btn btn-info2" type="button" onclick="queryTypeClick()">查询</button>
                     </div>
                     <div class="col-sm-6">
-                        <button class="btn btn-primary " type="button" onclick="exportExcel()" >导出Excel</button>
+                        <button class="btn btn-info3" type="button" onclick="exportExcel()" >导出Excel</button>
                     </div>
                 </div>
             </div>

VisualInspection/view/statistics/change_attendance.html

@@ -43,7 +43,7 @@
                     </select>
                 </div>
                 <div class="col-sm-2">
-                    <button class="btn btn-primary" id="searchBtn" type="button" >查询</button>
+                    <button class="btn btn-info2" id="searchBtn" type="button" >查询</button>
                 </div>
             </div>
         </form>

VisualInspection/view/statistics/change_work.html

@@ -51,7 +51,7 @@
                     </select>
                 </div>
                 <div class="col-sm-1">
-                    <button class="btn btn-primary" id="searchBtn" type="button" >查询</button>
+                    <button class="btn btn-info2" id="searchBtn" type="button" >查询</button>
                 </div>
             </div>
         </form>

VisualInspection/view/statistics/check_workload_statistics.html

@@ -10,7 +10,7 @@
             <div class="name1" style="width:70px;"><span>稽查人员：</span></div>
             <div class="div-select"><select id="select-personal"></select></button>
             </div>
-            <div class="name1" style="width:90px;"><span>考核提交时间：</span></div>
+            <div class="name1" style="width:100px;"><span>考核提交时间：</span></div>
             <div class="div-start" style='margin-left:0px'><input placeholder="请选择考核开始时间"></input>
             </div>
             <div class="div-to"><label>-</label></div>
@@ -20,23 +20,23 @@
                     <option value="">全部</option><option value="1" selected>扣分</option><option value="0">不扣分</option>
                 </select>
             </div>
-            <div class="query div-button"><button>查询</button></div>
+            <div class="query div-button"><button class="btn-info2">查询</button></div>
 
-            <div style="margin-right:30px;float:right;" class="div-button"><button id="export-check-info">导出</button></div>
+            <div style="margin-right:30px;float:right;" class="div-button"><button class="btn-info3" id="export-check-info">导出</button></div>
         </div>
     </div>
 
-    <div class="row-3">
-        <table class="table table-bordered" style="text-align:center;">
+    <div class="row-3" style="background:#fff">
+        <table class="table" style="text-align:center;">
             <tr>
-                <td>总稽查任务数</td>
-                <td>扣分任务数</td>
-                <td>无效任务数</td>
-                <td>总稽查时长</td>
-                <td>稽查扣分次数</td>
-                <td>考核人员数量</td>
-                <td>扣分人员数量</td>
-                <td>总扣分数</td>
+                <th>总稽查任务数</th>
+                <th>扣分任务数</th>
+                <th>无效任务数</th>
+                <th>总稽查时长</th>
+                <th>稽查扣分次数</th>
+                <th>考核人员数量</th>
+                <th>扣分人员数量</th>
+                <th>总扣分数</th>
             </tr>
             <tr>
                 <td class="all_check_task"></td>
@@ -53,7 +53,7 @@
 
     <div class="row" style="width:100%;margin:0 auto;">
         <!-- 使用一个div来显示数据表格 -->
-        <div id="check_workload_table" class="datatable" data-checkable="true" data-sortable="true"></div>
+        <div id="check_workload_table" style="margin-top:10px;" class="datatable" data-checkable="true" data-sortable="true"></div>
     </div>
 
 </div>

VisualInspection/view/statistics/common_attendance.html

@@ -43,7 +43,7 @@
                     </select>
                 </div>
                 <div class="col-sm-2">
-                    <button class="btn btn-primary" id="searchBtn" type="button" >查询</button>
+                    <button class="btn btn-info2" id="searchBtn" type="button" >查询</button>
                 </div>
             </div>
         </form>

VisualInspection/view/statistics/common_work.html

@@ -48,7 +48,7 @@
                     </select>
                 </div>
                 <div class="col-sm-1">
-                    <button class="btn btn-primary" id="searchBtn" type="button" >查询</button>
+                    <button class="btn btn-info2" id="searchBtn" type="button" >查询</button>
                 </div>
             </div>
         </form>
@@ -80,7 +80,7 @@
             </table>
         </div>
         <div id="scrollTable" style="height:300px;overflow:scroll;margin-right:-10px;">
-            <table style="border-top:0px;" border="1" width="100%"  align="center">
+            <table style="border-top:0px;" border="0" width="100%"  align="center">
                 <tbody class="table-tbody" style="background:white; " align="center">
                 </tbody>
             </table>

VisualInspection/view/statistics/emp_ranking.html

@@ -82,7 +82,7 @@
         <!-- 使用一个div来显示数据表格   -->
         <div class="datatable" data-checkable="false" style="margin-bottom: 0px;margin-right:10px;" data-sortable="false">
             <div class="table-head">
-                <table border="1" width="100%" align="center">
+                <table border="0" width="100%" align="center">
                     <thead class="table-thead" align="center">
                         <tr>
                             <th rowspan="2" width="4%;" id='th_1'>序号</th>
@@ -124,7 +124,7 @@
             </div>
         </div>
         <div id="scrollTable" style="height:300px;overflow:scroll;">
-            <table style="border-top:0;" border="1" width="100%" align="center">
+            <table style="border-top:0;" border="0" width="100%" align="center">
                 <tbody class="table-tbody" style="background:white; " align="center">
 
                 </tbody>

VisualInspection/view/statistics/personal_data_statistics.html

@@ -6,30 +6,30 @@
     <!--<div class="row-1"><span>个人数据统计</span></div>
     <div class="line-1"></div>-->
     <div class="row">
-        <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"><select class="form-control" id="select-dept"></select></button>
+            <div class="div-select col-sm-2"><select class="form-control" id="select-dept"></select></button>
             </div>
-            <div class="div-select"><select class="form-control" id="select-personal"></select></button>
+            <div class="div-select col-sm-1"><select class="form-control" id="select-personal"></select></button>
             </div>
-            <div class="div-start"><input class="form-control" placeholder="请选择考核开始时间"></input>
+            <div class="col-sm-3">
+                <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>
-            <div class="div-to"><label for="exampleInputAccount1">-</label></div>
-            <div class="div-end"><input class="form-control" placeholder="请选择考核结束时间"></input>
-            </div>
-            <div class="div-select">
+            <div class="div-select col-sm-2">
                 <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"><button>查询</button></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>
     <div class="line-1"></div>
-    <div class="row-3">
+    <div class="row-3" style="background: #fff;">
         <div class="dept">
             <div style="margin-top:14px;">
                 <span>部门</span><br/><br/>
@@ -65,22 +65,30 @@
 
     <div class="row" style="width:100%;margin:0 auto;">
         <!-- 使用一个div来显示数据表格 -->
-        <div id="personal_data_table" class="datatable" data-checkable="true" data-sortable="true"></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">
+        <div class="col-sm-6" style="padding:0 5px;">
+            <div class="border-no">
+                <div class="title-div"><span>个人得分统计</span></div>
+                <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="col-sm-6" style="padding:0 5px;">
+            <div class="border-no">
+                <div class="title-div"><span class="title-span">个人温馨服务检查问题类别占比</span></div>
+                <div id="personal-check-type" style="width:100%;height:400px;float:left;background-color: #fff;"></div>
+            </div>
+        </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>
-                <!-- <select style="float: right;margin-top: 3px;display: inline;width: 80px;" data-placeholder="选择一个宠物..." class="chosen-select form-control" tabindex="2">
-                     <option value=""></option>
-                     <option value="cat">小猫</option>
-                     <option value="fish">金鱼</option>
-                     <option value="dragon">龙</option>
-                     <option value="mammoth">猛犸</option>
-                     <option value="gollum">咕噜</option>
-                </select> -->
+               
             </div>
         </div>
         <div class="row-8">
@@ -88,7 +96,7 @@
             <div class="line-3"></div>
             <div id="personal-check-type" style="width:49%;height:400px;float:left;"></div>
         </div>
-    </div>
+    </div> -->
 </div>
 <script>
     $(document).ready(function() {

VisualInspection/view/statistics/road_manage_statistics.html

@@ -6,8 +6,7 @@
     <!--<div class="row-1"><span>道管中心统计</span></div>-->
     <!--<div class="line-1"></div>-->
     <div class="row">
-        <div>
-            <div class="div-month">
+            <div class="div-month col-sm-1">
                 <!--<select>-->
                 <!--<option value="1">一月</option>
                 <option value="2">二月</option>
@@ -24,12 +23,12 @@
                 <!--</select>-->
              <input id="month_date" class="form-control form-date" type="text" placeholder="请选择" style="height:30px;">   
             </div>
-        <div class="div-roadManage"><select class="form-control">
+        <div class="div-roadManage col-sm-1"><select class="form-control">
             <!--<option value="30">连云港</option>
             <option value="31">盐城</option>
             <option value="32">南通</option>-->
             </select></div>
-        <div class="div-button"><button class="btn btn-primary">查询</button></div></div>
+        <div class="div-button col-sm-2"><button class="btn btn-info2 col-sm-6">查询</button></div>
     </div>
     <!-- <div class="line-1"></div> -->
 
@@ -79,7 +78,7 @@
 
   <div class="border-line">
     <div class="row-3"><div class="title-div"><span>人员考核得分后20名</span></div></div>
-    <div id="people-rank-suf" style="height: 100%;height:400px;padding-right:10px;"></div>
+    <div id="people-rank-suf" style="width:100%;height:380px;padding-right:10px;"></div>
     </div>
 
     <div class="row">

VisualInspection/view/statistics/toll_station_statistics.html

@@ -5,38 +5,39 @@
 <div class="container-fluid">
     <!--<div class="row-1"><span>收费站统计</span></div>
     <div class="line-1"></div>-->
-    <div class="row">
-        <form  class="form-horizontal" style="margin:0px;">
-            <div class="form-group" style="margin:0px;">
-        <div class="div-month">
-            <!--<select>-->
-                <!--<option value="1">一月</option>
-                <option value="2">二月</option>
-                <option value="3">三月</option>
-                <option value="4">四月</option>
-                <option value="5">五月</option>
-                <option value="6">六月</option>
-                <option value="7">七月</option>
-                <option value="8">八月</option>
-                <option value="9">九月</option>
-                <option value="10">十月</option>
-                <option value="11">十一月</option>
-                <option value="12">十二月</option>-->
-                <!--</select>-->
-            <input id="month_date" class="form-control form-date" type="text" placeholder="请选择" style="height:30px;">
-        </div>
-        <div class="div-roadManage">
-            <select class="form-control" id="first">
-            <!--<option value="30">连云港</option>
-            <option value="31">盐城</option>
-            <option value="32">南通</option>-->
-            </select>
-        </div>
-        <div class="div-station"><select class="form-control" id="second"></select></div>
-        <div class="div-button"><button class="btn btn-primary" type="button">查询</button></div></div>
+    <form  class="form-horizontal" style="margin:0px;">
+        <div class="form-group" style="margin:0px;">
+            <div class="row">
+                <div class="div-month col-sm-1">
+                    <!--<select>-->
+                        <!--<option value="1">一月</option>
+                        <option value="2">二月</option>
+                        <option value="3">三月</option>
+                        <option value="4">四月</option>
+                        <option value="5">五月</option>
+                        <option value="6">六月</option>
+                        <option value="7">七月</option>
+                        <option value="8">八月</option>
+                        <option value="9">九月</option>
+                        <option value="10">十月</option>
+                        <option value="11">十一月</option>
+                        <option value="12">十二月</option>-->
+                        <!--</select>-->
+                    <input id="month_date" class="form-control form-date" type="text" placeholder="请选择" style="height:30px;">
+                </div>
+                <div class="div-roadManage col-sm-2">
+                    <select class="form-control" id="first">
+                    <!--<option value="30">连云港</option>
+                    <option value="31">盐城</option>
+                    <option value="32">南通</option>-->
+                    </select>
+                </div>
+                <div class="div-station col-sm-2"><select class="form-control" id="second"></select></div>
+                <div class="div-button col-sm-2"><button class="btn btn-info2 col-sm-6" type="button">查询</button></div>
+            </div>
         </div>
-        </form>
     </div>
+    </form>
     <!-- <div class="line-1"></div> -->
 
     <div class="border-line">
@@ -81,7 +82,7 @@
     
     <div class="border-line">
     <div class="row-6"><div class="title-div"><span>考核得分排行榜</span></div></div>
-    <div id="people-score-rank" style="height: 100%;height:400px;"></div>
+    <div id="people-score-rank" style="width:100%;height:380px;"></div>
     </div>
     
     <div class="row">

VisualInspection/view/statistics/total_company_statistics.html

@@ -6,26 +6,24 @@
     <!--<div class="row-1"><span>公司统计</span></div>
     <div class="line-1"></div>-->
     <div class="row">
-        <div>
-            <div class="div-month">
-                <!--<select>-->
-                <!--<option value="1">一月</option>
-                <option value="2">二月</option>
-                <option value="3">三月</option>
-                <option value="4">四月</option>
-                <option value="5">五月</option>
-                <option value="6">六月</option>
-                <option value="7">七月</option>
-                <option value="8">八月</option>
-                <option value="9">九月</option>
-                <option value="10">十月</option>
-                <option value="11">十一月</option>
-                <option value="12">十二月</option>-->
-                <!--</select>-->
-                <input id="month_date" class="form-control form-date" type="text" placeholder="请选择" style="height:30px;">
-            </div>
-            <div class="div-button"><button class="query-company">查询</button></div>
+        <div class="div-month col-sm-1">
+            <!--<select>-->
+            <!--<option value="1">一月</option>
+            <option value="2">二月</option>
+            <option value="3">三月</option>
+            <option value="4">四月</option>
+            <option value="5">五月</option>
+            <option value="6">六月</option>
+            <option value="7">七月</option>
+            <option value="8">八月</option>
+            <option value="9">九月</option>
+            <option value="10">十月</option>
+            <option value="11">十一月</option>
+            <option value="12">十二月</option>-->
+            <!--</select>-->
+            <input id="month_date" class="form-control form-date" type="text" placeholder="请选择" style="height:30px;">
         </div>
+        <div class="col-sm-2"><button class="btn btn-info2 col-sm-6">查询</button></div>
     </div>
     <!-- <div class="line-1"></div> -->
 
@@ -70,7 +68,7 @@
         <div class="row-6">
             <div class="title-div"><span>公司全体收费站排名</span></div>
         </div>
-        <div id="company-stationAll-rank" style="height: 100%;height:400px;"></div>
+        <div id="company-stationAll-rank" style="width:100%;height:400px;"></div>
     </div>
 
      <div class="row">