Merge remote-tracking branch 'origin/moly'

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

@@ -430,11 +430,7 @@ public class AssociateDiagosisConfigurationController {
 
             try {
 
-                /*String[] dimKpiSelSelectedArr = dimKpiSelSelectedarr.split(",");
-                List<Long> dimKpiSelSelectedList = new ArrayList<Long>();//指标名称 ID
-                for (String s : dimKpiSelSelectedArr) {
-                    dimKpiSelSelectedList.add(Long.parseLong(s));
-                }*/
+
 
                 Long associationIdL = Long.parseLong(associationId);//associationId
 
@@ -466,17 +462,8 @@ public class AssociateDiagosisConfigurationController {
                     relInfo.setDimAssociationAnaInfo(dimAssociationAnaInfo);
                     dimKpiAssociationRelInfoList.add(relInfo);
                 }
-                /*for (Long aLong : dimKpiSelSelectedList) {
-                    DimKpiAssociationRelInfo relInfo = new DimKpiAssociationRelInfo();
-                    relInfo.setKpiAssociationRelatedId(-1L);
-                    relInfo.setKpiId(aLong);
-                    relInfo.setKpiWeight(BigDecimal.valueOf(kpiWeightTdVL));
-                    relInfo.setDimAssociationAnaInfo(dimAssociationAnaInfo);
-                    dimKpiAssociationRelInfoList.add(relInfo);
 
-                }*/
 
-//                dimAssociationAnaInfo.setItems(dimKpiAssociationRelInfoList);
                 associateDiagosisConfigurationService.updateAssociDigConfig(associationIdL, dimKpiAssociationRelInfoList);
 
 

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

@@ -13,21 +13,27 @@
     <div class="slide-select">
         <label for="">关联维度：</label>
         <select name="xcdStatus" id="xcdStatusSelect" class="slide-menu-select" onChange="judge=false;">
+            <option value="" selected>全部</option>
             <option value="y">业务</option>
-            <option value="c" selected>渠道</option>
-            <%--<c:forEach var="workingOrderStatus" items="${workingOrderStatusList}">
-                <option value="${workingOrderStatus}" id="xcdStatus">
-                        ${workingOrderStatus}
-                </option>
-            </c:forEach>--%>
+            <option value="c">渠道</option>
         </select>
     </div>
 </div>
 <%--省份筛选项 --%>
 <div id="provinceDetail" class="slide-menu-option">
     <label for="">省份</label>
-    <div class="checkbox-inline"><label><input type="checkbox" name="allProvinceDetail" id="allProvinceDetail" title="allSelect" checked />全选</label></div>
-    <div id="provinceSelectAreaDetail">
+    <div class="checkbox-inline">
+        <%--<label><input type="checkbox" name="allProvinceDetail" id="allProvinceDetail" title="allSelect" checked />全选</label>--%>
+            <label>
+                <c:forEach items="${provinceList}" var="provinces">
+                    <c:if test="${provinces.provinceId ==32}">
+                        <input type="checkbox" name="provinceDetail" class="provinceDetail" title="${provinces.provinceName}" value="${provinces.provinceId}" checked disabled/>${provinces.provinceName}
+                    </c:if>
+
+                </c:forEach>
+            </label>
+    </div>
+    <%--<div id="provinceSelectAreaDetail">
         <c:forEach items="${provinceList}" var="provinces">
             <div class="checkbox-inline">
                 <label>
@@ -35,7 +41,7 @@
                 </label>
             </div>
         </c:forEach>
-    </div>
+    </div>--%>
 </div>
 <script type="text/javascript">
     var detailProviderCheckedValues=$(".providerDetail:checked");

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

@@ -243,7 +243,8 @@
     });
 
     $("#createIndicatorsBtn").click(function(){
-        $.dialog({
+        window.location.href="${ctx}/MonitorOperation/AssociateDiagosisConfiguration/createDiagosis";
+        /*$.dialog({
             title: "提醒",
             content:"确定新建指标？",
             ok: function(){location.href="${ctx}/MonitorOperation/AssociateDiagosisConfiguration/createDiagosis";},
@@ -251,7 +252,7 @@
             cancel: function(){},
             cancelValue:"取消",
             lock:true
-        });
+        });*/
     });
 
     //详情
@@ -309,7 +310,8 @@
     $("#updateIndicatorsBtn").click(function(){
         var associationId= $("#anaInfoSelected").val();
 
-        $.dialog({
+        window.location.href="${ctx}/MonitorOperation/AssociateDiagosisConfiguration/getAanaInfo?associationId="+associationId;
+        /*$.dialog({
             title: "提醒",
             content:"确定修改模型？",
             ok: function(){location.href="${ctx}/MonitorOperation/AssociateDiagosisConfiguration/getAanaInfo?associationId="+associationId;},
@@ -317,7 +319,7 @@
             cancel: function(){},
             cancelValue:"取消",
             lock:true
-        });
+        });*/
         /* $.confirm("确定修改模型？",
         function(){location.href="${ctx}/ModelManage/ModelParameterConfiguration?dataModelId="+modelId;},
 		function(){}); */

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

@@ -96,7 +96,7 @@
 
                             <div class="slideMenu" id="cbp-spmenu-s2" style="">
                                 <div class="form">
-                                    <tags:GZFX__Dimension_Province_detail/>
+                                    <tags:GZFX__Dimension_Province_detail_associateDiagosisDetail/>
                                     <button class="btn btn-primary" onclick="detailSubmit()">提交</button>
                                     <button class="btn btn-warning" onclick="detailReset()">重置</button>