monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit ecaf5ef7f59e3df9f8e2f7e98251c408064600fe 2 parents 420114ee c272b395

Merge branch 'master-500-dev-LH' into 'master-500-dev' 

性能走势默认自定义查询6小时



See merge request !434
Inline Side-by-side
Showing 3 changed files with 10 additions and 2 deletions
@@ -51,6 +51,14 @@ export default { @@ -51,6 +51,14 @@ export default {
51 }, 51 },
52 }, 52 },
53 { 53 {
  54 + text: '最近6小时',
  55 + value: () => {
  56 + const end = new Date();
  57 + const start = formatDate(6,'h');
  58 + return [start, end]
  59 + },
  60 + },
  61 + {
54 text: '最近1天', 62 text: '最近1天',
55 value: () => { 63 value: () => {
56 const end = new Date(); 64 const end = new Date();
@@ -238,7 +246,7 @@ export default { @@ -238,7 +246,7 @@ export default {
238 246
239 const oneDay=()=>{ 247 const oneDay=()=>{
240 const end = getDateTime(new Date()); 248 const end = getDateTime(new Date());
241 - const start = formatDate(1,'d'); 249 + const start = formatDate(6,'h');
242 dateValue.value=[start,end] 250 dateValue.value=[start,end]
243 changeDate(dateValue.value) 251 changeDate(dateValue.value)
244 } 252 }
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 <el-col :span="24" class="detail_linechart"> 28 <el-col :span="24" class="detail_linechart">
29 <LineChart :optionData="optionData" v-if="optionData"></LineChart> 29 <LineChart :optionData="optionData" v-if="optionData"></LineChart>
30 30
31 -<!-- <div class="detail_linechart" id="indentKpiLineChart"></div>--> 31 + <!-- <div class="detail_linechart" id="indentKpiLineChart"></div>-->
32 <!-- <div class="detail_linechart" id="warningKpiLineChart" style="margin-top:35px;"></div>--> 32 <!-- <div class="detail_linechart" id="warningKpiLineChart" style="margin-top:35px;"></div>-->
33 <!-- <div class="detail_linechart" id="line-tingyun-trendKpiLineChart" style="margin-top:35px;"></div>--> 33 <!-- <div class="detail_linechart" id="line-tingyun-trendKpiLineChart" style="margin-top:35px;"></div>-->
34 34