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

VisualInspection/js/statistics/appeal.js

@@ -134,8 +134,10 @@ function getTableContent(obj, seq) {
 
 
 
-    var content = "<tr><td width='8%'>" + seq + "</td> <td  width='16%'>" + obj.fee_station_name + "</td> <td  width='16%'>" + (GDV(obj.appeal_num, 0) > 0 ? ("<a href='javascript:void(0)' onclick='getappleTaskList(" + obj.dept_id + ",\"" + obj.fee_station_name + "\",0)'>" + GDV(obj.appeal_num, 0) + "</a>") : GDV(obj.appeal_num, 0)) +
-        "</td> <td >" + (GDV(obj.appeal_success_num, 0) > 0 ? ("<a href='javascript:void(0)' onclick='getappleTaskList(" + obj.dept_id + ",\"" + obj.fee_station_name + "\",1)'>" + GDV(obj.appeal_success_num, 0) + "</a>") : GDV(obj.appeal_success_num, 0)) + "</td><td>" + (GDV(obj.appeal_fail_num, 0) > 0 ? ("<a href='javascript:void(0)' onclick='getappleTaskList(" + obj.dept_id + ",\"" + obj.fee_station_name + "\",2)'>" + GDV(obj.appeal_fail_num, 0) + "</a>") : GDV(obj.appeal_fail_num, 0)) + "</td> </tr>";
+    var content = "<tr><td width='8%'>" + seq + "</td> <td  width='16%'>" + obj.fee_station_name + "</td> <td  width='16%'>" + GDV(obj.appeal_num, 0) + "&nbsp;&nbsp;&nbsp;" + (GDV(obj.appeal_num, 0) > 0 ? ("<a href='javascript:void(0)' onclick='getappleTaskList(" + obj.dept_id + ",\"" + obj.fee_station_name + "\",0)'>" + "<i class=\"icon icon-th-list\"></i>" + "</a>") : "") +
+        "</td> <td >" + GDV(obj.appeal_success_num, 0) + "&nbsp;&nbsp;&nbsp;" + (GDV(obj.appeal_success_num, 0) > 0 ? ("<a href='javascript:void(0)' onclick='getappleTaskList(" + obj.dept_id + ",\"" + obj.fee_station_name + "\",0)'>" + "<i class=\"icon icon-th-list\"></i>" + "</a>") : "") + "</td><td>" +
+        GDV(obj.appeal_fail_num, 0) + "&nbsp;&nbsp;&nbsp;" + (GDV(obj.appeal_fail_num, 0) > 0 ? ("<a href='javascript:void(0)' onclick='getappleTaskList(" + obj.dept_id + ",\"" + obj.fee_station_name + "\",0)'>" + "<i class=\"icon icon-th-list\"></i>" + "</a>") : "") +
+        "</td> </tr>";
 
     return content;
 }
@@ -165,12 +167,11 @@ function getappleTaskList(deptid, name, status) {
 
     var cols = [
         { width: 80, text: '序号', type: 'number', flex: true, colClass: 'text-center', field: 'num' },
-        { width: 160, text: '任务名称', type: 'string', flex: true, sort: 'down', field: 'name' },
+        { width: 160, text: '任务名称', type: 'href_link', flex: true, sort: 'down', field: '<a href=\"javascript:void(0);\" onclick=\"jumptodetail(\'$field=id$\')\">$field=name$</a>' },
         { width: 80, text: '考核人员', type: 'string', flex: true, colClass: '', field: 'checked_person_name' },
         { width: 160, text: '考核部门', type: 'string', flex: true, sort: 'down', field: 'checked_dept_name' },
         { width: 80, text: '稽查人员', type: 'string', flex: true, hide: false, colClass: '', field: 'checkman_name' },
-        { width: 160, text: '稽查时间段', type: 'string', flex: true, sort: 'down', field: 'check_period' },
-        { width: 50, height: 60, text: '操作', flex: true, type: 'href_link', colClass: 'text-center', field: '<a href=\"javascript:void(0);\" onclick=\"jumptodetail(\'$field=id$\')\">详情</a>' },
+        { width: 160, text: '稽查时间段', type: 'string', flex: true, sort: 'down', field: 'check_period' }
     ];
 
     var data = {

VisualInspection/js/statistics/personal_data_statistics.js

@@ -51,20 +51,26 @@ $(function() {
         var url_t = "/statistics/employee/order/detail"
         post_common_service(url_t, data_t, function(res) {
 
+            $("#c_dept_ranking").html("-");
+            $("#c_com_ranking").html("-");
+            $("#c_score_ranking").html("-");
+            $("#l_dept_ranking").html("-");
+            $("#l_com_ranking").html("-");
+            $("#l_score_ranking").html("-");
 
             var isshow_c = false;
             var isshow_l = false;
             if (typeof(res.currentP) != undefined && res.currentP != null) {
                 var p = res.currentP;
-                $("#c_dept_ranking").html(p.fee_station_ranking);
-                $("#c_com_ranking").html(p.company_ranking);
+                $("#c_dept_ranking").html(p.fee_station_ranking == undefined ? "-" : p.fee_station_ranking);
+                $("#c_com_ranking").html(p.company_ranking == undefined ? "-" : p.company_ranking);
                 $("#c_score_ranking").html(p.check_all_score + p.check_all_m_score);
                 isshow_c = true;
             }
             if (typeof(res.lastP) != undefined && res.lastP != null) {
                 var p = res.lastP;
-                $("#l_dept_ranking").html(p.fee_station_ranking);
-                $("#l_com_ranking").html(p.company_ranking);
+                $("#l_dept_ranking").html(p.fee_station_ranking == undefined ? "-" : p.fee_station_ranking);
+                $("#l_com_ranking").html(p.company_ranking == undefined ? "-" : p.company_ranking);
                 $("#l_score_ranking").html(p.check_all_score + p.check_all_m_score);
                 isshow_l = true;
             }
@@ -72,24 +78,17 @@ $(function() {
             if (isshow_c && isshow_l) {
                 var p_c = res.currentP;
                 var p_l = res.lastP;
-                var dept_r = p_c.fee_station_ranking - p_l.fee_station_ranking;
-                if (dept_r != 0) {
-                    $("#c_dept_ranking").html($("#c_dept_ranking").html() + "<i style='margin-left:10px;color:" + (dept_r > 0 ? "red" : "green") + "' class='icon icon-long-arrow-" + (dept_r > 0 ? "down" : "up") + "'>" + Math.abs(dept_r) + "</i>");
-                }
-                var com_r = p_c.company_ranking - p_l.company_ranking;
-                if (com_r != 0) {
-                    $("#c_com_ranking").html($("#c_com_ranking").html() + "<i style='margin-left:10px;color:" + (com_r > 0 ? "red" : "green") + "' class='icon icon-long-arrow-" + (com_r > 0 ? "down" : "up") + "'>" + Math.abs(com_r) + "</i>");
+                if (p_c.fee_station_ranking != undefined && p_l.fee_station_ranking != undefined) {
+                    var dept_r = p_c.fee_station_ranking - p_l.fee_station_ranking;
+                    if (dept_r != 0) {
+                        $("#c_dept_ranking").html($("#c_dept_ranking").html() + "<i style='margin-left:10px;color:" + (dept_r > 0 ? "red" : "green") + "' class='icon icon-long-arrow-" + (dept_r > 0 ? "down" : "up") + "'>" + Math.abs(dept_r) + "</i>");
+                    }
+                    var com_r = p_c.company_ranking - p_l.company_ranking;
+                    if (com_r != 0) {
+                        $("#c_com_ranking").html($("#c_com_ranking").html() + "<i style='margin-left:10px;color:" + (com_r > 0 ? "red" : "green") + "' class='icon icon-long-arrow-" + (com_r > 0 ? "down" : "up") + "'>" + Math.abs(com_r) + "</i>");
+                    }
                 }
-
-
-
             }
-
-
-
-
-
-
         }, function(error) {})
 
 
@@ -289,9 +288,9 @@ $(function() {
                 for (var i = 0; i < data.length; i++) {
                     for (var j = 33; j <= 53; j++) {
                         if (select_road == j) {
-                            if(data[i].id==userId){
+                            if (data[i].id == userId) {
                                 tempStr += "<option value=" + data[i].id + " selected='selected'>" + data[i].truename + "</option>";
-                            }else{
+                            } else {
                                 tempStr += "<option value=" + data[i].id + ">" + data[i].truename + "</option>";
                             }
                         }

VisualInspection/js/statistics/road_manage_statistics.js

@@ -12,6 +12,12 @@ var array_points2 = new Array();
 var array_allStation = new Array();
 var array_allStation_score = new Array();
 var array_check_type = new Array();
+
+var map_per_data = new HashMap();
+var map_month_data = new HashMap();
+var array_all_name = new Array()
+var array_all_deptname = new Array()
+
 var array_points_name = new Array();
 var array_points_pre = new Array();
 var arrar_points_month = new Array();
@@ -477,83 +483,117 @@ $(function() {
 
             }
         } else if (type == 6) {
-            array_check_type.length = 0;
+            array_check_type = [];
             if (data.length != 0) {
+                var map = new HashMap();
                 for (var i = 0; i < data.length; i++) {
-                    array_check_type.push({ "value": data[i].all_check_score, "name": data[i].name });
+                    if (map.get(data[i].name) == null) {
+                        map.set(data[i].name, data[i].all_check_score)
+                    } else {
+                        map.set(data[i].name, data[i].all_check_score + map.get(data[i].name))
+                    }
+
                 }
+
+                map.forEach(function(value, key) {
+                    array_check_type.push({ "value": value, "name": key });
+                });
             } else {
                 array_check_type.length = 0;
             }
         } else if (type == 7) {
-            array_points_name.length = 0;
-            array_points_pre.length = 0;
-            arrar_points_month.length = 0;
+            // array_points_name.length = 0;
+            // array_points_pre.length = 0;
+            // arrar_points_month.length = 0;
             if ((data != null && data.Pmth.length != 0) || (data != null && data.Tmth.length != 0)) {
                 data_each_people_points(data);
             } else {
-                array_points_name.length = 0;
-                array_points_pre.length = 0;
-                arrar_points_month.length = 0;
+                // array_points_name.length = 0;
+                // array_points_pre.length = 0;
+                // arrar_points_month.length = 0;
             }
         }
     }
 
     function data_each_people_points(data) {
-        var flag = true;
+        var flag = false;
         var name = ['环境卫生', '仪容仪表着装', '表情', '动作', '文明用语', '工作纪律及行为举止', '便民服务', '安全管理']
+        array_all_name = name;
+        // array_all_deptname = ["连云港道管", "盐城道管", "南通道管"];
         var Tmth = data.Tmth;
         var Pmth = data.Pmth;
-        var Ntemp = new Array();
-        var Ptemp = new Array();
-        var Ttemp = new Array();
+        // var Ntemp = new Array();
+        // var Ptemp = new Array();
+        // var Ttemp = new Array();
 
         for (var i = 0; i < name.length; i++) {
-            flag = true;
-            if (Tmth.length > 0) {
-                for (var j = 0; j < Tmth.length; j++) {
-                    if (name[i] == Tmth[j].name && Tmth[j].all_check_score != null) {
-                        // Ttemp[i] = filter_handler(Tmth[j].all_check_score,Tmth[j].checked_num,Tmth[j].people_num,0);
-                        Ttemp[i] = Tmth[j].all_check_score;
-                        break;
-                    } else {
-                        Ttemp[i] = 0;
+            //     var temp_map_m = new HashMap();
+            //     var temp_map_p = new HashMap();
+
+            for (var j = 0; j < Tmth.length; j++) {
+                flag = false;
+                if (array_all_deptname.length > 0) {
+                    for (var p = 0; p < array_all_deptname.length; p++) {
+                        if (array_all_deptname[p] == Tmth[j].feeStationName) {
+                            flag = true;
+                            break;
+                        }
                     }
                 }
-            } else {
-                Ttemp[i] = 0;
-            }
-            if (Pmth.length > 0) {
-                for (var m = 0; m < Pmth.length; m++) {
-                    if (name[i] == Pmth[m].name && Pmth[m].all_check_score != null) {
-                        // Ptemp[i] = filter_handler(Pmth[m].all_check_score,Pmth[m].checked_num,Pmth[m].people_num,0);
-                        Ptemp[i] = Pmth[m].all_check_score;
-                        break;
+                if (!flag) {
+                    array_all_deptname.push(Tmth[j].feeStationName);
+                }
+
+                if (name[i] == Tmth[j].name) {
+                    if (map_month_data.get(Tmth[j].feeStationName) != null) {
+                        var map = map_month_data.get(Tmth[j].feeStationName)
+                        if (map.get(name[i]) != null) {
+                            map.set(name[i], map.get(name[i]) + Tmth[j].all_check_score);
+                        } else {
+                            map.set(name[i], Tmth[j].all_check_score);
+                        }
+                        map_month_data.set(Tmth[j].feeStationName, map);
                     } else {
-                        Ptemp[i] = 0;
+                        var map = new HashMap();
+                        map.set(name[i], Tmth[j].all_check_score);
+                        map_month_data.set(Tmth[j].feeStationName, map);
                     }
                 }
-            } else {
-                Ptemp[i] = 0;
-            }
-            if (Ttemp[i] == 0 && Ptemp[i] == 0) {
-                name[i] = "";
-                flag = null;
+
             }
-            if (name[i] != "") {
-                if (name[i] == '仪容仪表着装') {
-                    name[i] = '仪表';
+
+            for (var j = 0; j < Pmth.length; j++) {
+                flag = false;
+                if (array_all_deptname.length > 0) {
+                    for (var p = 0; p < array_all_deptname.length; p++) {
+                        if (array_all_deptname[p] == Pmth[j].feeStationName) {
+                            flag = true;
+                            break;
+                        }
+                    }
+                }
+                if (!flag) {
+                    array_all_deptname.push(Pmth[j].feeStationName);
                 }
-                if (name[i] == '工作纪律及行为举止') {
-                    name[i] = '行为';
+                if (name[i] == Pmth[j].name) {
+                    if (map_per_data.get(Pmth[j].feeStationName) != null) {
+                        var map = map_per_data.get(Pmth[j].feeStationName)
+                        if (map.get(name[i]) != null) {
+                            map.set(name[i], map.get(name[i]) + Pmth[j].all_check_score);
+                        } else {
+                            map.set(name[i], Pmth[j].all_check_score);
+                        }
+                        map_per_data.set(Pmth[j].feeStationName, map);
+                    } else {
+                        var map = new HashMap();
+                        map.set(name[i], Pmth[j].all_check_score);
+                        map_per_data.set(Pmth[j].feeStationName, map);
+                    }
                 }
-                array_points_name.push(name[i]);
             }
 
-            if (flag) {
-                array_points_pre.push(Ptemp[i]);
-                arrar_points_month.push(Ttemp[i]);
-            }
+            //     map_month_data.set(name[i], temp_map_m)
+            //     map_pre_data.set(name[i], temp_map_p)
         }
     }
 
@@ -753,7 +793,7 @@ $(function() {
                     name: '访问来源',
                     type: 'pie',
                     selectedMode: 'single',
-                    radius: [0, 50],
+                    radius: [0, 80],
 
                     // for funnel
                     x: '20%',
@@ -765,17 +805,20 @@ $(function() {
                         normal: {
                             label: {
                                 show: true,
-                                position: 'inner',
-                                formatter: function(params, ticket, callback) {
-                                    var res = params.name;
-                                    if (params.percent < 10) {
-                                        return "";
-                                    }
-                                    return res;
+                                formatter: '{b}:\n{c}人({d}%)',
+                                textStyle: {
+                                    alias: 'center',
+                                    fontSize: 10,
+                                    color: '#888'
                                 }
                             },
                             labelLine: {
-                                show: false
+                                show: true,
+                                length: 80,
+                                lineStyle: {
+                                    color: '#888'
+                                }
+
                             }
                         }
                     },
@@ -784,7 +827,7 @@ $(function() {
                 {
                     name: '访问来源',
                     type: 'pie',
-                    radius: [60, 100],
+                    radius: [100, 125],
 
                     // for funnel
                     x: '60%',
@@ -794,11 +837,11 @@ $(function() {
                     itemStyle: {
                         normal: {
                             label: {
-                                show: true,
+                                show: false,
                                 formatter: '{b}:{c}人({d}%)'
                             },
                             labelLine: {
-                                show: true
+                                show: false
                             }
                         }
                     },
@@ -1089,9 +1132,107 @@ $(function() {
      * 图七
      */
     function each_people_points() {
+        var sdata = new Array();
+        for (var j = 0; j < array_all_deptname.length; j++) {
+            var dept = array_all_deptname[j]
+
+            if (map_per_data.get(dept) != null) {
+                var data_a = new Array();
+                var d_t = map_per_data.get(dept);
+                for (var i = 0; i < array_all_name.length; i++) {
+                    var name = array_all_name[i];
+                    data_a.push(d_t.get(name) == null ? 0 : d_t.get(name));
+                }
+                var d_tt = {
+                    name: dept,
+                    type: 'bar',
+                    stack: '上月',
+                    data: data_a
+                }
+                sdata.push(d_tt);
+            } else {
+                var data_a = new Array();
+                for (var i = 0; i < array_all_name.length; i++) {
+                    var name = array_all_name[i];
+                    data_a.push(0);
+                }
+                var d_tt = {
+                    name: dept,
+                    type: 'bar',
+                    stack: '上月',
+                    data: data_a
+                }
+                sdata.push(d_tt);
+            }
+
+            if (map_month_data.get(dept) != null) {
+                var data_a = new Array();
+                var d_t = map_month_data.get(dept);
+                for (var i = 0; i < array_all_name.length; i++) {
+                    var name = array_all_name[i];
+                    data_a.push(d_t.get(name) == null ? 0 : d_t.get(name));
+                }
+                var d_tt = {
+                    name: dept,
+                    type: 'bar',
+                    stack: '本月',
+                    data: data_a
+                }
+                sdata.push(d_tt);
+            } else {
+                var data_a = new Array();
+                for (var i = 0; i < array_all_name.length; i++) {
+                    var name = array_all_name[i];
+                    data_a.push(0);
+                }
+                var d_tt = {
+                    name: dept,
+                    type: 'bar',
+                    stack: '本月',
+                    data: data_a
+                }
+                sdata.push(d_tt);
+            }
+        }
+
+
+
+
+        var namelist = new Array();
+        for (var i = 0; i < array_all_name.length; i++) {
+            var name = array_all_name[i];
+            if (name == '仪容仪表着装') {
+                name = '仪表';
+            }
+            if (name == '工作纪律及行为举止') {
+                name = '行为';
+            }
+            namelist.push(name);
+        }
+
+
         option = {
             tooltip: {
-                trigger: 'axis'
+                trigger: 'axis',
+                axisPointer: { // 坐标轴指示器，坐标轴触发有效
+                    type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
+                },
+                formatter: function(params, ticket, callback) {
+                    var name = "";
+                    var content = "";
+                    if (params.length > 0) {
+                        for (var i = 0; i < params.length; i++) {
+                            var p = params[i];
+                            name = p.name;
+                            if (p.series.stack == "本月") {
+                                content += "<br>本月 " + p.seriesName.replace("收费站", "") + ":" + p.value + "分"
+                            } else {
+                                content += "<br>上月 " + p.seriesName.replace("收费站", "") + ":" + p.value + "分"
+                            }
+                        }
+                    }
+                    return name + content;
+                }
             },
             noDataLoadingOption: {
                 text: '暂无数据',
@@ -1108,52 +1249,20 @@ $(function() {
                 }
             },
             grid: {
-                width: "80%"
+                width: "80%",
             },
             legend: {
-                data: ['上月', '本月']
+                data: array_all_deptname
             },
             calculable: true,
             xAxis: [{
                 type: 'category',
-                data: array_points_name
+                data: namelist
             }],
             yAxis: [{
                 type: 'value'
             }],
-            series: [{
-                    name: '上月',
-                    type: 'bar',
-                    data: array_points_pre,
-                    itemStyle: {
-                        normal: {
-                            color: '#7bc0f2',
-                            label: {
-                                show: true,
-                                textStyle: {
-                                    color: 'black'
-                                }
-                            }
-                        }
-                    },
-                },
-                {
-                    name: '本月',
-                    type: 'bar',
-                    data: arrar_points_month,
-                    itemStyle: {
-                        normal: {
-                            color: '#ea644a',
-                            label: {
-                                show: true,
-                                textStyle: {
-                                    color: 'black'
-                                }
-                            }
-                        }
-                    },
-                }
-            ]
+            series: sdata
         };
         return option;
     }

VisualInspection/js/statistics/toll_station_statistics.js

@@ -268,7 +268,7 @@
      	                    if (months.indexOf(data[i].mth.substr(2))) {
      	                        // 指定位置插入值
      	                        array_year_score.splice(months.indexOf(data[i].mth.substr(2)), 0,
-     	                            (1000 - (filter_handler(data[i].all_check_score, data[i].checked_num, data[i].people_num, 0))));
+     	                            (1000 - (filter_handler(data[i].all_check_score, data[i].checked_num * 1.00, 1.00, 0))));
      	                    }
      	                }
      	            } else {
@@ -346,7 +346,7 @@
      	                }
      	            }
      	            for (var i = 0; i < array_score_data.length; i++) {
-     	                array_score_order.push(data[i].user.truename + "\n" + (rank[i]));
+     	                array_score_order.push(data[i].user.truename + "(" + (rank[i]) + ")");
      	            }
 
      	        } else if (type == 5) {
@@ -908,7 +908,11 @@
      	            calculable: true,
      	            xAxis: [{
      	                axisLabel: {
-     	                    interval: 0
+     	                    interval: 0,
+     	                    rotate: 45,
+     	                    textStyle: {
+     	                        fontSize: 10
+     	                    }
      	                },
      	                type: 'category',
      	                data: array_score_order

VisualInspection/js/statistics/total_company_statistics.js

@@ -9,6 +9,14 @@ var array_road_score = new Array();
 var array_allStation = new Array();
 var array_allStation_score = new Array();
 var array_check_type = new Array();
+
+var map_per_data = new HashMap();
+var map_month_data = new HashMap();
+var array_all_name = new Array()
+var array_all_deptname = new Array()
+
+
+
 var array_points_name = new Array();
 var array_points_pre = new Array();
 var arrar_points_month = new Array();
@@ -301,7 +309,7 @@ $(function() {
             array_road_score.length = 0;
             for (var i = 0; i < data.length; i++) {
                 if (data != '') {
-                    array_road_score.push((1000 - (filter_handler(data[i].all_check_score, data[i].checked_num, data[i].people_num, 0))));
+                    array_road_score.push((1000 - (filter_handler(data[i].all_check_score, data[i].checked_num, 1.0, 0))));
                 } else {
                     array_road.length = 0;
                     array_road_score.length = 0;
@@ -357,82 +365,166 @@ $(function() {
         } else if (type == 5) {
             array_check_type = [];
             if (data.length != 0) {
+                var map = new HashMap();
                 for (var i = 0; i < data.length; i++) {
-                    array_check_type.push({ "value": data[i].all_check_score, "name": data[i].name });
+                    if (map.get(data[i].name) == null) {
+                        map.set(data[i].name, data[i].all_check_score)
+                    } else {
+                        map.set(data[i].name, data[i].all_check_score + map.get(data[i].name))
+                    }
+
                 }
+
+                map.forEach(function(value, key) {
+                    array_check_type.push({ "value": value, "name": key });
+                });
             } else {
                 array_check_type.length = 0;
             }
         } else if (type == 6) {
-            array_points_name.length = 0;
-            array_points_pre.length = 0;
-            arrar_points_month.length = 0;
+            // array_points_name.length = 0;
+            // array_points_pre.length = 0;
+            // arrar_points_month.length = 0;
             if (data != '' && data.Pmth.length != 0 || data.Tmth.length != 0) {
                 data_each_people_points(data);
             } else {
-                array_points_name.length = 0;
-                array_points_pre.length = 0;
-                arrar_points_month.length = 0;
+                // array_points_name.length = 0;
+                // array_points_pre.length = 0;
+                // arrar_points_month.length = 0;
             }
         }
     }
 
     function data_each_people_points(data) {
-        var flag = true;
+        var flag = false;
         var name = ['环境卫生', '仪容仪表着装', '表情', '动作', '文明用语', '工作纪律及行为举止', '便民服务', '安全管理']
+        array_all_name = name;
+        // array_all_deptname = ["连云港道管", "盐城道管", "南通道管"];
         var Tmth = data.Tmth;
         var Pmth = data.Pmth;
-        var Ntemp = new Array();
-        var Ptemp = new Array();
-        var Ttemp = new Array();
+        // var Ntemp = new Array();
+        // var Ptemp = new Array();
+        // var Ttemp = new Array();
 
         for (var i = 0; i < name.length; i++) {
-            flag = true;
-            if (Tmth.length > 0) {
-                for (var j = 0; j < Tmth.length; j++) {
-                    if (name[i] == Tmth[j].name && Tmth[j].all_check_score != null) {
-                        //		Ttemp[i] = filter_handler(Tmth[j].all_check_score,Tmth[j].checked_num,Tmth[j].people_num,0);
-                        Ttemp[i] = Tmth[j].all_check_score;
-                        break;
-                    } else {
-                        Ttemp[i] = 0;
+            //     var temp_map_m = new HashMap();
+            //     var temp_map_p = new HashMap();
+
+            for (var j = 0; j < Tmth.length; j++) {
+                flag = false;
+                if (array_all_deptname.length > 0) {
+                    for (var p = 0; p < array_all_deptname.length; p++) {
+                        if (array_all_deptname[p] == Tmth[j].pfeeStationName) {
+                            flag = true;
+                            break;
+                        }
                     }
                 }
-            } else {
-                Ttemp[i] = 0;
-            }
-            if (Pmth.length > 0) {
-                for (var m = 0; m < Pmth.length; m++) {
-                    if (name[i] == Pmth[m].name && Pmth[m].all_check_score != null) {
-                        //	Ptemp[i] = filter_handler(Pmth[m].all_check_score,Pmth[m].checked_num,Pmth[m].people_num,0);
-                        Ptemp[i] = Pmth[m].all_check_score;
-                        break;
+                if (!flag) {
+                    array_all_deptname.push(Tmth[j].pfeeStationName);
+                }
+
+                if (name[i] == Tmth[j].name) {
+                    if (map_month_data.get(Tmth[j].pfeeStationName) != null) {
+                        var map = map_month_data.get(Tmth[j].pfeeStationName)
+                        if (map.get(name[i]) != null) {
+                            map.set(name[i], map.get(name[i]) + Tmth[j].all_check_score);
+                        } else {
+                            map.set(name[i], Tmth[j].all_check_score);
+                        }
+                        map_month_data.set(Tmth[j].pfeeStationName, map);
                     } else {
-                        Ptemp[i] = 0;
+                        var map = new HashMap();
+                        map.set(name[i], Tmth[j].all_check_score);
+                        map_month_data.set(Tmth[j].pfeeStationName, map);
                     }
                 }
-            } else {
-                Ptemp[i] = 0;
-            }
-            if (Ttemp[i] == 0 && Ptemp[i] == 0) {
-                name[i] = "";
-                flag = null;
+
             }
-            if (name[i] != "") {
-                if (name[i] == '仪容仪表着装') {
-                    name[i] = '仪表';
+
+            for (var j = 0; j < Pmth.length; j++) {
+                flag = false;
+                if (array_all_deptname.length > 0) {
+                    for (var p = 0; p < array_all_deptname.length; p++) {
+                        if (array_all_deptname[p] == Pmth[j].pfeeStationName) {
+                            flag = true;
+                            break;
+                        }
+                    }
                 }
-                if (name[i] == '工作纪律及行为举止') {
-                    name[i] = '行为';
+                if (!flag) {
+                    array_all_deptname.push(Pmth[j].pfeeStationName);
+                }
+                if (name[i] == Pmth[j].name) {
+                    if (map_per_data.get(Pmth[j].pfeeStationName) != null) {
+                        var map = map_per_data.get(Pmth[j].pfeeStationName)
+                        if (map.get(name[i]) != null) {
+                            map.set(name[i], map.get(name[i]) + Pmth[j].all_check_score);
+                        } else {
+                            map.set(name[i], Pmth[j].all_check_score);
+                        }
+                        map_per_data.set(Pmth[j].pfeeStationName, map);
+                    } else {
+                        var map = new HashMap();
+                        map.set(name[i], Pmth[j].all_check_score);
+                        map_per_data.set(Pmth[j].pfeeStationName, map);
+                    }
                 }
-                array_points_name.push(name[i]);
             }
 
-            if (flag) {
-                array_points_pre.push(Ptemp[i]);
-                arrar_points_month.push(Ttemp[i]);
-            }
+            //     map_month_data.set(name[i], temp_map_m)
+            //     map_pre_data.set(name[i], temp_map_p)
         }
+        // console.log(Tmth)
+        // console.log(map_month_data)
+
+
+        // flag = true;
+        // if (Tmth.length > 0) {
+        //     for (var j = 0; j < Tmth.length; j++) {
+        //         if (name[i] == Tmth[j].name && Tmth[j].all_check_score != null) {
+        //             //		Ttemp[i] = filter_handler(Tmth[j].all_check_score,Tmth[j].checked_num,Tmth[j].people_num,0);
+        //             Ttemp[i] = Tmth[j].all_check_score;
+        //             break;
+        //         } else {
+        //             Ttemp[i] = 0;
+        //         }
+        //     }
+        // } else {
+        //     Ttemp[i] = 0;
+        // }
+        // if (Pmth.length > 0) {
+        //     for (var m = 0; m < Pmth.length; m++) {
+        //         if (name[i] == Pmth[m].name && Pmth[m].all_check_score != null) {
+        //             //	Ptemp[i] = filter_handler(Pmth[m].all_check_score,Pmth[m].checked_num,Pmth[m].people_num,0);
+        //             Ptemp[i] = Pmth[m].all_check_score;
+        //             break;
+        //         } else {
+        //             Ptemp[i] = 0;
+        //         }
+        //     }
+        // } else {
+        //     Ptemp[i] = 0;
+        // }
+        // if (Ttemp[i] == 0 && Ptemp[i] == 0) {
+        //     name[i] = "";
+        //     flag = null;
+        // }
+        // if (name[i] != "") {
+        //     if (name[i] == '仪容仪表着装') {
+        //         name[i] = '仪表';
+        //     }
+        //     if (name[i] == '工作纪律及行为举止') {
+        //         name[i] = '行为';
+        //     }
+        //     array_points_name.push(name[i]);
+        // }
+
+        // if (flag) {
+        //     array_points_pre.push(Ptemp[i]);
+        //     arrar_points_month.push(Ttemp[i]);
+        // }
+        // }
     }
 
     /**
@@ -627,7 +719,7 @@ $(function() {
                     name: '访问来源',
                     type: 'pie',
                     selectedMode: 'single',
-                    radius: [0, 50],
+                    radius: [0, 80],
 
                     // for funnel
                     x: '20%',
@@ -639,18 +731,20 @@ $(function() {
                         normal: {
                             label: {
                                 show: true,
-                                position: 'inner',
-                                formatter: function(params, ticket, callback) {
-
-                                    var res = params.name;
-                                    if (params.percent < 10) {
-                                        return "";
-                                    }
-                                    return res;
+                                formatter: '{b}:\n{c}人({d}%)',
+                                textStyle: {
+                                    alias: 'center',
+                                    fontSize: 10,
+                                    color: '#888'
                                 }
                             },
                             labelLine: {
-                                show: false
+                                show: true,
+                                length: 80,
+                                lineStyle: {
+                                    color: '#888'
+                                }
+
                             }
                         }
                     },
@@ -659,7 +753,7 @@ $(function() {
                 {
                     name: '访问来源',
                     type: 'pie',
-                    radius: [80, 120],
+                    radius: [100, 125],
 
                     // for funnel
                     x: '60%',
@@ -669,11 +763,11 @@ $(function() {
                     itemStyle: {
                         normal: {
                             label: {
-                                show: true,
+                                show: false,
                                 formatter: '{b}:{c}人({d}%)'
                             },
                             labelLine: {
-                                show: true
+                                show: false
                             }
                         }
                     },
@@ -877,9 +971,108 @@ $(function() {
      * 图六
      */
     function each_people_points_six() {
+
+        var sdata = new Array();
+        for (var j = 0; j < array_all_deptname.length; j++) {
+            var dept = array_all_deptname[j]
+
+            if (map_per_data.get(dept) != null) {
+                var data_a = new Array();
+                var d_t = map_per_data.get(dept);
+                for (var i = 0; i < array_all_name.length; i++) {
+                    var name = array_all_name[i];
+                    data_a.push(d_t.get(name) == null ? 0 : d_t.get(name));
+                }
+                var d_tt = {
+                    name: dept,
+                    type: 'bar',
+                    stack: '上月',
+                    data: data_a
+                }
+                sdata.push(d_tt);
+            } else {
+                var data_a = new Array();
+                for (var i = 0; i < array_all_name.length; i++) {
+                    var name = array_all_name[i];
+                    data_a.push(0);
+                }
+                var d_tt = {
+                    name: dept,
+                    type: 'bar',
+                    stack: '上月',
+                    data: data_a
+                }
+                sdata.push(d_tt);
+            }
+
+            if (map_month_data.get(dept) != null) {
+                var data_a = new Array();
+                var d_t = map_month_data.get(dept);
+                for (var i = 0; i < array_all_name.length; i++) {
+                    var name = array_all_name[i];
+                    data_a.push(d_t.get(name) == null ? 0 : d_t.get(name));
+                }
+                var d_tt = {
+                    name: dept,
+                    type: 'bar',
+                    stack: '本月',
+                    data: data_a
+                }
+                sdata.push(d_tt);
+            } else {
+                var data_a = new Array();
+                for (var i = 0; i < array_all_name.length; i++) {
+                    var name = array_all_name[i];
+                    data_a.push(0);
+                }
+                var d_tt = {
+                    name: dept,
+                    type: 'bar',
+                    stack: '本月',
+                    data: data_a
+                }
+                sdata.push(d_tt);
+            }
+        }
+
+
+
+
+        var namelist = new Array();
+        for (var i = 0; i < array_all_name.length; i++) {
+            var name = array_all_name[i];
+            if (name == '仪容仪表着装') {
+                name = '仪表';
+            }
+            if (name == '工作纪律及行为举止') {
+                name = '行为';
+            }
+            namelist.push(name);
+        }
+
+
         option = {
             tooltip: {
-                trigger: 'axis'
+                trigger: 'axis',
+                axisPointer: { // 坐标轴指示器，坐标轴触发有效
+                    type: 'shadow' // 默认为直线，可选为：'line' | 'shadow'
+                },
+                formatter: function(params, ticket, callback) {
+                    var name = "";
+                    var content = "";
+                    if (params.length > 0) {
+                        for (var i = 0; i < params.length; i++) {
+                            var p = params[i];
+                            name = p.name;
+                            if (p.series.stack == "本月") {
+                                content += "<br>本月 " + p.seriesName.replace("道管中心", "") + ":" + p.value + "分"
+                            } else {
+                                content += "<br>上月 " + p.seriesName.replace("道管中心", "") + ":" + p.value + "分"
+                            }
+                        }
+                    }
+                    return name + content;
+                }
             },
             noDataLoadingOption: {
                 text: '暂无数据',
@@ -899,49 +1092,17 @@ $(function() {
                 width: "80%",
             },
             legend: {
-                data: ['上月', '本月']
+                data: array_all_deptname
             },
             calculable: true,
             xAxis: [{
                 type: 'category',
-                data: array_points_name
+                data: namelist
             }],
             yAxis: [{
                 type: 'value'
             }],
-            series: [{
-                    name: '上月',
-                    type: 'bar',
-                    data: array_points_pre,
-                    itemStyle: {
-                        normal: {
-                            color: '#7bc0f2',
-                            label: {
-                                show: true,
-                                textStyle: {
-                                    color: 'black'
-                                }
-                            }
-                        }
-                    },
-                },
-                {
-                    name: '本月',
-                    type: 'bar',
-                    data: arrar_points_month,
-                    itemStyle: {
-                        normal: {
-                            color: '#ea644a',
-                            label: {
-                                show: true,
-                                textStyle: {
-                                    color: 'black'
-                                }
-                            }
-                        }
-                    },
-                }
-            ]
+            series: sdata
         };
         return option;
     }

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/StatisticsBean.java

@@ -99,6 +99,7 @@ public class StatisticsBean {
     
     // 收费站名称
     private String feeStationName ;
+    private String pfeeStationName ;
     
     private User user;
     

VisualInspection_server/src/main/java/com/xintong/visualinspection/bean/StatisticsBo.java

@@ -45,11 +45,13 @@ public class StatisticsBo {
     // 比较大小 1 小 ， -1 大
     public int compareTo(StatisticsBo o2){
     	double a = 1000.0 ,b=1000.0 ;
-		if((this.getChecked_num()+this.getChecked_m_num())!=0 ){
-			a = (this.getCheck_all_score()+this.getCheck_all_m_score()) / (this.getChecked_num()+this.getChecked_m_num()+0.00);
+    	int a_c = this.getChecked_num()+this.getChecked_m_num();
+    	int b_c = o2.getChecked_num()+o2.getChecked_m_num();
+		if(a_c!=0 ){
+			a = (this.getCheck_all_score()+this.getCheck_all_m_score()) / (a_c+0.00);
 		}
-		if((o2.getChecked_num()+o2.getChecked_m_num())!=0){
-			b = (o2.getCheck_all_score()+o2.getCheck_all_m_score()) /(o2.getChecked_num()+o2.getChecked_m_num()+0.00);
+		if(b_c!=0){
+			b = (o2.getCheck_all_score()+o2.getCheck_all_m_score()) /(b_c+0.00);
 		}
 	
 		if (a > b ) {
@@ -57,9 +59,9 @@ public class StatisticsBo {
 		} else if (a < b) {
 			return -1;
 		} else {
-			if(this.getChecked_num() == 0 && o2.getChecked_num()!=0 ){
+			if(a_c == 0 && b_c!=0 ){
 				return -1 ;
-			}else if(o2.getChecked_num() ==0 && this.getChecked_num() != 0){
+			}else if(b_c ==0 && a_c != 0){
 				return 1;
 			}else{
 				return 0;

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/cluster/DepartmentMapper.xml

@@ -98,7 +98,15 @@
 	<select id="selectFeeStationGroup" parameterType="com.xintong.visualinspection.bean.User" resultType="com.xintong.visualinspection.bean.StatisticsBean"  >
 		SELECT COUNT(1) AS people_num,s.ORGAN_ID AS dept_id, s.name from t_sys_users t 
 			       LEFT JOIN t_br_layer_fee_station s ON t.ORGANID = s.ORGAN_ID
-			WHERE 1=1 
+			WHERE 1=1
+
+        <if test="invalidtime != null">
+            AND  t.id not in ( select t_s_y.id from t_sys_users t_s_y
+            LEFT join (select starttime,endtime from check_task_period ) t_p on DELETE_TIME &gt;= starttime and DELETE_TIME &lt; endtime
+            WHERE STATUS =-1 and DELETE_TIME &gt;= t_p.starttime and DELETE_TIME &lt; t_p.endtime and date_sub(t_p.starttime,interval 1 hour) &lt;= #{invalidtime} )
+        </if>
+
+
 			<if test="position_ids != null and position_ids.size() > 0">
         		AND t.positionid in 
         		<foreach collection="position_ids" item="position_id" index="index"

VisualInspection_server/src/main/java/com/xintong/visualinspection/mapper/master/StatisticsMapper.xml

@@ -109,7 +109,7 @@
 		        AND	 t.start_time >= #{start_date} AND t.end_time < #{end_date}
 			</if>
 			<if test="position_ids != null and position_ids.size() > 0">
-        		AND u.positionid in 
+        		AND u.positionid in
         		<foreach collection="position_ids" item="position_id" index="index"
 		            open="(" close=")" separator=",">
 		            #{position_id}
@@ -204,9 +204,67 @@
 		) check_num_t ON checked_score_t.checked_person = check_num_t.checked_person
 		AND check_num_t.mth = checked_score_t.mth
      </sql>
+
+
+    <!--包含未扣分的-->
+    <sql id="selectAllCheckedInfoAllCheck">
+        SELECT
+        check_num_t.checked_num , check_num_t.mth, IFNULL(checked_score_t.checkd_all_score ,0) as checkd_all_score, check_num_t.checked_person,check_num_t.checked_dept
+        FROM
+
+        (
+        SELECT
+        COUNT(t.checked_person) AS checked_num,
+        t.checked_person,
+        monthfunc (t.start_time) AS mth,
+        t.id,t.checked_dept
+        FROM
+        check_task t
+        WHERE
+        t.checked_person IS NOT NULL
+        AND t.check_status != 22  and t.id not in <include refid="taskexclouddeleteUser"/>
+        <if test="start_date !=null">
+            AND t.start_time >= #{start_date}
+        </if>
+        <if test="end_date !=null">
+            AND t.end_time &lt; #{end_date}
+        </if>
+        <if test="mth!=null and mth!=''">
+            AND monthfunc (t.start_time) =#{mth}
+        </if>
+        GROUP BY
+        t.checked_person,
+        mth
+        ) check_num_t
+
+        LEFT JOIN  (
+        SELECT
+        monthfunc (t.start_time) AS mth,
+        sum(m.check_item_score) AS checkd_all_score, m.*
+        FROM
+        check_score m INNER JOIN
+        ( select * From check_task t
+        where t.check_status != 22 and t.id not in <include refid="taskexclouddeleteUser"/>
+        <if test="start_date !=null">
+            AND t.start_time >= #{start_date}
+        </if>
+        <if test="end_date !=null">
+            AND t.end_time &lt; #{end_date}
+        </if>
+        <if test="mth!=null and mth!=''">
+            AND monthfunc (t.start_time) =#{mth}
+        </if>
+        ) t
+        ON m.task_id = t.id
+        WHERE 1=1
+        GROUP BY mth , m.checked_person
+
+        ) checked_score_t  ON checked_score_t.checked_person = check_num_t.checked_person
+        AND check_num_t.mth = checked_score_t.mth
+    </sql>
     
     <select id="selectYearScoreInfo" parameterType="com.xintong.visualinspection.bean.StatisticsBean" resultType="com.xintong.visualinspection.bean.StatisticsBean">
-    	SELECT sum(tab.checkd_all_score) AS all_check_score  , sum(tab.checked_num) AS checked_num  , tab.mth FROM ( <include refid="selectAllCheckedInfo" />  ) tab 
+    	SELECT sum(tab.checkd_all_score) AS all_check_score  , sum(tab.checked_num) AS checked_num  , tab.mth FROM ( <include refid="selectAllCheckedInfoAllCheck" />  ) tab
     	WHERE 1=1 
     	<if test="dept_list!=null and queryType == 1 and dept_list.size()>0 ">
     		AND	tab.checked_dept IN
@@ -222,7 +280,7 @@
     </select>
      
     <select id="selectFeeStationScoreInfo" parameterType="com.xintong.visualinspection.bean.StatisticsBean" resultType="com.xintong.visualinspection.bean.StatisticsBean">
-    	SELECT sum(tab.checkd_all_score) AS all_check_score , sum(tab.checked_num) AS checked_num ,tab.checked_dept AS dept_id FROM ( <include refid="selectAllCheckedInfo" />  ) tab
+    	SELECT sum(tab.checkd_all_score) AS all_check_score , sum(tab.checked_num) AS checked_num ,tab.checked_dept AS dept_id FROM ( <include refid="selectAllCheckedInfoAllCheck" />  ) tab
     	WHERE 1=1 
     	GROUP BY tab.checked_dept
     </select>
@@ -269,7 +327,7 @@
      
      
      <select id="selectCheckedItemScoreInfo" parameterType="com.xintong.visualinspection.bean.StatisticsBean" resultType="com.xintong.visualinspection.bean.StatisticsBean">
-     	SELECT count(DISTINCT m.task_id) AS checked_num , sum(m.check_item_score) AS all_check_score , m.parent_id,m.check_item_name AS name FROM check_task t INNER JOIN
+     	SELECT count(DISTINCT m.task_id) AS checked_num , sum(m.check_item_score) AS all_check_score , m.parent_id,m.checked_dept as dept_id,(select parentid from t_sys_organ where id=m.checked_dept ) as parent_dept_id,m.check_item_name AS name FROM check_task t INNER JOIN
 		(
 			select ci.name AS check_item_name , t.* FROM
 			(  SELECT ci.parent_id, t.* from check_score t LEFT JOIN check_item  ci ON t.check_item_id = ci.id
@@ -289,7 +347,7 @@
 			) m ON t.id = m.task_id
 			where t.check_status !=22 and t.id not in <include refid="taskexclouddeleteUser"/>
 			AND monthfunc( t.start_time ) = #{mth}
-		GROUP BY m.parent_id
+		GROUP BY m.parent_id,m.checked_dept order by  m.checked_dept
      </select>
      
      

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

@@ -67,8 +67,7 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 //        计算上个周期时间   周期时间：00:00:00   ----- 00:00:00       参数：23:00:00
         for (CheckTaskPeriod p:checkTaskPeriods
              ) {
-            if(obj.getStart_date().getTime() > p.getStarttime().getTime() &&
-                    obj.getEnd_date().getTime() > p.getStarttime().getTime()){
+            if(obj.getStart_date().getTime()+1*1000*60*60 == p.getEndtime().getTime()){
                 lastTaskPeriod = p;
                 break;
             }
@@ -299,6 +298,7 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 		}
 		user.setPosition_ids(positionList);
 
+        user.setInvalidtime(obj.getStart_date());
 		List<StatisticsBean> lists = departmentDao.selectFeeStationGroup(user);
 		Map<Long, StatisticsBean> mapStationInfos = new HashMap<>();
 		int i = 0;
@@ -404,6 +404,7 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 			positionList.add(Integer.parseInt(postions[i]));
 		}
 		user.setPosition_ids(positionList);
+		user.setInvalidtime(obj.getStart_date());
 		List<StatisticsBean> lists = departmentDao.selectFeeStationGroup(user);
 		Map<Long, StatisticsBean> mapStationInfos = new HashMap<>();
 		int i = 0;
@@ -749,10 +750,25 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 			}
 		}
 
+//        Constant t = CodeUtil.getCodeByFlagAndValue("feestation_check_jobs", "1");
+//        String[] postions = t.getCode_name().split(",");
+//        List<Integer> positionList = new ArrayList<Integer>();
+//        for (int i = 0; i < postions.length; i++) {
+//            positionList.add(Integer.parseInt(postions[i]));
+//        }
+//        //未计算未扣分的稽查次数
+//        obj.setPosition_ids(positionList);
+//        List<StatisticsBean> listCheckNum = statisticsDao.selectFeeStationCheckNum(obj);
+
+
 		List<StatisticsBean> lists = statisticsDao.selectYearScoreInfo(obj);
 		for (StatisticsBean sta : lists) {
 			sta.setPeople_num(people_num);
 		}
+
+
+
+
 		return lists;
 	}
 
@@ -1033,6 +1049,8 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 
 		for (int i = 0; i < objList.size(); i++) {
 			objList.get(i).setPeople_num(people_num);
+            objList.get(i).setFeeStationName(CacheUtil.getOrgannameFromMap(objList.get(i).getDept_id()));
+            objList.get(i).setPfeeStationName(CacheUtil.getOrgannameFromMap(objList.get(i).getParent_dept_id()));
 		}
 
 		map.put("Tmth", objList);
@@ -1043,6 +1061,8 @@ public class StatisticsServiceImpl extends BaseService implements StatisticsServ
 
 		for (int i = 0; i < objList.size(); i++) {
 			objList.get(i).setPeople_num(people_num);
+            objList.get(i).setFeeStationName(CacheUtil.getOrgannameFromMap(objList.get(i).getDept_id()));
+            objList.get(i).setPfeeStationName(CacheUtil.getOrgannameFromMap(objList.get(i).getParent_dept_id()));
 		}
 
 		map.put("Pmth", objList);

VisualInspection_server/src/main/resources/application.properties

@@ -3,7 +3,7 @@ spring.thymeleaf.cache=false
 context.listener.classes=com.xintong.SystemInit
 
 #master.datasource.url = jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
-master.datasource.url = jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf-8
+master.datasource.url = jdbc:mysql://git.topm.win:6400/visualinspection?useUnicode=true&characterEncoding=utf-8
 #master.datasource.url = jdbc:mysql://10.112.0.199:7002/visualinspection?useUnicode=true&characterEncoding=utf-8
 master.datasource.username = root
 master.datasource.password = root
@@ -12,7 +12,7 @@ master.mapper-locations=classpath:com/xintong/visualinspection/mapper/master/*.x
 
 ## \u7528\u6237\u6570\u636E\u6E90\u914D\u7F6E
 #cluster.datasource.url=jdbc:mysql://10.112.0.199:3306/visualinspection?useUnicode=true&characterEncoding=utf8
-cluster.datasource.url=jdbc:mysql://git.topm.win:6381/visualinspection?useUnicode=true&characterEncoding=utf8
+cluster.datasource.url=jdbc:mysql://git.topm.win:6400/visualinspection?useUnicode=true&characterEncoding=utf8
 #cluster.datasource.url=jdbc:mysql://10.112.0.199:7002/visualinspection?useUnicode=true&characterEncoding=utf8
 cluster.datasource.username=root
 cluster.datasource.password=root
@@ -60,7 +60,7 @@ spring.redis.host=git.topm.win
 #spring.redis.port=7003
 
 #spring.redis.port=7003
-spring.redis.port=6380 
+spring.redis.port=6401 
 # Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
 spring.redis.password=xintong
 # \u8FDE\u63A5\u6C60\u6700\u5927\u8FDE\u63A5\u6570\uFF08\u4F7F\u7528\u8D1F\u503C\u8868\u793A\u6CA1\u6709\u9650\u5236\uFF09