Merge remote-tracking branch 'origin/master'

src/main/java/com/founder/interservice/spatiotemporalBackTrack/model/SBTResultDetail.java

 package com.founder.interservice.spatiotemporalBackTrack.model;
 
-import com.alibaba.fastjson.annotation.JSONField;
+import com.founder.interservice.VO.PageBean;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.Transient;
 import java.util.Date;
 
 @Data
-public class SBTResultDetail {
+public class SBTResultDetail extends PageBean {
     private String XXZJBH;
     private String taskId;//任务id
     private String taskResultId;//案件编号

src/main/resources/static/js/skhsJgzs.js

@@ -699,13 +699,13 @@ function showDialog(tjType) {
     //alert(JSON.stringify(tjry));
     var count=0;
     var width=0;
-    if(tjType==1){
+    if(tjType==6){
         count=tjryCount;
         width=1100;
-    }else if(tjType==2){
+    }else if(tjType==7){
         count=tjhmCount;
         width=900;
-    }else if(tjType==3){
+    }else if(tjType==8){
         count=tjclCount;
         width=900;
     }

src/main/webapp/WEB-INF/jsp/skhs/skhsJgzs.jsp

@@ -166,19 +166,19 @@
                 <div id="zntj">
                     <legend style="color: #06532f;font-weight: 600;"><img src="/images/logo.png" style="height:25px;position: relative;top: -2px;" />智能推荐</legend>
                     <div class="zntj-wrap">
-                        <div class="counter col_third" onclick="showDialog(1)">
+                        <div class="counter col_third" onclick="showDialog(6)">
                             <div class="ac"><i class="fa fa-address-book fa-2x fa-fw"></i>推荐人员</div>
                             <h2 class="timer count-title" id="count-number"  data-to="${tjryCount}" data-speed="1500"></h2>
                             <span class="tj"></span>
                         </div>
 
-                        <div class="counter col_third" onclick="showDialog(2)">
+                        <div class="counter col_third" onclick="showDialog(7)">
                             <div class="ac"><i class="fa fa-phone-square fa-2x fa-fw"></i>推荐号码</div>
                             <h2 class="timer count-title" id="count-number2" data-to="${tjhmCount}" data-speed="1500"></h2>
                             <span class="tj"></span>
                         </div>
 
-                        <div class="counter col_third" onclick="showDialog(3)">
+                        <div class="counter col_third" onclick="showDialog(8)">
                             <div class="ac"><i class="fa fa-car fa-2x fa-fw" style="font-size: 18px;"></i>推荐车辆</div>
                             <h2 class="timer count-title" id="count-number3" data-to="0" data-speed="1500"></h2>
                             <span class="tj"></span>
@@ -268,6 +268,7 @@
 <script type="text/javascript" src="/js/jquery-1.11.3.js"></script>
 <script type="text/javascript" src="/js/jquery.easyui.min.js"></script>
 <script type="text/javascript" src="/js/easyui-lang-zh_CN.js"></script>
+<script type="text/javascript" src="/common/easyui-window/js/function.js"></script>
 <!--- 日期时间-->
 <script type="text/javascript" src="/common/datepicker/WdatePicker.js"></script>
 <script type="text/javascript" src="/common/datepicker/calendar.js"></script>
@@ -294,6 +295,7 @@
     console.log(sfzhUser);
     var fsrjh = "${fsrjh}";
     var asjbh = "${taskCaseId}";
+    var taskId = "${taskId}";
     console.log(asjbh);
     var djsjStr = "${rksj}";
     var gdWrap_H=$(".gd-wrap").height();