Merge remote-tracking branch 'origin/master'

src/main/java/com/founder/interservice/spatiotemporalBackTrack/controller/SpatiotemporalBackTrackController.java

@@ -51,6 +51,9 @@ public class SpatiotemporalBackTrackController {
                     String asjbh = jsonObject.getString("taskCaseId");
                     String taskName = jsonObject.getString("taskName");
                     String paramStr = jsonObject.getString("paramStr");
+                    if(""!=paramStr && null != paramStr){
+                        paramStr  = paramStr.substring(1,paramStr.length()-1);
+                    }
                     String taskId = spatiotemporalBackTrackService.getTaskId(asjbh,taskName,paramStr);
                     //String taskId = "98f6bcd4621d373cade4e832627b4f6-557-65-api-3-15347501887832";
                     if (!StringUtil.ckeckEmpty(taskId)) {

src/main/resources/static/js/skgjbasjgzs.js

@@ -122,6 +122,9 @@ function doQuery(){
         loadFilter: function(data){
             $(".total").html(data.total);
             return data;
+        },
+        onLoadSuccess: function(index,field,value){
+            doQueryqk();
         }
     });
 };
@@ -253,11 +256,7 @@ function doQueryFL(){
         $("#fldh").hide();
         $("#fldh").empty();
         //$("#objectType").val("");
-        if(presentTypeVal=="DList"){
-            doQuery();
-        }else if(presentTypeVal=="EZUIGrid") {
-            doQueryqk();
-        }
+        doQuery();
 
     }
 }