Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web

@@ -46,7 +46,8 @@ layui.define(['commonDetail','common', 'admin'], function (exports) {
             dataRenderingBase("arms_cacheRegion_lineChart", resId, "KPIBAD64951,KPIA80D93D8", "直接缓冲区/每分钟", null);
             dataRenderingBase("arms_cacheRegion_lineChart", resId, "KPIBAD64951,KPIA80D93D8", "直接缓冲区/每分钟", null);
             // //JVM线程数/每分钟
             // //JVM线程数/每分钟
             dataRenderingBase("arms_JVM_threadCount_lineChart", resId, "KPI7C4BEB26,KPI97B71BAA,KPI15EC2627,KPIA9E2E4DE,KPI068D9FA5,KPI6ECA9036,KPI328E5AFE,KPI8F8FAD7F", "JVM线程数/每分钟", null, 1);
             dataRenderingBase("arms_JVM_threadCount_lineChart", resId, "KPI7C4BEB26,KPI97B71BAA,KPI15EC2627,KPIA9E2E4DE,KPI068D9FA5,KPI6ECA9036,KPI328E5AFE,KPI8F8FAD7F", "JVM线程数/每分钟", null, 1);
-
+           //响应时间/每分钟
+            dataRenderingBase("arms_time_lineChart", resId, "KPI678F9FC3", "响应时间/每分钟", null);
             //活动告警
             //活动告警
             commonDetail.renderActiveAlarms("arms_active_alram", resId);
             commonDetail.renderActiveAlarms("arms_active_alram", resId);
         }
         }

@@ -31,10 +31,16 @@
                             <h5 class="lay-row-title">非堆内存/每分钟</h5>
                             <h5 class="lay-row-title">非堆内存/每分钟</h5>
                             <div id="arms_NOJVN_memory_lineChart" class="detail_line_chart"></div>
                             <div id="arms_NOJVN_memory_lineChart" class="detail_line_chart"></div>
                         </div>
                         </div>
+                    </div>
+                    <div class="lay-row">
                         <div class="lay-row-item">
                         <div class="lay-row-item">
                             <h5 class="lay-row-title">直接缓冲区/每分钟</h5>
                             <h5 class="lay-row-title">直接缓冲区/每分钟</h5>
                             <div id="arms_cacheRegion_lineChart" class="detail_line_chart"></div>
                             <div id="arms_cacheRegion_lineChart" class="detail_line_chart"></div>
                         </div>
                         </div>
+                        <div class="lay-row-item">
+                            <h5 class="lay-row-title">响应时间/每分钟</h5>
+                            <div id="arms_time_lineChart" class="detail_line_chart"></div>
+                        </div>
                     </div>
                     </div>
                     <div class="lay-row">
                     <div class="lay-row">
                         <div class="lay-row-item">
                         <div class="lay-row-item">

@@ -94,7 +94,7 @@ export default {
                     },
                     },
                     axisLabel:{
                     axisLabel:{
                         color:'#ffffff',
                         color:'#ffffff',
-                        fontSize: 11
+                        fontSize: 10
                     },
                     },
                 },
                 },
                 yAxis: {
                 yAxis: {