Merge branch 'master' of code.dianpingoa.com:arch/cat

cat-home/src/main/webapp/jsp/report/storage/historyStorage.jsp

@@ -85,7 +85,14 @@
 			<td class="right">${w:format(domain.value.operations[item].count,'#,###,###,###,##0')}</td>
 			<td class="right">${w:format(domain.value.operations[item].longCount,'#,###,###,###,##0')}</td>
 			<td class="right">${w:format(domain.value.operations[item].avg,'###,##0.0')}</td>
-			<td class="right">${w:format(domain.value.operations[item].error,'#,###,###,###,##0')}</td>
+			<td class="right"><c:choose>
+			<c:when test="${domain.value.operations[item].error > 0}">
+				<span class="text-danger"><strong>${w:format(domain.value.operations[item].error,'#,###,###,###,##0')}</strong></span>
+			</c:when>
+			<c:otherwise>
+				${w:format(domain.value.operations[item].error,'#,###,###,###,##0')}
+			</c:otherwise>
+			</c:choose></td>
 		</c:forEach>
 		</tr>
 	</c:forEach>

cat-home/src/main/webapp/jsp/report/storage/storage.jsp

@@ -94,7 +94,16 @@
 			<td class="right">${w:format(domain.value.operations[item].count,'#,###,###,###,##0')}</td>
 			<td class="right">${w:format(domain.value.operations[item].longCount,'#,###,###,###,##0')}</td>
 			<td class="right">${w:format(domain.value.operations[item].avg,'###,##0.0')}</td>
-			<td class="right">${w:format(domain.value.operations[item].error,'#,###,###,###,##0')}</td>
+			<td class="right">
+			<c:choose>
+			<c:when test="${domain.value.operations[item].error > 0}">
+				<span class="text-danger"><strong>${w:format(domain.value.operations[item].error,'#,###,###,###,##0')}</strong></span>
+			</c:when>
+			<c:otherwise>
+				${w:format(domain.value.operations[item].error,'#,###,###,###,##0')}
+			</c:otherwise>
+			</c:choose>
+			</td>
 		</c:forEach>
 		</tr>
 		<tr class="graphs"><td colspan="${w:size(model.operations)*4 + 2}" style="display:none"><div id="${domain.key}" style="display:none"></div></td></tr>