bug修改

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/road_manage_statistics.js

@@ -814,7 +814,7 @@ $(function() {
                             },
                             labelLine: {
                                 show: true,
-                                length: 90,
+                                length: 80,
                                 lineStyle: {
                                     color: '#888'
                                 }
@@ -827,7 +827,7 @@ $(function() {
                 {
                     name: '访问来源',
                     type: 'pie',
-                    radius: [100, 140],
+                    radius: [100, 125],
 
                     // for funnel
                     x: '60%',

VisualInspection/js/statistics/toll_station_statistics.js

@@ -267,10 +267,8 @@
      	                for (var i = 0; i < data.length; i++) {
      	                    if (months.indexOf(data[i].mth.substr(2))) {
      	                        // 指定位置插入值
-
-     	                        console.log(data[i])
      	                        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 {
@@ -571,7 +569,7 @@
      	        if (num1 == 0 || num2 == 0) {
      	            return num3;
      	        } else {
-     	            return ((num / num1 * 1.0)).toFixed(2);
+     	            return ((num / num1) / num2).toFixed(2);
      	        }
      	    }
 

VisualInspection/js/statistics/total_company_statistics.js

@@ -309,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;
@@ -740,7 +740,7 @@ $(function() {
                             },
                             labelLine: {
                                 show: true,
-                                length: 90,
+                                length: 80,
                                 lineStyle: {
                                     color: '#888'
                                 }
@@ -753,7 +753,7 @@ $(function() {
                 {
                     name: '访问来源',
                     type: 'pie',
-                    radius: [100, 140],
+                    radius: [100, 125],
 
                     // for funnel
                     x: '60%',

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

@@ -280,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>