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

VisualInspection/css/common/foot.css

@@ -4,6 +4,7 @@ footer {
     position: absolute;
     width: 100%;
     z-index: 0;
+    position: absolute;
 }
 
 footer p {

VisualInspection/css/statistics/toll_station_statistics.css

@@ -108,8 +108,14 @@
 .view_change{
     width:60px;
     height:40px;
-    background: url("/images/change-btn.png?time=2017725152348") no-repeat center center ;
+    background: url("/images/up.png?time=2017725152349") no-repeat center center ;
     cursor: pointer;
+    background-size: 30%;
+}
+
+.view_change.active{
+    background: url("/images/back.png?time=2017725152349") no-repeat center center ;
+    background-size: 30%;
 }
 
 .row-3,.row-4,.row-6,.row-7{

VisualInspection/css/user/login.css

@@ -1,3 +1,7 @@
+html {
+    height: 100%
+}
+
 .col-md-4 {
     text-align: center;
 }
@@ -54,7 +58,7 @@ fieldset[disabled] .btn-primary:hover {
 }
 
 .login_btn {
-    background: #328dc7;
+    background: #4c95e1;
     color: white;
     border: none;
     font-size: 18px;
@@ -62,35 +66,45 @@ fieldset[disabled] .btn-primary:hover {
 }
 
 .main {
-    background-image: url("/images/bg.png");
+    background-image: url("/images/login/bg.png");
     filter: "progid:DXImageTransform.Microsoft.AlphaImageLoader(sizingMethod='scale')";
-    -moz-background-size: 100% 100%;
-    background-size: 100% 100%;
+    -moz-background-size: 100%;
+    background-size: 100%;
+    height: 100%;
+    background-repeat: no-repeat;
+    background-position-y: center;
+    background-color: white;
 }
-.bg{
-     background-image: url("/images/brige.png");
-     background-repeat:no-repeat;
-     background-position:center;
-     background-size:100% 100%;
-     position: relative;
-     width: 1075px;
-     height: 510px;
-     margin: 0 auto;
-     top:100px
-}
-.login{
+
+.bg {
+    background: white;
+    /* background-repeat: no-repeat; */
+    /* background-position: center; */
+    /* background-size: 100% 100%; */
     position: absolute;
-    bottom: 26%;
-    width: 25%;
-    right: 6%;
+    width: 263px;
+    height: 200px;
+    top: 29%;
+    right: 11.5%;
+    border-radius: 5px;
 }
-.ll{
 
-    padding:0px;
+.row {
+    margin-right: 0px;
+    margin-left: 0px;
+}
+
+.login {
+    width: 100%;
+    padding: 36px;
+}
+
+.ll {
+    padding: 0px;
     line-height: 32px;
     text-align: left;
-
 }
-.lll{
+
+.lll {
     padding: 0px
 }

VisualInspection/js/lib/mytable.js

@@ -25,7 +25,7 @@ String.prototype.replaceAll = function(s1, s2) {
                 page_size: 10
             }
         };
-        this.options = $.extend(true,{}, DEFAULTS, options);
+        this.options = $.extend(true, {}, DEFAULTS, options);
         this.element = element;
         // this.options = options;
         this.pager = options.pager;
@@ -63,7 +63,7 @@ String.prototype.replaceAll = function(s1, s2) {
             var param = options.param;
             // var obj = this.obj;
             //加载层
-            var index = layer.load(2, {shade: false}); //0代表加载的风格，支持0-2
+            var index = layer.load(2, { shade: false }); //0代表加载的风格，支持0-2
             post_common_service(url + "/" + p_cur + "/" + page_size, param, function(data) {
                 // console.log(data);
                 layer.close(index);
@@ -117,7 +117,7 @@ String.prototype.replaceAll = function(s1, s2) {
             });
             // $('#my_table').datatable({checkable: true});
 
-            $('a.lightbox-toggle').lightbox(); //图片轮播
+            // $('a.lightbox-toggle').lightbox(); //图片轮播
             function formatTableData(data, cols, p_cur) {
                 var rows = [];
                 for (var i = 0; i < data.length; i++) {
@@ -175,7 +175,7 @@ String.prototype.replaceAll = function(s1, s2) {
                                     src = src.split('.mp4')[0] + "_screen_0.png"
                                     ispic = false;
                                 }
-                                var pic = (ispic ? '<a class="card lightbox-toggle" data-group="image-group-'+num+'" data-lightbox-group="example-3" href="' + src + '" style="width:60px;height:50px;float:left;">' : '<a class="card" onclick="video_paly(\'' + videosrc + '\')" href="javascript:void(0)" style="width:60px;height:50px;">') +
+                                var pic = (ispic ? '<a class="card lightbox-toggle" onclick="img_play(\'' + src + '\')" href="javascript:void(0)" style="width:60px;height:50px;float:left;">' : '<a class="card" onclick="video_paly(\'' + videosrc + '\')" href="javascript:void(0)" style="width:60px;height:50px;">') +
                                     '<img class="pic-class  img-thumbnail" style="width:60px;height:50px;" src="' + src + '" alt="">' + (ispic ? '' : '<i class="icon icon-play-circle" style=" font-size: 30px;position: absolute;top: 10px;left: 15px;color: white;"></i>') +
                                     '</a>';
                                 picStr += pic;
@@ -216,19 +216,21 @@ String.prototype.replaceAll = function(s1, s2) {
                 row.data = dArr;
                 return row;
             }
+
             function uuid() {
                 var s = [];
                 var hexDigits = "0123456789abcdef";
                 for (var i = 0; i < 36; i++) {
                     s[i] = hexDigits.substr(Math.floor(Math.random() * 0x10), 1);
                 }
-                s[14] = "4";  // bits 12-15 of the time_hi_and_version field to 0010
-                s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1);  // bits 6-7 of the clock_seq_hi_and_reserved to 01
+                s[14] = "4"; // bits 12-15 of the time_hi_and_version field to 0010
+                s[19] = hexDigits.substr((s[19] & 0x3) | 0x8, 1); // bits 6-7 of the clock_seq_hi_and_reserved to 01
                 s[8] = s[13] = s[18] = s[23] = "-";
-            
+
                 var uuid = s.join("");
                 return uuid;
             }
+
             function clearTable(cols, options, element) {
                 var checkable = options.checkable;
                 var sortable = options.sortable

VisualInspection/js/mytask/check.js

@@ -298,6 +298,7 @@ function initCheckAppealBtns() {
 function showAppealLayer() {
     layer.open({
         type: 1,
+        area: ['400px', "400px"],
         title: "申诉详情",
         closeBtn: 1,
         shade: false,
@@ -567,7 +568,7 @@ function showChangeUser() {
     };
 
     post_common_service("/user/getUserList/", param, function(data) {
-        changePersonLayer = showPopup4Common('更改人员', null, ['550px', '600px'], null, 'r','确定');
+        changePersonLayer = showPopup4Common('更改人员', null, ['550px', '600px'], null, 'r', '确定');
         $("#user_container").empty();
         var userStr = "";
         for (var i in data) {

VisualInspection/js/other_check/other_check.js

@@ -74,6 +74,7 @@ var al_data = [];
         })
         queryTable();
     }
+
      //关闭弹窗
     $("#close-layer").click(function(){
         layer.closeAll();
@@ -173,12 +174,21 @@ var al_data = [];
         $("#editImage").empty();
         layerUpdateTeam('form-div','稽查记录新增','550px');
         $("#save-check").html("保存");
+
+        
+        //debugger;
+        var nodedata;
+        $("#add_btn").data("tree_flag",1);
+        loadData(nodedata);
+        $("#add_btn").data("tree_flag",0);
+      
+
         $("#check_item_select input").on("click", function() {
             //debugger;
-            var nodedata;
-            $("#add_btn").data("tree_flag",1);
-            loadData(nodedata);
-            $("#add_btn").data("tree_flag",0);
+            // var nodedata;
+            // $("#add_btn").data("tree_flag",1);
+            // loadData(nodedata);
+            // $("#add_btn").data("tree_flag",0);
         })
     })
 function queryTable(){
@@ -239,15 +249,23 @@ function updateCheckTeam(id){
         edittype = "edit";
         layerUpdateTeam('form-div','稽查记录修改','550px');
         $("#save-check").html("修改");
+
+         var nodedata;
+        if($("#check_item_select input") != undefined && $("#check_item_select input") != ""){
+            nodedata = check_item_tree.getNodeByParam("name",$("#check_item_select input").val(), null);
+        }
+        loadData(nodedata);
+
+
         $("#check_item_select input").on("click", function() {
             //debugger;
-            var nodedata;
-            if($("#check_item_select input") != undefined && $("#check_item_select input") != ""){
-                nodedata = check_item_tree.getNodeByParam("name",$("#check_item_select input").val(), null);
-            }
-            $("#add_btn").data("tree_flag",1);
-            loadData(nodedata);
-            $("#add_btn").data("tree_flag",0);
+            // var nodedata;
+            // if($("#check_item_select input") != undefined && $("#check_item_select input") != ""){
+            //     nodedata = check_item_tree.getNodeByParam("name",$("#check_item_select input").val(), null);
+            // }
+            // $("#add_btn").data("tree_flag",1);
+            // loadData(nodedata);
+            // $("#add_btn").data("tree_flag",0);
         })
     }, function(){
 
@@ -369,6 +387,16 @@ function refreshUploader(){
         setPersonal();
     });
 
+    $("#check_item_select").delegate("div[id*='treeSelect_panel_'] ","blur",function(){
+        // alert(1)
+        if($(this).is(":hidden")){
+            if(map[dept_selectinput.value] != null ){
+                $("#check_score").val( map[dept_selectinput.value]  );
+            }else{
+                 $("#check_score").val("");
+            }
+        }
+    })
     
     function layerUpdateTeam(domId,title,area){
         var uploader = $('#uploaderExample').data('zui.uploader');
@@ -461,7 +489,6 @@ function refreshUploader(){
      }
 
      function zTreeOnClick(event, treeId, treeNode) {
-
         var rowdata = [];
 
         seq = 0 ;
@@ -559,9 +586,12 @@ function refreshUploader(){
             zdataItem["children"] = addobj(m);
             zdataItem.open = false;
             zdata.push(zdataItem);
+            map[m.id] =  m.score ;
         }
         return zdata;
     } else {
         return [];
     }
-}
+}
+
+var map =  {} ;

VisualInspection/js/statistics/assess_situation.js

@@ -142,23 +142,23 @@
                     ranking = rank[i];
                 }
 
-                strTbody += "<tr><td rowspan=" + rowspan + " width='" + ($("#tb_th_1").width() + 4) + "px'>" + name + "</td>";
-                strTbody += "<td width='" + ($("#tb_th_2").width() + 4) + "px'>" + ranking + "</td><td width='" + ($("#tb_th_3").width() + 4) + "px'>" + data.name + "</td><td width='" + ($("#tb_th_4").width() + 4) + "px'>" + filter(data.people_num, 0) +
-                    "</td><td width='" + ($("#tb_th_5").width() + 4) + "px'>" + filter(data.checked_people_num, 0) + "</td><td width='" + ($("#tb_th_6").width() + 4) + "px'>" + filter(data.checked_num, 0) +
-                    "</td><td width='" + ($("#tb_th_7_1").width() + 4) + "px'>" + (data.checked_people_num - (data.score_fifteen + data.score_fifty + data.score_over_fifty)) +
-                    "</td><td width='" + ($("#tb_th_7_2").width() + 4) + "px'>" + data.score_fifteen + "</td><td width='" + ($("#tb_th_7_3").width() + 4) + "px'>" + data.score_fifty + "</td><td width='" + ($("#tb_th_7_4").width() + 4) + "px'>" +
-                    data.score_over_fifty + "</td><td width='" + ($("#tb_th_7_5").width() + 4) + "px'>" + data.all_check_score + "</td><td width='" + ($("#tb_th_7_6").width() + 4) + "px'>" +
-                    filterByZeroHandle(filterJudge(data.all_check_score, data.checked_num), '0') + "</td><td>" +
+                strTbody += "<tr><td rowspan=" + rowspan + " width='10%'>" + name + "</td>";
+                strTbody += "<td width='7%'>" + ranking + "</td><td width='8%'>" + data.name + "</td><td width='8%'>" + filter(data.people_num, 0) +
+                    "</td><td width='6%'>" + filter(data.checked_people_num, 0) + "</td><td width='6%'>" + filter(data.checked_num, 0) +
+                    "</td><td width='7%'>" + (data.checked_people_num - (data.score_fifteen + data.score_fifty + data.score_over_fifty)) +
+                    "</td><td width='7%'>" + data.score_fifteen + "</td><td width='7%'>" + data.score_fifty + "</td><td width='7%'>" +
+                    data.score_over_fifty + "</td><td width='7%'>" + data.all_check_score + "</td><td width='7%'>" +
+                    filterByZeroHandle(filterJudge(data.all_check_score, data.checked_num), '0') + "</td><td width='7%'>" +
                     filterByZeroHandle((1000 - filterJudge(data.all_check_score, data.checked_num)), '1000') + "</td>";
                 strTbody += "</tr>";
             } else {
                 strTbody += "<tr>"
-                strTbody += "<td>" + rank[i] + "</td><td>" + data.name + "</td><td>" + filter(data.people_num, '0') +
-                    "</td><td>" + filter(data.checked_people_num, 0) + "</td><td>" + filter(data.checked_num, '0') +
-                    "</td><td>" + (data.checked_people_num - (data.score_fifteen + data.score_fifty + data.score_over_fifty)) +
-                    "</td><td>" + data.score_fifteen + "</td><td>" + data.score_fifty + "</td><td>" +
-                    data.score_over_fifty + "</td><td>" + data.all_check_score + "</td><td>" +
-                    filterByZeroHandle(filterJudge(data.all_check_score, data.checked_num), '0') + "</td><td>" +
+                strTbody += "<td width='7%'>" + rank[i] + "</td><td width='8%'>" + data.name + "</td><td width='8%'>" + filter(data.people_num, '0') +
+                    "</td><td width='6%'>" + filter(data.checked_people_num, 0) + "</td><td width='6%'>" + filter(data.checked_num, '0') +
+                    "</td><td width='6%'>" + (data.checked_people_num - (data.score_fifteen + data.score_fifty + data.score_over_fifty)) +
+                    "</td><td width='7%'>" + data.score_fifteen + "</td><td width='7%'>" + data.score_fifty + "</td><td width='7%'>" +
+                    data.score_over_fifty + "</td><td width='7%'>" + data.all_check_score + "</td><td width='7%'>" +
+                    filterByZeroHandle(filterJudge(data.all_check_score, data.checked_num), '0') + "</td><td width='7%'>" +
                     filterByZeroHandle((1000 - filterJudge(data.all_check_score, data.checked_num)), '1000') + "</td>";
                 strTbody += "</tr>";
 

VisualInspection/js/user/login.js

@@ -2,26 +2,27 @@ $(document).ready(function() {
     $.zui.store.set("user", "");
 
 
-   //获取屏幕高
-   var bg_height =  window.innerHeight*0.6;
-   var bg_width = bg_height*(1022/485.0);
-   $("#bg").css("height",bg_height);
-   $("#bg").css("width",bg_width);
+    //获取屏幕高
 
-   var top = (window.innerHeight-bg_height)/2.0
-   $("#bg").css("top",top);
-   $("#bg input").css("height",window.innerHeight*.04);
-   $("#bg label").css("line-height",window.innerHeight*.04+"px");
+    var bg_width = window.innerWidth * 0.25;
+    var bg_height = bg_width;
+    $("#bg").css("height", bg_height);
+    $("#bg").css("width", bg_width);
 
-   $("#bg").css("font-size",window.innerHeight*.02);
-   $(".p").css("margin-top",window.innerHeight*.035+"px");
+    var top = (window.innerHeight - bg_height) / 2.0
+    $("#bg").css("top", top);
+    //  $("#bg input").css("height",window.innerHeight*.04);
+    //  $("#bg label").css("line-height",window.innerHeight*.04+"px");
 
-  $(".login").css("bottom",window.innerHeight*.15+"px")
+    //  $("#bg").css("font-size",window.innerHeight*.02);
+    //  $(".p").css("margin-top",window.innerHeight*.035+"px");
+
+    // $(".login").css("bottom",window.innerHeight*.15+"px")
 
 
     $('html').bind('keydown', function(e) {
         if (e.keyCode == 13) {
-            // alert('enter'); 
+            // alert('enter');
             $('#loadingBtn').click();
         }
     });
@@ -42,12 +43,11 @@ $(document).ready(function() {
             // host = "http://"+window.location.host+"/";
             // base_image_server_url = host;
             // base_ui_url = host;
-            window.location.href = base_ui_url + "view/main.html?time="+(Date.parse(new Date()))
+            window.location.href = base_ui_url + "view/main.html?time=" + (Date.parse(new Date()))
 
         }, function(error) {
             $btn.button('reset');
             layer.alert('用户名或密码错误');
         });
     });
-});
-
+});

VisualInspection/js/util/media.js

@@ -1,8 +1,30 @@
 var media_count = 0;
 
+function img_play(src) {
+
+    var height = 404;
+    var width = 640;
+
+    layer.open({
+        area: [width + "px", height + "px"],
+        type: 1,
+        title: '图片预览',
+        maxmin: true,
+        closeBtn: 1,
+        shadeClose: true,
+        skin: 'layui-layer-nobg', //没有背景色
+        shadeClose: true,
+        resize: true,
+        content: "<div style='height: 100%;width:100%;background:#000;text-align: center; '> <img src='" + src + "' style='height: 100%; '/></div>"
+    });
+
+}
+
+
+
 function video_paly(src) {
 
-    var height = 264;
+    var height = 364;
     var width = 640;
 
 
@@ -16,7 +38,7 @@ function video_paly(src) {
         '    class="video-js"' +
         '    controls' +
         '    preload="auto"' +
-        '    width="' + width + '" height="' + height + '"' +
+        '    width="' + width + '" height="' + (height - 42) + '"' +
         '    data-setup=\'{}\'>' +
         '  <source src=\'' + src + '\' type="video/' + videotype + '"></source>' +
         '  <p class="vjs-no-js">' +
@@ -27,11 +49,13 @@ function video_paly(src) {
         '    </a>' +
         '  </p>' +
         '</video>';
+    var lpayer = null;
 
     layer.open({
         area: [width + "px", height + "px"],
         type: 1,
-        title: false,
+        title: '视频播放',
+        maxmin: true,
         closeBtn: 1,
         shadeClose: true,
         content: "<div id='video_content_div'>" + html + "</div>",
@@ -40,7 +64,7 @@ function video_paly(src) {
 
             };
 
-            var player = videojs('my-player' + media_count, options, function onPlayerReady() {
+            lpayer = videojs('my-player' + media_count, options, function onPlayerReady() {
                 videojs.log('Your player is ready!');
 
                 // In this context, `this` is the player that was created by Video.js.
@@ -52,6 +76,14 @@ function video_paly(src) {
                 });
 
             });
+        },
+        full: function() {
+            lpayer.width(window.innerWidth - 20);
+            lpayer.height(window.innerHeight - 40 - 10);
+        },
+        restore: function() {
+            lpayer.width(width);
+            lpayer.height(height - 40);
         }
     });
 

VisualInspection/js/util/util.js

@@ -161,7 +161,7 @@ function deleteItem4Common(id, url, okCb, offset) {
     });
 }
 
-function deleteItem4CallBack(cb){
+function deleteItem4CallBack(cb) {
     layer.confirm('确定删除记录？', {
         shade: 0,
         btn: ['确定', '取消'] //按钮
@@ -652,7 +652,7 @@ function settime() {
     nowStr = moment(nowStr).format('YYYY-MM-DD HH:mm:ss');
     $("#time_p").html(nowStr);
     $("#main").css("min-height", window.innerHeight);
-    var height = window.innerHeight - $("#main").height();
+    var height = window.innerHeight - $("body").height();
     $("#foot").css("bottom", height > 0 ? 0 : height);
     setTimeout(gettime, 1000);
 }

VisualInspection/view/mytask/appealDetail.html

@@ -12,8 +12,8 @@
             </td>
         </tr>
         <tr>
-            <td width="80%"><textarea id="recheck_result" style="height:50px;"></textarea></td>
+            <td width="80%"><textarea id="recheck_result" style="height: 150px;width:90%;"></textarea></td>
             <td width="20%"><button class="btn btn-primary" type="button" onclick="saveRecheckResult()">保存</button></td>
         </tr>
     </table>
-</div>
+</div>

VisualInspection/view/mytask/applyDetail.html

@@ -16,8 +16,8 @@
         <div class="form-group">
             <label class="col-md-4 col-sm-2">原因</label>
             <div class="col-md-6 col-sm-10">
-                <input type="text" class="form-control" id="apply_reason" disabled="disabled" placeholder="">
+                <textarea class="form-control" id="apply_reason" disabled="disabled" placeholder="" rows="10"></textarea>
             </div>
         </div>
     </form>
-</div>
+</div>

VisualInspection/view/mytask/taskDetail.html

@@ -327,15 +327,26 @@
         };
         post_common_service("/task/getStatusById/", data, function(data) {
             if (data) {
+                console.log(data)
                 var flowStr = "";
+
+                var color_t = new $.zui.Color("#63B8FF");
                 for (var i in data) {
+                    var color = new $.zui.Color(color_t.r - i * 10, color_t.g - i * 10, color_t.b - i * 10);
+
+                    var startcolor = new $.zui.Color(color_t.r - i * 10 + 5, color_t.g - i * 10 + 5, color_t.b - i * 10 + 5);
+
+                    var endcolor = new $.zui.Color(color_t.r - i * 10 - 5, color_t.g - i * 10 - 5, color_t.b - i * 10 - 5);
+
+                    var background = "background:-webkit-gradient(linear, 0 % 0 % , 0 % 100 % , from(" + startcolor.hexStr() + "), to(" + endcolor.hexStr() + "));" +
+                        "background:-webkit-linear-gradient(top, " + startcolor.hexStr() + ", " + endcolor.hexStr() + ");" + "background:-moz-linear-gradient(top," + startcolor.hexStr() + "," + endcolor.hexStr() + ");"
+
+
+
                     var str = "";
                     if (i == 0) {
                         str = '<div class="col-sm-2" style="text-align:center;padding:0px;width: 87px;margin-left:-60px;">' +
-                            '<div class="row" style="    margin-left: 56px;">' +
-                            '   <label>开始</label>' +
-                            '</div>' +
-                            '    <div class="timeline_item_station" style="    margin-left: 25px;"></div>' +
+                            '<img src="/images/start.png" style="width: 28px;right:-1px; position: absolute; top:16px;">' +
                             '</div>'
                     }
                     str +=
@@ -348,14 +359,15 @@
                         '<div class="row">' +
                         '   <label>' + data[i].check_status_name + '</label>' +
                         '</div>' +
-                        '<div class="row line" style="margin-top: 3px;">' +
-                        '    <div class="timeline_item_station"></div>' +
+                        '<div class="row line" style="margin-top: 3px;' + background + '">' +
+                        '    <div class="timeline_item_station" style="background:' + color.hexStr() + '"></div>' +
                         '</div>' +
                         '<div class="row" style="margin-top: -5px;">' +
                         '   <label style="    font-weight: 400;">' + data[i].update_time + '</label>' +
                         '</div>' +
                         (i == data.length - 1 ? (
-                            '   <img src="/images/end.png" style="width: 28px;right:-10px; position: absolute; top:16px;">'
+                            '<i class="icon icon-angle-right" style="font-size: 45px;right: -5px;position: absolute;top: 6px;color:' + endcolor.hexStr() + '"></i>'
+                            // '   <img src="/images/end.png" style="width: 28px;right:-10px; position: absolute; top:16px;">'
                         ) : "") +
                         '</div>';
 

VisualInspection/view/other_check/toubleshoot_check.html

@@ -0,0 +1,134 @@
+<link rel="stylesheet" type="text/css" href="/css/other_check/other_check.css">
+<script src="/js/other_check/other_check.js?_inline"></script>
+<!--  start -->
+<div class="container-fluid ">
+        <div class="row">
+             <div>
+                <div class="div-month">
+                    <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"></select>
+                </div>
+                <div class="div-station">
+                    <select class="form-control" id="second"></select>
+                </div>
+
+               <div class="col-xs-3">
+                    <div class="input-group">
+                        <button class="btn btn-primary " type="button" id="conditional_query">查询</button>
+                    </div>
+                </div>
+
+                 <div style="float:right;margin-right:30px;">
+                    <button class="btn btn-primary" type="button" id="add_btn"><i class="icon icon-plus-sign"></i> 增加稽查记录</button>
+                </div>
+            </div>
+        </div>
+        <hr>
+        <div class="row">
+            <!-- 使用一个div来显示数据表格 -->
+            <div class="datatable" data-checkable="true" data-sortable="true"></div>
+        </div>
+        <div class="">
+            
+
+        </div>
+
+</div>
+<!--  end -->          
+<div style="display:none;" id="form-div">
+    <div class="layer-content" style="width:100%;height:100%;">
+        <div style="width:350px;overflow:hidden;zoom:1;margin:auto;">
+            <div style="width:100%;margin-top:20px;overflow:hidden;zoom:1;">
+                <div style="width:100%;margin-top:10px;overflow:hidden;zoom:1;">
+                    <div style="width:80px;float:left;">
+                        <span style="line-height:32px;">选择人员</span>
+                    </div>
+                    <div style="width:260px;float:left;">
+                        <div class="div-select"><select class="form-control" id="select-dept"></select></button>
+                        </div>
+                        <div class="div-select"><select class="form-control" id="select-personal"></select></button>
+                        </div>
+                    </div>
+                </div>
+            <div style="width:100%;margin-top:10px;">
+                <div style="width:80px;float:left;">
+                    <span style="line-height:32px;">扣分类别</span>
+                </div>
+                <div style="width:260px;float:left;">
+                    <div id="check_item_select" style="position: relative;">
+                        <input class="form-control" id="check_item_id">
+                    </div>
+                     <div class="form-group check_item_group">
+                        <!--<label for="exampleInputPassword4" class="col-sm-2">分类：</label>-->
+                        <div class="col-md-6 col-sm-10">
+                            <div id="check_item_select"></div>
+
+                        </div>
+                    </div>
+                </div>
+                <div class="panel-body" style="display:none;">
+                    <ul id="check_rule_tree2" class="ztree">
+
+                    </ul>
+                </div>
+            </div>
+             <div style="width:100%;margin-top:10px;overflow:hidden;zoom:1;">
+                <div style="width:80px;float:left;">
+                    <span style="line-height:32px;">扣分描述</span>
+                </div>
+                <div style="width:260px;float:left;">
+                   <input class="form-control" id="remark">
+                </div>
+            </div>
+            <div style="width:100%;margin-top:10px;overflow:hidden;zoom:1;">
+                <div style="width:80px;float:left;">
+                    <span style="line-height:32px;">扣分值</span>
+                </div>
+                <div style="width:260px;float:left;">
+                    <input class="form-control" id="check_score" onkeypress="return kkpager.keypress_gopage(event);">
+                </div>
+            </div>
+            <div style="width:100%;margin-top:10px;overflow:hidden;zoom:1;">
+                <div style="width:80px;float:left;">
+                    <span style="line-height:32px;">附件上传</span>
+                </div>
+                <div style="width:260px;float:left;">
+                    <div class="col-md-10">
+                        <div id="uploaderExample" class="uploader">
+                            <div id="editImage" file_src="" style="overflow:hidden;zoom:1;"></div>
+                            <div class="file-list" data-drag-placeholder="请拖拽文件到此处"></div>
+                            <button type="button" class="btn btn-primary  uploader-btn-browse" style="float:left;"><i class="icon icon-cloud-upload"></i> 选择文件</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div style="width:100%;margin-top:10px;overflow:hidden;zoom:1;">
+                <div style="width:80px;float:left;">
+                    <span style="line-height:32px;">稽查时间</span>
+                </div>
+                <div style="width:260px;float:left;">
+                    <div class="div-month2">
+                        <input id="month_date2" class="form-control form-date" type="text" placeholder="请选择" style="height:32px;">
+                    </div>
+                    <select class="form-control" style="width:130px;" id="check_num">
+                        <option value="1">第一次检查</option>
+                        <option value="2">第二次检查</option>
+                        <option value="3">第三次检查</option>
+                    </select>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="operation" style="width:100%;overflow:hidden;zoom:1;border-top:1px solid #ddd;margin-top:20px;padding:10px 10px 10px 10px;">
+        <button class="btn btn-primary" type="button"  style="float:right;" id="save-check"> 保存</button>
+        <button class="btn btn-primary" type="button" style="float:right;background-color:#fff;color:#333;margin-right:20px;" id="close-layer"> 关闭</button>
+    </div>
+</div>
+<script>
+    $(document).ready(function() {
+        check_type = 5;
+        init();
+    });
+</script>

VisualInspection/view/statistics/assess_situation.html

@@ -29,22 +29,22 @@
                 <table border="1" width="100%" height="90px" align="center" class="a">
                     <thead>
                         <tr>
-                            <th rowspan="2" width="110px" id="tb_th_1">道管</th>
-                            <th rowspan="2" width="80px" id="tb_th_2">道管内排名</th>
-                            <th rowspan="2" width="90px" id="tb_th_3">站名</th>
-                            <th rowspan="2" width="80px" id="tb_th_4">收费值机人数</th>
-                            <th rowspan="2" width="80px" id="tb_th_5">受检人数</th>
-                            <th rowspan="2" width="80px" id="tb_th_6">受检次数</th>
-                            <th colspan="6" height="40px" id="tb_th_7">扣分情况</th>
-                            <th rowspan="2" width="85px" id="tb_th_8">平均得分(千分)</th>
+                            <th rowspan="2" width="10%" id="tb_th_1">道管</th>
+                            <th rowspan="2" width="7%" id="tb_th_2">道管内排名</th>
+                            <th rowspan="2" width="8%" id="tb_th_3">站名</th>
+                            <th rowspan="2" width="8%" id="tb_th_4">收费值机人数</th>
+                            <th rowspan="2" width="6%" id="tb_th_5">受检人数</th>
+                            <th rowspan="2" width="6%" id="tb_th_6">受检次数</th>
+                            <th colspan="6" height="5%" id="tb_th_7">扣分情况</th>
+                            <th rowspan="2" width="7%" id="tb_th_8">平均得分(千分)</th>
                         </tr>
                         <tr>
-                            <th width="80px" id="tb_th_7_1">满分（人）</th>
-                            <th width="80px" id="tb_th_7_2">≤15分（人）</th>
-                            <th width="80px" id="tb_th_7_3">≤50分（人）</th>
-                            <th width="80px" id="tb_th_7_4">50分（人）</th>
-                            <th width="80px" id="tb_th_7_5">总扣分（分）</th>
-                            <th width="80px" id="tb_th_7_6">平均每人次扣分（分）</th>
+                            <th width="7%" id="tb_th_7_1">满分（人）</th>
+                            <th width="7%" id="tb_th_7_2">≤15分（人）</th>
+                            <th width="7%" id="tb_th_7_3">≤50分（人）</th>
+                            <th width="7%" id="tb_th_7_4">50分（人）</th>
+                            <th width="7%" id="tb_th_7_5">总扣分（分）</th>
+                            <th width="7%" id="tb_th_7_6">平均每人次扣分（分）</th>
                         </tr>
                     </thead>
                     <!-- <tbody class="table-tbody" style="background:white" align="center" height="500px">

VisualInspection/view/statistics/toll_station_statistics.html

@@ -48,7 +48,7 @@
     <div class="row-4">
         <div class="col-1"><span>收费站考核扣分情况占比</span></div><div class="line-2"></div>
         <div class="col-1" id="progress"><span>考核进步Top5排行榜</span><div class="btn-change">
-            <div class="view_change" title="切换"></div></div></div>
+            <div title="切换" class="view_change" title="切换排行榜"></div></div></div>
         <div class="col-1" id="backward" style="display:none;"><span>考核退步Top5排行榜</span></div>
     </div>
     <div class="row-5">
@@ -80,7 +80,13 @@
 </div>
 <script>
     $(document).ready(function() {
-
+        $(".view_change").click(function(){
+            if($(this).hasClass("active")){
+                $(this).removeClass("active");
+            }else{
+                 $(this).addClass("active");
+            }
+        })
     });
 </script>
        

VisualInspection/view/user/login.html

@@ -11,40 +11,48 @@
 <body>
     <!--<link rel="import" href="/view/common/login_head.html?__inline">-->
 
+
     <div id="main" class="container-fluid main">
+
         <div class="bg" id="bg">
+
             <div class="row login">
-      
-                    <!--<div class="form-group">
+
+                <!--<div class="form-group">
                         <label for="exampleInputAccount4" class="col-sm-2">账号</label>
                         <div class="input-group">
                             <span class="input-group-addon fix-border input_login"><i class="icon icon-envelope icon-1x"></i></span>
                             <input id="username" type="text" class="form-control input_login" placeholder="用户账号">
                         </div>
                     </div>-->
-                     <!--<div class="row" style="margin-top:20px">
+                <!--<div class="row" style="margin-top:20px">
                     <div class="input-group">
                         <span class="input-group-addon fix-border input_login"><i class="icon icon-lock icon-1x"></i></span>
                         <input id="password" type="password" class="form-control input_login" placeholder="密码">
                     </div>
                 </div>-->
+                <div class="row" style="text-align: center; margin-bottom: 39px;margin-top: 10px;font-size: 22px;">
+                    <label style="    letter-spacing: 8px;">用户登录</label>
 
-                    <div class="row">
-                        <label for="exampleInputAccount4" class="col-md-3  ll">用户名：</label>
-                        <div class="col-md-9 lll">
-                            <input type="text" id="username" class="form-control" autofocus placeholder="用户账号">
-                        </div>
+                </div>
+
+                <div class="row">
+
+                    <label for="exampleInputAccount4" class="col-md-3  ll">用户名：</label>
+                    <div class="col-md-9 lll">
+                        <input type="text" id="username" class="form-control" autofocus placeholder="用户账号">
                     </div>
+                </div>
 
-                    <div class="row p" style="margin-top:13%">
-                        <label for="exampleInputAccount4" class="col-md-3  ll">密&emsp;码：</label>
-                        <div class="col-md-9 lll">
-                            <input id="password" type="password" class="form-control" placeholder="密码">
-                        </div>
+                <div class="row p" style="margin-top:9%">
+                    <label for="exampleInputAccount4" class="col-md-3  ll">密&emsp;码：</label>
+                    <div class="col-md-9 lll">
+                        <input id="password" type="password" class="form-control" placeholder="密码">
                     </div>
+                </div>
+
 
-               
-                <div class="row p" style="margin-top:13%">
+                <div class="row p" style="margin-top:9%">
                     <button id="loadingBtn" type="button" class="btn btn-primary  btn-block login_btn" data-loading-text="正在登录...">登录</button>
                 </div>
             </div>