diff --git a/cat-home/src/main/webapp/jsp/report/dependency/dependencyOpNav.jsp b/cat-home/src/main/webapp/jsp/report/dependency/dependencyOpNav.jsp index e187fc9a31e8582042654779a1fa2d9c183aa0a0..b0e354ac1e818d0962a6982d722e5d3f43b0f65f 100644 --- a/cat-home/src/main/webapp/jsp/report/dependency/dependencyOpNav.jsp +++ b/cat-home/src/main/webapp/jsp/report/dependency/dependencyOpNav.jsp @@ -24,6 +24,10 @@ $(document).ready(function() { var refresh = ${payload.refresh}; var frequency = ${payload.frequency}; + var fullscreen = ${payload.fullScreen}; + if(fullscreen){ + $('#fullScreen').addClass('btn-danger'); + } if(refresh){ $('#refresh${payload.frequency}').addClass('btn-danger'); setInterval(function(){ diff --git a/cat-home/src/main/webapp/jsp/report/metric/dashboard.jsp b/cat-home/src/main/webapp/jsp/report/metric/dashboard.jsp index 131c01fc0fcafcbe8687447e4d45c2f52e00a203..4c382e6adaf9868d656af64fb745e7e97238b70c 100644 --- a/cat-home/src/main/webapp/jsp/report/metric/dashboard.jsp +++ b/cat-home/src/main/webapp/jsp/report/metric/dashboard.jsp @@ -7,12 +7,46 @@ - - + + + + + + + + <%@ include file="detail.jsp" %> + + + +
+ + + + + +
  From ${w:format(model.startTime,'yyyy-MM-dd HH:mm:ss')} to ${w:format(model.endTime,'yyyy-MM-dd HH:mm:ss')}
+
+ <%@ include file="detail.jsp" %> + + + + + +
+
+
+
+ + -
- - - - - -
  From ${w:format(model.startTime,'yyyy-MM-dd HH:mm:ss')} to ${w:format(model.endTime,'yyyy-MM-dd HH:mm:ss')}
-
-
- <%@ include file="metricOpNav.jsp" %> -
-
- -
-
-

说明:图中纵轴数据为10分钟数据之和

- -
-
${item.title}
-
-
-
-
- - - - - -
- diff --git a/cat-home/src/main/webapp/jsp/report/metric/detail.jsp b/cat-home/src/main/webapp/jsp/report/metric/detail.jsp new file mode 100644 index 0000000000000000000000000000000000000000..650ff03dde2bce1060868abfb33cae778df4e0b7 --- /dev/null +++ b/cat-home/src/main/webapp/jsp/report/metric/detail.jsp @@ -0,0 +1,24 @@ +<%@ page contentType="text/html; charset=utf-8" %> + + <%@ include file="metricOpNav.jsp" %> +
+
+ +
+
+

说明:图中纵轴数据为10分钟数据之和

+ +
+
${item.title}
+
+
+
+
\ No newline at end of file diff --git a/cat-home/src/main/webapp/jsp/report/metric/metricOpNav.jsp b/cat-home/src/main/webapp/jsp/report/metric/metricOpNav.jsp index c41066048ba1eadeb948ef4b53199d1d00d0dc44..06bfba84560da2d58c80b1fe1328fd4f490ac6b3 100644 --- a/cat-home/src/main/webapp/jsp/report/metric/metricOpNav.jsp +++ b/cat-home/src/main/webapp/jsp/report/metric/metricOpNav.jsp @@ -21,6 +21,10 @@ $(document).ready(function() { var refresh = ${payload.refresh}; var frequency = ${payload.frequency}; + var fullscreen = ${payload.fullScreen}; + if(fullscreen){ + $('#fullScreen').addClass('btn-danger'); + } if(refresh){ $('#refresh${payload.frequency}').addClass('btn-danger'); setInterval(function(){