Merge remote-tracking branch 'origin/moly'

.idea/misc.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <file type="web" url="file://$PROJECT_DIR$" />
+  </component>
   <component name="JavaScriptSettings">
     <option name="languageLevel" value="ES5" />
   </component>

build.xml

@@ -18,12 +18,12 @@
         <target name="clean">  
             <delete dir="${basedir}/build" />  
             <mkdir dir="${basedir}/build" />  
-        </target>  
-          
+        </target>
+    n
         <!-- 定义任务，编译src文件夹中的java文件，编译后的class文件放到创建的文件夹下。 -->  
         <target name="compile" depends="clean"> 
             <javac target="1.6" debug="on" encoding="UTF-8" srcdir="${basedir}/src/main/java" destdir="${basedir}/build" includeantruntime="false">
-        		<compilerarg value="-Xlint:unchecked" />
+        		<compilerarg value="-Xlit:unchecked" />
                 <classpath refid="project.lib"></classpath>  
             </javac>  
         	<native2ascii src="src/main/resources" dest="${basedir}/build" encoding="UTF-8" />

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

@@ -52,7 +52,6 @@ public class AssociateDiagosisConfigurationController {
 
 
         List<DimAssociationAnaInfo> listDim = new ArrayList<DimAssociationAnaInfo>();
-//        List<DimKpi>listDimKpi=new ArrayList<DimKpi>();
         if (detailProvince.equalsIgnoreCase("") && dimension.equalsIgnoreCase("")) {//查找所有
             listDim = associateDiagosisConfigurationService.findAllDimAssociationAnaInfo();
         }
@@ -89,7 +88,6 @@ public class AssociateDiagosisConfigurationController {
         List<Province> provinceList = (List<Province>) provinceDao.findProvince();
 
         model.put("provinceList", provinceList);
-//        model.put("listDimKpi", gson.toJson(listDimKpi));//所有指标
         model.put("gzfxDetailInfos", gson.toJson(listDim));
         model.put("provinces", gsonP.toJson(provinceList));
         model.put("indicatorsAll", gsonP.toJson(provinceList));//所有指标
@@ -595,6 +593,38 @@ public class AssociateDiagosisConfigurationController {
 
     }
 
+    @RequestMapping(value = {"/deleteAssociDigConfigM"})
+    public String deleteAssociDigConfigM(@RequestParam(value = "associationId", defaultValue = "") String associationId, Map model) {
+
+        String strR="";
+        try {
+            Long associationIdL = Long.parseLong(associationId);//associationId
+            associateDiagosisConfigurationService.deleteAssociDigConfig(associationIdL);
+            strR="success";
+        } catch (Exception e) {
+            strR="failed";
+            e.printStackTrace();
+        }
+
+
+        List<DimAssociationAnaInfo> listDim = new ArrayList<DimAssociationAnaInfo>();
+        listDim = associateDiagosisConfigurationService.findAllDimAssociationAnaInfo();
+
+
+        Gson gson = new Gson();
+
+        List<Province> provinceList = (List<Province>) provinceDao.findProvince();
+
+        model.put("provinceList", provinceList);
+        model.put("gzfxDetailInfos", gson.toJson(listDim));
+        model.put("provinces", gson.toJson(provinceList));
+        model.put("indicatorsAll", gson.toJson(provinceList));//所有指标
+        model.put("deleleMess", strR);//提示信息
+
+
+        return PageURLController.AssociateDiagosisConfiguration;
+
+    }
 
 
 }

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

@@ -26,6 +26,10 @@
     <script type="text/javascript" src="${ctx}/static/js/associatediagosisconfiguration.js"></script>
     <script type="text/javascript">
         $(document).ready(function() {
+            var deleleMess=document.getElementById('deleleMess').value;
+            if(deleleMess === 'success'){
+                //setTimeout("alert('ok')",2000);
+            }
             var jso = document.getElementById('gzfxDetail').value;
 //            failureTable();
 //            initDateDetail();//初始化  时间范围
@@ -113,11 +117,12 @@
                                                          style="top: -6px;float: right;height: 0px;position: relative;">
                                                         <button id="createIndicatorsBtn"
                                                                 class="btn-sm btn btn-primary btn-sm btn-group btn-group-cog"
-                                                                onclick="createIndicators()">新建关联配置
+                                                                onclick="createIndicators()">新建
                                                         </button>
+                                                        <button type="button" id="deleteAnaInfo" class="btn btn-danger" disabled>删除</button>
                                                         <button id="updateIndicatorsBtn"
                                                                 class="btn-sm btn btn-primary btn-sm btn-group btn-group-cog" disabled
-                                                                >修改关联配置
+                                                                >修改
                                                         </button>
                                                     </div>
                                                 </shiro:hasAnyRoles>
@@ -144,6 +149,7 @@
                 <input type="hidden" id="provinceAll" name="provinceAll" value='${provinces}' />
                 <input type="hidden" id="indicatorsAll" name="indicatorsAll" value='${indicatorsAll}' />
                 <input type="hidden" id="anaInfoSelected" name="anaInfoSelected" value='' />
+                <input type="hidden" id="deleleMess" name="deleleMess" value='${deleleMess}' />
             </div>
         </div>
     </div>
@@ -180,6 +186,7 @@
 
 
         $("#updateIndicatorsBtn").attr("disabled","true");
+        $("#deleteAnaInfo").attr("disabled","true");
         updateTags(true);//更新 tags显示
 
     }
@@ -311,14 +318,27 @@
             cancelValue:"取消",
             lock:true
         });
-
-
-
         /* $.confirm("确定修改模型？",
         function(){location.href="${ctx}/ModelManage/ModelParameterConfiguration?dataModelId="+modelId;},
 		function(){}); */
     });
 
+    $("#deleteAnaInfo").click(function(){
+
+        var associationId= $("#anaInfoSelected").val();
+
+        $.dialog({
+            title: "提醒",
+            content:"确定删除规则？",
+            ok: function(){location.href="${ctx}/MonitorOperation/AssociateDiagosisConfiguration/deleteAssociDigConfigM?associationId="+associationId;},
+            okValue:"确定",
+            cancel: function(){},
+            cancelValue:"取消",
+            lock:true
+        });
+
+    });
+
 </script>
 </body>
 </html>

src/main/webapp/static/js/associatediagosisconfiguration.js

@@ -24,6 +24,7 @@ function failureDelete(){
 // 点击单选按钮时 触发
 function radioChoose(e){
     $("#updateIndicatorsBtn").removeAttr("disabled");
+    $("#deleteAnaInfo").removeAttr("disabled");
     $("#anaInfoSelected").val(e.id);
 }