稽查统计表格

VisualInspection/css/statistics/assess_situation.css

@@ -1,3 +1,9 @@
+.from-label label{
+    width:60px;
+    float:left;
+    padding-top: 6px;
+}
+
 .col-sm-1{
     width:102px;
     float:left;

VisualInspection/js/statistics/assess_type.js

@@ -129,18 +129,20 @@ function check_people_avg(data){
                 sum = parseFloat(sum)+ parseFloat(filterByZeroHandle(data[k].all_check_score,'0'));
                 sum1 = parseFloat(sum1)+ parseFloat(filterByZeroHandle(data[k].checked_num,'0'));
             if(k==6){
-                dataArray.push(filterByZeroHandle(sum/sum1).toFixed(2),'0');
-                console.log(sum+" "+sum1);
+                dataArray.push(filterJudge(sum,sum1));
+                console.log(sum/sum1);
                 sum = 0;
                 sum1 = 0;
             }
             if(k==12){  
-                dataArray.push(sum/6);
+                dataArray.push(filterJudge(sum,sum1));
+                console.log(sum+" "+sum1);
                 sum = 0;
                 sum1 = 0;
             }
             if(k==20){
-                dataArray.push(sum/8);
+                dataArray.push(filterJudge(sum,sum1));
+                console.log(sum+" "+sum1);  
                 sum = 0;
                 sum1 = 0;
             }
@@ -199,13 +201,21 @@ function getItemScore(obj, check_item_name){
  * @param {*} default_display_value 
  */
 function filterByZeroHandle(value , default_display_value){
-        if(isNaN(value)|| value=='0.00'){
+        if(isNaN(value) || value=='0.00'){
             return default_display_value ;
         }else{
             return value ;
         }
 }
 
+function filterJudge(num1,num2){
+        if(num2==0){
+            return 0;
+        }else{
+            return (num1/num2).toFixed(2);
+        }
+}
+
 
 
 

VisualInspection/view/statistics/assess_situation.html

@@ -4,7 +4,7 @@
     <div class="form-div">
         <form  class="form-horizontal">
             <div class="form-group">
-            
+                <div class="from-label"><label>稽查日期</label></div>
                 <div class="col-sm-3">
                     <input type="text" id="start-time" class="form-control form-date" placeholder="开始日期">
                 </div>

VisualInspection/view/statistics/assess_type.html

@@ -4,7 +4,7 @@
     <div class="form-div">
         <form  class="form-horizontal">
             <div class="form-group">
-                
+                <div class="from-label"><label>稽查日期</label></div>
                 <div class="col-sm-3">
                     <input type="text" id="start-time" class="form-control form-date" placeholder="开始日期">
                 </div>

VisualInspection/view/statistics/emp_ranking.html

@@ -9,6 +9,7 @@
                     <select class="form-control" id="fsList">
                     </select>
                 </div>
+                <div class="from-label"><label>稽查日期</label></div>
                 <div class="col-sm-3">
                     <input type="text" id="start-time" class="form-control form-date" placeholder="开始日期">
                 </div>

VisualInspection_server/src/main/resources/application.properties

@@ -2,8 +2,8 @@ server.port=8089
 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://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://192.168.8.236:3306/visualinspection?useUnicode=true&characterEncoding=utf-8
 master.datasource.username = root
 master.datasource.password = root
@@ -11,8 +11,8 @@ master.datasource.driver-class-name = com.mysql.jdbc.Driver
 master.mapper-locations=classpath:com/xintong/visualinspection/mapper/master/*.xml
 
 ## \u7528\u6237\u6570\u636e\u6e90\u914d\u7f6e
-cluster.datasource.url=jdbc:mysql://10.112.0.199:3306/yanhai?useUnicode=true&characterEncoding=utf8
-#cluster.datasource.url=jdbc:mysql://git.topm.win:6381/yanhai?useUnicode=true&characterEncoding=utf8
+#cluster.datasource.url=jdbc:mysql://10.112.0.199:3306/yanhai?useUnicode=true&characterEncoding=utf8
+cluster.datasource.url=jdbc:mysql://git.topm.win:6381/yanhai?useUnicode=true&characterEncoding=utf8
 cluster.datasource.username=root
 cluster.datasource.password=root
 cluster.datasource.driver-class-name = com.mysql.jdbc.Driver
@@ -53,8 +53,8 @@ spring.datasource.useGlobalDataSourceStat=true
 # Redis\u6570\u636e\u5e93\u7d22\u5f15\uff08\u9ed8\u8ba4\u4e3a0\uff09
 spring.redis.database=0  
 # Redis\u670d\u52a1\u5668\u5730\u5740
-spring.redis.host=10.112.0.199
-#spring.redis.host=git.topm.win
+#spring.redis.host=10.112.0.199
+spring.redis.host=git.topm.win
 # Redis\u670d\u52a1\u5668\u8fde\u63a5\u7aef\u53e3
 #spring.redis.port=6380
 spring.redis.port=6379