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

# Conflicts:
#	VisualInspection/js/config.js

VisualInspection/js/config.js

@@ -48,6 +48,8 @@ function getTaskaddr() {
     } else if (base_ui_url.indexOf("localhost") != -1) {
         // return "http://10.112.0.199:8099/"
         return "http://localhost:8099/"
+    } else if (base_ui_url.indexOf("192.168.8.236") != -1) {
+        return "http://192.168.8.236:8099/"
     } else {
         return "http://10.112.0.199:8099/"
     }

VisualInspection/js/main.js

@@ -88,7 +88,6 @@ $(document).ready(function() {
                     datactemp["html"] = "<a id=\"" + mtemp.id + "\" href=\"#\"><i class=\"icon\"></i>" + mtemp.menuname + "</a>";
                     secondMenus.push(mtemp.id);
                     datac.push(datactemp);
-
                     $.zui.store.set(mtemp.url, mtemp.menuname);
                 }
                 datatemp["children"] = datac;
@@ -278,6 +277,12 @@ function changePage(url, tableObj) {
         if (name) {
             // $("#breadcrumb_menu").html('<li murl="'+url+'" mname="'+name+'"><a href="#" onclick="changePage('+url+')">'+name+'</a></li>');
             addBreadMenu(url, name, true);
+        } else {
+            var t = url.split("?")[0];
+            name = $.zui.store.get(t);
+            if (name) {
+                addBreadMenu(url, name, false);
+            }
         }
         if (ISCLIENT) {
             event = document.createEvent('MessageEvent');

VisualInspection/js/mytask/check.js

@@ -15,9 +15,21 @@ function initCheck() {
         $("#ex1_span").css("left", ((left > 25 ? left : 25)) + "px")
 
         if ($.checkTask) {
-
             var time = moment($.checkTask.start_time);
+            var pos = $("#video_pos").val();
+            if ($("#full_video_pos").length > 0) {
+                pos = $("#full_video_pos").val();
+            }
             var c_time = time.add(sender.value.newValue, "s");
+            if (/^(\+|-)?\d+($|\.\d+$)/.test(pos)) {
+                if (pos > 0) {
+                    c_time = time.add(Math.abs(pos), "s");
+                } else {
+                    c_time = time.subtract(Math.abs(pos), "s");
+                }
+            }
+
+
             $("#ex1_span").html(c_time.format("YYYY-MM-DD HH:mm:ss"))
         }
     });
@@ -128,6 +140,7 @@ function setfastorslow(type, speed) {
 function normalscreen() {
     if (layer_full) {
         layer.close(layer_full)
+        $("#video_pos").val($("#full_video_pos").val());
     }
 
 }
@@ -185,13 +198,13 @@ function fullscreen() {
                 setVideoProcess(slideEvt.value);
             });
 
-            $("#full_video_btn_start").mouseover(function(){
-				$("#full_video_btn_start_img").attr("src","/images/movie.png");
-			});
-			$("#full_video_btn_start").mouseout(function(){
-				$("#full_video_btn_start_img").attr("src","/images/video.png");
+            $("#full_video_btn_start").mouseover(function() {
+                $("#full_video_btn_start_img").attr("src", "/images/movie.png");
             });
-            
+            $("#full_video_btn_start").mouseout(function() {
+                $("#full_video_btn_start_img").attr("src", "/images/video.png");
+            });
+
             $("#full_ex1").on("change", function(sender) {
                 var width = $("#full_ex1").siblings(".slider").children(".slider-track").children(".slider-selection").width();
                 var total_width = $("#full_ex1").siblings(".slider").children(".slider-track").width();
@@ -203,9 +216,22 @@ function fullscreen() {
                 $("#full_ex1_span").css("left", ((left > 0 ? left : 10)) + "px")
 
                 if ($.checkTask) {
-
                     var time = moment($.checkTask.start_time);
+                    var pos = $("#video_pos").val();
+                    if ($("#full_video_pos").length > 0) {
+                        pos = $("#full_video_pos").val();
+                    }
                     var c_time = time.add(sender.value.newValue, "s");
+                    if (/^(\+|-)?\d+($|\.\d+$)/.test(pos)) {
+                        if (pos > 0) {
+                            c_time = time.add(Math.abs(pos), "s");
+                        } else {
+                            c_time = time.subtract(Math.abs(pos), "s");
+                        }
+                    }
+
+
+
                     $("#full_ex1_span").html(c_time.format("YYYY-MM-DD HH:mm:ss"))
                 }
             });

VisualInspection/js/statistics/assess_ranking.js

@@ -123,6 +123,36 @@ function queryEmpClick() {
 }
 
 function initQueryEmp(parent_dept_id, dept_id) {
+    setJobSelect("#jobSelect");
+    var p_m = $.zui.store.get('store_param_' + current_url)
+    $.zui.store.set('store_param_' + current_url, null);
+    if (p_m) {
+
+        $("#center-manager").val(p_m.parent_dept_id);
+        $("#fsList").val(p_m.dept_id);
+        $("#start-time").val(p_m.start_date);
+        $("#end-time").val(p_m.end_date);
+        $("#start-num").val(p_m.start_num);
+        $("#end-num").val(p_m.end_num);
+        $("#start-score").val(p_m.start_score);
+        $("#end-score").val(p_m.end_score);
+        $("#jobSelect").val(p_m.job_select);
+
+
+        parent_dept_id = p_m.parent_dept_id;
+        dept_id = p_m.dept_id;
+        setJobSelect("#jobSelect", p_m.job_select);
+
+        getFsStationList(GV("#center_manage"), function(options) {
+            $("#fsList").append(options);
+            var dept;
+            if (roleContains("STATION")) {
+                dept = getCurrentUser().organid;
+            }
+            $("#fsList").val(p_m.dept_id);
+        });
+    }
+
     //默认初始化前一周查所有
     var endD = new Date();
     var startD = new Date();
@@ -133,7 +163,7 @@ function initQueryEmp(parent_dept_id, dept_id) {
     var end_score = $("#end-score").val();
     var start_num = $("#start-num").val() != '' ? $("#start-num").val() : 0;
     var end_num = $("#end-num").val() != '' ? $("#end-num").val() : 100;
-    setJobSelect("#jobSelect");
+
     //默认初始化时间页面回显
     $("#start-time").val(start_time);
     $("#end-time").val(end_time);
@@ -198,7 +228,7 @@ function getEmployeeInfosClick(url, param, start_score, end_score, start_num, en
                 }
 
                 strTbody += "<tr><td width='4%;'>" + (count + 1) + "</td><td width='6%;'>" + data[i].user.fee_station_name + "</td>" +
-                    "<td width='6%;'>" + data[i].user.truename + "</td><td width='6%;'>" + data[i].user.position_name + "</td>" +
+                    "<td width='6%;'><a href='JavaScript:void(0)' onclick='jumpuser(\"" + data[i].user.id + "\",\"" + data[i].user.organid + "\")'>" + data[i].user.truename + "</a></td><td width='6%;'>" + data[i].user.position_name + "</td>" +
                     "<td width='7%;'>" + data[i].user.workno + "</td><td width='4%;'>" + filter(data[i].company_ranking, '/') + "</td>" +
                     "<td width='4%;'>" + filter(data[i].center_ranking, '/') + "</td><td width='4%;'>" + filter(data[i].fee_station_ranking, '/') +
                     "</td><td width='4%;'>" + getItemScore(data[i], '环境') + "</td>" +
@@ -206,7 +236,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 < 6000 ? 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 < 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='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++;
             }
@@ -218,6 +248,28 @@ function getEmployeeInfosClick(url, param, start_score, end_score, start_num, en
     });
 }
 
+function jumpuser(userid, deptid) {
+
+
+    var param = {
+        "parent_dept_id": GV("#center-manager"),
+        "dept_id": GV("#fsList"),
+        "start_date": $("#start-time").val(),
+        "end_date": $("#end-time").val(),
+        "start_num": $("#start-num").val(),
+        "end_num": $("#end-num").val(),
+        "start_score": $("#start-score").val(),
+        "end_score": $("#end-score").val(),
+        "job_select": $("#jobSelect").val()
+    }
+    $.zui.store.set('store_param_' + current_url, param);
+
+    url = "/view/statistics/personal_data_statistics.html?userid=" + userid + "&deptid=" + deptid
+
+    changePage(url);
+
+}
+
 
 function showAddTaskListView(data, widthtemp, heighttemp, start_date, end_date, checknum) {
 
@@ -492,13 +544,13 @@ function showAddTaskListView(data, widthtemp, heighttemp, start_date, end_date,
     }
 
     var btn_html = "";
-    if(checknum<6){
+    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">'+btn_html+'</div></div>';
+        '</select></div><div class="row row_alert">' + btn_html + '</div></div>';
 
     return html;
 }
@@ -532,7 +584,7 @@ function addTask(userid, username, stationname, checknum, start_date, end_date)
         var allwidth = 1200;
 
 
-        var html = showAddTaskListView(data, allwidth, allheight, start_date, end_date,checknum);
+        var html = showAddTaskListView(data, allwidth, allheight, start_date, end_date, checknum);
 
 
 

VisualInspection/js/statistics/personal_data_statistics.js

@@ -1,9 +1,11 @@
 var year = new Date().getFullYear();
+var x_m_array = new Array();
+var x_m_array_temp = new Array();
 var months = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'];
 var monthsCH = ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'];
 var array_year_score = new Array();
 var array_check_type = new Array();
-var user_id = 2424; // 用户假数据
+var user_id = 2524; // 用户假数据
 var score_statistics;
 var check_type;
 var cur_status;
@@ -227,6 +229,24 @@ $(function() {
      * @param {*} dept_id
      */
     function init_personal_score_statistics(url, user_id) {
+
+        var end_date = $(".div-end input").val() + " 23:00:00";
+        var date = moment(end_date);
+        var y = date.get('y');
+        var m = date.get('M') + 1;
+
+
+        x_m_array = new Array();
+        for (var i = 1; i <= 12; i++) {
+            var month = parseInt(m) + i;
+            var starty = parseInt(y) - 1
+            if (month > 12) {
+                month = month - 12;
+                starty = y;
+            }
+            x_m_array.push(starty + "/" + (month >= 10 ? month : ("0" + month)));
+        }
+
         var param = {
             "start_date": (year - 1) + "-" + new Date().getMonth() + "-25" + " 23:00:00",
             "end_date": year + "-" + (new Date().getMonth() + 1) + "-25" + " 23:00:00",
@@ -272,6 +292,34 @@ $(function() {
         });
     }
 
+    function getsymbol(score) {
+        var sy = 'emptyCircle';
+        var col = 'green'
+
+        if (score == 1000) {
+            sy = "emptystar"
+            col = 'red'
+        } else
+        if (score > 990) {
+            sy = "emptystar"
+            col = 'orange'
+        } else {
+            sy = "emptyTriangle"
+            col = 'green'
+        }
+
+
+
+        // itemStyle: {        // 数据级个性化折线样式
+        //   normal: {
+        //       color: 'yellowgreen'
+        //   },
+        // }
+
+        return { value: (score), symbol: sy, symbolSize: 5, itemStyle: { normal: { color: col } } };
+
+    }
+
     /**
      * 数组数据
      * @param {*} data
@@ -280,24 +328,56 @@ $(function() {
     function data_array(data, type) {
         if (type == 1) {
             array_year_score.length = 0;
-            months.length = 0;
-            if (data.length != 0) {
-                if (data.length < 14) {
-                    for (var i = 0; i < 14 - data.length; i++) {
-                        array_year_score.push(0)
+
+            if (data != '' && data.length != 0) {
+
+                x_m_array_temp = new Array();
+                for (var i = 0; i < x_m_array.length; i++) {
+
+                    var index = -1;
+                    for (var j = 0; j < data.length; j++) {
+                        if (x_m_array[i] == data[j].mth) {
+                            index = j;
+                            break;
+                        }
                     }
-                }
-                var month_arr = month_method_2();
-                for (var i = 0; i < data.length; i++) {
-                    if (month_arr.indexOf(parseInt(data[i].mth))) {
-                        // 指定位置插入值
-                        array_year_score.splice(month_arr.indexOf(data[i].mth), 0,
-                            (1000 - (filter(data[i].all_check_score, data[i].checked_num, 0))));
+                    if (index < 0) {
+
+                    } else {
+
+                        x_m_array_temp.push(x_m_array[i]);
+                        var score = (1000 - (filter(data[index].all_check_score, data[index].checked_num, 1.0, 0)));
+                        var data_s = getsymbol(score)
+
+                        console.log(data_s)
+                        array_year_score.push(data_s);
                     }
                 }
             } else {
                 array_year_score.length = 0;
+                x_m_array = new Array();
+                x_m_array_temp = new Array();
             }
+
+
+            // months.length = 0;
+            // if (data.length != 0) {
+            //     if (data.length < 14) {
+            //         for (var i = 0; i < 14 - data.length; i++) {
+            //             array_year_score.push(0)
+            //         }
+            //     }
+            //     var month_arr = month_method_2();
+            //     for (var i = 0; i < data.length; i++) {
+            //         if (month_arr.indexOf(parseInt(data[i].mth))) {
+            //             // 指定位置插入值
+            //             array_year_score.splice(month_arr.indexOf(data[i].mth), 0,
+            //                 (1000 - (filter(data[i].all_check_score, data[i].checked_num, 0))));
+            //         }
+            //     }
+            // } else {
+            //     array_year_score.length = 0;
+            // }
         } else if (type == 2) {
             array_points = new Array();
             array_points2 = new Array();
@@ -350,11 +430,20 @@ $(function() {
             return;
         }
     });
+
+    var userid_t = $.zui.store.get("page_params").userid
+    var dept_t = $.zui.store.get("page_params").deptid
+
+
     // 收费站下拉框
     var dept;
     if (roleContains("STATION")) {
         dept = getCurrentUser().organid;
     }
+    if (dept_t) {
+        dept = dept_t;
+    }
+
     var roadManager;
     if (roleContains("ROAD_MANAGER")) {
         roadManager = getCurrentUser().organid;
@@ -379,6 +468,10 @@ $(function() {
                 if (hasRole("ROLE_STATION")) {
                     userId = getCurrentUser().id;
                 }
+                if (userid_t) {
+                    userId = userid_t;
+                }
+
                 for (var i = 0; i < data.length; i++) {
                     for (var j = 33; j <= 53; j++) {
                         if (select_road == j) {
@@ -496,7 +589,7 @@ $(function() {
             xAxis: [{
                 type: 'category',
                 boundaryGap: false,
-                data: month_method_2()
+                data: x_m_array_temp
             }],
             yAxis: [{
                 type: 'value',
@@ -510,17 +603,17 @@ $(function() {
                     name: '平均分',
                     type: 'line',
                     data: array_year_score,
-                    markPoint: {
-                        data: [
-                            { type: 'max', name: '最大值' },
-                            { type: 'min', name: '最小值' }
-                        ]
-                    },
-                    markLine: {
-                        data: [
-                            { type: 'average', name: '平均值' }
-                        ]
-                    }
+                    // markPoint: {
+                    //     data: [
+                    //         { type: 'max', name: '最大值' },
+                    //         { type: 'min', name: '最小值' }
+                    //     ]
+                    // },
+                    // markLine: {
+                    //     data: [
+                    //         { type: 'average', name: '平均值' }
+                    //     ]
+                    // }
                 },
 
             ]

VisualInspection/js/statistics/road_manage_statistics.js

@@ -1,6 +1,7 @@
 var year = new Date().getFullYear();
 var month = new Date().getMonth();
 var x_m_array = new Array();
+var x_m_array_temp = new Array();
 var date = new Date().getDate();
 var year_assess;
 var score_rank;
@@ -307,8 +308,8 @@ $(function() {
                             break;
                         }
                     }
-                    if (index < 0) array_year_score.push(0);
-                    else {
+                    if (index < 0) {} else {
+                        x_m_array_temp.push(x_m_array[i]);
                         array_year_score.push(
                             (1000 - (filter_handler(data[index].all_check_score, data[index].checked_num, 1.0, 0))));
                     }
@@ -317,6 +318,7 @@ $(function() {
             } else {
                 array_year_score.length = 0;
                 x_m_array = new Array();
+                x_m_array_temp = new Array();
             }
             if (eval("Math.min(" + array_year_score.toString() + ")") == 0)
                 min_year = 0;
@@ -705,7 +707,7 @@ $(function() {
             xAxis: [{
                 type: 'category',
                 boundaryGap: false,
-                data: x_m_array
+                data: x_m_array_temp
             }],
             yAxis: [{
                 type: 'value',

VisualInspection/js/statistics/toll_station_statistics.js

@@ -1,6 +1,7 @@
      	var year = new Date().getFullYear();
      	var month = new Date().getMonth();
      	var x_m_array = new Array();
+     	var x_m_array_temp = new Array();
      	var date = new Date().getDate();
      	var select_road = $(".div-roadManage select").val();
      	var select_station = $("#second").val();
@@ -280,8 +281,8 @@
      	                            break;
      	                        }
      	                    }
-     	                    if (index < 0) array_year_score.push(0);
-     	                    else {
+     	                    if (index < 0) {} else {
+     	                        x_m_array_temp.push(x_m_array[i]);
      	                        array_year_score.push(
      	                            (1000 - (filter_handler(data[index].all_check_score, data[index].checked_num * 1.00, 1.0, 0))));
      	                    }
@@ -289,6 +290,7 @@
      	            } else {
      	                array_year_score.length = 0;
      	                x_m_array = new Array();
+     	                x_m_array_temp = new Array();
      	            }
      	            if (eval("Math.min(" + array_year_score.toString() + ")") == 0)
      	                min_year = 0;
@@ -682,7 +684,7 @@
      	            xAxis: [{
      	                type: 'category',
      	                boundaryGap: false,
-     	                data: x_m_array
+     	                data: x_m_array_temp
      	            }],
      	            yAxis: [{
      	                type: 'value',

VisualInspection/js/statistics/total_company_statistics.js

@@ -1,5 +1,6 @@
 var year = new Date().getFullYear();
 var x_m_array = new Array();
+var x_m_array_temp = new Array();
 var date = new Date().getDate();
 var array_year_score = new Array();
 var array_points = new Array();
@@ -270,6 +271,7 @@ $(function() {
             array_year_score.length = 0;
             if (data != '' && data.length != 0) {
 
+                x_m_array_temp = new Array();
                 for (var i = 0; i < x_m_array.length; i++) {
 
                     var index = -1;
@@ -279,8 +281,11 @@ $(function() {
                             break;
                         }
                     }
-                    if (index < 0) array_year_score.push(0);
-                    else {
+                    if (index < 0) {
+
+                    } else {
+
+                        x_m_array_temp.push(x_m_array[i]);
                         array_year_score.push(
                             (1000 - (filter_handler(data[index].all_check_score, data[index].checked_num, 1.0, 0))));
                     }
@@ -288,6 +293,7 @@ $(function() {
             } else {
                 array_year_score.length = 0;
                 x_m_array = new Array();
+                x_m_array_temp = new Array();
             }
 
 
@@ -642,7 +648,7 @@ $(function() {
             xAxis: [{
                 type: 'category',
                 boundaryGap: false,
-                data: x_m_array
+                data: x_m_array_temp
             }],
             yAxis: [{
                 type: 'value',

VisualInspection_server/src/main/java/com/xintong/visualinspection/service/impl/StatisticsServiceImpl.java

@@ -526,7 +526,12 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 			if (objs.getMin_check_num() != null && st.getChecked_num() < objs.getMin_check_num()) {
 				flag = true;
 			}
-			double score = (st.getChecked_num() != 0) ? 1000 - (st.getCheck_all_score() / (st.getChecked_num())) : 1000;
+//			double score = (st.getChecked_num() != 0) ? 1000 - (st.getCheck_all_score() / (st.getChecked_num())) : 1000;
+            double score = 0;
+            if(st.getCheck_score_avg()!=null){
+                score = 1000 -  Double.parseDouble(st.getCheck_score_avg());
+            }
+
 			if (objs.getMin_score() != null && score < objs.getMin_score()) {
 				flag = true;
 			}
@@ -545,14 +550,22 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		int j = 1;
 		for (Iterator<StatisticsBo> it = listStatistic.iterator(); it.hasNext();) {
 			StatisticsBo st = it.next();
-			double score = (st.getChecked_num() != 0) ? 1000 - (st.getCheck_all_score() / (st.getChecked_num())) : 1000;
+			String scoredata = "";
+            double score = 0;
+            if(st.getCheck_score_avg()!=null){
+                score = 1000 -  Double.parseDouble(st.getCheck_score_avg());
+                scoredata = String.format("%.2f", score);
+            }else{
+                scoredata = "-";
+            }
 			if (score >= start_score && score <= end_score) {
-				// 得分
-				st.setCheck_score((st.getChecked_num() != 0) ? String.format("%.2f", score) : "1000.00");
-				// 平均值
-				st.setCheck_score_avg((st.getChecked_num() != 0)
-						? String.format("%.2f", st.getCheck_all_score() / (st.getChecked_num() + 0.0)) : "0.00");
-				// id值设置
+//				// 得分
+
+				st.setCheck_score(scoredata);
+//				// 平均值
+//				st.setCheck_score_avg((st.getChecked_num() != 0)
+//						? String.format("%.2f", st.getCheck_all_score() / (st.getChecked_num() + 0.0)) : "0.00");
+//				// id值设置
 				st.setId(j++);
 				st.getEmp_item_score().add(getItemScore(st, "环境卫生"));
 				st.getEmp_item_score().add(getItemScore(st, "仪容仪表"));