Merge remote-tracking branch 'origin/moly'

src/main/java/com/hp/cmsz/web/monitoroperation/AssociateDiagosisDetailController.java

@@ -421,4 +421,31 @@ public class AssociateDiagosisDetailController {
         return PageURLController.CreateDiagosis;
     }
 
+    @RequestMapping("/yinjingyinhuanToguanlianzhenduanmingxi")
+    public String yinjingyinhuanToguanlianzhenduanmingxi(Map model, ServletRequest request, HttpSession session)
+            throws UnsupportedEncodingException, ParseException {
+        List<Province> provinceList =(List<Province>) provinceDao.findProvince();
+        String timestamp1=getLastMonth();//getOld();
+        String  timestamp2=getNow();//getNew();
+        List<Object[]> diagosisDetailsObj=associateDiagosisDetailService.findAssociateDiagosisDetailByWarnTimeBeginAndEnd(timestamp1,timestamp2);
+        List<AssociateDiagosisDetail> associateDiagosisDetails=new ArrayList<AssociateDiagosisDetail>();
+        for (Object[] objects : diagosisDetailsObj) {
+            AssociateDiagosisDetail detail=new AssociateDiagosisDetail();
+            detail.setAssociationId((BigInteger)objects[0]);
+            detail.setProvinceId((BigInteger)objects[1]);
+            detail.setAssociationType(objects[2].toString().toCharArray()[0]);
+            detail.setAssociationDesc((String)objects[3]);
+            detail.setProvinceName((String)objects[4]);
+            detail.setWarnBeginTime((Timestamp)objects[5]);
+            detail.setWarnEndTime((Timestamp)objects[6]);
+            detail.setWarningNum((BigInteger)objects[7]);
+            associateDiagosisDetails.add(detail);
+        }
+
+        model.put("provinceList", provinceList);
+        Gson gson=new Gson();
+        model.put("diagosisDetails", gson.toJson(associateDiagosisDetails));
+        return PageURLController.AssociateDiagosisDetail;
+    }
+
 }

src/main/webapp/WEB-INF/views/MonitorOperation/CreateDiagosis.jsp

@@ -64,7 +64,7 @@
                                         <td>省份：</td>
                                         <td>
                                             <div class="checkbox-inline">
-                                                <input type="checkbox" name="" id="provinceDetailAll" title="" value="" />全选
+                                                <input type="checkbox" name="" id="provinceDetailAll" title="" value="" /><div style="color:red;">全选</div>
                                             </div>
                                                 <c:forEach var="provice" items="${proviceList}">
                                                     <div class="checkbox-inline">
@@ -143,7 +143,7 @@
 
 
                                     <tr>
-                                        <td>业务：</td>
+                                        <td><acronym title="ni caicai">业务：</acronym></td>
                                         <td id="businessActivedListTd">
 
                                         </td>

src/main/webapp/WEB-INF/views/MonitorOperation/WorkingOrderManage.jsp

@@ -93,13 +93,6 @@
 		                               //修改无刷新的更改协查单信息
 		                              
 		                                var currentpage=document.getElementById("goPageNo2").value;
-		                                /*
-		                                var listForm=$("#listForm");
-		                                listForm.attr("method","post");
-		                                listForm.attr("action","${ctx}/MonitorOperation/WorkingOrderManage/closeStatus/"+warningIds+"/"+currentpage);
-		                                listForm.submit();
-		                                listForm.attr("action","#");
-		                                listForm.attr("method","get");  */
 							             var period=getPeriodStr();
 							             var warningSource=getWarningSourceIds();
 							             var risk=getRiskEarlyWarningTypeIds();
@@ -181,11 +174,13 @@
 												} 
 											  ids.splice(0,ids.length);
 											  if (ids.length > 0) {
+                                                  $("#guanlian").attr("disabled", false);
                                                   $("#preview").attr("disabled", false);
 													$("#create").attr("disabled", false);
 													$("#closeButton").attr("disabled", false);
 													$("#confirmButton").attr("disabled", false);
 												} else {
+                                                  $("#guanlian").attr("disabled", true);
                                                   $("#preview").attr("disabled", true);
                                                   $("#create").attr("disabled", true);
 													$("#closeButton").attr("disabled", true);
@@ -194,9 +189,6 @@
 											}
 								         });
 		                                
-		                               // alert(document.getElementById("goPageNo2").value);
-		                               //$("#jumpbutton").trigger("click");
-		                                
 		                                
 		                                 },
 		                           function(){}
@@ -205,11 +197,10 @@
 		                         
 		                        }
 		                      }
-		                  });
 
-//		                   $("#goPageNo2").val(currentpage);
-//		                   alert(document.getElementById("goPageNo2").value);
-//		                   $("#jumpbutton").trigger("click");
+							}
+	                    );
+		                  
 
 		          });
       	
@@ -664,6 +655,7 @@ th{
 								<div class="table-header">预警和隐患列表
 							     <shiro:hasAnyRoles name="admin,dataAnalysis,businessAnalysis">
 								    <div class="bt-list-import" >
+										<input type="button" id="guanlian" class="btn btn-primary" value="关联诊断" disabled=true>
 										<input type="button" id="preview" class="btn btn-primary" value="结果预览" disabled=true>
 								     	<input type="button" id="create" class="btn btn-primary" value="生成协查单" disabled=true><!-- onclick="window.location.href='${ctx}/MonitorOperation/WorkingOrderCreate'" -->
                                      	<input type="button" id="closeButton" value="关闭" class="btn btn-primary" disabled=true>
@@ -717,6 +709,14 @@ th{
 	}
 */
 
+$("#guanlian").click(function(){
+    alert(ids[0]);
+    if(ids.length>10){
+        $.alert("最多只能选一个");
+        return;
+    }
+    window.location.href="${ctx}/MonitorOperation/AssociateDiagosisDetail/yinjingyinhuanToguanlianzhenduanmingxi";
+});
 
   $(function(){
    
@@ -743,11 +743,13 @@ th{
 					} 
 				  ids.splice(0,ids.length);
 				 if (ids.length > 0) {
+                     $("#guanlian").attr("disabled", false);
                      $("#preview").attr("disabled", false);
 					$("#create").attr("disabled", false);
 				    $("#closeButton").attr("disabled", false);
 					$("#confirmButton").attr("disabled", false);
 				} else {
+                     $("#guanlian").attr("disabled", true);
                      $("#preview").attr("disabled", true);
 					$("#create").attr("disabled", true);
 					$("#closeButton").attr("disabled", true);

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

@@ -582,11 +582,13 @@ function checkChoose(clickObj){
 	
 	// 无复选框被选中时,生成协查单按钮，删除按钮，确认按钮都不可用
 	if (ids.length > 0) {
+        $("#guanlian").attr("disabled", false);
         $("#preview").attr("disabled", false);
 		$("#create").attr("disabled", false);
 		$("#closeButton").attr("disabled", false);
 		$("#confirmButton").attr("disabled", false);
 	} else {
+        $("#guanlian").attr("disabled", true);
         $("#preview").attr("disabled", true);
 		$("#create").attr("disabled", true);
 		$("#closeButton").attr("disabled", true);
@@ -632,11 +634,13 @@ function checkAll(){
 	}
 	// 无复选框被选中时,生成协查单按钮，删除按钮，确认按钮都不可用
 	if (ids.length > 0) {
+        $("#guanlian").attr("disabled", false);
         $("#preview").attr("disabled", false);
 		$("#create").attr("disabled", false);
 		$("#closeButton").attr("disabled", false);
 		$("#confirmButton").attr("disabled", false);
 	} else {
+        $("#guanlian").attr("disabled", true);
         $("#preview").attr("disabled", true);
 		$("#create").attr("disabled", true);
 		$("#closeButton").attr("disabled", true);