智能分析平台备份

src/main/webapp/WEB-INF/layouts/header.jsp

@@ -102,7 +102,7 @@
                         </li>
                     </shiro:hasPermission>
 
-                    <shiro:hasPermission name="预分析与建模:数据预分析  or 预分析与建模:数据模型管理    or 预分析与建模:数据模型验证 or 预分析与建模:数据沙盒 ">
+                    <shiro:hasPermission name="预分析与建模:数据预分析  or 预分析与建模:数据模型管理    or 预分析与建模:数据模型验证 or 预分析与建模:数据沙盒 or  预分析与建模：数据质量核查  ">
                         <li class="titleLine"></li>
                         <li class="dropdown">
                             <a class="dropdonw-toggle" data-toggle="dropdown" role="button" href="#"><span
@@ -147,6 +147,17 @@
                                         </ul>
                                     </li>
                                 </shiro:hasPermission>
+                                <shiro:hasPermission name="预分析与建模:数据质量核查">
+                                    <li class="dropdown-submenu">
+                                        <a href="#">数据质量核查</a>
+                                        <ul class="dropdown-menu">
+                                            <li><a href="${ctx}/AnalysisSupport/QualityRuleResult">数据质量规则维护</a></li>
+                                            <li><a href="${ctx}/AnalysisSupport/QualityRuleOperation/home?selectTab=focus">数据质量运营</a></li>
+                                            <li><a href="${ctx}/AnalysisSupport/QualityRuleReport">数据质量报告</a></li>
+                                            <li><a href="${ctx}/AnalysisSupport/FilterRuleResult">过滤规则维护</a></li>
+                                        </ul>
+                                    </li>
+                                </shiro:hasPermission>
                             </ul>
                         </li>
                     </shiro:hasPermission>
@@ -202,8 +213,7 @@
                         </li>
                     </shiro:hasPermission>
 
-                    <shiro:hasPermission
-                            name="运营支撑:配置项分析  or 运营支撑:集成商分析  or 运营支撑:竞品分析  or 运营支撑:业务热点分析　or 运营支撑:投诉文本分析   or  运营支撑：数据质量核查 ">
+                    <shiro:hasPermission name="运营支撑:配置项分析  or 运营支撑:集成商分析  or 运营支撑:竞品分析  or 运营支撑:业务热点分析　or 运营支撑:投诉文本分析   ">
                         <li class="titleLine"></li>
                         <li class="dropdown">
                             <a class="dropdonw-toggle" data-toggle="dropdown" role="button" href="#"><span
@@ -268,17 +278,7 @@
                                         </ul>
                                     </li>
                                 </shiro:hasPermission>
-                                <shiro:hasPermission name="运营支撑:数据质量核查">
-                                    <li class="dropdown-submenu">
-                                        <a href="#">数据质量核查</a>
-                                        <ul class="dropdown-menu">
-                                            <li><a href="${ctx}/AnalysisSupport/QualityRuleResult">数据质量规则维护</a></li>
-                                            <li><a href="${ctx}/AnalysisSupport/QualityRuleOperation/home?selectTab=focus">数据质量运营</a></li>
-                                            <li><a href="${ctx}/AnalysisSupport/QualityRuleReport">数据质量报告</a></li>
-                                            <li><a href="${ctx}/AnalysisSupport/FilterRuleResult">过滤规则维护</a></li>
-                                        </ul>
-                                    </li>
-                                </shiro:hasPermission>
+
                             </ul>
                         </li>
                     </shiro:hasPermission>

src/main/webapp/WEB-INF/views/AnalysisSupport/FilterRuleResult.jsp

@@ -26,7 +26,8 @@
 			<div class="tab-bar-bt">
 				<ul class="nav nav-tabs">
 					<li><a href="${ctx}/AnalysisSupport/QualityRuleResult">数据质量规则维护</a></li>
-					<li><a href="${ctx}/AnalysisSupport/QualityRuleOperation">数据质量运营</a></li>
+					<li><a href="${ctx}/AnalysisSupport/QualityRuleOperation/home?selectTab=focus">数据质量运营</a></li>
+					<li><a href="${ctx}/AnalysisSupport/QualityRuleReport">数据质量报告</a></li>
 					<li class="active"><a href="#home" data-toggle="tab">过滤规则维护</a></li>
 				</ul>
 			</div>

src/main/webapp/WEB-INF/views/TaskManage/RunTaskListTable.jsp

@@ -46,10 +46,38 @@
 				<tr>
 					<td><input type="radio" name="taskId" id="taskId" value="${runTask.taskId}" onclick="choseTask()" /></td>
 					<c:if test="${runTask.taskType.tasktypeId == '1' || runTask.taskType.tasktypeId == '5' }">
-						<td>${runTask.provinceView.provinceName}</td>
-						<td>${runTask.channelView.channelName}</td>
-						<td>${runTask.businessView.businessName}</td>
-						<td>${runTask.dimKpiView.name}</td>
+						<td>
+							<c:if test="${runTask.provinceView.provinceName == null}">
+								全国
+							</c:if>
+							<c:if test="${runTask.provinceView.provinceName != null}">
+								${runTask.provinceView.provinceName}
+							</c:if>
+						</td>
+						<td>
+							<c:if test="${runTask.channelView.channelName == null}">
+								全部渠道
+							</c:if>
+							<c:if test="${runTask.channelView.channelName != null}">
+								${runTask.channelView.channelName}
+							</c:if>
+						</td>
+						<td>
+							<c:if test="${runTask.businessView.businessName == null}">
+								全部业务
+							</c:if>
+							<c:if test="${runTask.businessView.businessName != null}">
+								${runTask.businessView.businessName}
+							</c:if>
+						</td>
+						<td>
+							<c:if test="${runTask.dimKpiView.name == null}">
+								全部指标
+							</c:if>
+							<c:if test="${runTask.dimKpiView.name != null}">
+								${runTask.dimKpiView.name}
+							</c:if>
+						</td>
 						<td>${runTask.evaluationResult}</td>
 					</c:if>
 					<td>${runTask.name}</td>

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

@@ -220,7 +220,7 @@ table_pagging.prototype = {
 
 	},
 	pagging : function(objectJson) {
-	
+
 	    this.objectlist = eval('(' + objectJson + ')');
 		if (this.start + this.limit >= this.objectlist.length) {
 			this.end = this.objectlist.length;
@@ -290,7 +290,7 @@ table_pagging.prototype = {
 
 				for ( var k = 0; k < rowLength; k++) {
 					var td = tr.insertCell(rowLength * j + k);
-					
+
 					var tdContext = "&nbsp;";
 					var tdTitle = "";
 					if (this.header[k][1]) {
@@ -323,14 +323,18 @@ table_pagging.prototype = {
 									if(tdContext!="&nbsp;"){
 									tdContext = df.format(new Date(tdContext));
 									}
-								}else if(k==11){
+								}
+								if(k==11){
 									if(tdContext!="&nbsp;"){
 									tdContext = df.format(new Date(tdContext));
-								 }else if(k==12){
+								 }
+								}
+								if(k==12){
                                         if(tdContext!="&nbsp;"){
                                             tdContext = df.format(new Date(tdContext));
                                         }
-								}else if(k==16){
+								}
+								if(k==16){
 									if(tdContext=="已确认"){
 										tr.className="green-tr";
 									}else if(tdContext=="已关联协查单"){
@@ -343,7 +347,7 @@ table_pagging.prototype = {
 								}
 							}
 						} else {
-							
+
 						    tdContext="<input type='checkbox' name='cbox"+i+"' class='cbox1' onclick='javascript:checkChoose(this);'/>"+"<span style='display:none'>"+i+"</span>";
 
 							for ( var t = 0; t < ids.length; t++) {
@@ -352,8 +356,8 @@ table_pagging.prototype = {
 									   break;
 								}
 							}
-					
-						  
+
+
 						}
 					} else {
 						tdContext = "&nbsp;";