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

VisualInspection/js/statistics/road_manage_statistics.js

@@ -1132,6 +1132,9 @@ $(function() {
      * 图七
      */
     function each_people_points() {
+
+        var t_map_p = new HashMap();
+        var t_map_c = new HashMap();
         var sdata = new Array();
         for (var j = 0; j < array_all_deptname.length; j++) {
             var dept = array_all_deptname[j]
@@ -1142,19 +1145,58 @@ $(function() {
                 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));
+
+                    if (t_map_p.get(name) == null) {
+                        t_map_p.set(name, d_t.get(name) == null ? 0 : d_t.get(name))
+                    } else {
+                        t_map_p.set(name, t_map_p.get(name) + (d_t.get(name) == null ? 0 : d_t.get(name)));
+                    }
                 }
                 var d_tt = {
                     name: dept,
                     type: 'bar',
                     stack: '上月',
+                    barGap: 5,
+                    barCategoryGap: 20,
                     data: data_a
                 }
+                if (j == array_all_deptname.length - 1) {
+                    d_tt['itemStyle'] = {
+
+                        normal: {
+                            label: {
+                                show: true,
+                                position: 'top',
+                                formatter: function(params) {
+                                    var name = params.name
+                                    if (name == '仪表') {
+                                        name = '仪容仪表着装';
+                                    }
+                                    if (name == '行为') {
+                                        name = '工作纪律及行为举止';
+                                    }
+
+                                    return '上月\n' + t_map_p.get(name);
+                                },
+                                textStyle: {
+                                    color: 'blue'
+                                }
+                            }
+                        }
+                    }
+                }
                 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);
+
+                    if (t_map_p.get(name) == null) {
+                        t_map_p.set(name, 0)
+                    } else {
+                        t_map_p.set(name, t_map_p.get(i) + 0);
+                    }
                 }
                 var d_tt = {
                     name: dept,
@@ -1162,6 +1204,30 @@ $(function() {
                     stack: '上月',
                     data: data_a
                 }
+                if (j == array_all_deptname.length - 1) {
+                    d_tt['itemStyle'] = {
+                        normal: {
+                            label: {
+                                show: true,
+                                position: 'top',
+                                formatter: function(params) {
+                                    var name = params.name
+                                    if (name == '仪表') {
+                                        name = '仪容仪表着装';
+                                    }
+                                    if (name == '行为') {
+                                        name = '工作纪律及行为举止';
+                                    }
+
+                                    return '上月\n' + t_map_p.get(name);
+                                },
+                                textStyle: {
+                                    color: 'blue'
+                                }
+                            }
+                        }
+                    }
+                }
                 sdata.push(d_tt);
             }
 
@@ -1171,6 +1237,12 @@ $(function() {
                 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));
+
+                    if (t_map_c.get(name) == null) {
+                        t_map_c.set(name, d_t.get(name) == null ? 0 : d_t.get(name))
+                    } else {
+                        t_map_c.set(name, t_map_c.get(name) + (d_t.get(name) == null ? 0 : d_t.get(name)));
+                    }
                 }
                 var d_tt = {
                     name: dept,
@@ -1178,12 +1250,41 @@ $(function() {
                     stack: '本月',
                     data: data_a
                 }
+                if (j == array_all_deptname.length - 1) {
+                    d_tt['itemStyle'] = {
+                        normal: {
+                            label: {
+                                show: true,
+                                position: 'top',
+                                formatter: function(params) {
+                                    var name = params.name
+                                    if (name == '仪表') {
+                                        name = '仪容仪表着装';
+                                    }
+                                    if (name == '行为') {
+                                        name = '工作纪律及行为举止';
+                                    }
+
+                                    return '本月\n' + t_map_c.get(name);
+                                },
+                                textStyle: {
+                                    color: 'red'
+                                }
+                            }
+                        }
+                    }
+                }
                 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);
+                    if (t_map_c.get(name) == null) {
+                        t_map_c.set(name, 0)
+                    } else {
+                        t_map_c.set(name, t_map_c.get(name) + 0);
+                    }
                 }
                 var d_tt = {
                     name: dept,
@@ -1191,6 +1292,21 @@ $(function() {
                     stack: '本月',
                     data: data_a
                 }
+                if (j == array_all_deptname.length - 1) {
+                    d_tt['itemStyle'] = {
+
+                        normal: {
+                            label: {
+                                show: true,
+                                position: 'top',
+                                formatter: '本月',
+                                textStyle: {
+                                    color: 'red'
+                                }
+                            }
+                        }
+                    }
+                }
                 sdata.push(d_tt);
             }
         }

VisualInspection/js/statistics/total_company_statistics.js

@@ -987,19 +987,44 @@ $(function() {
                     var name = array_all_name[i];
                     data_a.push(d_t.get(name) == null ? 0 : d_t.get(name));
 
-                    if (t_map_p.get(i) == null) {
-                        t_map_p.set(i, d_t.get(name) == null ? 0 : d_t.get(name))
+                    if (t_map_p.get(name) == null) {
+                        t_map_p.set(name, d_t.get(name) == null ? 0 : d_t.get(name))
                     } else {
-                        t_map_p.set(i, t_map_p.get(i) + (d_t.get(name) == null ? 0 : d_t.get(name)));
+                        t_map_p.set(name, t_map_p.get(name) + (d_t.get(name) == null ? 0 : d_t.get(name)));
                     }
                 }
                 var d_tt = {
                     name: dept,
                     type: 'bar',
                     stack: '上月',
-                    barWidth: 10,
+                    barGap: 5,
+                    barCategoryGap: 20,
                     data: data_a
                 }
+                if (j == array_all_deptname.length - 1) {
+                    d_tt['itemStyle'] = {
+                        normal: {
+                            label: {
+                                show: true,
+                                position: 'top',
+                                formatter: function(params) {
+                                    var name = params.name
+                                    if (name == '仪表') {
+                                        name = '仪容仪表着装';
+                                    }
+                                    if (name == '行为') {
+                                        name = '工作纪律及行为举止';
+                                    }
+
+                                    return '上月\n' + t_map_p.get(name);
+                                },
+                                textStyle: {
+                                    color: 'blue'
+                                }
+                            }
+                        }
+                    }
+                }
                 sdata.push(d_tt);
             } else {
                 var data_a = new Array();
@@ -1007,25 +1032,44 @@ $(function() {
                     var name = array_all_name[i];
                     data_a.push(0);
 
-                    if (t_map_p.get(i) == null) {
-                        t_map_p.set(i, 0)
+                    if (t_map_p.get(name) == null) {
+                        t_map_p.set(name, 0)
                     } else {
-                        t_map_p.set(i, t_map_p.get(i) + 0);
+                        t_map_p.set(name, t_map_p.get(i) + 0);
                     }
                 }
                 var d_tt = {
                     name: dept,
                     type: 'bar',
                     stack: '上月',
-                    barWidth: 10,
                     data: data_a
                 }
+                if (j == array_all_deptname.length - 1) {
+                    d_tt['itemStyle'] = {
+                        normal: {
+                            label: {
+                                show: true,
+                                position: 'top',
+                                formatter: function(params) {
+                                    var name = params.name
+                                    if (name == '仪表') {
+                                        name = '仪容仪表着装';
+                                    }
+                                    if (name == '行为') {
+                                        name = '工作纪律及行为举止';
+                                    }
+
+                                    return '上月\n' + t_map_p.get(name);
+                                },
+                                textStyle: {
+                                    color: 'blue'
+                                }
+                            }
+                        }
+                    }
+                }
                 sdata.push(d_tt);
             }
-
-
-
-
             if (map_month_data.get(dept) != null) {
                 var data_a = new Array();
                 var d_t = map_month_data.get(dept);
@@ -1033,10 +1077,10 @@ $(function() {
                     var name = array_all_name[i];
                     data_a.push(d_t.get(name) == null ? 0 : d_t.get(name));
 
-                    if (t_map_c.get(i) == null) {
-                        t_map_c.set(i, d_t.get(name) == null ? 0 : d_t.get(name))
+                    if (t_map_c.get(name) == null) {
+                        t_map_c.set(name, d_t.get(name) == null ? 0 : d_t.get(name))
                     } else {
-                        t_map_c.set(i, t_map_c.get(i) + (d_t.get(name) == null ? 0 : d_t.get(name)));
+                        t_map_c.set(name, t_map_c.get(name) + (d_t.get(name) == null ? 0 : d_t.get(name)));
                     }
                 }
                 var d_tt = {
@@ -1045,16 +1089,41 @@ $(function() {
                     stack: '本月',
                     data: data_a
                 }
+                if (j == array_all_deptname.length - 1) {
+                    d_tt['itemStyle'] = {
+
+                        normal: {
+                            label: {
+                                show: true,
+                                position: 'top',
+                                formatter: function(params) {
+                                    var name = params.name
+                                    if (name == '仪表') {
+                                        name = '仪容仪表着装';
+                                    }
+                                    if (name == '行为') {
+                                        name = '工作纪律及行为举止';
+                                    }
+
+                                    return '本月\n' + t_map_c.get(name);
+                                },
+                                textStyle: {
+                                    color: 'red'
+                                }
+                            }
+                        }
+                    }
+                }
                 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);
-                    if (t_map_c.get(i) == null) {
-                        t_map_c.set(i, 0)
+                    if (t_map_c.get(name) == null) {
+                        t_map_c.set(name, 0)
                     } else {
-                        t_map_c.set(i, t_map_c.get(i) + 0);
+                        t_map_c.set(name, t_map_c.get(name) + 0);
                     }
                 }
                 var d_tt = {
@@ -1063,37 +1132,34 @@ $(function() {
                     stack: '本月',
                     data: data_a
                 }
+                if (j == array_all_deptname.length - 1) {
+                    d_tt['itemStyle'] = {
+                        normal: {
+                            label: {
+                                show: true,
+                                position: 'top',
+                                formatter: function(params) {
+                                    var name = params.name
+                                    if (name == '仪表') {
+                                        name = '仪容仪表着装';
+                                    }
+                                    if (name == '行为') {
+                                        name = '工作纪律及行为举止';
+                                    }
+
+                                    return '本月\n' + t_map_c.get(name);
+                                },
+                                textStyle: {
+                                    color: 'red'
+                                }
+                            }
+                        }
+                    }
+                }
                 sdata.push(d_tt);
             }
         }
 
-        var d_s = new Array();
-        t_map_c.forEach(function(value, key) {
-            var d = {
-                name: "本月",
-                value: value,
-                xAxis: key,
-                yAxis: value
-            }
-            d_s.push(d);
-        });
-        t_map_p.forEach(function(value, key) {
-            console.log(key)
-            var d = {
-                name: "上月",
-                value: value,
-                xAxis: key == 0 ? -0.01 : (key - 0.3),
-                yAxis: value
-            }
-            d_s.push(d);
-        });
-
-
-
-        sdata[sdata.length - 1]['markPoint'] = {
-            data: d_s
-        }
-
 
         var namelist = new Array();
         for (var i = 0; i < array_all_name.length; i++) {

VisualInspection/view/statistics/total_company_statistics.html

@@ -30,45 +30,49 @@
     <div class="line-1"></div>
 
     <div class="border-line">
-    <div class="row-3"><div><span>公司12个月考核得分总体变化趋势分析</span></div></div>
-    <div id="company-year-assess" style="height: 100%;height:400px;"></div>
+        <div class="row-3">
+            <div><span>公司12个月考核得分总体变化趋势分析</span></div>
+        </div>
+        <div id="company-year-assess" style="height: 100%;height:400px;"></div>
     </div>
 
     <div class="border-line">
-    <div class="row-4">
-        <div class="col-1"><span>公司考核扣分情况占比</span></div><div class="line-2"></div>
-        <div class="col-1"><span>道管中心得分排名</span></div>
-    </div>
-    <div class="row-5">
-        <div id="company-points-assess" style="width:49%;height:400px;float:left;"></div>
-        <div class="line-3"></div>
-        <div id="roadManager-score-rank" style="width:49%;height:400px;float:left;"></div>
-    </div>
+        <div class="row-4">
+            <div class="col-1"><span>公司考核扣分情况占比</span></div>
+            <div class="line-2"></div>
+            <div class="col-1"><span>道管中心得分排名</span></div>
+        </div>
+        <div class="row-5">
+            <div id="company-points-assess" style="width:49%;height:400px;float:left;"></div>
+            <div class="line-3"></div>
+            <div id="roadManager-score-rank" style="width:49%;height:400px;float:left;"></div>
+        </div>
     </div>
 
-    
+
     <div class="border-line">
-    <div class="row-6"><div><span>公司全体收费站排名</span></div></div>
-    <div id="company-stationAll-rank" style="height: 100%;height:400px;"></div>
-    </div>
-    
-  <div class="border-line">
-    <div class="row-7">
-        <div class="col-1"><span>温馨服务检查问题类别占比</span></div><div class="line-2"></div>
-        <div class="col-1"><span>各个问题类别的扣分情况</span></div>
+        <div class="row-6">
+            <div><span>公司全体收费站排名</span></div>
+        </div>
+        <div id="company-stationAll-rank" style="height: 100%;height:400px;"></div>
     </div>
-    <div class="row-8">
-        <div id="server-check-type" style="width:49%;height:400px;float:left;"></div>
-        <div class="line-3"></div>
-        <div id="each-people-points" style="width:49%;height:400px;float:left;"></div>
+
+    <div class="border-line">
+        <div class="row-7">
+            <div class="col-1"><span>温馨服务检查问题类别占比</span></div>
+            <div class="line-2"></div>
+            <div class="col-1"><span>各个问题类别的扣分情况</span></div>
+        </div>
+        <div class="row-8">
+            <div id="server-check-type" style="width:49%;height:400px;float:left;"></div>
+            <div class="line-3"></div>
+            <div id="each-people-points" style="width:49%;height:400px;float:left;"></div>
+        </div>
     </div>
-  </div>
-  
+
 </div>
 <script>
     $(document).ready(function() {
 
     });
-</script>
-
-       
+</script>