智能分析平台备份

src/main/java/com/hp/cmsz/repository/commonmanage/RunTaskDao.java

@@ -8,6 +8,9 @@ import org.springframework.data.repository.query.Param;
 
 import com.hp.cmsz.entity.commonmanage.RunTask;
 
+import javax.persistence.SequenceGenerator;
+import java.util.List;
+
 /**
  * RunTask实体类对应的Dao层实现
  * 
@@ -23,4 +26,7 @@ public interface RunTaskDao extends PagingAndSortingRepository<RunTask, Long>, J
 	@Modifying
 	@Query("update RunTask t set t.taskStatus='3' where t.taskType.tasktypeId=1 and t.dataModelView.dataModelId=:dataModelId ")
 	public void updateTaskStatusByModelId(@Param("dataModelId") Long dataModelId);
+
+
+
 }

src/main/java/com/hp/cmsz/web/PageURLController.java

@@ -44,8 +44,8 @@ public class PageURLController {
 	public static String ImgDisplay="MonitorOperation/ImgDisplay";
 
 	//模型监控下的预览图片展示
-	//ImgDisplay映射到WEB-INF/views下的MonitorOperation/ImgDisplay.jsp页面
-	public static String RunTaskImgDisplay="TaskManage/ImgDisplay";
+	//RunTaskImgDisplay-INF/TaskManage/RunTaskImage.jsp页面
+	public static String RunTaskImgDisplay="TaskManage/RunTaskImage";
 	
 	//监控运营下的告警分析
 	//WarnAnalysis映射到WEB-INF/views下的MonitorOperation/WarnAnalysis.jsp页面

src/main/java/com/hp/cmsz/web/commonmanage/TaskManageController.java

 package com.hp.cmsz.web.commonmanage;
 
 import com.hp.cmsz.repository.commonmanage.EWarningCalcResultDao;
+import com.hp.cmsz.repository.commonmanage.RunTaskDao;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
+import org.springframework.jdbc.support.incrementer.DataFieldMaxValueIncrementer;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -11,6 +13,10 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+import javax.persistence.Query;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
@@ -53,6 +59,8 @@ public class TaskManageController {
 
     @Autowired
     private BusinessDao businessDao;
+    @Autowired
+    private RunTaskDao runTaskDao;
 
     @Autowired
     private com.hp.cmsz.repository.PublicDao PublicDao;
@@ -99,17 +107,10 @@ public class TaskManageController {
                                       @RequestParam(value = "pageSize", defaultValue = "5") int pageSize,
                                       RunTask runTask, String newTaskStatus) {
         ModelAndView modelAndView = new ModelAndView(PageURLController.RunTaskList);
-		/*if (StringUtils.isNotEmpty(newTaskStatus) && runTask.getTaskId() != null) {
-			runTaskService.updateTaskStatus(runTask.getTaskId(), newTaskStatus);
-		}
-		Page<RunTask> taskList = runTaskService.getRunTaskPage(runTask, pageNumber, pageSize, sortType);
-
-		modelAndView.addObject("taskList", taskList);*/
         modelAndView.addObject("queryCondition", runTask);
         modelAndView.addObject("pageSize", pageSize);
         modelAndView.addObject("sortType", sortType);
         modelAndView.addObject("taskTypeList", runTaskService.getTaskTypeList());
-//		modelAndView.addObject("useType", defaultTaskType);
         return modelAndView;
     }
 
@@ -342,7 +343,8 @@ public class TaskManageController {
     @RequestMapping(value = "/modelPreview")
     @ResponseBody
     public APPEWarningDetail ModelPreview(String id){
-        APPEWarningDetail app =null;
+//        APPEWarningDetail app = null;
+        APPEWarningDetail app = new APPEWarningDetail();
         String modelSavePath = systemParameterDao.findByParameterName("MODEL_SCRIPT_FILE_DIR").get(0).getParameterValue();
 
         RunTask rt = runTaskService.getRunTask(Long.parseLong(id));
@@ -390,7 +392,7 @@ public class TaskManageController {
         String modelSavePath = systemParameterDao.findByParameterName("MODEL_SCRIPT_FILE_DIR").get(0).getParameterValue();
 
         File file = new File(modelSavePath+path);
-//        File file = new File("d:\\rscript\\al.jpg");
+//        File file = new File("D:\\game\\Warcraft3\\361_ee8b12708735464225629f3200a93.gif");
         FileInputStream fis;
         try {
             fis = new FileInputStream(file);

src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleMaintain.jsp

@@ -121,280 +121,275 @@
 			</div>
 		</div>
 	</div>
-</body>
-<script type="text/javascript">
-	$("#ruleBack").click(function(){
-		location.href="${ctx}/AnalysisSupport/FilterRuleResult";
-	});
-$(".period").hide();
-$(".ifRepeate").change(function (){
-	var selectValue = $("input:radio[name='ifRepeate']:checked").val();
-	if (selectValue == 0){
-        var alertMsg=[];
-        var filterStartTime = $("#filterStartTime").val();
-        if(filterStartTime ===""){
-            alertMsg.push("您没有选择生效开始时间，请先选择生效开始时间和结束时间")
-        }
-        var filterEndTime = $("#filterEndTime").val();
-
-        if(filterEndTime ===""){
-            alertMsg.push("您没有选择生效结束时间，请先选择生效开始时间和结束时间")
+	<script>
+        $("#ruleBack").click(function(){
+            location.href="${ctx}/AnalysisSupport/FilterRuleResult";
+        });
+        $(".period").hide();
+        $(".ifRepeate").change(function (){
+            var selectValue = $("input:radio[name='ifRepeate']:checked").val();
+            if (selectValue == 0){
+                var alertMsg=[];
+                var filterStartTime = $("#filterStartTime").val();
+                if(filterStartTime ===""){
+                    alertMsg.push("您没有选择生效开始时间，请先选择生效开始时间和结束时间")
+                }
+                var filterEndTime = $("#filterEndTime").val();
+
+                if(filterEndTime ===""){
+                    alertMsg.push("您没有选择生效结束时间，请先选择生效开始时间和结束时间")
+                }
+                if(alertMsg.length ===0){
+                    var timeDifference = new Date(filterEndTime).getTime() - new Date(filterStartTime).getTime();
+                    var $unit =  $("#unit");
+                    $unit.empty();
+                    if(timeDifference<(1000*60*60*24)){
+                        $unit.append(new Option("分钟",0));
+                        $unit.append(new Option("小时",1))
+                    }
+                    $unit.append(new Option("天",2));
+                    $unit.append(new Option("月",3))
+
+                }else{
+                    var msg ="";
+                    alertMsg.forEach(function (t,i) {
+                        msg+="<span style='color: red'>"+(i+1)+"."+t+"</span><br />"
+                    });
+                    $.dialog({
+                        title: "提醒",
+                        content:msg,
+                        ok: function(){
+                        },
+                        okValue:"确定",
+                        lock:true
+                    });
+                }
+                $(".period").show();
+            }
+            if (selectValue == 1){
+
+                $(".period").hide();
+            }
+        });
+        function changeDate() {
+            $("input[name='ifRepeate']:eq(1)").attr("checked",'checked');
+            $(".period").hide();
         }
-        if(alertMsg.length ===0){
-			var timeDifference = new Date(filterEndTime).getTime() - new Date(filterStartTime).getTime();
-			var $unit =  $("#unit");
-            $unit.empty();
-			if(timeDifference<(1000*60*60*24)){
-                $unit.append(new Option("分钟",0));
-                $unit.append(new Option("小时",1))
-			}
-            $unit.append(new Option("天",2));
-            $unit.append(new Option("月",3))
 
-		}else{
-            var msg ="";
-            alertMsg.forEach(function (t,i) {
-                msg+="<span style='color: red'>"+(i+1)+"."+t+"</span><br />"
+        function getProvinceCheckedValues() {
+            var provinceArray = [];
+            var i=0;
+            $("#province:checked").each(function(){
+                provinceArray[i]=$(this).val();
+                i++;
             });
-            $.dialog({
-                title: "提醒",
-                content:msg,
-                ok: function(){
-                },
-                okValue:"确定",
-                lock:true
-            });
-		}
-		$(".period").show();
-	}
-	if (selectValue == 1){
-
-		$(".period").hide();
-	}
-});
-function changeDate() {
-    $("input[name='ifRepeate']:eq(1)").attr("checked",'checked');
-    $(".period").hide();
-}
-
-function getProvinceCheckedValues() {
-    var provinceArray = [];
-    var i=0;
-    $("#province:checked").each(function(){
-        provinceArray[i]=$(this).val();
-        i++;
-    });
-    return provinceArray;
-}
-
-function getProvinceCheckedValuesString(){
-    var provinceStr="";
-    var provinceArray=getProvinceCheckedValues();
-    for(var i=0;i<provinceArray.length;i++){
-        if(i==provinceArray.length-1){
-            provinceStr+=provinceArray[i];
-        }else{
-            provinceStr+=provinceArray[i]+",";
+            return provinceArray;
         }
-    }
-    return provinceStr;
-}
 
-var dataSourceValue =$("#dataSource").val();
-var channelValue = $("#channel").val();
-var businessIds = getBusinessCheckedValues();
-var calCycleValue =$("#calCycle").val();
-$("#dataSource").change(function(){
-    dataSourceValue = $("#dataSource").val();
-    updateBusiness(dataSourceValue,channelValue);
-});
-$("#channel").change(function(){
-    channelValue = $("#channel").val();
-    updateBusiness(dataSourceValue,channelValue);
+        function getProvinceCheckedValuesString(){
+            var provinceStr="";
+            var provinceArray=getProvinceCheckedValues();
+            for(var i=0;i<provinceArray.length;i++){
+                if(i==provinceArray.length-1){
+                    provinceStr+=provinceArray[i];
+                }else{
+                    provinceStr+=provinceArray[i]+",";
+                }
+            }
+            return provinceStr;
+        }
 
-});
+        var dataSourceValue =$("#dataSource").val();
+        var channelValue = $("#channel").val();
+        var businessIds = getBusinessCheckedValues();
+        var calCycleValue =$("#calCycle").val();
+        $("#dataSource").change(function(){
+            dataSourceValue = $("#dataSource").val();
+            updateBusiness(dataSourceValue,channelValue);
+        });
+        $("#channel").change(function(){
+            channelValue = $("#channel").val();
+            updateBusiness(dataSourceValue,channelValue);
 
-function updateKpi(businessIds){
+        });
 
-    $.ajax({
-        type : "GET",
-        contentType : "application/json",
-        url: "${ctx}/AnalysisSupport/QualityRuleMaintain/findKpiId?businessIds="+businessIds,
-        async: false,
-        beforeSend: function(data) {},
-        success: function(data){
-            var td = $("#kpitd");
-            td.empty();
-            data = JSON.parse(data)
-            data.forEach(function(t){
-                td.append("<input type='checkbox' name='kpiinput' class='kpiItem' value='"+t[0]+"' checked >"+t[1]+"</input>")
+        function updateKpi(businessIds){
+
+            $.ajax({
+                type : "GET",
+                contentType : "application/json",
+                url: "${ctx}/AnalysisSupport/QualityRuleMaintain/findKpiId?businessIds="+businessIds,
+                async: false,
+                beforeSend: function(data) {},
+                success: function(data){
+                    var td = $("#kpitd");
+                    td.empty();
+                    data = JSON.parse(data)
+                    data.forEach(function(t){
+                        td.append("<input type='checkbox' name='kpiinput' class='kpiItem' value='"+t[0]+"' checked />"+t[1])
+                    });
+                }
             });
         }
-    });
-}
 
-function updateBusiness(dataSource,channel){
-    $.ajax({
-        type : "GET",
-        contentType : "application/json",
-        url: "${ctx}/AnalysisSupport/QualityRuleMaintain/findBusinessId?dataSource="+dataSource+"&channel="+channel,
-        async: false,
-        beforeSend: function(data) {},
-        success: function(data){
-            var td = $("#businesstd");
-            var businessIds = new Array();
-            td.empty();
-            data = JSON.parse(data)
-            data.forEach(function(t){
-                td.append("<input type='checkbox' name='businessinput' class='businessItem' value='"+t[0]+"' checked >"+t[1]+"</input>")
-                businessIds+=t[0]+",";
+        function updateBusiness(dataSource,channel){
+            $.ajax({
+                type : "GET",
+                contentType : "application/json",
+                url: "${ctx}/AnalysisSupport/QualityRuleMaintain/findBusinessId?dataSource="+dataSource+"&channel="+channel,
+                async: false,
+                beforeSend: function(data) {},
+                success: function(data){
+                    var td = $("#businesstd");
+                    var businessIds = new Array();
+                    td.empty();
+                    data = JSON.parse(data)
+                    data.forEach(function(t){
+                        td.append("<input type='checkbox' name='businessinput' class='businessItem' value='"+t[0]+"' checked />"+t[1])
+                        businessIds+=t[0]+",";
+                    });
+                    updateKpi(businessIds);
+                }
             });
-            updateKpi(businessIds);
-        }
-    });
-
-    $(".businessItem").click(function(){
-        businessIds="";
-        $("[name='businessinput']:checked").each(function (){
-            businessIds += $(this).val()+",";
-        });
-        updateKpi(businessIds);
-    });
-
-}
-
-updateBusiness($("#dataSource").val(),$("#channel").val());
 
-function getBusinessCheckedValues(){
-    var businessArray = [];
-    var i=0;
-    $("[name='businessinput']:checked").each(function(){
-        businessArray[i]=$(this).val();
-        i++;
-    });
-    return businessArray;
-}
+            $(".businessItem").click(function(){
+                businessIds="";
+                $("[name='businessinput']:checked").each(function (){
+                    businessIds += $(this).val()+",";
+                });
+                updateKpi(businessIds);
+            });
 
-function getBusinessCheckedValuesString(){
-    var businessStr="";
-    var businessArray=getBusinessCheckedValues();
-    for(var i=0;i<businessArray.length;i++){
-        if(i==businessArray.length-1){
-            businessStr+=businessArray[i];
-        }else{
-            businessStr+=businessArray[i]+",";
         }
-    }
-    return businessStr;
-}
 
-function getKpiCheckedValues(){
-    var kpiArray = new Array();
-    var i=0;
-    $("[name='kpiinput']:checked").each(function(){
-        kpiArray[i]=$(this).val();
-        i++;
-    });
-    return kpiArray;
-}
+        updateBusiness($("#dataSource").val(),$("#channel").val());
 
-function getKpiCheckedValuesString(){
-    var kpiStr="";
-    var kpiArray=getKpiCheckedValues();
-    for(var i=0;i<kpiArray.length;i++){
-        if(i==kpiArray.length-1){
-            kpiStr+=kpiArray[i];
-        }else{
-            kpiStr+=kpiArray[i]+",";
+        function getBusinessCheckedValues(){
+            var businessArray = [];
+            var i=0;
+            $("[name='businessinput']:checked").each(function(){
+                businessArray[i]=$(this).val();
+                i++;
+            });
+            return businessArray;
         }
-    }
-    return kpiStr;
-}
-
-
-
-$('#ruleSubmit').click(function () {
-    var alertMsg = [];
-    var provinceArr = $("input:checkbox[name='province']:checked");
-	if(provinceArr.length ===0){
-	    alertMsg.push("您没有选择省份，请选择省份")
-	}
-    var businessArr = $("input:checkbox[name='businessinput']");
-	var businessChecked=false;
-    businessArr.each(function () {
-        if($(this).attr("checked"))businessChecked=true
-	});
-    if(businessArr.length !==0 && !businessChecked){
-        alertMsg.push("您没有选择业务，请选择业务")
-    }
-    var kpiArr = $("input:checkbox[name='kpiinput']");
-   var kpiChecked = false;
-    kpiArr.each(function () {
-        if($(this).attr("checked"))kpiChecked=true
-    });
-    if(kpiArr.length !==0 && !kpiChecked){
-        alertMsg.push("您没有选择指标，请选择指标")
-    }
-    var filterStartTime = $("#filterStartTime").val();
-    if(filterStartTime ===""){
-        alertMsg.push("您没有选择生效开始时间，请选择生效开始时间")
-    }
-    var filterEndTime = $("#filterEndTime").val();
-
-    if(filterEndTime ===""){
-        alertMsg.push("您没有选择生效结束时间，请选择生效结束时间")
-    }
-    var filterReason = $("#filterReason").val();
-    if(filterReason ===""){
-        alertMsg.push("您没有填写过滤原因，请填写过滤原因")
-    }
-    var ifRepeate = $("input:radio[name='ifRepeate']:checked").val();
-    var cycle = $("#cycle").val();
-    if(ifRepeate ===0 && cycle===""){
-        alertMsg.push("您选择了重复，请填写重复周期")
-    }
-    if(alertMsg.length ===0){
-        $.dialog({
-            title: "提醒",
-            content:"确定上传该规则吗？",
-            ok: function(){
-
-				$.ajax({
-                    cache: true,
-                    type : "POST",
-                    async: false,
-                    dataType : "json",
-                    url: "${ctx}/AnalysisSupport/FilterRuleMaintain/createRule",
-					data:$("#filterMaintainForm").serialize(),
-                    success: function(data){
-                        window.location.href="${ctx}/AnalysisSupport/FilterRuleResult";
-                    }
-				})
-            },
-            okValue:"确定",
-            cancel: function(){},
-            cancelValue:"返回修改",
-            lock:true
-        });
-
-	}
-	else{
-        var msg="";
-        alertMsg.forEach(function (t,i) {
-            msg+="<span style='color: red'>"+(i+1)+"."+t+"</span><br />"
-		});
-        $.dialog({
-            title: "提醒",
-            content:msg,
-            ok: function(){
-            },
-            okValue:"确定",
-            lock:true
-        });
-    }
-})
 
+        function getBusinessCheckedValuesString(){
+            var businessStr="";
+            var businessArray=getBusinessCheckedValues();
+            for(var i=0;i<businessArray.length;i++){
+                if(i==businessArray.length-1){
+                    businessStr+=businessArray[i];
+                }else{
+                    businessStr+=businessArray[i]+",";
+                }
+            }
+            return businessStr;
+        }
 
+        function getKpiCheckedValues(){
+            var kpiArray = new Array();
+            var i=0;
+            $("[name='kpiinput']:checked").each(function(){
+                kpiArray[i]=$(this).val();
+                i++;
+            });
+            return kpiArray;
+        }
 
+        function getKpiCheckedValuesString(){
+            var kpiStr="";
+            var kpiArray=getKpiCheckedValues();
+            for(var i=0;i<kpiArray.length;i++){
+                if(i==kpiArray.length-1){
+                    kpiStr+=kpiArray[i];
+                }else{
+                    kpiStr+=kpiArray[i]+",";
+                }
+            }
+            return kpiStr;
+        }
 
-</script>
+        $('#ruleSubmit').click(function () {
\ No newline at end of file
+            var alertMsg = [];
+            var provinceArr = $("input:checkbox[name='province']:checked");
+            if(provinceArr.length ===0){
+                alertMsg.push("您没有选择省份，请选择省份")
+            }
+            var businessArr = $("input:checkbox[name='businessinput']");
+            var businessChecked=false;
+            businessArr.each(function () {
+                if($(this).attr("checked"))businessChecked=true
+            });
+            if(businessArr.length !==0 && !businessChecked){
+                alertMsg.push("您没有选择业务，请选择业务")
+            }
+            var kpiArr = $("input:checkbox[name='kpiinput']");
+            var kpiChecked = false;
+            kpiArr.each(function () {
+                if($(this).attr("checked"))kpiChecked=true
+            });
+            if(kpiArr.length !==0 && !kpiChecked){
+                alertMsg.push("您没有选择指标，请选择指标")
+            }
+            var filterStartTime = $("#filterStartTime").val();
+            if(filterStartTime ===""){
+                alertMsg.push("您没有选择生效开始时间，请选择生效开始时间")
+            }
+            var filterEndTime = $("#filterEndTime").val();
+
+            if(filterEndTime ===""){
+                alertMsg.push("您没有选择生效结束时间，请选择生效结束时间")
+            }
+            var filterReason = $("#filterReason").val();
+            if(filterReason ===""){
+                alertMsg.push("您没有填写过滤原因，请填写过滤原因")
+            }
+            var ifRepeate = $("input:radio[name='ifRepeate']:checked").val();
+            var cycle = $("#cycle").val();
+            if(ifRepeate ===0 && cycle===""){
+                alertMsg.push("您选择了重复，请填写重复周期")
+            }
+            if(alertMsg.length ===0){
+                $.dialog({
+                    title: "提醒",
+                    content:"确定上传该规则吗？",
+                    ok: function(){
+
+                        $.ajax({
+                            cache: true,
+                            type : "POST",
+                            async: false,
+                            dataType : "json",
+                            url: "${ctx}/AnalysisSupport/FilterRuleMaintain/createRule",
+                            data:$("#filterMaintainForm").serialize(),
+                            success: function(data){
+                                window.location.href="${ctx}/AnalysisSupport/FilterRuleResult";
+                            }
+                        })
+                    },
+                    okValue:"确定",
+                    cancel: function(){},
+                    cancelValue:"返回修改",
+                    lock:true
+                });
+
+            }
+            else{
+                var msg="";
+                alertMsg.forEach(function (t,i) {
+                    msg+="<span style='color: red'>"+(i+1)+"."+t+"</span><br />"
+                });
+                $.dialog({
+                    title: "提醒",
+                    content:msg,
+                    ok: function(){
+                    },
+                    okValue:"确定",
+                    lock:true
+                });
+            }
+        })
+
+	</script>
+</body>

src/main/webapp/WEB-INF/views/TaskManage/ModelMonitorHome.jsp

@@ -84,8 +84,19 @@
         dilog.close();
         document.getElementById("taskManageFrame").src='${ctx}'+"/BaseManage/TaskManage/taskFormFrame?defaultTaskType="+taskType+"&taskId=" + id+"&type=modify";
     }
+    function openwin(url) {
+        var a = document.createElement("a"); //创建a对象
+        a.setAttribute("href", url);
+        a.setAttribute("target", "_blank");
+        a.setAttribute("id", "camnpr");
+        document.body.appendChild(a);
+        a.click(); //执行当前对象
 
+    }
+    function imgOnclick(e) {
+        openwin("${ctx}/BaseManage/TaskManage/ImgDisplay?"+e.src)
 
+    }
 
     function OpenDialog(data,id,taskType) {
         var df=new SimpleDateFormat();
@@ -143,7 +154,7 @@
             "    <tr>" +
             "        <td colspan='8'>" +
             "            <div class=''>" +
-            "                <a src='${ctx}/BaseManage/TaskManage/ImgDisplay?${ctx}/BaseManage/TaskManage/modelPreviewImg?path="+data.fileAddress+"'><img id='img' src='${ctx}/BaseManage/TaskManage/modelPreviewImg?path="+data.fileAddress+"'/></a>" +
+            "               <img id='img' onclick='imgOnclick(this)' style='width:622px' src='${ctx}/BaseManage/TaskManage/modelPreviewImg?path="+data.fileAddress+"'/>" +
             "            </div>" +
             "        </td>" +
             "    </tr>" +

src/main/webapp/WEB-INF/views/TaskManage/RunTaskForm.jsp

@@ -217,18 +217,12 @@ var kpiOptions = new Array();
 	function submitForm() {
 		var url = '${ctx}/BaseManage/TaskManage/checkNameAndCode';
 		var data = 'name=' + $('#name').val() + "&code=" + $('#code').val() + "&id=" + $('#taskId').val() + "&defaultTaskType=" + $('#defaultTaskType').val() ;
-		/* if(!checkFrequency()) {
-			alert("运行频率允许的值为整数、小数、分数和格式为ADD_MONTHS(x)的字符串，其中x可以为整数、小数、分数");
-			$('#frequency').focus();
-			return;
-		} */
         if (validate()) {
             var i = $("#addTr").find("tr").size();
             if(i==0){
                 checkAndSubmit(url, encodeURI(encodeURI(data)));
             }else {
                 $("#addTr").find("tr").each(function () {
-                    //alert($(this).find("td").eq(0).html());
 					var paramId = $(this).context.id;
                     var modelId =  $('#modelId').val();
                     var paramName = $(this).find("td").eq(0).html();
@@ -389,6 +383,9 @@ var kpiOptions = new Array();
 			$('#frequencyValue').append(monthOption);
 		}
 	}
+
+
+
 	function abandonTask(){
         $.ajax({
             type: "GET",

src/main/webapp/WEB-INF/views/TaskManage/RunTaskImage.jsp

@@ -47,7 +47,7 @@
                                 <div class="content clearfix">
                                     <div class="block clearfix">
                                         <div class="tab-content">
-                                            <img id="img" src="${ctx}/static/images/loading.gif"/>
+                                            <img style="width: 100%" id="img" src="${ctx}/static/images/loading.gif"/>
                                         </div>
                                     </div>
                                 </div>
@@ -60,7 +60,8 @@
     </div>
 </div>
 <script type="text/javascript">
-    var src=window.location.href.split('?')[1];
+    var src=window.location.href.split('?')[1]+"?"+window.location.href.split('?')[2];
+
     $("#img").attr("src",src);
 </script>
 

src/main/webapp/static/js/xcdWarningTable.js

@@ -319,15 +319,18 @@ table_pagging.prototype = {
 										 +")' alt='"+i+"'>"+this.getData(this.objectlist[i],this.header[k][1])+"</a>";
 									}
 
-								if(k==11){
+								if(k==10){
 									if(tdContext!="&nbsp;"){
 									tdContext = df.format(new Date(tdContext));
 									}
-								}else if(k==12){
+								}else if(k==11){
 									if(tdContext!="&nbsp;"){
 									tdContext = df.format(new Date(tdContext));
-								 }
-								}else if(k==15){
+								 }else if(k==12){
+                                        if(tdContext!="&nbsp;"){
+                                            tdContext = df.format(new Date(tdContext));
+                                        }
+								}else if(k==16){
 									if(tdContext=="已确认"){
 										tr.className="green-tr";
 									}else if(tdContext=="已关联协查单"){