统计表增加便民服务和安全管理两列

VisualInspection/js/statistics/assess_ranking.js

@@ -59,12 +59,13 @@ function getEmployeeInfosClick(url,param,start_score,end_score){
             if(score>=parseFloat(start_score) && score<=parseFloat(end_score)){
             strTbody+="<tr><td width='67px;'>"+(i+1)+"</td><td width='87px;'>"+data[i].user.fee_station_name+"</td>"
                 +"<td width='67px;'>"+data[i].user.truename+"</td><td width='67px;'>"+"</td>"
-                +"<td width='87px;'>"+data[i].user.workno+"</td><td width='55px;'>"+ getItemScore(data[i], '环境') +"</td>"
-                +"<td width='55px;'>"+getItemScore(data[i], '仪容仪表')+"</td><td width='55px;'>"+getItemScore(data[i], '表情')+"</td>"
-                +"<td width='55px;'>"+getItemScore(data[i], '动作')+"</td><td width='55px;'>"+getItemScore(data[i], '文明用语')+"</td>"
-                +"<td width='55px;'>"+ getItemScore(data[i], '工作纪律') +"</td><td width='55px;'>"+data[i].check_all_score+"</td>"
+                +"<td width='87px;'>"+data[i].user.workno+"</td><td width='58px;'>"+ getItemScore(data[i], '环境') +"</td>"
+                +"<td width='58px;'>"+getItemScore(data[i], '仪容仪表')+"</td><td width='58px;'>"+getItemScore(data[i], '表情')+"</td>"
+                +"<td width='58px;'>"+getItemScore(data[i], '动作')+"</td><td width='58px;'>"+getItemScore(data[i], '文明用语')+"</td>"
+                +"<td width='58px;'>"+ getItemScore(data[i], '工作纪律') +"</td><td width='58px'>"+getItemScore(data[i], '便民服务')+"</td><td width='58px'>"
+                +getItemScore(data[i], '安全管理')+"</td><td width='58px;'>"+data[i].check_all_score+"</td>"
                 +"<td width='67px;'>"+filter(data[i].checked_num,'0')+"</td><td width='67px;'>"+filterByZeroHandle(average(data[i]).toFixed(2),'0')+"</td>"
-                +"<td width='55px;'>"+score+"</td><td width='55px;'>"+"</td><td>"+"</td></tr>";
+                +"<td width='55px;'>"+score+"</td><td width='58px;'>"+"</td><td>"+"</td></tr>";
         }
     }
        $(".table-tbody").append(strTbody);   
@@ -84,12 +85,13 @@ function getEmployeeInfos(url,param){
         for(var i=0;i<data.length;i++){
             strTbody+="<tr><td width='67px;'>"+(i+1)+"</td><td width='87px;'>"+data[i].user.fee_station_name+"</td>"
                 +"<td width='67px;'>"+data[i].user.truename+"</td><td width='67px;'>"+"</td>"
-                +"<td width='87px;'>"+data[i].user.workno+"</td><td width='55px;'>"+ getItemScore(data[i], '环境') +"</td>"
-                +"<td width='55px;'>"+getItemScore(data[i], '仪容仪表')+"</td><td width='55px;'>"+getItemScore(data[i], '表情')+"</td>"
-                +"<td width='55px;'>"+getItemScore(data[i], '动作')+"</td><td width='55px;'>"+getItemScore(data[i], '文明用语')+"</td>"
-                +"<td width='55px;'>"+ getItemScore(data[i], '工作纪律') +"</td><td width='55px;'>"+data[i].check_all_score+"</td>"
+                +"<td width='87px;'>"+data[i].user.workno+"</td><td width='58px;'>"+ getItemScore(data[i], '环境') +"</td>"
+                +"<td width='58px;'>"+getItemScore(data[i], '仪容仪表')+"</td><td width='58px;'>"+getItemScore(data[i], '表情')+"</td>"
+                +"<td width='58px;'>"+getItemScore(data[i], '动作')+"</td><td width='58px;'>"+getItemScore(data[i], '文明用语')+"</td>"
+                +"<td width='58px;'>"+ getItemScore(data[i], '工作纪律') +"</td><td width='58px'>"+getItemScore(data[i], '便民服务')+"</td><td width='58px'>"
+                +getItemScore(data[i], '安全管理')+"</td><td width='58px'>"+data[i].check_all_score+"</td>"
                 +"<td width='67px;'>"+filter(data[i].checked_num,'0')+"</td><td width='67px;'>"+filterByZeroHandle(average(data[i]).toFixed(2),'0')+"</td>"
-                +"<td width='55px;'>"+(1000-filterByZeroHandle(average(data[i]).toFixed(2),'0'))+"</td><td width='55px;'>"+"</td><td>"+"</td></tr>";
+                +"<td width='55px;'>"+(1000-filterByZeroHandle(average(data[i]).toFixed(2),'0'))+"</td><td width='58px;'>"+"</td><td>"+"</td></tr>";
         }
        $(".table-tbody").append(strTbody);   
     },function(error){

VisualInspection/js/statistics/assess_type.js

@@ -108,7 +108,8 @@ function gethtml(data,i,avg,lists){
                    +"</td><td>"+filter(data.checked_num,'0')+"</td><td>"+getItemScore(data, '环境卫生')
                    +"</td> <td>"+getItemScore(data, '仪容仪表')+"</td><td>"+getItemScore(data, '表情')
                    +"</td><td>"+getItemScore(data, '收费动作')+"</td><td>"+getItemScore(data, '文明用语')
-                   +"</td><td>"+getItemScore(data, '工作纪律')+"</td><td>"+data.all_check_score+"</td><td>"
+                   +"</td><td>"+getItemScore(data, '工作纪律')+"</td><td>"+getItemScore(data, '便民服务')
+                   +"</td><td>"+getItemScore(data, '安全管理')+"</td><td>"+data.all_check_score+"</td><td>"
                    +filterByZeroHandle(filterJudge(data.all_check_score,data.checked_num),'0')
                    +"</td><td rowspan="+rowspan+">"+avg+"</td>";
         strTbody += "</tr>";
@@ -121,6 +122,7 @@ function gethtml(data,i,avg,lists){
                   +"</td><td>"+getItemScore(data, '环境卫生')+"</td><td>"+getItemScore(data, '仪容仪表')
                   +"</td><td>"+getItemScore(data, '表情')+"</td><td>"+getItemScore(data, '收费动作')
                   +"</td><td>"+getItemScore(data, '文明用语')+"</td><td>"+getItemScore(data, '工作纪律')
+                  +"</td><td>"+getItemScore(data, '便民服务')+"</td><td>"+getItemScore(data, '安全管理')
                   +"</td><td>"+data.all_check_score+"</td><td>"
                   +filterByZeroHandle(filterJudge(data.all_check_score,data.checked_num),'0')+"</td>";
         strTbody += "</tr>";

VisualInspection/view/statistics/assess_type.html

@@ -30,12 +30,13 @@
                         <tr>
                         <th rowspan="2" width="67px">道管整体排名</th><th rowspan="2" width="67px">单位</th><th rowspan="2" width="67px">管道内收费站排名</th>
                         <th rowspan="2" width="85px">单位</th><th rowspan="2" width="67px">收费值机岗位人数</th><th rowspan="2" width="67px">被检查人数</th>
-                        <th rowspan="2" width="67px">受检次数</th><th colspan="7" height="40px">存在问题扣分详情</th>
+                        <th rowspan="2" width="67px">受检次数</th><th colspan="9" height="40px">存在问题扣分详情</th>
                         <th rowspan="2">受检人平均每人次扣分（千分制）</th><th rowspan="2">管道中心受检人平均每人次扣分（千分制）</th>
                         </tr>
                         <tr> 
                         <th width="67px">环境卫生</th><th width="67px">仪容仪表</th><th width="67px">表情</th>
-                        <th width="67px">收费动作</th><th width="67px">文明用语</th><th width="67px">工作纪律</th><th width="67px">扣分合计</th>
+                        <th width="67px">收费动作</th><th width="67px">文明用语</th><th width="67px">工作纪律</th>
+                        <th width="67px">便民服务</th><th width="67px">安全管理</th><th width="67px">扣分合计</th>
                         </tr>
                  </thead>
                     <tbody class="table-tbody" style="background:white" align="center">

VisualInspection/view/statistics/emp_ranking.html

@@ -45,14 +45,15 @@
                         <thead class="table-thead" align="center">
                             <tr>
                             <th rowspan="2" width="67px;">序号</th><th rowspan="2" width="87px">站名</th><th rowspan="2" width="67px">姓名</th>
-                            <th rowspan="2" width="67px">岗位</th><th rowspan="2" width="87px">工号</th><th colspan="7" height="40px">考核扣分</th>
-                            <th rowspan="2" width="67px">受检次数</th><th rowspan="2" width="67px">平均扣分（千分制）</th><th width="55px">得分</th>
-                            <th rowspan="2" width="55px">服务评价</th><th rowspan="2">备注</th>
+                            <th rowspan="2" width="67px">岗位</th><th rowspan="2" width="87px">工号</th><th colspan="9" height="40px">考核扣分</th>
+                            <th rowspan="2" width="67px">受检次数</th><th rowspan="2" width="67px">平均扣分（千分制）</th><th rowspan="2" width="55px">得分</th>
+                            <th rowspan="2" width="58px">服务评价</th><th rowspan="2">备注</th>
                             </tr>
                             <tr> 
-                            <th width="55px">环境卫生</th><th width="55px">仪容仪表</th><th width="55px">表情</th>
-                            <th width="55px">收费动作</th><th width="55px">文明用语</th><th width="55px">工作纪律</th>
-                            <th width="55px">扣分合计</th>
+                            <th width="58px">环境卫生</th><th width="58px">仪容仪表</th><th width="58px">表情</th>
+                            <th width="58px">收费动作</th><th width="58px">文明用语</th><th width="58px">工作纪律</th>
+                            <th width="58px">便民服务</th><th width="58px">安全管理</th>
+                            <th width="58px">扣分合计</th>
                             </tr>
                         </thead>