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 92 additions and 84 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 }
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 <div class="pie-detail-title"> 2 <div class="pie-detail-title">
3 <span class="pie-detail-title-active">性能走势</span> 3 <span class="pie-detail-title-active">性能走势</span>
4 </div> 4 </div>
5 - <!-- 趋势分析 预警分析--> 5 + <!-- 趋势分析 预警分析-->
6 <div class="pie-detail-content"> 6 <div class="pie-detail-content">
7 <el-row class="detail-content-title"> 7 <el-row class="detail-content-title">
8 <el-col :span="8"></el-col> 8 <el-col :span="8"></el-col>
@@ -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
@@ -21,87 +21,87 @@ export default { @@ -21,87 +21,87 @@ export default {
21 let startTime=Vue.ref(''); 21 let startTime=Vue.ref('');
22 let endTime=Vue.ref(''); 22 let endTime=Vue.ref('');
23 let colorsArr=Vue.ref([ 23 let colorsArr=Vue.ref([
24 - {  
25 - start: '#46d6d8',  
26 - end: '#2883d0'  
27 - },  
28 - {  
29 - start: '#facf5b',  
30 - end: '#f77623'  
31 - },  
32 - {  
33 - start: '#C04DD8',  
34 - end: '#D81F72'  
35 - },  
36 - {  
37 - start: '#F5A1EB',  
38 - end: '#A04DE2'  
39 - },  
40 - {  
41 - start: '#F36093',  
42 - end: '#FF465C'  
43 - },  
44 - {  
45 - start: '#C2E74D',  
46 - end: '#00AE8B'  
47 - },  
48 - {  
49 - start: '#3DC3FF',  
50 - end: '#01FFFF'  
51 - },  
52 - {  
53 - start: '#B850ED',  
54 - end: '#9062EF'  
55 - },  
56 - {  
57 - start: '#305be6',  
58 - end: '#36a7d3'  
59 - },  
60 - {  
61 - start: '#FFA500',  
62 - end: '#FFEE00'  
63 - },  
64 - {  
65 - start: '#C4E64C',  
66 - end: '#2de078'  
67 - },  
68 - {  
69 - start: '#30ffb3',  
70 - end: '#01FFFF'  
71 - },  
72 - {  
73 - start: '#FF4488',  
74 - end: '#F13EFF'  
75 - },  
76 - {  
77 - start: '#A64CE2',  
78 - end: '#625AE7'  
79 - },  
80 - {  
81 - start: '#5AEBC7',  
82 - end: '#5FC9F8'  
83 - },  
84 - {  
85 - start: '#FFA500',  
86 - end: '#FFEE00'  
87 - },  
88 - {  
89 - start: '#00AAD6',  
90 - end: '#625AE7'  
91 - },  
92 - {  
93 - start: '#E48BDE',  
94 - end: '#FF9262'  
95 - },  
96 - {  
97 - start: '#B2797B',  
98 - end: '#FF4B51'  
99 - },  
100 - {  
101 - start: '#ffe393',  
102 - end: '#feff5b'  
103 - }  
104 - ]) 24 + {
  25 + start: '#46d6d8',
  26 + end: '#2883d0'
  27 + },
  28 + {
  29 + start: '#facf5b',
  30 + end: '#f77623'
  31 + },
  32 + {
  33 + start: '#C04DD8',
  34 + end: '#D81F72'
  35 + },
  36 + {
  37 + start: '#F5A1EB',
  38 + end: '#A04DE2'
  39 + },
  40 + {
  41 + start: '#F36093',
  42 + end: '#FF465C'
  43 + },
  44 + {
  45 + start: '#C2E74D',
  46 + end: '#00AE8B'
  47 + },
  48 + {
  49 + start: '#3DC3FF',
  50 + end: '#01FFFF'
  51 + },
  52 + {
  53 + start: '#B850ED',
  54 + end: '#9062EF'
  55 + },
  56 + {
  57 + start: '#305be6',
  58 + end: '#36a7d3'
  59 + },
  60 + {
  61 + start: '#FFA500',
  62 + end: '#FFEE00'
  63 + },
  64 + {
  65 + start: '#C4E64C',
  66 + end: '#2de078'
  67 + },
  68 + {
  69 + start: '#30ffb3',
  70 + end: '#01FFFF'
  71 + },
  72 + {
  73 + start: '#FF4488',
  74 + end: '#F13EFF'
  75 + },
  76 + {
  77 + start: '#A64CE2',
  78 + end: '#625AE7'
  79 + },
  80 + {
  81 + start: '#5AEBC7',
  82 + end: '#5FC9F8'
  83 + },
  84 + {
  85 + start: '#FFA500',
  86 + end: '#FFEE00'
  87 + },
  88 + {
  89 + start: '#00AAD6',
  90 + end: '#625AE7'
  91 + },
  92 + {
  93 + start: '#E48BDE',
  94 + end: '#FF9262'
  95 + },
  96 + {
  97 + start: '#B2797B',
  98 + end: '#FF4B51'
  99 + },
  100 + {
  101 + start: '#ffe393',
  102 + end: '#feff5b'
  103 + }
  104 + ])
105 let keys=Vue.ref(''); 105 let keys=Vue.ref('');
106 let getOptionData=(res)=>{ 106 let getOptionData=(res)=>{
107 let nameArr=[]; 107 let nameArr=[];