diff --git a/hg-monitor-web-base/src/main/resources/static/vue3/src/components/common/dateRange/indexInflux.js b/hg-monitor-web-base/src/main/resources/static/vue3/src/components/common/dateRange/indexInflux.js index 64a3e90..2d1b33a 100644 --- a/hg-monitor-web-base/src/main/resources/static/vue3/src/components/common/dateRange/indexInflux.js +++ b/hg-monitor-web-base/src/main/resources/static/vue3/src/components/common/dateRange/indexInflux.js @@ -51,6 +51,14 @@ export default { }, }, { + text: '最近6小时', + value: () => { + const end = new Date(); + const start = formatDate(6,'h'); + return [start, end] + }, + }, + { text: '最近1天', value: () => { const end = new Date(); @@ -238,7 +246,7 @@ export default { const oneDay=()=>{ const end = getDateTime(new Date()); - const start = formatDate(1,'d'); + const start = formatDate(6,'h'); dateValue.value=[start,end] changeDate(dateValue.value) } diff --git a/hg-monitor-web-qh/src/main/resources/static/vue3/src/views/pieDetailLine/index.html b/hg-monitor-web-qh/src/main/resources/static/vue3/src/views/pieDetailLine/index.html index a930202..6b11363 100644 --- a/hg-monitor-web-qh/src/main/resources/static/vue3/src/views/pieDetailLine/index.html +++ b/hg-monitor-web-qh/src/main/resources/static/vue3/src/views/pieDetailLine/index.html @@ -2,7 +2,7 @@ <div class="pie-detail-title"> <span class="pie-detail-title-active">性能走势</span> </div> - <!-- 趋势分析 预警分析--> + <!-- 趋势分析 预警分析--> <div class="pie-detail-content"> <el-row class="detail-content-title"> <el-col :span="8"></el-col> @@ -28,7 +28,7 @@ <el-col :span="24" class="detail_linechart"> <LineChart :optionData="optionData" v-if="optionData"></LineChart> -<!-- <div class="detail_linechart" id="indentKpiLineChart"></div>--> + <!-- <div class="detail_linechart" id="indentKpiLineChart"></div>--> <!-- <div class="detail_linechart" id="warningKpiLineChart" style="margin-top:35px;"></div>--> <!-- <div class="detail_linechart" id="line-tingyun-trendKpiLineChart" style="margin-top:35px;"></div>--> diff --git a/hg-monitor-web-qh/src/main/resources/static/vue3/src/views/pieDetailLine/index.js b/hg-monitor-web-qh/src/main/resources/static/vue3/src/views/pieDetailLine/index.js index 113dcc1..25b0112 100644 --- a/hg-monitor-web-qh/src/main/resources/static/vue3/src/views/pieDetailLine/index.js +++ b/hg-monitor-web-qh/src/main/resources/static/vue3/src/views/pieDetailLine/index.js @@ -21,87 +21,87 @@ export default { let startTime=Vue.ref(''); let endTime=Vue.ref(''); let colorsArr=Vue.ref([ - { - start: '#46d6d8', - end: '#2883d0' - }, - { - start: '#facf5b', - end: '#f77623' - }, - { - start: '#C04DD8', - end: '#D81F72' - }, - { - start: '#F5A1EB', - end: '#A04DE2' - }, - { - start: '#F36093', - end: '#FF465C' - }, - { - start: '#C2E74D', - end: '#00AE8B' - }, - { - start: '#3DC3FF', - end: '#01FFFF' - }, - { - start: '#B850ED', - end: '#9062EF' - }, - { - start: '#305be6', - end: '#36a7d3' - }, - { - start: '#FFA500', - end: '#FFEE00' - }, - { - start: '#C4E64C', - end: '#2de078' - }, - { - start: '#30ffb3', - end: '#01FFFF' - }, - { - start: '#FF4488', - end: '#F13EFF' - }, - { - start: '#A64CE2', - end: '#625AE7' - }, - { - start: '#5AEBC7', - end: '#5FC9F8' - }, - { - start: '#FFA500', - end: '#FFEE00' - }, - { - start: '#00AAD6', - end: '#625AE7' - }, - { - start: '#E48BDE', - end: '#FF9262' - }, - { - start: '#B2797B', - end: '#FF4B51' - }, - { - start: '#ffe393', - end: '#feff5b' - } - ]) + { + start: '#46d6d8', + end: '#2883d0' + }, + { + start: '#facf5b', + end: '#f77623' + }, + { + start: '#C04DD8', + end: '#D81F72' + }, + { + start: '#F5A1EB', + end: '#A04DE2' + }, + { + start: '#F36093', + end: '#FF465C' + }, + { + start: '#C2E74D', + end: '#00AE8B' + }, + { + start: '#3DC3FF', + end: '#01FFFF' + }, + { + start: '#B850ED', + end: '#9062EF' + }, + { + start: '#305be6', + end: '#36a7d3' + }, + { + start: '#FFA500', + end: '#FFEE00' + }, + { + start: '#C4E64C', + end: '#2de078' + }, + { + start: '#30ffb3', + end: '#01FFFF' + }, + { + start: '#FF4488', + end: '#F13EFF' + }, + { + start: '#A64CE2', + end: '#625AE7' + }, + { + start: '#5AEBC7', + end: '#5FC9F8' + }, + { + start: '#FFA500', + end: '#FFEE00' + }, + { + start: '#00AAD6', + end: '#625AE7' + }, + { + start: '#E48BDE', + end: '#FF9262' + }, + { + start: '#B2797B', + end: '#FF4B51' + }, + { + start: '#ffe393', + end: '#feff5b' + } + ]) let keys=Vue.ref(''); let getOptionData=(res)=>{ let nameArr=[];