Merge remote-tracking branch 'origin/moly'

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

@@ -57,6 +57,7 @@ function getDetailProvinceCheckedValues(){
        provinceArray[i]=$(this).val();
        i++;
    });
+   console.log("provinceArray   "+provinceArray):
    return provinceArray;
 }
 

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

@@ -2,13 +2,21 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <c:set var="ctx" value="${pageContext.request.contextPath}" />
 
+<div id="timeLine" class="date">
+    <label for="">时间范围</label><!-- 最近3年 -->
+
+    <input id="d1" class="Wdate" type="text" style="width:137px;" value="" onFocus="var d2=$dp.$('d2');WdatePicker({onpicked:function(){d2.focus();},minDate:'{%y-3}-%M-%d %H:%m:%s',maxDate:'#F{$dp.$D(\'d2\')||\'%y-%M-%d %H:%m:%s\'}',dateFmt:'yyyy-MM-dd'})">
+    --
+    <input id="d2" class="Wdate" type="text" style="width:137px;" value="" onFocus="WdatePicker({minDate:'#F{$dp.$D(\'d1\')||\'{%y-3}-%M-%d %H:%m:%s\'}',maxDate:'%y-%M-%d %H:%m:%s',dateFmt:'yyyy-MM-dd'})">
+
+</div>
 
 <div id="more-option" class="slide-menu-option">
     <div class="slide-select">
         <label for="">关联维度：</label>
         <select name="xcdStatus" id="xcdStatusSelect" class="slide-menu-select" onChange="judge=false;">
-            <option value="yewu">业务</option>
-            <option value="qudao" selected>渠道</option>
+            <option value="c">业务</option>
+            <option value="q" selected>渠道</option>
             <%--<c:forEach var="workingOrderStatus" items="${workingOrderStatusList}">
                 <option value="${workingOrderStatus}" id="xcdStatus">
                         ${workingOrderStatus}
@@ -95,6 +103,7 @@
     //返回 关联维度 的 选择值
     function getDetailCheckeddDimension() {
         var checkedDimension=$("#xcdStatusSelect option:selected").val();
+        console.log("checkedDimension  "+checkedDimension);
         return checkedDimension;
 
     }
@@ -171,6 +180,7 @@
             provinceArray[i]=$(this).val();
             i++;
         });
+        console.log("provinceArray  "+provinceArray );
         return provinceArray;
     }
 
@@ -195,7 +205,7 @@
     function getDetailProvinceCheckedTitles(){
         var provinceArray=new Array();
         var i=0;
-        detailProvinceCheckedValues.each(function(){
+        $(".provinceDetail:checked").each(function(){
             provinceArray[i]=$(this).attr("title");
             i++;
         });

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

@@ -22,7 +22,6 @@
 
     <script src="${ctx}/static/artDialog4.1.7/artDialog.source.js?skin=default"></script>
     <script src="${ctx}/static/artDialog4.1.7/plugins/iframeTools.source.js"></script>
-    <%--<script type="text/javascript" src="${ctx}/static/js/failureAnalysisDetailTable.js"></script>--%>
     <script type="text/javascript" src="${ctx}/static/js/associatediagosisdetail.js"></script>
     <script type="text/javascript">
         $(document).ready(function(){
@@ -87,24 +86,14 @@
                                         </button>
                                         <div class="slide-menu-tags">
                                             <span id="detailPeriodTag" class="label label-info" data-placement="bottom">最近一个月</span>
-                                            <span id="detailDataSourceTag" class="label label-info"
-                                                  data-placement="bottom"></span>
-                                            <span id="detailChannelTag" class="label label-info"
+
+                                            <span id="detailTimeTag" class="label label-info"
                                                   data-placement="bottom"></span>
-                                            <span id="detailBusinessTag" class="label label-info"
+                                            <span id="detailDimensionTag" class="label label-info"
                                                   data-placement="bottom"></span>
                                             <span id="detailProvinceTag" class="label label-info"
                                                   data-placement="bottom"></span>
-                                            <span id="detailProviderTag" class="label label-info"
-                                                  data-placement="bottom"></span>
-                                            <span id="detailXcdStatusTag" class="label label-info"
-                                                  data-placement="bottom"></span>
-                                            <span id="detailTitleTag" class="label label-info"
-                                                  data-placement="bottom"></span>
-                                            <span id="detailWarningSourceTag" class="label label-info"
-                                                  data-placement="bottom"></span>
-                                            <span id="detailFailureIdTag" class="label label-info"
-                                                  data-placement="bottom"></span>
+
                                         </div>
                                         <div class="bt-list-import">
                                             <a href="#" id="gzfxDetailUpload" class="">
@@ -255,15 +244,35 @@
     }
 
 
+    //获取选取的时间段,返回结果为字符串数组
+    function getPeriod(){
+        var period=new Array();
+        period[0]=$("#d1").val();
+        period[1]=$("#d2").val();
+        return period;
+    }
+    //返回结果为以逗号分隔的字符串类型
+    function getPeriodString(){
+        var str="";
+        var period=getPeriod();
+        str=str+period[0]+"~"+period[1];
+        console.log("str "+str);
+        console.log("str leng "+str.length);
+        return str;
+    }
+
     function detailSubmit(){
 
         var detailProvinceSum = getDetailProvinceCheckedValues().length;
-
-        if(detailProvinceSum==0) {
+        var detailtime=getPeriodString();
+        if(detailtime == "" || detailtime == null||detailtime.length <2){
+            $.alert("时间范围不能为空");
+        }else if(detailProvinceSum==0) {
             $.alert("省份的选择不能为空");
         }else{
             var detailProvince = getDetailProvinceCheckedValueString();
             var dimension=getDetailCheckeddDimension();
+
             //alert(dimension+"-pi-");
 //            alert(detailProvince);
             //var href="${ctx}/MonitorOperation/FailureAnalysisDetail/changeTable?detailProvince="+detailProvince+"&detailProvider="+detailProvider+"&xcdStatus="+xcdStatus+"&detailDataSource="+detailDataSource+"&detailChannel="+detailChannel+"&detailBusiness="+detailBusiness+"&detailWarningSource="+detailWarningSource+"&failureTitle="+"-1";
@@ -282,14 +291,33 @@
                     toggleMenu('slidePushMenus2');//隐藏筛选项
                 }
             });*/
+           $("#detailPeriodTag").empty();
+            $("#detailProvinceTag").text("省份").append($("<span class='badge'></span>").text(detailProvinceSum)).attr('data-original-title',getDetailProvinceTag()).tooltip();
+            $("#detailDimensionTag").text("关联维度").append($("<span class='badge'></span>").text()).attr('data-original-title',getdetailDemensionTagValue()).tooltip();
+            $("#detailTimeTag").text("时间范围").append($("<span class='badge'></span>").text()).attr('data-original-title',detailtime).tooltip();
             toggleMenu('slidePushMenus2');//隐藏筛选项
         }
-        writeLable();
+        //writeLable();
 
     }
+    function getdetailDemensionTagValue(){
+        var checkedDimension=$("#xcdStatusSelect option:selected").text();
+
+        return checkedDimension;
+    }
+    function getDetailProvinceTag(){
+        var str="";
+        $(".provinceDetail:input:checkbox:checked").each(function(){
+            str+=$(this).attr("title")+" ";
+        });
+        return str;
+    }
 
     //重置detail中的筛选项
     function detailReset(){
+
+        $("#d1").val('');
+        $("#d2").val('');
         detail_Province_Reset();
         detail_Dimension_Reset();
         judge = true;