2017年11月20日

src/main/java/com/hp/cmsz/repository/GjfxRelatedInsideWorkingOrderDao.java

@@ -10,5 +10,6 @@ import java.util.List;
 public interface GjfxRelatedInsideWorkingOrderDao extends PagingAndSortingRepository<GjfxRelatedInsideWorkingOrder, Long>,
         JpaSpecificationExecutor<GjfxRelatedInsideWorkingOrder> {
         List<GjfxRelatedInsideWorkingOrder> findAllByInnerWorkingOrderId(Long id);
+        List<GjfxRelatedInsideWorkingOrder> findAllByWarningIdIn(List id);
 
 }

src/main/webapp/WEB-INF/tags/XCD_RelStatus.tag

@@ -7,10 +7,11 @@
 <div id="ws2" class="slide-menu-option">
      <label>告警状态</label> <!--    <div class="slide-select">   -->
           		                 <select class="slide-menu-select" id="relStatus" name="relStatus">  
-          		       		     <option value="未确认,已确认,已关联协查单" title="全部"selected ><a href="#">全部</a></option>
+          		       		     <option value="未确认,已确认,已关联协查单,已关联内部协查单" title="全部"selected ><a href="#">全部</a></option>
           		                 <option value="未确认" title="未确认"><a href="#">未确认</a></option>
           		                 <option value="已确认" title="已确认"><a href="#">已确认</a></option>
           		                 <option value="已关联协查单" title="已关联协查单"><a href="#">已关联协查单</a></option>
+          		                 <option value="已关联内部协查单" title="已关联内部协查单"><a href="#">已关联内部协查单</a></option>
           		                  </select>
           		            <!--    </div> --> 
 </div>

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

@@ -142,7 +142,7 @@
                                             <div class="table-header">协查单列表
                                                 <shiro:hasAnyRoles name="admin,dataAnalysis,businessAnalysis">
                                                     <div class="bt-list-import" >
-                                                        <input type="button" id="createXcd"class="btn btn-primary" style="margin-right:13px;" value="下发协查单" disabled=true onclick="">
+                                                        <input type="button" id="createXcd" class="btn btn-primary" style="margin-right:13px;" value="下发协查单" disabled=true onclick="">
                                                     </div>
                                                 </shiro:hasAnyRoles>
                                             </div>
@@ -186,10 +186,10 @@
     $(function(){
         //初始化
         xcdFindTable();
-        initDate()
-
+        initDate();
         //筛选项提交按钮
-        $("#submit").click(function(){
+        $("#submit").click(searchTable);
+        function searchTable(){
             var href;
             if($('#workingOrderID').val()==null||$('#workingOrderID').val()==""){//协查单编号为空
                 if(getStatsDataSourceCheckedValues().length==0){	$.alert('数据来源选择不能为空！');}
@@ -219,7 +219,7 @@
                     });
                 }
             }else{
-              href="${ctx}/MonitorOperation/InsideXcd/changeTable?WorkingOrderCode="+$('#workingOrderID').val();
+                href="${ctx}/MonitorOperation/InsideXcd/changeTable?WorkingOrderCode="+$('#workingOrderID').val();
                 <%--upLoadExcel="${ctx}/MonitorOperation/WarnAnalysisDetail/upLoadExcel?WorkingOrderCode="+$('#WorkingOrderCode').val();--%>
 
                 $.ajax({
@@ -237,7 +237,71 @@
                 });
             }
 
-        });
+        }
+        function getUrlParams() {
+            //获取当前URL地址
+            var search = window.location.search;
+            //从search中抽取从 1 开始到search.length字符，并以&分割获取写入字符串
+            var tmparray = search.substr(1, search.length).split("&");
+            var paramsArray = new Array;
+            if (tmparray != null) {
+                for (var i = 0; i < tmparray.length; i++) {
+                    // 用=进行拆分，但不包括==
+                    var reg = /[=|^==]/;
+                    //用&替换reg
+                    var set1 = tmparray[i].replace(reg, '&');
+                    //以&分割获取
+                    var tmpStr2 = set1.split('&');
+                    var array = new Array;
+                    array[tmpStr2[0]] = tmpStr2[1];
+                    // 将array添加到paramsArray中，并返回长度
+                    paramsArray.push(array);
+                }
+            }
+            // 返回参数数组
+            return paramsArray;
+        }
+        //根据参数名称获取参数值
+        function getParamValue(name) {
+            var paramsArray = getUrlParams();
+            if (paramsArray != null) {
+                for (var i = 0 ; i < paramsArray.length ; i++) {
+                    for (var j in paramsArray[i]) {
+                        if (j == name) {
+                            return paramsArray[i][j];
+                        }
+                    }
+                }
+            }
+            return null;
+        }
+        var returninfo2;
+        returninfo2=getParamValue("returninfo");
+        var relatedId = getParamValue("relatedId");
+        if(returninfo2!=null){
+            $.alert(decodeURIComponent(returninfo2)+relatedId);
+        }
+        if(relatedId !=null){
+            $('#workingOrderID').val(relatedId);
+            searchTable();
+            toggleMenu('slidePushMenus');//隐藏筛选项
+        }
+
+    });
+
+    $("#createXcd").click(function(){
+      console.log(xcdId)
+        var xcdids = xcdId.split(",");
+        var msg ="";
+        for(var i=0;i<xcdids.length;i++) {
+            if (i == xcdids.length - 1) {
+                msg += "$"
+            } else {
+                msg += "$,"
+            }
+        }
+        openwin("${ctx}/MonitorOperation/WorkingOrderCreate?warningId="+xcdId+"&msg="+msg);
+
 
     });
     function getCol(json,name){return (json[name]!=null)?json[name]:'';}//防止空值时出现undefined
@@ -358,7 +422,15 @@
         form.appendTo('body').submit().remove();
     }
 
+    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(); //执行当前对象
 
+    }
 </script>
 
 

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

@@ -402,15 +402,14 @@
 							  k++;
 							}
 
-					 }
+					 	}
 						for(var i=0;i<json.length;i++){
-					   for(var j=i+1;j<json.length;j++){
-						  if(json[i].provinceId!=json[j].provinceId){
-							 m++;
-						  }
-
-					   }
-					  }
+					   		for(var j=i+1;j<json.length;j++){
+						  		if(json[i].provinceId!=json[j].provinceId){
+							 		m++;
+						  		}
+					   		}
+					  	}
 						for(var p=0;p<json.length;p++){
 					   for(var q=p+1;q<json.length;q++){
 						  if(json[p].channelId!=json[q].channelId){
@@ -982,7 +981,7 @@ th{
                         return paramsArray;
                     }
                     //根据参数名称获取参数值
-                    function getParamValue(name) {
+	  	function getParamValue(name) {
                         var paramsArray = getUrlParams();
                         if (paramsArray != null) {
                             for (var i = 0 ; i < paramsArray.length ; i++) {
@@ -1006,12 +1005,10 @@ th{
             
             var returninfo2;
             returninfo2=getParamValue("returninfo");
-
-            console.log(returninfo2)
             if(returninfo2!=null){
                    $.alert(decodeURIComponent(returninfo2));
-
             }
+
             
   });
   

src/main/webapp/static/js/insideXcdWarningTable.js

@@ -575,8 +575,17 @@ function radioChoose(clickObj){
     if(clickObj.checked){
         //alert(clickObj);
         //alert(clickObj.nextSibling.innerHTML);
-        $("#updateButton").attr("disabled", false);
-        xcdId=parseInt(obj[parseInt(clickObj.nextSibling.innerHTML)].workingOrderId);
+        $("#createXcd").attr("disabled", false);
+        xcdId="";
+        var warningDataArr = obj[parseInt(clickObj.nextSibling.innerHTML)].alarmListRelation;
+        warningDataArr.forEach(function (t,i) {
+            if(i==warningDataArr.length-1){
+                xcdId +=t.warningId
+            }else{
+                xcdId +=t.warningId+","
+            }
+        });
+        // xcdId=parseInt(obj[parseInt(clickObj.nextSibling.innerHTML)].workingOrderId);
 
     }
 }	    

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

@@ -332,8 +332,10 @@ table_pagging.prototype = {
 										tr.className="green-tr";
 									}else if(tdContext=="已关联协查单"){
 										tr.className="blue-tr";
+									}else if(tdContext == "已关联内部协查单"){
+										tr.className="orange-tr";
 									}else{
-										tr.className="white-tr";
+                                        tr.className="white-tr";
 									}
 								}
 							}