2017年10月18日提交记录

.gitignore

+# Created by .ignore support plugin (hsz.mobi)
+### Example user template template
+### Example user template
+
+# IntelliJ project files
+
+*.iml
+out
+gen
+.gitignore
+.svn/
+src/test/
+.classpath
+.project
+CmszMonitorAnalysis.war
+.externalToolBuilders
+monitorAnalysis
+

.idea/artifacts/CmszMonitorAnalysis.xml

@@ -152,6 +152,7 @@
           <element id="library" level="module" name="xmlsec-1.3.0-1.0.0.jar" module-name="CmszMonitorAnalysis" />
           <element id="file-copy" path="$PROJECT_DIR$/lib/freemarker.jar" />
           <element id="library" level="project" name="lib" />
+          <element id="library" level="application" name="servlet-api" />
         </element>
       </element>
       <element id="javaee-facet-resources" facet="CmszMonitorAnalysis/web/Web" />

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

@@ -249,8 +249,10 @@
 									<div class="form-group">
 										<div class="col-sm-offset-3 col-sm-9">
 											<input type="button" id="confirmId" class="btn btn-primary" value="确认"> 
-											
+											0
 											<input type="button" id="back" class="btn btn-warning" value="返回">
+											<input type="button" id="createInsideWorkingOrder" class="btn btn-success" value="生成内部协查单">
+
 
 										</div>
 									</div>

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

@@ -261,7 +261,6 @@ table_pagging.prototype = {
 			}
 		}
 	},
-
 	// 创建table的数据区域
 	createTableBodyTd : function() {
 		this.clearSearchTable();
@@ -315,43 +314,8 @@ table_pagging.prototype = {
 								}
 								//add by eric 2014-04-29 21:42   由预警和隐患列表链接到告警明细相关页面
 								if(k==1){
-		//							tdContext= "<a target='_blank' href='/CmszMonitorAnalysis/MonitorOperation/WarnAnalysisDetail?WarningID="+this.getData(this.objectlist[i],this.header[k][1])+"'>"+ tdContext+"</a>";
-/*	change by eric 2014-08-10 18:53                                  
-									//add by Eric 2014-05-04 14:58 start
-								tdContext="<a href=\"javascript:;\" onclick=\"openDialog('"+this.getData(this.objectlist[i],this.header[k][1])+"',"
-						 			+ this.getData(this.objectlist[i],"warningSourceId")+","
-						 			+ this.getData(this.objectlist[i],"dataSourceId")+","
-						 			+ this.getData(this.objectlist[i],"channelId")+","
-						 			+ this.getData(this.objectlist[i],"businessId")+","
-						 			+ this.getData(this.objectlist[i],"kpiId")+","
-						 			+ this.getData(this.objectlist[i],"configItemId")+","
-						 			+ this.getData(this.objectlist[i],"provinceId")+",'"
-						 			+ ((this.getData(this.objectlist[i],"warningTitle")!=null&&this.getData(this.objectlist[i],"warningTitle")!='')?this.getData(this.objectlist[i],"warningTitle"):"")+"','"
-						 			+ ((this.getData(this.objectlist[i],"provinceName")!=null&&this.getData(this.objectlist[i],"provinceName")!='')?this.getData(this.objectlist[i],"provinceName"):"")+"','"
-						 			+ ((this.getData(this.objectlist[i],"channelName")!=null&&this.getData(this.objectlist[i],"channelName")!='')?this.getData(this.objectlist[i],"channelName"):"")+"','"
-						 			+ ((this.getData(this.objectlist[i],"businessName")!=null&&this.getData(this.objectlist[i],"businessName")!='')?this.getData(this.objectlist[i],"businessName"):"")+"','"
-						 			+ ((this.getData(this.objectlist[i],"dataSourceName")!=null&&this.getData(this.objectlist[i],"dataSourceName")!='')?this.getData(this.objectlist[i],"dataSourceName"):"")+"','"
-						 			+ ((this.getData(this.objectlist[i],"warningSourceName")!=null&&this.getData(this.objectlist[i],"warningSourceName")!='')?this.getData(this.objectlist[i],"warningSourceName"):"")+"','"
-						 			+ ((this.getData(this.objectlist[i],"kpiCode").replace(/\"/g,"")!=null&&this.getData(this.objectlist[i],"kpiCode").replace(/\"/g,"")!='')?this.getData(this.objectlist[i],"kpiCode").replace(/\"/g,""):"")+"','" //去掉其中的双引号
-						 			+ ((this.getData(this.objectlist[i],"kpiName").replace(/\"/g,"")!=null&&this.getData(this.objectlist[i],"kpiName").replace(/\"/g,"")!='')?this.getData(this.objectlist[i],"kpiName").replace(/\"/g,""):"")+"','"
-						 			+ ((this.getData(this.objectlist[i],"ciCode")!=null&&this.getData(this.objectlist[i],"ciCode")!='')?this.getData(this.objectlist[i],"ciCode"):"")+"','"
-						 			+ ((this.getData(this.objectlist[i],"ciName")!=null&&this.getData(this.objectlist[i],"ciName")!='')?this.getData(this.objectlist[i],"ciName"):"")+"','"
-						 			+ ((this.getData(this.objectlist[i],"providerName")!=null&&this.getData(this.objectlist[i],"providerName")!='')?this.getData(this.objectlist[i],"providerName"):"")+"','"
-						 			+ ((this.getData(this.objectlist[i],"importanceLevelName")!=null&&this.getData(this.objectlist[i],"importanceLevelName")!='')?this.getData(this.objectlist[i],"importanceLevelName"):"")+"','"
-						 			+ ((this.getData(this.objectlist[i],"occurTime")!=null&&this.getData(this.objectlist[i],"occurTime")!='')?df.format(new Date(this.getData(this.objectlist[i],"occurTime"))):"")+"','"
-						 			+ ((this.getData(this.objectlist[i],"closeTime")!=null&&this.getData(this.objectlist[i],"closeTime")!='')?df.format(new Date(this.getData(this.objectlist[i],"closeTime"))):"")+"','"
-						 			+ ((this.getData(this.objectlist[i],"workingOrderCode")!=null&&this.getData(this.objectlist[i],"workingOrderCode")!='')?this.getData(this.objectlist[i],"workingOrderCode"):"")+"','"
-						 			+ ((this.getData(this.objectlist[i],"relevantFailureId")!=null&&this.getData(this.objectlist[i],"relevantFailureId")!='')?this.getData(this.objectlist[i],"relevantFailureId"):"")+"','"
-						 			+ ((this.getData(this.objectlist[i],"riskEarlyWarningTypeId")!=null&&this.getData(this.objectlist[i],"riskEarlyWarningTypeId")!='')?this.getData(this.objectlist[i],"riskEarlyWarningTypeId"):"")+"','"
-						 			+ ((this.getData(this.objectlist[i],"dataModelName")!=null&&this.getData(this.objectlist[i],"dataModelName")!='')?this.getData(this.objectlist[i],"dataModelName"):"")+"','"
-						 			+ ((this.getData(this.objectlist[i],"status")!=null&&this.getData(this.objectlist[i],"status")!='')?this.getData(this.objectlist[i],"status"):"")+"','"
-						 			+ ((this.getData(this.objectlist[i],"type")!=null&&this.getData(this.objectlist[i],"type")!='')?this.getData(this.objectlist[i],"type"):"")+"'"
-						 			+")\" alt='"+i+"'>"+this.getData(this.objectlist[i],this.header[k][1])+"</a>";    
-									//add by Eric 2014-05-04 14:58 end
-									
-end change by eric 2014-08-10 18:54  */ 	
-									 tdContext="<a href=\"javascript:;\" onclick=\"openDialog("+i
-										 +")\" alt='"+i+"'>"+this.getData(this.objectlist[i],this.header[k][1])+"</a>";	 
+									 tdContext="<a href='javascript:;' onclick='batchOpenDialog("+i
+										 +")' alt='"+i+"'>"+this.getData(this.objectlist[i],this.header[k][1])+"</a>";
 									}
 
 								if(k==11){
@@ -589,7 +553,6 @@ function checkChoose(clickObj){
 	$("#ckAll").attr("checked",false);   
 	var obj = eval('(' + jsonData + ')');
 	if(clickObj.checked){//选中
-		
 		 ids.push(obj[clickObj.nextSibling.innerHTML].warningId);
 	}else{//未选中
 		var index=-1;
@@ -604,15 +567,17 @@ function checkChoose(clickObj){
 			ids.splice(index, 1);
 		}
 	}
-//	alert(ids.join(","));///////////////////////////////////////////////////////////////////////////////////////////
+	// alert(ids.join(","));///////////////////////////////////////////////////////////////////////////////////////////
 
 	
 	// 无复选框被选中时,生成协查单按钮，删除按钮，确认按钮都不可用
 	if (ids.length > 0) {
+        $("#preview").attr("disabled", false);
 		$("#create").attr("disabled", false);
 		$("#closeButton").attr("disabled", false);
 		$("#confirmButton").attr("disabled", false);
 	} else {
+        $("#preview").attr("disabled", true);
 		$("#create").attr("disabled", true);
 		$("#closeButton").attr("disabled", true);
 		$("#confirmButton").attr("disabled", true);
@@ -657,10 +622,12 @@ function checkAll(){
 	}
 	// 无复选框被选中时,生成协查单按钮，删除按钮，确认按钮都不可用
 	if (ids.length > 0) {
+        $("#preview").attr("disabled", false);
 		$("#create").attr("disabled", false);
 		$("#closeButton").attr("disabled", false);
 		$("#confirmButton").attr("disabled", false);
 	} else {
+        $("#preview").attr("disabled", true);
 		$("#create").attr("disabled", true);
 		$("#closeButton").attr("disabled", true);
 		$("#confirmButton").attr("disabled", true);